pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #33746 from NeQuissimus/docker_18_01

docker-edge: 17.12.0 -> 18.01.0

authored by Tim Steinbach and committed by GitHub 078fc694 f7bb9f67

+15 -2
unified split
+12
pkgs/applications/virtualization/docker/default.nix
··· 208 208 tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; 209 209 tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; 210 210 }; 211 + 212 + docker_18_01 = dockerGen rec { 213 + version = "18.01.0-ce"; 214 + rev = "03596f51b120095326d2004d676e97228a21014d"; # git commit 215 + sha256 = "1zffaxwkfz8ca76f5ql5z76mcjx37jbgv2kk75i68487yg16x0md"; 216 + runcRev = "b2567b37d7b75eb4cf325b77297b140ea686ce8f"; 217 + runcSha256 = "0zarsrbfcm1yp6mdl6rcrigdf7nb70xmv2cbggndz0qqyrw0mk0l"; 218 + containerdRev = "89623f28b87a6004d4b785663257362d1658a729"; 219 + containerdSha256 = "0irx7ps6rhq7z69cr3gspxdr7ywrv6dz62gkr1z2723cki9hsxma"; 220 + tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; 221 + tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; 222 + }; 211 223 }
+3 -2
pkgs/top-level/all-packages.nix
··· 14662 14662 }; 14663 14663 14664 14664 inherit (callPackage ../applications/virtualization/docker { }) 14665 - docker_17_12; 14665 + docker_17_12 14666 + docker_18_01; 14666 14667 14667 14668 docker = docker_17_12; 14668 - docker-edge = docker_17_12; 14669 + docker-edge = docker_18_01; 14669 14670 14670 14671 docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; 14671 14672