git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #108862 from cpcloud/refactor-nvidia-containers
commitf3042e30785437f6cb2d99b15625b962fb96799f authorJörg Thalheim <Mic92@users.noreply.github.com> dateFri 15 Jan 2021, 11:10 (6 years ago) parent147270ccaf2a8d
11 files changed+155−97
nixos/modules/virtualisation/docker.nix−3 nixos/modules/virtualisation/podman.nix+2−10 pkgs/applications/virtualization/nvidia-docker/avoid-static-libtirpc-build.patch → pkgs/applications/virtualization/libnvidia-container/avoid-static-libtirpc-build.patch pkgs/applications/virtualization/nvidia-docker/libnvc.nix → pkgs/applications/virtualization/libnvidia-container/default.nix+10−3 pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch → pkgs/applications/virtualization/libnvidia-container/libnvc-ldconfig-and-path-fixes.patch pkgs/applications/virtualization/nvidia-docker/modprobe.patch → pkgs/applications/virtualization/libnvidia-container/modprobe.patch pkgs/applications/virtualization/nvidia-container-runtime/default.nix+72 pkgs/applications/virtualization/nvidia-container-toolkit/default.nix+37 pkgs/applications/virtualization/nvidia-docker/default.nix+6−80 pkgs/applications/virtualization/nvidia-docker/podman-config.toml → pkgs/applications/virtualization/nvidia-podman/config.toml pkgs/top-level/all-packages.nix+28−1
nixos/modules/virtualisation/docker.nix−3
@@ -213,9 +213,6 @@ in
213213 message = "Option enableNvidia requires 32bit support libraries";
214214 }];
215215 }
216− (mkIf cfg.enableNvidia {
217− environment.etc."nvidia-container-runtime/config.toml".source = "${pkgs.nvidia-docker}/etc/config.toml";
218− })
219216 ]);
220217
221218 imports = [
nixos/modules/virtualisation/podman.nix+2−10
@@ -2,7 +2,6 @@
22let
33 cfg = config.virtualisation.podman;
44 toml = pkgs.formats.toml { };
5− nvidia-docker = pkgs.nvidia-docker.override { containerRuntimePath = "${pkgs.runc}/bin/runc"; };
65
76 inherit (lib) mkOption types;
87
@@ -100,8 +99,8 @@ in
10099 containersConf.extraConfig = lib.optionalString cfg.enableNvidia
101100 (builtins.readFile (toml.generate "podman.nvidia.containers.conf" {
102101 engine = {
103− conmon_env_vars = [ "PATH=${lib.makeBinPath [ nvidia-docker ]}" ];
104− runtimes.nvidia = [ "${nvidia-docker}/bin/nvidia-container-runtime" ];
102+ conmon_env_vars = [ "PATH=${lib.makeBinPath [ pkgs.nvidia-podman ]}" ];
103+ runtimes.nvidia = [ "${pkgs.nvidia-podman}/bin/nvidia-container-runtime" ];
105104 };
106105 }));
107106 };
@@ -111,14 +110,7 @@ in
111110 assertion = cfg.dockerCompat -> !config.virtualisation.docker.enable;
112111 message = "Option dockerCompat conflicts with docker";
113112 }
114− {
115− assertion = cfg.enableNvidia -> !config.virtualisation.docker.enableNvidia;
116− message = "Option enableNvidia conflicts with docker.enableNvidia";
117− }
118113 ];
119114 }
120− (lib.mkIf cfg.enableNvidia {
121− environment.etc."nvidia-container-runtime/config.toml".source = "${nvidia-docker}/etc/podman-config.toml";
122− })
123115 ]);
124116}
pkgs/applications/virtualization/nvidia-docker/avoid-static-libtirpc-build.patch → pkgs/applications/virtualization/libnvidia-container/avoid-static-libtirpc-build.patchrenamed

The content is the same.

