diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-29 12:01:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-29 12:01:16 +0000 |
| commit | c1a6c05aa71609aa9b892987d12527c73f53987a (patch) | |
| tree | 2adf07864e5fc3d24ca0db3d581e4b7526d01821 /pkgs/applications/virtualization | |
| parent | 6fe9af917e840a08ac29faa8d52afea666bd0f81 (diff) | |
| parent | f1d249a007de3c4d5c62bf6c83a3d0ca5f20e284 (diff) | |
| download | nixlib-c1a6c05aa71609aa9b892987d12527c73f53987a.tar nixlib-c1a6c05aa71609aa9b892987d12527c73f53987a.tar.gz nixlib-c1a6c05aa71609aa9b892987d12527c73f53987a.tar.bz2 nixlib-c1a6c05aa71609aa9b892987d12527c73f53987a.tar.lz nixlib-c1a6c05aa71609aa9b892987d12527c73f53987a.tar.xz nixlib-c1a6c05aa71609aa9b892987d12527c73f53987a.tar.zst nixlib-c1a6c05aa71609aa9b892987d12527c73f53987a.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/nvidia-container-toolkit/default.nix | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix index 9d32d9864ac0..a174c3031227 100644 --- a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix +++ b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix @@ -2,7 +2,7 @@ , glibc , fetchFromGitLab , makeWrapper -, buildGoPackage +, buildGoModule , linkFarm , writeShellScript , containerRuntimePath @@ -24,7 +24,7 @@ let fi ''; in -buildGoPackage rec { +buildGoModule rec { pname = "container-toolkit/container-toolkit"; version = "1.9.0"; @@ -32,20 +32,30 @@ buildGoPackage rec { owner = "nvidia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b4mybNB5FqizFTraByHk5SCsNO66JaISj18nLgLN7IA="; + hash = "sha256-b4mybNB5FqizFTraByHk5SCsNO66JaISj18nLgLN7IA="; }; - goPackagePath = "github.com/NVIDIA/nvidia-container-toolkit"; + vendorHash = null; + + postPatch = '' + # replace the default hookDefaultFilePath to the $out path + substituteInPlace cmd/nvidia-container-runtime/main.go \ + --replace '/usr/bin/nvidia-container-runtime-hook' '${placeholder "out"}/bin/nvidia-container-runtime-hook' + ''; ldflags = [ "-s" "-w" ]; nativeBuildInputs = [ makeWrapper ]; - preBuild = '' - # replace the default hookDefaultFilePath to the $out path - substituteInPlace go/src/github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-container-runtime/main.go \ - --replace '/usr/bin/nvidia-container-runtime-hook' '${placeholder "out"}/bin/nvidia-container-runtime-hook' - ''; + checkFlags = + let + skippedTests = [ + # Disable tests executing nvidia-container-runtime command. + "TestGoodInput" + "TestDuplicateHook" + ]; + in + [ "-skip" "${builtins.concatStringsSep "|" skippedTests}" ]; postInstall = '' mkdir -p $out/etc/nvidia-container-runtime |