nvidia-container-toolkit: 1.15.0-rc.3 -> 1.17.5 (#367769)

authored by Someone and committed by GitHub 6b691c15 24b30dd0

+17 -18
+1 -1
nixos/modules/services/hardware/nvidia-container-toolkit/cdi-generate.nix
··· 39 --device-name-strategy ${deviceNameStrategy} \ 40 --ldconfig-path ${lib.getExe' glibc "ldconfig"} \ 41 --library-search-path ${lib.getLib nvidia-driver}/lib \ 42 - --nvidia-ctk-path ${lib.getExe' nvidia-container-toolkit "nvidia-ctk"} 43 } 44 45 function additionalMount {
··· 39 --device-name-strategy ${deviceNameStrategy} \ 40 --ldconfig-path ${lib.getExe' glibc "ldconfig"} \ 41 --library-search-path ${lib.getLib nvidia-driver}/lib \ 42 + --nvidia-cdi-hook-path ${lib.getExe' nvidia-container-toolkit.tools "nvidia-cdi-hook"} 43 } 44 45 function additionalMount {
+16 -17
pkgs/by-name/nv/nvidia-container-toolkit/package.nix
··· 1 { 2 lib, 3 glibc, 4 - fetchFromGitLab, 5 makeWrapper, 6 buildGoModule, 7 formats, ··· 26 cliVersionPackage = "github.com/NVIDIA/nvidia-container-toolkit/internal/info"; 27 in 28 buildGoModule rec { 29 - pname = "container-toolkit/container-toolkit"; 30 - version = "1.15.0-rc.3"; 31 32 - src = fetchFromGitLab { 33 - owner = "nvidia"; 34 repo = pname; 35 rev = "v${version}"; 36 - hash = "sha256-IH2OjaLbcKSGG44aggolAOuJkjk+GaXnnTbrXfZ0lVo="; 37 38 }; 39 ··· 51 ]; 52 53 postPatch = '' 54 - # Replace the default hookDefaultFilePath to the $out path and override 55 - # default ldconfig locations to the one in nixpkgs. 56 - 57 substituteInPlace internal/config/config.go \ 58 - --replace '/usr/bin/nvidia-container-runtime-hook' "$out/bin/nvidia-container-runtime-hook" \ 59 - --replace '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig' 60 - 61 - substituteInPlace internal/config/config_test.go \ 62 --replace '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig' 63 64 substituteInPlace tools/container/toolkit/toolkit.go \ 65 --replace '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig' 66 67 - substituteInPlace cmd/nvidia-ctk/hook/update-ldcache/update-ldcache.go \ 68 - --replace '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig' 69 - ''; 70 71 # Based on upstream's Makefile: 72 # https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/03cbf9c6cd26c75afef8a2dd68e0306aace80401/Makefile#L64 ··· 104 --prefix PATH : ${libnvidia-container}/bin 105 106 mkdir -p $tools/bin 107 - mv $out/bin/{containerd,crio,docker,nvidia-toolkit,toolkit} $tools/bin 108 '' 109 + lib.optionalString (configTemplate != null || configTemplatePath != null) '' 110 mkdir -p $out/etc/nvidia-container-runtime
··· 1 { 2 lib, 3 glibc, 4 + fetchFromGitHub, 5 makeWrapper, 6 buildGoModule, 7 formats, ··· 26 cliVersionPackage = "github.com/NVIDIA/nvidia-container-toolkit/internal/info"; 27 in 28 buildGoModule rec { 29 + pname = "nvidia-container-toolkit"; 30 + version = "1.17.5"; 31 32 + src = fetchFromGitHub { 33 + owner = "NVIDIA"; 34 repo = pname; 35 rev = "v${version}"; 36 + hash = "sha256-vEo8agJ3jTaBokBjdGcO2naE457y8KPUAedC8vtwD1Y="; 37 38 }; 39 ··· 51 ]; 52 53 postPatch = '' 54 substituteInPlace internal/config/config.go \ 55 + --replace '/usr/bin/nvidia-container-runtime-hook' "$tools/bin/nvidia-container-runtime-hook" \ 56 --replace '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig' 57 58 substituteInPlace tools/container/toolkit/toolkit.go \ 59 --replace '/sbin/ldconfig' '${lib.getBin glibc}/sbin/ldconfig' 60 + ''; 61 62 + subPackages = [ 63 + "cmd/nvidia-cdi-hook" 64 + "cmd/nvidia-container-runtime.cdi" 65 + "cmd/nvidia-container-runtime-hook" 66 + "cmd/nvidia-container-runtime.legacy" 67 + "cmd/nvidia-ctk" 68 + ]; 69 70 # Based on upstream's Makefile: 71 # https://gitlab.com/nvidia/container-toolkit/container-toolkit/-/blob/03cbf9c6cd26c75afef8a2dd68e0306aace80401/Makefile#L64 ··· 103 --prefix PATH : ${libnvidia-container}/bin 104 105 mkdir -p $tools/bin 106 + mv $out/bin/{nvidia-cdi-hook,nvidia-container-runtime.cdi,nvidia-container-runtime-hook,nvidia-container-runtime.legacy} $tools/bin 107 '' 108 + lib.optionalString (configTemplate != null || configTemplatePath != null) '' 109 mkdir -p $out/etc/nvidia-container-runtime