nvidia-container-toolkit: move to by-name structure

NixOS · Feb 21, 2024 · 6ac6aab · 6ac6aab
1 parent 8ba61eb
commit 6ac6aab
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/...-toolkit/0001-Add-dlopen-discoverer.patch → ...-toolkit/0001-Add-dlopen-discoverer.patch b/...-toolkit/0001-Add-dlopen-discoverer.patch → ...-toolkit/0001-Add-dlopen-discoverer.patch
diff --git a/.../virtualization/nvidia-docker/default.nix → ...vidia-container-toolkit/nvidia-docker.nix b/.../virtualization/nvidia-docker/default.nix → ...vidia-container-toolkit/nvidia-docker.nix
diff --git a/...tion/nvidia-container-toolkit/default.nix → ...e/nv/nvidia-container-toolkit/package.nix b/...tion/nvidia-container-toolkit/default.nix → ...e/nv/nvidia-container-toolkit/package.nix
diff --git a/...ion/nvidia-container-toolkit/packages.nix → .../nv/nvidia-container-toolkit/packages.nix b/...ion/nvidia-container-toolkit/packages.nix → .../nv/nvidia-container-toolkit/packages.nix
@@ -29,7 +29,7 @@ lib.makeScope newScope (
         ldconfig = "@@glibcbin@/bin/ldconfig";
       };
     };
-    nvidia-container-toolkit-docker = self.callPackage ./. {
+    nvidia-container-toolkit-docker = self.callPackage ./package.nix {
       containerRuntimePath = "${docker}/libexec/docker/docker";
       configTemplate = self.dockerConfig;
     };
@@ -65,7 +65,8 @@ lib.makeScope newScope (
       ];
       inherit (self.nvidia-docker-unwrapped) meta;
     };
-    nvidia-docker-unwrapped = self.callPackage ../nvidia-docker { };
+    nvidia-docker-unwrapped =
+      self.callPackage ./nvidia-docker.nix { };
 
     nvidia-podman = symlinkJoin {
       name = "nvidia-podman";

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -24067,10 +24067,8 @@ with pkgs;
   nv-codec-headers-11 = callPackage ../development/libraries/nv-codec-headers/11_x.nix { };
   nv-codec-headers-12 = callPackage ../development/libraries/nv-codec-headers/12_x.nix { };
 
-  nvidia-container-toolkit = callPackage ../applications/virtualization/nvidia-container-toolkit { };
-
   nvidiaCtkPackages =
-    callPackage ../applications/virtualization/nvidia-container-toolkit/packages.nix
+    callPackage ../by-name/nv/nvidia-container-toolkit/packages.nix
       { };
   inherit (nvidiaCtkPackages)
     nvidia-docker