pkgs/applications/virtualization/nvidia-docker/libnvc.nix → pkgs/applications/virtualization/libnvidia-container/default.nixrenamed+10−3
@@ -7,6 +7,7 @@
77, libseccomp
88, rpcsvc-proto
99, libtirpc
10+, makeWrapper
1011}:
1112let
1213 modp-ver = "450.57";
@@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
2324
2425 src = fetchFromGitHub {
2526 owner = "NVIDIA";
26− repo = "libnvidia-container";
27+ repo = pname;
2728 rev = "v${version}";
2829 sha256 = "0j6b8z9x9hrrs4xp11zyjjd7kyl7fzcicpiis8k1qb1q2afnqsrq";
2930 };
@@ -64,17 +65,23 @@ stdenv.mkDerivation rec {
6465 popd
6566 '';
6667
68+ postInstall = ''
69+ wrapProgram $out/bin/nvidia-container-cli \
70+ --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:/run/opengl-driver-32/lib
71+ '';
72+
6773 NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];
6874 NIX_LDFLAGS = [ "-L${libtirpc.dev}/lib" "-ltirpc" ];
6975
70− nativeBuildInputs = [ pkgconfig rpcsvc-proto ];
76+ nativeBuildInputs = [ pkgconfig rpcsvc-proto makeWrapper ];
7177
7278 buildInputs = [ libelf libcap libseccomp libtirpc ];
7379
7480 meta = with lib; {
7581 homepage = "https://github.com/NVIDIA/libnvidia-container";
7682 description = "NVIDIA container runtime library";
77− license = licenses.bsd3;
83+ license = licenses.asl20;
7884 platforms = platforms.linux;
85+ maintainers = with maintainers; [ cpcloud ];
7986 };
8087}
pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch → pkgs/applications/virtualization/libnvidia-container/libnvc-ldconfig-and-path-fixes.patchrenamed

The content is the same.

pkgs/applications/virtualization/nvidia-docker/modprobe.patch → pkgs/applications/virtualization/libnvidia-container/modprobe.patchrenamed

The content is the same.

