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: 1847b85f1528
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f5462b19d5bc
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Feb 28, 2019

  1. conmon: unstable-2018-11-28 -> unstable-2019-02-15 

    Signed-off-by: Vincent Demeester <vincent@sbr.pm>
    @vdemeester
    vdemeester committed Feb 28, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    vdemeester Vincent Demeester
    GPG key ID: 083CC6FD6EB699A3
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e8a4d2a View commit details

  2. podman: 1.0.0 -> 1.1.0 

    Signed-off-by: Vincent Demeester <vincent@sbr.pm>
    @vdemeester
    vdemeester committed Feb 28, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    vdemeester Vincent Demeester
    GPG key ID: 083CC6FD6EB699A3
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    42a79f7 View commit details

Commits on Mar 5, 2019

  1. Merge pull request #56513 from vdemeester/update-podman 

    Update podman
    @nlewo
    nlewo authored Mar 5, 2019

    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
    f5462b1 View commit details
Showing with 5 additions and 5 deletions.
  1. +3 −3 pkgs/applications/virtualization/podman/conmon.nix
  2. +2 −2 pkgs/applications/virtualization/podman/default.nix
6 changes: 3 additions & 3 deletions pkgs/applications/virtualization/podman/conmon.nix
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@ with lib;

stdenv.mkDerivation rec {
name = "conmon-${version}";
version = "unstable-2018-11-28";
rev = "8fba206232c249a8fc4e2fac1469fb2fddbf5cf7";
version = "unstable-2019-02-15";
rev = "cc2b49590a485da9bd358440f92f219dfd6b230f";

src = fetchFromGitHub {
owner = "containers";
repo = "conmon";
sha256 = "07ar0dk9i072b14f6il51yqahxp5c4fkf5jzar8rxcpvymkdy8zq";
sha256 = "13f5as4a9y6nkmr7cg0n27c2hfx9pkr75fxq2m0hlpcwhaardbm7";
inherit rev;
};

4 changes: 2 additions & 2 deletions pkgs/applications/virtualization/podman/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@

buildGoPackage rec {
name = "podman-${version}";
version = "1.0.0";
version = "1.1.0";

src = fetchFromGitHub {
owner = "containers";
repo = "libpod";
rev = "v${version}";
sha256 = "1py6vbmpm25j1gb51dn973pckvgjl9q63y9qyzszvc3q3wsxsqhw";
sha256 = "1fk9gqhr9yijf0fbxvidmza455x59d94id6d142isv8s36rkw858";
};

goPackagePath = "github.com/containers/libpod";