diff options
| author | lewo <lewo@abesis.fr> | 2019-03-05 21:12:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-05 21:12:51 +0100 |
| commit | f5462b19d5bca0c9d8f32764437f5877900145de (patch) | |
| tree | cee2c077613237a11630e2ccc6759998b5b5821a /pkgs | |
| parent | 1847b85f152897ed34c95aa48dad05cb2c4a2e40 (diff) | |
| parent | 42a79f7bc2f4f9c884985ec17865652657a07f6e (diff) | |
| download | nixpkgs-f5462b19d5bca0c9d8f32764437f5877900145de.tar nixpkgs-f5462b19d5bca0c9d8f32764437f5877900145de.tar.gz nixpkgs-f5462b19d5bca0c9d8f32764437f5877900145de.tar.bz2 nixpkgs-f5462b19d5bca0c9d8f32764437f5877900145de.tar.lz nixpkgs-f5462b19d5bca0c9d8f32764437f5877900145de.tar.xz nixpkgs-f5462b19d5bca0c9d8f32764437f5877900145de.tar.zst nixpkgs-f5462b19d5bca0c9d8f32764437f5877900145de.zip | |
Merge pull request #56513 from vdemeester/update-podman
Update podman
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/virtualization/podman/conmon.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/podman/default.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/virtualization/podman/conmon.nix b/pkgs/applications/virtualization/podman/conmon.nix index 42907bc84ba..6089aa7f69c 100644 --- a/pkgs/applications/virtualization/podman/conmon.nix +++ b/pkgs/applications/virtualization/podman/conmon.nix @@ -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; }; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 7fc74de1d2e..2e98194bb9d 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -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"; |