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

Commits on Apr 5, 2019

  1. podman: 1.1.2 -> 1.2.0 

    Signed-off-by: Vincent Demeester <vincent@sbr.pm>
    @vdemeester
    vdemeester committed Apr 5, 2019
    Copy the full SHA
    91fc821 View commit details

  2. Merge pull request #59017 from vdemeester/update-podman 

    podman: 1.1.2 -> 1.2.0
    @dywedir
    dywedir authored Apr 5, 2019
    Copy the full SHA
    1e722e1 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-2019-02-15";
rev = "cc2b49590a485da9bd358440f92f219dfd6b230f";
version = "unstable-2019-03-19";
rev = "84c860029893e2e2dd71d62231f009c9dcd3c0b4";

src = fetchFromGitHub {
owner = "containers";
repo = "conmon";
sha256 = "13f5as4a9y6nkmr7cg0n27c2hfx9pkr75fxq2m0hlpcwhaardbm7";
sha256 = "1ydidl3s7s5rfwk9gx0k80nxcixlilxw61g7x0vqsdy3mkylysv5";
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.1.2";
version = "1.2.0";

src = fetchFromGitHub {
owner = "containers";
repo = "libpod";
rev = "v${version}";
sha256 = "180sv1a7k3866ilb0mxbhiysms9xy4v6xbpy4in6ch8m8qym9amh";
sha256 = "1nlll4q62w3i897wraj18pdi5cc91b8gmp360pzyqzzjdm9ag7v6";
};

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