diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2018-05-11 09:19:41 -0400 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2018-05-11 09:19:41 -0400 |
| commit | 46440d3426bf3eaeb5082713543ed008c8661a03 (patch) | |
| tree | 9bf53018a83aa64b583a46b40b9686b3ec5a0ef6 | |
| parent | 16b4691dd1b4cc4c551f54bd4220f62244c11a9d (diff) | |
| download | nixlib-46440d3426bf3eaeb5082713543ed008c8661a03.tar nixlib-46440d3426bf3eaeb5082713543ed008c8661a03.tar.gz nixlib-46440d3426bf3eaeb5082713543ed008c8661a03.tar.bz2 nixlib-46440d3426bf3eaeb5082713543ed008c8661a03.tar.lz nixlib-46440d3426bf3eaeb5082713543ed008c8661a03.tar.xz nixlib-46440d3426bf3eaeb5082713543ed008c8661a03.tar.zst nixlib-46440d3426bf3eaeb5082713543ed008c8661a03.zip | |
docker-edge: 18.04.0-ce -> 18.05.0-ce
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 2a271a96ecd4..2ab2bd022199 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -209,10 +209,10 @@ rec { tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; - docker_18_04 = dockerGen rec { - version = "18.04.0-ce"; - rev = "3d479c0af67cb9ea43a9cfc1bf2ef097e06a3470"; # git commit - sha256 = "1askbk8b92cdv7vlm688g2f1v2xjhmx77578318x76dydfql3jfl"; + docker_18_05 = dockerGen rec { + version = "18.05.0-ce"; + rev = "f150324782643a5268a04e7d1a675587125da20e"; # git commit + sha256 = "0vgh03qwlfm25sm3yaa6vf5ap2ag575f814ccgcrp5zlcal13r0z"; runcRev = "4fc53a81fb7c994640722ac585fa9ca548971871"; runcSha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062"; containerdRev = "773c489c9c1b21a6d78b5c538cd395416ec50f88"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9e89c1ac4b3..f6d3a7a5b937 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15306,10 +15306,10 @@ with pkgs; # go 1.9 pin until https://github.com/moby/moby/pull/35739 inherit (callPackage ../applications/virtualization/docker { go = go_1_9; }) docker_18_03 - docker_18_04; + docker_18_05; docker = docker_18_03; - docker-edge = docker_18_04; + docker-edge = docker_18_05; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; |