From 6ac6aab1993eeb0d5da48054ff3d89b666c241e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?=
 <ereslibre@ereslibre.es>
Date: Sat, 17 Feb 2024 18:16:22 +0100
Subject: [PATCH] nvidia-container-toolkit: move to by-name structure

---
 .../0001-Add-dlopen-discoverer.patch                         | 0
 .../nv/nvidia-container-toolkit/nvidia-docker.nix}           | 0
 .../nv/nvidia-container-toolkit/package.nix}                 | 0
 .../nv}/nvidia-container-toolkit/packages.nix                | 5 +++--
 pkgs/top-level/all-packages.nix                              | 4 +---
 5 files changed, 4 insertions(+), 5 deletions(-)
 rename pkgs/{applications/virtualization => by-name/nv}/nvidia-container-toolkit/0001-Add-dlopen-discoverer.patch (100%)
 rename pkgs/{applications/virtualization/nvidia-docker/default.nix => by-name/nv/nvidia-container-toolkit/nvidia-docker.nix} (100%)
 rename pkgs/{applications/virtualization/nvidia-container-toolkit/default.nix => by-name/nv/nvidia-container-toolkit/package.nix} (100%)
 rename pkgs/{applications/virtualization => by-name/nv}/nvidia-container-toolkit/packages.nix (93%)

diff --git a/pkgs/applications/virtualization/nvidia-container-toolkit/0001-Add-dlopen-discoverer.patch b/pkgs/by-name/nv/nvidia-container-toolkit/0001-Add-dlopen-discoverer.patch
similarity index 100%
rename from pkgs/applications/virtualization/nvidia-container-toolkit/0001-Add-dlopen-discoverer.patch
rename to pkgs/by-name/nv/nvidia-container-toolkit/0001-Add-dlopen-discoverer.patch
diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix
similarity index 100%
rename from pkgs/applications/virtualization/nvidia-docker/default.nix
rename to pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix
diff --git a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/nvidia-container-toolkit/default.nix
rename to pkgs/by-name/nv/nvidia-container-toolkit/package.nix
diff --git a/pkgs/applications/virtualization/nvidia-container-toolkit/packages.nix b/pkgs/by-name/nv/nvidia-container-toolkit/packages.nix
similarity index 93%
rename from pkgs/applications/virtualization/nvidia-container-toolkit/packages.nix
rename to pkgs/by-name/nv/nvidia-container-toolkit/packages.nix
index 0ce76d5aed31..c78b6b1c2834 100644
--- a/pkgs/applications/virtualization/nvidia-container-toolkit/packages.nix
+++ b/pkgs/by-name/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
index 6c4c2a20b25a..4f580d8e3984 100644
--- 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