Merge pull request #136958 from lovesegfault/nvidia-container-updates

nvidia-{docker,podman}: update
This commit is contained in:
Bernardo Meurer 2021-09-09 13:29:40 -07:00 committed by GitHub
commit 1f78c4ca9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 9 deletions

View File

@ -20,13 +20,13 @@ let
in
stdenv.mkDerivation rec {
pname = "libnvidia-container";
version = "1.3.3";
version = "1.5.0";
src = fetchFromGitHub {
owner = "NVIDIA";
repo = pname;
rev = "v${version}";
sha256 = "0rr6ngkzqgw250nilv36fz7fhsqxcgl4nhld2hnr0sr4ngirqcjp";
sha256 = "sha256-b9yQ1mEo1EkjXMguV0t98OvFEQO4h76EVu154MsB2II=";
};
patches = [
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
postPatch = ''
sed -i \
-e 's/^REVISION :=.*/REVISION = ${src.rev}/' \
-e 's/^REVISION ?=.*/REVISION = ${src.rev}/' \
-e 's/^COMPILER :=.*/COMPILER = $(CC)/' \
mk/common.mk

View File

@ -25,21 +25,20 @@ let
in
buildGoPackage rec {
pname = "nvidia-container-runtime";
version = "3.4.0";
version = "3.5.0";
src = fetchFromGitHub {
owner = "NVIDIA";
repo = pname;
rev = "v${version}";
sha256 = "095mks0r4079vawi50pk4zb5jk0g6s9idg2s1w55a0d27jkknldr";
sha256 = "sha256-+LZjsN/tKqsPJamoI8xo9LFv14c3e9vVlSP4NJhElcs=";
};
goPackagePath = "github.com/${pname}/src";
goPackagePath = "github.com/nvidia/nvidia-container-runtime";
ldflags = [ "-s" "-w" ];
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
mv $out/bin/{src,nvidia-container-runtime}
mkdir -p $out/etc/nvidia-container-runtime
# nvidia-container-runtime invokes docker-runc or runc if that isn't

View File

@ -6,13 +6,13 @@
}:
buildGoModule rec {
pname = "nvidia-container-toolkit";
version = "1.3.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "NVIDIA";
repo = pname;
rev = "v${version}";
sha256 = "04284bhgx4j55vg9ifvbji2bvmfjfy3h1lq7q356ffgw3yr9n0hn";
sha256 = "sha256-YvwqnwYOrlSE6PmNNZ5xjEaEcXdHKcakIwua+tOvIJ0=";
};
vendorSha256 = "17zpiyvf22skfcisflsp6pn56y6a793jcx89kw976fq2x5br1bz7";