summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorTim Steinbach <NeQuissimus@users.noreply.github.com>2017-10-19 07:39:50 -0400
committerGitHub <noreply@github.com>2017-10-19 07:39:50 -0400
commit606487e19c9fa028b6df02744132ec70966fc9c0 (patch)
tree0a25b46eff87f127ccdb05e74bc512bbe1e062d1 /pkgs/top-level
parent6f9c76662ba8ca4ac78ef34cc2178250829a1d47 (diff)
parentde3d191b91a6d00f160c26974cf338e189bc519d (diff)
downloadnixlib-606487e19c9fa028b6df02744132ec70966fc9c0.tar
nixlib-606487e19c9fa028b6df02744132ec70966fc9c0.tar.gz
nixlib-606487e19c9fa028b6df02744132ec70966fc9c0.tar.bz2
nixlib-606487e19c9fa028b6df02744132ec70966fc9c0.tar.lz
nixlib-606487e19c9fa028b6df02744132ec70966fc9c0.tar.xz
nixlib-606487e19c9fa028b6df02744132ec70966fc9c0.tar.zst
nixlib-606487e19c9fa028b6df02744132ec70966fc9c0.zip
Merge pull request #30522 from NeQuissimus/docker_17_10
docker: add 17.10.0-ce
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90890e0f2d07..f9a904120af7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14103,11 +14103,11 @@ with pkgs;
   };
 
   inherit (callPackage ../applications/virtualization/docker { })
-    docker_17_06
-    docker_17_09;
+    docker_17_09
+    docker_17_10;
 
   docker = docker_17_09;
-  docker-edge = docker_17_09;
+  docker-edge = docker_17_10;
 
   docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };