From be4d1def38bf550b161abc6ebb104655f8b4e054 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sat, 13 Jun 2026 12:57:58 -0500
Subject: [PATCH 1/2] krunvm: switch to finalAttrs and add strictDeps and
 structuredAttrs

Assisted-by: Cursor Composer 2.5
---
 pkgs/applications/virtualization/krunvm/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/virtualization/krunvm/default.nix b/pkgs/applications/virtualization/krunvm/default.nix
index 8dd4fc569e42..0f7085e8913a 100644
--- a/pkgs/applications/virtualization/krunvm/default.nix
+++ b/pkgs/applications/virtualization/krunvm/default.nix
@@ -14,22 +14,25 @@
   sigtool,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "krunvm";
   version = "0.2.6";
 
   src = fetchFromGitHub {
     owner = "libkrun";
     repo = "krunvm";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-peOaPivQKOwioh5skPNFiA3ptHv9pSsnjpy43cms8O8=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit src;
+    inherit (finalAttrs) src;
     hash = "sha256-MRcQ0Vnd3PJqE2q981JpXPjwMUKT4t+RcOvzWptK7PQ=";
   };
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   nativeBuildInputs = [
     rustPlatform.cargoSetupHook
     cargo
@@ -77,4 +80,4 @@ stdenv.mkDerivation rec {
     platforms = libkrun.meta.platforms;
     mainProgram = "krunvm";
   };
-}
+})

From 32c97dd4e385f4f33b93fd00e8a9718509526d37 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sat, 13 Jun 2026 13:04:00 -0500
Subject: [PATCH 2/2] krunvm: migrate to by-name

Assisted-by: Cursor Composer 2.5
---
 .../krunvm/default.nix => by-name/kr/krunvm/package.nix}      | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{applications/virtualization/krunvm/default.nix => by-name/kr/krunvm/package.nix} (96%)

diff --git a/pkgs/applications/virtualization/krunvm/default.nix b/pkgs/by-name/kr/krunvm/package.nix
similarity index 96%
rename from pkgs/applications/virtualization/krunvm/default.nix
rename to pkgs/by-name/kr/krunvm/package.nix
index 0f7085e8913a..70b8dd4114f0 100644
--- a/pkgs/applications/virtualization/krunvm/default.nix
+++ b/pkgs/by-name/kr/krunvm/package.nix
@@ -7,11 +7,11 @@
   buildah,
   buildah-unwrapped,
   cargo,
+  darwin,
   libiconv,
   libkrun,
   makeWrapper,
   rustc,
-  sigtool,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     asciidoctor
     makeWrapper
   ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ];
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ];
 
   buildInputs = [
     libkrun
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ba3eba8821e..53fb8e7fea33 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2478,10 +2478,6 @@ with pkgs;
 
   keybase-gui = callPackage ../tools/security/keybase/gui.nix { };
 
-  krunvm = callPackage ../applications/virtualization/krunvm {
-    inherit (darwin) sigtool;
-  };
-
   limine-full = limine.override { enableAll = true; };
 
   logstash7 = callPackage ../tools/misc/logstash/7.x.nix {