diff options
author | Tim Steinbach <tim@nequissimus.com> | 2018-01-11 09:15:47 -0500 |
---|---|---|
committer | Tim Steinbach <tim@nequissimus.com> | 2018-01-11 09:15:47 -0500 |
commit | 438452f07a6df2b93e0e186cea51f059a54dd5cc (patch) | |
tree | fd6aa436efbfad9f67c8338fd49280e322a2d6bb | |
parent | 65774cb22e0b40a3ac7bc97adde3767f1d7df20b (diff) | |
download | nixlib-438452f07a6df2b93e0e186cea51f059a54dd5cc.tar nixlib-438452f07a6df2b93e0e186cea51f059a54dd5cc.tar.gz nixlib-438452f07a6df2b93e0e186cea51f059a54dd5cc.tar.bz2 nixlib-438452f07a6df2b93e0e186cea51f059a54dd5cc.tar.lz nixlib-438452f07a6df2b93e0e186cea51f059a54dd5cc.tar.xz nixlib-438452f07a6df2b93e0e186cea51f059a54dd5cc.tar.zst nixlib-438452f07a6df2b93e0e186cea51f059a54dd5cc.zip |
docker-edge: 17.12.0 -> 18.01.0
-rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 12 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index c4c0adbb9bf9..ed7741b5522a 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -215,4 +215,16 @@ rec { tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; + + docker_18_01 = dockerGen rec { + version = "18.01.0-ce"; + rev = "03596f51b120095326d2004d676e97228a21014d"; # git commit + sha256 = "1zffaxwkfz8ca76f5ql5z76mcjx37jbgv2kk75i68487yg16x0md"; + runcRev = "b2567b37d7b75eb4cf325b77297b140ea686ce8f"; + runcSha256 = "0zarsrbfcm1yp6mdl6rcrigdf7nb70xmv2cbggndz0qqyrw0mk0l"; + containerdRev = "89623f28b87a6004d4b785663257362d1658a729"; + containerdSha256 = "0irx7ps6rhq7z69cr3gspxdr7ywrv6dz62gkr1z2723cki9hsxma"; + tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; + tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 910afc8ac692..f2e565032e61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14523,10 +14523,11 @@ with pkgs; }; inherit (callPackage ../applications/virtualization/docker { }) - docker_17_12; + docker_17_12 + docker_18_01; docker = docker_17_12; - docker-edge = docker_17_12; + docker-edge = docker_18_01; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; |