diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2019-11-27 22:57:50 -0800 |
---|---|---|
committer | Jonathan Ringer <jonringer117@gmail.com> | 2019-11-27 22:57:50 -0800 |
commit | 0c1c18ca4416baa46c940960aa5e619873a2318e (patch) | |
tree | 78d7fd3eb63e91fa99267e2d91a2a891ee29f567 /pkgs/applications/virtualization | |
parent | 4cc592761db580855b47fb84776e68b1d936521c (diff) | |
parent | f4f816902112778172565baf91c2483186027c3b (diff) | |
download | nixlib-0c1c18ca4416baa46c940960aa5e619873a2318e.tar nixlib-0c1c18ca4416baa46c940960aa5e619873a2318e.tar.gz nixlib-0c1c18ca4416baa46c940960aa5e619873a2318e.tar.bz2 nixlib-0c1c18ca4416baa46c940960aa5e619873a2318e.tar.lz nixlib-0c1c18ca4416baa46c940960aa5e619873a2318e.tar.xz nixlib-0c1c18ca4416baa46c940960aa5e619873a2318e.tar.zst nixlib-0c1c18ca4416baa46c940960aa5e619873a2318e.zip |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r-- | pkgs/applications/virtualization/cntr/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/virtualization/cri-o/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/virtualization/docker-compose/default.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix index 13afe0a42619..698f6df0673a 100644 --- a/pkgs/applications/virtualization/cntr/default.nix +++ b/pkgs/applications/virtualization/cntr/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cntr"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "Mic92"; repo = "cntr"; rev = version; - sha256 = "0lmbsnjia44h4rskqkv9yc7xb6f3qjgbg8kcr9zqnr7ivr5fjcxg"; + sha256 = "0dhfz7aj3cqi974ybf0axchih40rzrs9m8bxhwz1hgig57aisfc0"; }; cargoSha256 = "0xkwza9fx61pvlsm0s3dxc9i09mqp6c9df8w63fyiq7174vjxryx"; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index fddf1741720c..29111399ae96 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { project = "cri-o"; - version = "1.16.0"; + version = "1.16.1"; name = "${project}-${version}${flavor}"; goPackagePath = "github.com/${project}/${project}"; @@ -26,7 +26,7 @@ buildGoPackage rec { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "1kbg544v7c1apaxrpndgrap0pb5c67d8fazbkgykg6ynskx6n344"; + sha256 = "0w690zhc55gdqzc31jc34nrzwd253pfb3rq23z51q22nqwmlsh9p"; }; outputs = [ "bin" "out" ]; diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix index b1c42b099b67..7e8dbf33a7b0 100644 --- a/pkgs/applications/virtualization/docker-compose/default.nix +++ b/pkgs/applications/virtualization/docker-compose/default.nix @@ -7,12 +7,12 @@ }: buildPythonApplication rec { - version = "1.24.1"; + version = "1.25.0"; pname = "docker-compose"; src = fetchPypi { inherit pname version; - sha256 = "0lx7bx6jvhydbab8vwry0bclhdf0dfj6jrns1m5y45yp9ybqxmd5"; + sha256 = "0zlprmsgmj4z627snsl0qmq8y7ggcyqrqm5vxvrvcigl7zywnprc"; }; # lots of networking and other fails |