Merge pull request #91979 from zowoq/runc

runc: 1.0.0-rc90 -> 1.0.0-rc91
This commit is contained in:
Benjamin Hipple 2020-07-05 19:39:18 -04:00 committed by GitHub
commit f688b2b421
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions

View File

@ -267,7 +267,7 @@ in
php = handleTest ./php {}; php = handleTest ./php {};
plasma5 = handleTest ./plasma5.nix {}; plasma5 = handleTest ./plasma5.nix {};
plotinus = handleTest ./plotinus.nix {}; plotinus = handleTest ./plotinus.nix {};
podman = handleTest ./podman.nix {}; podman = handleTestOn ["x86_64-linux"] ./podman.nix {};
postgis = handleTest ./postgis.nix {}; postgis = handleTest ./postgis.nix {};
postgresql = handleTest ./postgresql.nix {}; postgresql = handleTest ./postgresql.nix {};
postgresql-wal-receiver = handleTest ./postgresql-wal-receiver.nix {}; postgresql-wal-receiver = handleTest ./postgresql-wal-receiver.nix {};

View File

@ -14,13 +14,13 @@
buildGoPackage rec { buildGoPackage rec {
pname = "runc"; pname = "runc";
version = "1.0.0-rc90"; version = "1.0.0-rc91";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "opencontainers"; owner = "opencontainers";
repo = "runc"; repo = "runc";
rev = "v${version}"; rev = "v${version}";
sha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk"; sha256 = "1hg3hbbjsz76q1piz86q8la6dym86d65xd7h6q12krfmwd2lbhkw";
}; };
goPackagePath = "github.com/opencontainers/runc"; goPackagePath = "github.com/opencontainers/runc";
@ -30,7 +30,6 @@ buildGoPackage rec {
buildInputs = [ libselinux libseccomp libapparmor apparmor-parser ]; buildInputs = [ libselinux libseccomp libapparmor apparmor-parser ];
# these will be the default in the next release
makeFlags = [ "BUILDTAGS+=seccomp" "BUILDTAGS+=apparmor" "BUILDTAGS+=selinux" ]; makeFlags = [ "BUILDTAGS+=seccomp" "BUILDTAGS+=apparmor" "BUILDTAGS+=selinux" ];
buildPhase = '' buildPhase = ''