Merge pull request #87739 from zowoq/inputs-tags
podman, etc packages: fix/update inputs/tags
commit26ac020560f6f8a853420c4f294284491f09643d
authorMario Rodas <marsam@users.noreply.github.com>
dateThu 14 May 2020, 20:33 (7 years ago)
parent0687addf28b0d6
pkgs/applications/virtualization/cri-o/default.nix+3−5
@@ -6,8 +6,6 @@
66, gpgme
77, installShellFiles
88, libapparmor
9−, libassuan
10−, libgpgerror
119, libseccomp
1210, libselinux
1311, lvm2
@@ -32,15 +30,15 @@ buildGoModule rec {
3230 btrfs-progs
3331 gpgme
3432 libapparmor
35− libassuan
36− libgpgerror
3733 libseccomp
3834 libselinux
3935 lvm2
4036 ] ++ stdenv.lib.optionals (glibc != null) [ glibc glibc.static ];
4137
42− BUILDTAGS = "apparmor seccomp selinux containers_image_ostree_stub";
38+ BUILDTAGS = "apparmor seccomp selinux containers_image_openpgp containers_image_ostree_stub";
4339 buildPhase = ''
40+ patchShebangs .
41+
4442 sed -i '/version.buildDate/d' Makefile
4543
4644 make binaries docs BUILDTAGS="$BUILDTAGS"
pkgs/applications/virtualization/podman/default.nix+11−1
@@ -6,7 +6,9 @@
66, gpgme
77, lvm2
88, btrfs-progs
9+, libapparmor
910, libseccomp
11+, libselinux
1012, systemd
1113, go-md2man
1214, nixosTests
@@ -29,7 +31,15 @@ buildGoModule rec {
2931
3032 nativeBuildInputs = [ pkg-config go-md2man installShellFiles ];
3133
32− buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs libseccomp gpgme lvm2 systemd ];
34+ buildInputs = stdenv.lib.optionals stdenv.isLinux [
35+ btrfs-progs
36+ gpgme
37+ libapparmor
38+ libseccomp
39+ libselinux
40+ lvm2
41+ systemd
42+ ];
3343
3444 buildPhase = ''
3545 patchShebangs .
pkgs/applications/virtualization/runc/default.nix+5−2
@@ -8,6 +8,7 @@
88, libapparmor
99, apparmor-parser
1010, libseccomp
11+, libselinux
1112}:
1213
1314buildGoPackage rec {
@@ -25,9 +26,11 @@ buildGoPackage rec {
2526 outputs = [ "out" "man" ];
2627
2728 nativeBuildInputs = [ go-md2man installShellFiles pkg-config which ];
28− buildInputs = [ libseccomp libapparmor apparmor-parser ];
2929
30− makeFlags = [ "BUILDTAGS+=seccomp" "BUILDTAGS+=apparmor" ];
30+ buildInputs = [ libselinux libseccomp libapparmor apparmor-parser ];
31+
32+ # these will be the default in the next release
33+ makeFlags = [ "BUILDTAGS+=seccomp" "BUILDTAGS+=apparmor" "BUILDTAGS+=selinux" ];
3134
3235 buildPhase = ''
3336 cd go/src/${goPackagePath}
pkgs/development/tools/buildah/default.nix+11−2
@@ -4,9 +4,9 @@
44, installShellFiles
55, pkg-config
66, gpgme
7−, libgpgerror
87, lvm2
98, btrfs-progs
9+, libapparmor
1010, libselinux
1111, libseccomp
1212}:
@@ -27,9 +27,18 @@ buildGoModule rec {
2727 vendorSha256 = null;
2828
2929 nativeBuildInputs = [ installShellFiles pkg-config ];
30− buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs libselinux libseccomp ];
30+
31+ buildInputs = [
32+ btrfs-progs
33+ gpgme
34+ libapparmor
35+ libseccomp
36+ libselinux
37+ lvm2
38+ ];
3139
3240 buildPhase = ''
41+ patchShebangs .
3342 make GIT_COMMIT="unknown"
3443 make -C docs
3544 '';
pkgs/development/tools/skopeo/default.nix+2−3
@@ -3,11 +3,9 @@
33, fetchFromGitHub
44, runCommand
55, gpgme
6−, libgpgerror
76, lvm2
87, btrfs-progs
98, pkg-config
10−, libselinux
119, go-md2man
1210, installShellFiles
1311, makeWrapper
@@ -41,8 +39,9 @@ buildGoModule {
4139 excludedPackages = [ "integration" ];
4240
4341 nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper ];
42+
4443 buildInputs = [ gpgme ]
45− ++ stdenv.lib.optionals stdenv.isLinux [ libgpgerror lvm2 btrfs-progs libselinux ];
44+ ++ stdenv.lib.optionals stdenv.isLinux [ lvm2 btrfs-progs ];
4645
4746 buildFlagsArray = ''
4847 -ldflags=