Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1872641e2a98
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f688b2b4212c
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jul 2, 2020

  1. runc: 1.0.0-rc90 -> 1.0.0-rc91 

    https://github.com/opencontainers/runc/releases/tag/v1.0.0-rc91
    @zowoq
    zowoq committed Jul 2, 2020
    Copy the full SHA
    ee7835e View commit details

  2. nixos/podman: restrict test to x86_64-linux

    @zowoq
    zowoq committed Jul 2, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f1cf202 View commit details

Commits on Jul 5, 2020

  1. Merge pull request #91979 from zowoq/runc 

    runc: 1.0.0-rc90 -> 1.0.0-rc91
    @bhipple
    bhipple authored Jul 5, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f688b2b View commit details
Showing with 3 additions and 4 deletions.
  1. +1 −1 nixos/tests/all-tests.nix
  2. +2 −3 pkgs/applications/virtualization/runc/default.nix
2 changes: 1 addition & 1 deletion nixos/tests/all-tests.nix
View file
Original file line number Diff line number Diff line change
@@ -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 {};
5 changes: 2 additions & 3 deletions pkgs/applications/virtualization/runc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = ''