diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2018-07-19 08:34:13 -0400 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2018-07-19 08:34:13 -0400 |
| commit | e953d314a89c804c3b3b413369f73d54732d42ff (patch) | |
| tree | a1606f2632c8cb1a0604af2a55aad3ad5715aab1 /pkgs/top-level | |
| parent | 80d44926bf7099f2bc77ca5e9288c0c0ca35e99d (diff) | |
| download | nixlib-e953d314a89c804c3b3b413369f73d54732d42ff.tar nixlib-e953d314a89c804c3b3b413369f73d54732d42ff.tar.gz nixlib-e953d314a89c804c3b3b413369f73d54732d42ff.tar.bz2 nixlib-e953d314a89c804c3b3b413369f73d54732d42ff.tar.lz nixlib-e953d314a89c804c3b3b413369f73d54732d42ff.tar.xz nixlib-e953d314a89c804c3b3b413369f73d54732d42ff.tar.zst nixlib-e953d314a89c804c3b3b413369f73d54732d42ff.zip | |
docker: 18.03 -> 18.06
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3afb13b28fb4..6be270050ffb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15643,13 +15643,11 @@ with pkgs; dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) { }; - # 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_05; + inherit (callPackage ../applications/virtualization/docker {}) + docker_18_06; - docker = docker_18_03; - docker-edge = docker_18_05; + docker = docker_18_06; + docker-edge = docker_18_06; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; |