git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #108607 from cpcloud/update-nvidia-runtime
commit2f2d887664783756041e9831057a5dd6be6f8b7f authorSandro <sandro.jaeckel@gmail.com> dateThu 7 Jan 2021, 16:43 (6 years ago) parent2fe7c5c6468f2c
4 files changed+84−37
pkgs/applications/virtualization/nvidia-docker/default.nix+45−30 pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch+2−2 pkgs/applications/virtualization/nvidia-docker/libnvc.nix+8−5 pkgs/applications/virtualization/nvidia-docker/modprobe.patch+29
pkgs/applications/virtualization/nvidia-docker/default.nix+45−30
@@ -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}
pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch+2−2
@@ -86,7 +86,7 @@ index 30e3cfd..6d12a50 100644
8686 if (info->libs == NULL)
8787 goto fail;
8888 if (ldcache_resolve(&ld, LIB_ARCH, root, libs,
89−- info->libs, info->nlibs, select_libraries, info) < 0)
89+- info->libs, info->nlibs, select_libraries_fn, info) < 0)
9090+ info->libs, info->nlibs, info->nvrm_version) < 0)
9191 goto fail;
9292
@@ -95,7 +95,7 @@ index 30e3cfd..6d12a50 100644
9595 if (info->libs32 == NULL)
9696 goto fail;
9797 if (ldcache_resolve(&ld, LIB32_ARCH, root, libs,
98−- info->libs32, info->nlibs32, select_libraries, info) < 0)
98+- info->libs32, info->nlibs32, select_libraries_fn, info) < 0)
9999+ info->libs32, info->nlibs32, info->nvrm_version) < 0)
100100 goto fail;
101101 rv = 0;
pkgs/applications/virtualization/nvidia-docker/libnvc.nix+8−5
@@ -9,23 +9,23 @@
99, libtirpc
1010}:
1111let
12− modp-ver = "396.51";
12+ modp-ver = "450.57";
1313 nvidia-modprobe = fetchFromGitHub {
1414 owner = "NVIDIA";
1515 repo = "nvidia-modprobe";
1616 rev = modp-ver;
17− sha256 = "1fw2qwc84k64agw6fx2v0mjf88aggph9c6qhs4cv7l3gmflv8qbk";
17+ sha256 = "0r4f6lpbbqqs9932xd2mr7bxn6a3xdalcwq332fc1amrrkgzfyv7";
1818 };
1919in
2020stdenv.mkDerivation rec {
2121 pname = "libnvidia-container";
22− version = "1.0.6";
22+ version = "1.3.1";
2323
2424 src = fetchFromGitHub {
2525 owner = "NVIDIA";
2626 repo = "libnvidia-container";
2727 rev = "v${version}";
28− sha256 = "1pnpc9knwh8d1zqb28zc3spkjc00w0z10vd3jna8ksvpl35jl7w3";
28+ sha256 = "0j6b8z9x9hrrs4xp11zyjjd7kyl7fzcicpiis8k1qb1q2afnqsrq";
2929 };
3030
3131 patches = [
@@ -58,7 +58,10 @@ stdenv.mkDerivation rec {
5858 mkdir -p deps/src/nvidia-modprobe-${modp-ver}
5959 cp -r ${nvidia-modprobe}/* deps/src/nvidia-modprobe-${modp-ver}
6060 chmod -R u+w deps/src
61− touch deps/src/nvidia-modprobe-${modp-ver}/.download_stamp
61+ pushd deps/src
62+ patch -p0 < ${./modprobe.patch}
63+ touch nvidia-modprobe-${modp-ver}/.download_stamp
64+ popd
6265 '';
6366
6467 NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];
pkgs/applications/virtualization/nvidia-docker/modprobe.patchnew file+29
@@ -0,0 +1,29 @@
1+diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c
2+--- nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c 2020-07-09 17:06:05.000000000 +0000
3++++ nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c 2020-08-18 12:43:03.223871514 +0000
4+@@ -840,10 +840,10 @@
5+ return mknod_helper(major, minor_num, vgpu_dev_name, NV_PROC_REGISTRY_PATH);
6+ }
7+
8+-static int nvidia_cap_get_device_file_attrs(const char* cap_file_path,
9+- int *major,
10+- int *minor,
11+- char *name)
12++int nvidia_cap_get_device_file_attrs(const char* cap_file_path,
13++ int *major,
14++ int *minor,
15++ char *name)
16+ {
17+ char field[32];
18+ FILE *fp;
19+diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h
20+--- nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h 2020-07-09 17:06:05.000000000 +0000
21++++ nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h 2020-08-18 12:43:44.227745050 +0000
22+@@ -81,6 +81,7 @@
23+ int nvidia_nvswitch_get_file_state(int minor);
24+ int nvidia_cap_mknod(const char* cap_file_path, int *minor);
25+ int nvidia_cap_get_file_state(const char* cap_file_path);
26++int nvidia_cap_get_device_file_attrs(const char* cap_file_path, int *major, int *minor, char *name);
27+ int nvidia_get_chardev_major(const char *name);
28+
29+ #endif /* NV_LINUX */