diff options
| author | Tim Steinbach <NeQuissimus@users.noreply.github.com> | 2018-01-03 15:36:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-03 15:36:02 +0000 |
| commit | bbb04db8feb54c99ac1c8d4e9c9352fcd053cd89 (patch) | |
| tree | ffdc4b33a4664f660d2ae4736146865bda6b3a55 /pkgs/top-level | |
| parent | ab1fdc784d41252db40484cb51d26a8b5894f424 (diff) | |
| parent | b084b360100dcd5f849a22a6ff4543eef0aa3a1f (diff) | |
| download | nixlib-bbb04db8feb54c99ac1c8d4e9c9352fcd053cd89.tar nixlib-bbb04db8feb54c99ac1c8d4e9c9352fcd053cd89.tar.gz nixlib-bbb04db8feb54c99ac1c8d4e9c9352fcd053cd89.tar.bz2 nixlib-bbb04db8feb54c99ac1c8d4e9c9352fcd053cd89.tar.lz nixlib-bbb04db8feb54c99ac1c8d4e9c9352fcd053cd89.tar.xz nixlib-bbb04db8feb54c99ac1c8d4e9c9352fcd053cd89.tar.zst nixlib-bbb04db8feb54c99ac1c8d4e9c9352fcd053cd89.zip | |
Merge pull request #33329 from NeQuissimus/docker_17_12
docker: 17.{09,11} -> 17.12Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0e749289b79..254740c34607 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14486,11 +14486,10 @@ with pkgs; }; inherit (callPackage ../applications/virtualization/docker { }) - docker_17_09 - docker_17_11; + docker_17_12; - docker = docker_17_09; - docker-edge = docker_17_11; + docker = docker_17_12; + docker-edge = docker_17_12; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; |