@@ -1,47 +1,61 @@
1−{ stdenv, lib, fetchFromGitHub, fetchpatch, callPackage, makeWrapper
2−, buildGoPackage, runc, glibc }:
1+{ stdenv
2+, lib
3+, fetchFromGitHub
4+, fetchpatch
5+, callPackage
6+, makeWrapper
7+, buildGoModule
8+, buildGoPackage
9+, git
10+, glibc
11+}:
312
413with lib; let
5−
614 libnvidia-container = callPackage ./libnvc.nix { };
715
8− nvidia-container-runtime = fetchFromGitHub {
9− owner = "NVIDIA";
10− repo = "nvidia-container-runtime";
11− rev = "runtime-v2.0.0";
12− sha256 = "0jcj5xxbg7x7gyhbb67h3ds6vly62gx7j02zm6lg102h34jajj7a";
13− };
14−
15− nvidia-container-runtime-hook = buildGoPackage {
16− pname = "nvidia-container-runtime-hook";
17− version = "1.4.0";
18−
19− goPackagePath = "nvidia-container-runtime-hook";
20−
21− src = "${nvidia-container-runtime}/hook/nvidia-container-runtime-hook";
16+ nvidia-container-runtime = buildGoPackage rec {
17+ pname = "nvidia-container-toolkit";
18+ version = "3.4.0";
19+ src = fetchFromGitHub {
20+ owner = "NVIDIA";
21+ repo = "nvidia-container-runtime";
22+ rev = "v${version}";
23+ sha256 = "095mks0r4079vawi50pk4zb5jk0g6s9idg2s1w55a0d27jkknldr";
24+ };
25+ goPackagePath = "github.com/nvidia-container-runtime/src";
26+ buildFlagsArray = [ "-ldflags=" "-s -w" ];
27+ postInstall = ''
28+ mv $out/bin/{src,nvidia-container-runtime}
29+ '';
2230 };
2331
24− nvidia-runc = runc.overrideAttrs (oldAttrs: rec {
25− name = "nvidia-runc";
26− version = "1.0.0-rc6";
32+ nvidia-container-toolkit = buildGoModule rec {
33+ pname = "nvidia-container-toolkit";
34+ version = "1.3.0";
2735 src = fetchFromGitHub {
28− owner = "opencontainers";
29− repo = "runc";
36+ owner = "NVIDIA";
37+ repo = "nvidia-container-toolkit";
3038 rev = "v${version}";
31− sha256 = "1jwacb8xnmx5fr86gximhbl9dlbdwj3rpf27hav9q1si86w5pb1j";
39+ sha256 = "04284bhgx4j55vg9ifvbji2bvmfjfy3h1lq7q356ffgw3yr9n0hn";
3240 };
33− patches = [ "${nvidia-container-runtime}/runtime/runc/3f2f8b84a77f73d38244dd690525642a72156c64/0001-Add-prestart-hook-nvidia-container-runtime-hook-to-t.patch" ];
34− });
41+ vendorSha256 = "17zpiyvf22skfcisflsp6pn56y6a793jcx89kw976fq2x5br1bz7";
42+ buildFlagsArray = [ "-ldflags=" "-s -w" ];
43+ postInstall = ''
44+ mv $out/bin/{pkg,${pname}}
45+ cp $out/bin/{${pname},nvidia-container-runtime-hook}
46+ '';
47+ };
3548
36−in stdenv.mkDerivation rec {
49+in
50+stdenv.mkDerivation rec {
3751 pname = "nvidia-docker";
38− version = "2.0.3";
52+ version = "2.5.0";
3953
4054 src = fetchFromGitHub {
4155 owner = "NVIDIA";
4256 repo = "nvidia-docker";
4357 rev = "v${version}";
44− sha256 = "1vx5m591mnvcb9vy0196x5lh3r8swjsk0fnlv5h62m7m4m07v6wx";
58+ sha256 = "1n1k7fnimky67s12p2ycaq9mgk245fchq62vgd7bl3bzfcbg0z4h";
4559 };
4660
4761 nativeBuildInputs = [ makeWrapper ];
@@ -50,8 +64,8 @@ in stdenv.mkDerivation rec {
5064 mkdir bin
5165 cp nvidia-docker bin
5266 cp ${libnvidia-container}/bin/nvidia-container-cli bin
53− cp ${nvidia-container-runtime-hook}/bin/nvidia-container-runtime-hook bin
54− cp ${nvidia-runc}/bin/runc bin/nvidia-container-runtime
67+ cp ${nvidia-container-toolkit}/bin/nvidia-container-{toolkit,runtime-hook} bin
68+ cp ${nvidia-container-runtime}/bin/nvidia-container-runtime bin
5569 '';
5670
5771 installPhase = ''
@@ -68,5 +82,6 @@ in stdenv.mkDerivation rec {
6882 description = "NVIDIA container runtime for Docker";
6983 license = licenses.bsd3;
7084 platforms = platforms.linux;
85+ maintainers = with lib.maintainers; [ cpcloud ];
7186 };
7287}