diff options
| author | Benjamin Hipple <bhipple@protonmail.com> | 2020-07-05 19:39:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-05 19:39:18 -0400 |
| commit | f688b2b4212cd82b4122a7076dafbdc9ac47b88e (patch) | |
| tree | 34e4797863123f33436fe0d19fa1fc94d77d6bd1 | |
| parent | 1872641e2a98740e0dc9e744cae8fd6c7eedc99f (diff) | |
| parent | f1cf202dbbe3de6ee8f4fd8b40a5c61654aaa19d (diff) | |
Merge pull request #91979 from zowoq/runc
runc: 1.0.0-rc90 -> 1.0.0-rc91
| -rw-r--r-- | nixos/tests/all-tests.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/runc/default.nix | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 366873cb90081..26ea0570f0fe3 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -267,7 +267,7 @@ in php = handleTest ./php {}; plasma5 = handleTest ./plasma5.nix {}; plotinus = handleTest ./plotinus.nix {}; - podman = handleTest ./podman.nix {}; + podman = handleTestOn ["x86_64-linux"] ./podman.nix {}; postgis = handleTest ./postgis.nix {}; postgresql = handleTest ./postgresql.nix {}; postgresql-wal-receiver = handleTest ./postgresql-wal-receiver.nix {}; diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 58c3ef4f61b30..a8d63a0ca40c1 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -14,13 +14,13 @@ buildGoPackage rec { pname = "runc"; - version = "1.0.0-rc90"; + version = "1.0.0-rc91"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - sha256 = "0pi3rvj585997m4z9ljkxz2z9yxf9p2jr0pmqbqrc7bc95f5hagk"; + sha256 = "1hg3hbbjsz76q1piz86q8la6dym86d65xd7h6q12krfmwd2lbhkw"; }; goPackagePath = "github.com/opencontainers/runc"; @@ -30,7 +30,6 @@ buildGoPackage rec { buildInputs = [ libselinux libseccomp libapparmor apparmor-parser ]; - # these will be the default in the next release makeFlags = [ "BUILDTAGS+=seccomp" "BUILDTAGS+=apparmor" "BUILDTAGS+=selinux" ]; buildPhase = '' |