diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2018-02-09 10:25:50 -0500 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2018-02-09 10:25:58 -0500 |
| commit | 4ffe462b10f1bd55afe9ea6d92ee44dccaf1f2f5 (patch) | |
| tree | bc3e1b3ce542d95f0c096cf7e3760f69bf12d46d | |
| parent | 855e66860ab2d200d79e0853d8c9b6e8a769ac42 (diff) | |
| download | nixlib-4ffe462b10f1bd55afe9ea6d92ee44dccaf1f2f5.tar nixlib-4ffe462b10f1bd55afe9ea6d92ee44dccaf1f2f5.tar.gz nixlib-4ffe462b10f1bd55afe9ea6d92ee44dccaf1f2f5.tar.bz2 nixlib-4ffe462b10f1bd55afe9ea6d92ee44dccaf1f2f5.tar.lz nixlib-4ffe462b10f1bd55afe9ea6d92ee44dccaf1f2f5.tar.xz nixlib-4ffe462b10f1bd55afe9ea6d92ee44dccaf1f2f5.tar.zst nixlib-4ffe462b10f1bd55afe9ea6d92ee44dccaf1f2f5.zip | |
docker-edge: 18.01.0 -> 18.02.0
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 56436d047f2e..339d3e8490d9 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -209,14 +209,14 @@ rec { 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"; + docker_18_02 = dockerGen rec { + version = "18.02.0-ce"; + rev = "fc4de447b563498eb4da89f56fb858bbe761d91b"; # git commit + sha256 = "1025cwv2niiwg5pc30nb1qky1raisvd9ix2qw6rdib232hwq9k8m"; + runcRev = "9f9c96235cc97674e935002fc3d78361b696a69e"; + runcSha256 = "18f8vqdbf685dd777pjh8jzpxafw2vapqh4m43xgyi7lfwa0gsln"; + containerdRev = "9b55aab90508bd389d7654c4baf173a981477d55"; + containerdSha256 = "0kfafqi66yp4qy738pl11f050hfrx9m4kc670qpx7fmf9ii7q6p2"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84ad04e4ce7e..d192c3dcf4be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11167,7 +11167,7 @@ with pkgs; strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; }; subdl = callPackage ../applications/video/subdl { }; - + subtitleeditor = callPackage ../applications/video/subtitleeditor { }; suil-qt4 = callPackage ../development/libraries/audio/suil { @@ -14711,10 +14711,10 @@ with pkgs; inherit (callPackage ../applications/virtualization/docker { }) docker_17_12 - docker_18_01; + docker_18_02; docker = docker_17_12; - docker-edge = docker_18_01; + docker-edge = docker_18_02; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; |