From 248dc21a54b85fd3c613252416eb309719569c2f Mon Sep 17 00:00:00 2001
From: Adam Stephens <adam@valkor.net>
Date: Fri, 29 Mar 2024 22:27:22 -0400
Subject: [PATCH 1/2] treewide: fix renamed incus container tests

---
 .../linux/lxcfs/default.nix => by-name/lx/lxcfs/package.nix} | 5 +++++
 pkgs/os-specific/linux/lxc/default.nix                       | 4 ++--
 pkgs/tools/virtualization/distrobuilder/default.nix          | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)
 rename pkgs/{os-specific/linux/lxcfs/default.nix => by-name/lx/lxcfs/package.nix} (89%)

diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/by-name/lx/lxcfs/package.nix
similarity index 89%
rename from pkgs/os-specific/linux/lxcfs/default.nix
rename to pkgs/by-name/lx/lxcfs/package.nix
index 00c7f6f5edbd..07dec2a8dc8f 100644
--- a/pkgs/os-specific/linux/lxcfs/default.nix
+++ b/pkgs/by-name/lx/lxcfs/package.nix
@@ -63,6 +63,11 @@ stdenv.mkDerivation rec {
   passthru.tests = {
     incus-container-old-init = nixosTests.incus.container-old-init;
     incus-container-new-init = nixosTests.incus.container-new-init;
+  passthru = {
+    tests = {
+      incus-container-legacy-init = nixosTests.incus.container-legacy-init;
+      incus-container-systemd-init = nixosTests.incus.container-systemd-init;
+    };
   };
 
   meta = {
diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index 4026784f92a4..e525c9c3f5f7 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -63,8 +63,8 @@ stdenv.mkDerivation rec {
 
   passthru = {
     tests = {
-      incus-old-init = nixosTests.incus.container-old-init;
-      incus-new-init = nixosTests.incus.container-new-init;
+      incus-legacy-init = nixosTests.incus.container-legacy-init;
+      incus-systemd-init = nixosTests.incus.container-systemd-init;
     };
     updateScript = nix-update-script {
       extraArgs = [
diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix
index fb08c7110039..5ccf8070c3c9 100644
--- a/pkgs/tools/virtualization/distrobuilder/default.nix
+++ b/pkgs/tools/virtualization/distrobuilder/default.nix
@@ -52,8 +52,8 @@ buildGoModule rec {
 
   passthru = {
     tests = {
-      incus-old-init = nixosTests.incus.container-old-init;
-      incus-new-init = nixosTests.incus.container-new-init;
+      incus-legacy-init = nixosTests.incus.container-legacy-init;
+      incus-systemd-init = nixosTests.incus.container-systemd-init;
     };
 
     generator = callPackage ./generator.nix { inherit src version; };

From 811965cd34f8878e6ad555a0c51ba73881c3acdf Mon Sep 17 00:00:00 2001
From: Adam Stephens <adam@valkor.net>
Date: Fri, 29 Mar 2024 22:29:52 -0400
Subject: [PATCH 2/2] lxcfs: 5.0.4 -> 6.0.0

---
 .../linux => by-name/lx}/lxcfs/no-spec.patch        |  0
 pkgs/by-name/lx/lxcfs/package.nix                   | 13 ++++++-------
 .../linux => by-name/lx}/lxcfs/pidfd.patch          |  0
 .../linux => by-name/lx}/lxcfs/skip-init.patch      |  0
 pkgs/top-level/all-packages.nix                     |  1 -
 5 files changed, 6 insertions(+), 8 deletions(-)
 rename pkgs/{os-specific/linux => by-name/lx}/lxcfs/no-spec.patch (100%)
 rename pkgs/{os-specific/linux => by-name/lx}/lxcfs/pidfd.patch (100%)
 rename pkgs/{os-specific/linux => by-name/lx}/lxcfs/skip-init.patch (100%)

diff --git a/pkgs/os-specific/linux/lxcfs/no-spec.patch b/pkgs/by-name/lx/lxcfs/no-spec.patch
similarity index 100%
rename from pkgs/os-specific/linux/lxcfs/no-spec.patch
rename to pkgs/by-name/lx/lxcfs/no-spec.patch
diff --git a/pkgs/by-name/lx/lxcfs/package.nix b/pkgs/by-name/lx/lxcfs/package.nix
index 07dec2a8dc8f..67562ddc7baa 100644
--- a/pkgs/by-name/lx/lxcfs/package.nix
+++ b/pkgs/by-name/lx/lxcfs/package.nix
@@ -7,6 +7,7 @@
   makeWrapper,
   meson,
   ninja,
+  nix-update-script,
   nixosTests,
   pkg-config,
   python3,
@@ -15,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxcfs";
-  version = "5.0.4";
+  version = "6.0.0";
 
   src = fetchFromGitHub {
     owner = "lxc";
     repo = "lxcfs";
-    rev = "lxcfs-${version}";
-    sha256 = "sha256-vusxbFV7cnQVBOOo7E+fSyaE63f5QiE2xZhYavc8jJU=";
+    rev = "v${version}";
+    sha256 = "sha256-Mx2ZTul3hUEL9SloYSOh+MGoc2QmZg88MTsfIOvaIZU=";
   };
 
   patches = [
@@ -35,7 +36,6 @@ stdenv.mkDerivation rec {
     ./pidfd.patch
   ];
 
-
   nativeBuildInputs = [
     meson
     help2man
@@ -60,14 +60,13 @@ stdenv.mkDerivation rec {
     patchelf --set-rpath "$(patchelf --print-rpath "$out/bin/lxcfs"):$out/lib" "$out/bin/lxcfs"
   '';
 
-  passthru.tests = {
-    incus-container-old-init = nixosTests.incus.container-old-init;
-    incus-container-new-init = nixosTests.incus.container-new-init;
   passthru = {
     tests = {
       incus-container-legacy-init = nixosTests.incus.container-legacy-init;
       incus-container-systemd-init = nixosTests.incus.container-systemd-init;
     };
+
+    updateScript = nix-update-script { };
   };
 
   meta = {
diff --git a/pkgs/os-specific/linux/lxcfs/pidfd.patch b/pkgs/by-name/lx/lxcfs/pidfd.patch
similarity index 100%
rename from pkgs/os-specific/linux/lxcfs/pidfd.patch
rename to pkgs/by-name/lx/lxcfs/pidfd.patch
diff --git a/pkgs/os-specific/linux/lxcfs/skip-init.patch b/pkgs/by-name/lx/lxcfs/skip-init.patch
similarity index 100%
rename from pkgs/os-specific/linux/lxcfs/skip-init.patch
rename to pkgs/by-name/lx/lxcfs/skip-init.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d3bab087bf0a..d9e676750cdf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10587,7 +10587,6 @@ with pkgs;
   lwc = callPackage ../tools/misc/lwc { };
 
   lxc = callPackage ../os-specific/linux/lxc {  };
-  lxcfs = callPackage ../os-specific/linux/lxcfs { };
 
   lxd = callPackage ../tools/admin/lxd/wrapper.nix { };
   lxd-unwrapped = callPackage ../tools/admin/lxd {