about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorTim Steinbach <NeQuissimus@users.noreply.github.com>2018-03-24 12:32:38 -0400
committerGitHub <noreply@github.com>2018-03-24 12:32:38 -0400
commit62b350771133dd4f638e2f55a89a168cb368dcfe (patch)
treef0724dfc43a548e1b9df98ff2850ff281cfa37dc /pkgs/top-level
parent204a029101b028e479cdbd4e12fa4f74c1155ae5 (diff)
parentb072dcffaeba82364aa8bff7c8db63d47876deec (diff)
Merge pull request #37713 from NeQuissimus/docker_18_03
docker: 18.02 -> 18.03
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a515c543a91d5..d1cfa3463ef35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15131,11 +15131,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_17_12
-    docker_18_02;
+    docker_18_03;
 
-  docker = docker_17_12;
-  docker-edge = docker_18_02;
+  docker = docker_18_03;
+  docker-edge = docker_18_03;
 
   docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };