From 356b874541f191cbeef1a01cef5db61396ade0e2 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 3 Apr 2025 22:26:18 +0000
Subject: [PATCH 1/4] lxcfs: 6.0.3 -> 6.0.4

https://discuss.linuxcontainers.org/t/lxcfs-6-0-4-lts-has-been-released/23389
https://github.com/lxc/lxcfs/releases/tag/v6.0.4
---
 pkgs/by-name/lx/lxcfs/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/lx/lxcfs/package.nix b/pkgs/by-name/lx/lxcfs/package.nix
index 966d93df2ac8..8b10fd6886d3 100644
--- a/pkgs/by-name/lx/lxcfs/package.nix
+++ b/pkgs/by-name/lx/lxcfs/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxcfs";
-  version = "6.0.3";
+  version = "6.0.4";
 
   src = fetchFromGitHub {
     owner = "lxc";
     repo = "lxcfs";
-    rev = "v${version}";
-    hash = "sha256-+Xlx1E6ggB/Vx3yOJGgh4UfEvaVyT7uOttaxelDA7Iw=";
+    tag = "v${version}";
+    hash = "sha256-jmadClC/3nHfNL+F/gC5NM6u03OE9flEVtPU28nylw4=";
   };
 
   patches = [

From b53467502234c9a4fc483e880b96fa1979e92996 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 3 Apr 2025 22:31:14 +0000
Subject: [PATCH 2/4] lxc: 6.0.3 -> 6.0.4

https://discuss.linuxcontainers.org/t/lxc-6-0-4-lts-has-been-released/23390
https://github.com/lxc/lxc/releases/tag/v6.0.4
---
 pkgs/by-name/lx/lxc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lx/lxc/package.nix b/pkgs/by-name/lx/lxc/package.nix
index 6398ec6093a2..fba1b0efba4b 100644
--- a/pkgs/by-name/lx/lxc/package.nix
+++ b/pkgs/by-name/lx/lxc/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lxc";
-  version = "6.0.3";
+  version = "6.0.4";
 
   src = fetchFromGitHub {
     owner = "lxc";
     repo = "lxc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-h41lcHGjJmIH28XRpM0gdFsOQOCLSWevSLfvQ7gIf7Q=";
+    hash = "sha256-zmL568PprrpIWTVCkScXHEzTZ+NduSH4r8ETnz4NY64=";
   };
 
   nativeBuildInputs = [

From 160d352c6a933f223efee02a692066763dc18ef1 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 3 Apr 2025 22:32:38 +0000
Subject: [PATCH 3/4] incus-lts: 6.0.3 -> 6.0.4

https://discuss.linuxcontainers.org/t/incus-6-0-4-lts-has-been-released/23391
https://github.com/lxc/incus/releases/tag/v6.0.4
---
 pkgs/by-name/in/incus/lts.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/in/incus/lts.nix b/pkgs/by-name/in/incus/lts.nix
index a6cbeffb08d4..f7e89ba71bf3 100644
--- a/pkgs/by-name/in/incus/lts.nix
+++ b/pkgs/by-name/in/incus/lts.nix
@@ -1,7 +1,7 @@
 import ./generic.nix {
-  hash = "sha256-+W4imWem5iQ6nPVcoObc4COFxQVED0ppVd/YC+Nqtgw=";
-  version = "6.0.3";
-  vendorHash = "sha256-ZUtWzbAjHij95khYx8lWYEpA8ITlMtKpObG5Vl7aE90=";
+  hash = "sha256-zwefzCmj4K1GJRbherOS28swLoGbHnUxbF9bmLOh738=";
+  version = "6.0.4";
+  vendorHash = "sha256-4of741V2ztxkyI2r5UVEL5ON/9kaDTygosLxyTw6ShQ=";
   patches = [
     # qemu 9.1 compat, remove when added to LTS
     ./572afb06f66f83ca95efa1b9386fceeaa1c9e11b.patch

From fce5edc7552b2174da48361151960e78db8f7cd2 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 8 Apr 2025 23:19:37 -0400
Subject: [PATCH 4/4] lxcfs: wrap lxc.reboot.hook

---
 pkgs/by-name/lx/lxcfs/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/lx/lxcfs/package.nix b/pkgs/by-name/lx/lxcfs/package.nix
index 8b10fd6886d3..07a8f1725392 100644
--- a/pkgs/by-name/lx/lxcfs/package.nix
+++ b/pkgs/by-name/lx/lxcfs/package.nix
@@ -59,6 +59,13 @@ stdenv.mkDerivation rec {
         util-linux
       ]
     }
+
+    # requires access to sleep
+    wrapProgram "$out/share/lxcfs/lxc.reboot.hook" --prefix PATH : ${
+      lib.makeBinPath [
+        coreutils
+      ]
+    }
   '';
 
   postFixup = ''