pkgs/applications/virtualization/nvidia-container-runtime/default.nixnew file+72
@@ -0,0 +1,72 @@
1+{ lib
2+, glibc
3+, fetchFromGitHub
4+, makeWrapper
5+, buildGoPackage
6+, linkFarm
7+, writeShellScript
8+, containerRuntimePath
9+, configTemplate
10+}:
11+let
12+ isolatedContainerRuntimePath = linkFarm "isolated_container_runtime_path" [
13+ {
14+ name = "runc";
15+ path = containerRuntimePath;
16+ }
17+ ];
18+ warnIfXdgConfigHomeIsSet = writeShellScript "warn_if_xdg_config_home_is_set" ''
19+ set -eo pipefail
20+
21+ if [ -n "$XDG_CONFIG_HOME" ]; then
22+ echo >&2 "$(tput setaf 3)warning: \$XDG_CONFIG_HOME=$XDG_CONFIG_HOME$(tput sgr 0)"
23+ fi
24+ '';
25+in
26+buildGoPackage rec {
27+ pname = "nvidia-container-runtime";
28+ version = "3.4.0";
29+
30+ src = fetchFromGitHub {
31+ owner = "NVIDIA";
32+ repo = pname;
33+ rev = "v${version}";
34+ sha256 = "095mks0r4079vawi50pk4zb5jk0g6s9idg2s1w55a0d27jkknldr";
35+ };
36+
37+ goPackagePath = "github.com/${pname}/src";
38+ buildFlagsArray = [ "-ldflags=" "-s -w" ];
39+ nativeBuildInputs = [ makeWrapper ];
40+
41+ postInstall = ''
42+ mv $out/bin/{src,nvidia-container-runtime}
43+ mkdir -p $out/etc/nvidia-container-runtime
44+
45+ # nvidia-container-runtime invokes docker-runc or runc if that isn't
46+ # available on PATH.
47+ #
48+ # Also set XDG_CONFIG_HOME if it isn't already to allow overriding
49+ # configuration. This in turn allows users to have the nvidia container
50+ # runtime enabled for any number of higher level runtimes like docker and
51+ # podman, i.e., there's no need to have mutually exclusivity on what high
52+ # level runtime can enable the nvidia runtime because each high level
53+ # runtime has its own config.toml file.
54+ wrapProgram $out/bin/nvidia-container-runtime \
55+ --run "${warnIfXdgConfigHomeIsSet}" \
56+ --prefix PATH : ${isolatedContainerRuntimePath} \
57+ --set-default XDG_CONFIG_HOME $out/etc
58+
59+ cp ${configTemplate} $out/etc/nvidia-container-runtime/config.toml
60+
61+ substituteInPlace $out/etc/nvidia-container-runtime/config.toml \
62+ --subst-var-by glibcbin ${lib.getBin glibc}
63+ '';
64+
65+ meta = with lib; {
66+ homepage = "https://github.com/NVIDIA/nvidia-container-runtime";
67+ description = "NVIDIA container runtime";
68+ license = licenses.asl20;
69+ platforms = platforms.linux;
70+ maintainers = with maintainers; [ cpcloud ];
71+ };
72+}
pkgs/applications/virtualization/nvidia-container-toolkit/default.nixnew file+37
@@ -0,0 +1,37 @@
1+{ lib
2+, fetchFromGitHub
3+, buildGoModule
4+, makeWrapper
5+, nvidia-container-runtime
6+}:
7+buildGoModule rec {
8+ pname = "nvidia-container-toolkit";
9+ version = "1.3.0";
10+
11+ src = fetchFromGitHub {
12+ owner = "NVIDIA";
13+ repo = pname;
14+ rev = "v${version}";
15+ sha256 = "04284bhgx4j55vg9ifvbji2bvmfjfy3h1lq7q356ffgw3yr9n0hn";
16+ };
17+
18+ vendorSha256 = "17zpiyvf22skfcisflsp6pn56y6a793jcx89kw976fq2x5br1bz7";
19+ buildFlagsArray = [ "-ldflags=" "-s -w" ];
20+ nativeBuildInputs = [ makeWrapper ];
21+
22+ postInstall = ''
23+ mv $out/bin/{pkg,${pname}}
24+ ln -s $out/bin/nvidia-container-{toolkit,runtime-hook}
25+
26+ wrapProgram $out/bin/nvidia-container-toolkit \
27+ --add-flags "-config ${nvidia-container-runtime}/etc/nvidia-container-runtime/config.toml"
28+ '';
29+
30+ meta = with lib; {
31+ homepage = "https://github.com/NVIDIA/nvidia-container-toolkit";
32+ description = "NVIDIA container runtime hook";
33+ license = licenses.asl20;
34+ platforms = platforms.linux;
35+ maintainers = with maintainers; [ cpcloud ];
36+ };
37+}
pkgs/applications/virtualization/nvidia-docker/default.nix+6−80
@@ -1,106 +1,32 @@
1−{ stdenv
2−, lib
3−, fetchFromGitHub
4−, fetchpatch
5−, callPackage
6−, makeWrapper
7−, buildGoModule
8−, buildGoPackage
9−, glibc
10−, docker
11−, linkFarm
12−, containerRuntimePath ? "${docker}/libexec/docker/runc"
13−}:
14−
15−with lib; let
16− libnvidia-container = callPackage ./libnvc.nix { };
17− isolatedContainerRuntimePath = linkFarm "isolated_container_runtime_path" [
18− {
19− name = "runc";
20− path = containerRuntimePath;
21− }
22− ];
23−
24− nvidia-container-runtime = buildGoPackage rec {
25− pname = "nvidia-container-runtime";
26− version = "3.4.0";
27− src = fetchFromGitHub {
28− owner = "NVIDIA";
29− repo = "nvidia-container-runtime";
30− rev = "v${version}";
31− sha256 = "095mks0r4079vawi50pk4zb5jk0g6s9idg2s1w55a0d27jkknldr";
32− };
33− goPackagePath = "github.com/nvidia-container-runtime/src";
34− buildFlagsArray = [ "-ldflags=" "-s -w" ];
35− postInstall = ''
36− mv $out/bin/{src,nvidia-container-runtime}
37− '';
38− };
39−
40− nvidia-container-toolkit = buildGoModule rec {
41− pname = "nvidia-container-toolkit";
42− version = "1.3.0";
43− src = fetchFromGitHub {
44− owner = "NVIDIA";
45− repo = "nvidia-container-toolkit";
46− rev = "v${version}";
47− sha256 = "04284bhgx4j55vg9ifvbji2bvmfjfy3h1lq7q356ffgw3yr9n0hn";
48− };
49− vendorSha256 = "17zpiyvf22skfcisflsp6pn56y6a793jcx89kw976fq2x5br1bz7";
50− buildFlagsArray = [ "-ldflags=" "-s -w" ];
51− postInstall = ''
52− mv $out/bin/{pkg,${pname}}
53− cp $out/bin/{${pname},nvidia-container-runtime-hook}
54− '';
55− };
56−
57−in
1+{ stdenv, lib, fetchFromGitHub, callPackage }:
582stdenv.mkDerivation rec {
593 pname = "nvidia-docker";
604 version = "2.5.0";
615
626 src = fetchFromGitHub {
637 owner = "NVIDIA";
64− repo = "nvidia-docker";
8+ repo = pname;
659 rev = "v${version}";
6610 sha256 = "1n1k7fnimky67s12p2ycaq9mgk245fchq62vgd7bl3bzfcbg0z4h";
6711 };
6812
69− nativeBuildInputs = [ makeWrapper ];
70−
7113 buildPhase = ''
7214 mkdir bin
7315
7416 cp nvidia-docker bin
7517 substituteInPlace bin/nvidia-docker --subst-var-by VERSION ${version}
76−
77− cp ${libnvidia-container}/bin/nvidia-container-cli bin
78− cp ${nvidia-container-toolkit}/bin/nvidia-container-{toolkit,runtime-hook} bin
79− cp ${nvidia-container-runtime}/bin/nvidia-container-runtime bin
8018 '';
8119
8220 installPhase = ''
83− mkdir -p $out/{bin,etc}
84− cp -r bin $out
85−
86− wrapProgram $out/bin/nvidia-container-cli \
87− --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:/run/opengl-driver-32/lib
88−
89− # nvidia-container-runtime invokes docker-runc or runc if that isn't available on PATH
90− wrapProgram $out/bin/nvidia-container-runtime --prefix PATH : ${isolatedContainerRuntimePath}
91−
92− cp ${./config.toml} $out/etc/config.toml
93− substituteInPlace $out/etc/config.toml --subst-var-by glibcbin ${lib.getBin glibc}
94−
95− cp ${./podman-config.toml} $out/etc/podman-config.toml
96− substituteInPlace $out/etc/podman-config.toml --subst-var-by glibcbin ${lib.getBin glibc}
21+ mkdir -p $out/bin
22+ cp bin/nvidia-docker $out/bin
9723 '';
9824
99− meta = {
25+ meta = with lib; {
10026 homepage = "https://github.com/NVIDIA/nvidia-docker";
10127 description = "NVIDIA container runtime for Docker";
10228 license = licenses.bsd3;
10329 platforms = platforms.linux;
104− maintainers = with lib.maintainers; [ cpcloud ];
30+ maintainers = with maintainers; [ cpcloud ];
10531 };
10632}
pkgs/applications/virtualization/nvidia-docker/podman-config.toml → pkgs/applications/virtualization/nvidia-podman/config.tomlrenamed

The content is the same.

pkgs/top-level/all-packages.nix+28−1
@@ -15715,7 +15715,34 @@ in
1571515715
1571615716 nv-codec-headers = callPackage ../development/libraries/nv-codec-headers { };
1571715717
15718− nvidia-docker = callPackage ../applications/virtualization/nvidia-docker { };
15718+ mkNvidiaContainerPkg = { name, containerRuntimePath, configTemplate, additionalPaths ? [] }:
15719+ let
15720+ nvidia-container-runtime = callPackage ../applications/virtualization/nvidia-container-runtime {
15721+ inherit containerRuntimePath configTemplate;
15722+ };
15723+ in symlinkJoin {
15724+ inherit name;
15725+ paths = [
15726+ (callPackage ../applications/virtualization/libnvidia-container { })
15727+ nvidia-container-runtime
15728+ (callPackage ../applications/virtualization/nvidia-container-toolkit {
15729+ inherit nvidia-container-runtime;
15730+ })
15731+ ] ++ additionalPaths;
15732+ };
15733+
15734+ nvidia-docker = mkNvidiaContainerPkg {
15735+ name = "nvidia-docker";
15736+ containerRuntimePath = "${docker}/libexec/docker/runc";
15737+ configTemplate = ../applications/virtualization/nvidia-docker/config.toml;
15738+ additionalPaths = [ (callPackage ../applications/virtualization/nvidia-docker { }) ];
15739+ };
15740+
15741+ nvidia-podman = mkNvidiaContainerPkg {
15742+ name = "nvidia-podman";
15743+ containerRuntimePath = "${runc}/bin/runc";
15744+ configTemplate = ../applications/virtualization/nvidia-podman/config.toml;
15745+ };
1571915746
1572015747 nvidia-texture-tools = callPackage ../development/libraries/nvidia-texture-tools { };
1572115748