Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

docker: 18.03 -> 18.06

(cherry picked from commit e953d314a89c804c3b3b413369f73d54732d42ff)

+14 -28
+10 -22
pkgs/applications/virtualization/docker/default.nix
··· 197 197 # Get revisions from 198 198 # https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/* 199 199 200 - docker_18_03 = dockerGen rec { 201 - version = "18.03.1-ce"; 202 - rev = "9ee9f402cd1eba817c5591a64f1d770c87c421a4"; # git commit 203 - sha256 = "1jm3jmcbkvvy3s8pi3xcpir6mwxjfbad46lbif4bnpjfd2r5irrx"; 204 - runcRev = "4fc53a81fb7c994640722ac585fa9ca548971871"; 205 - runcSha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062"; 206 - containerdRev = "773c489c9c1b21a6d78b5c538cd395416ec50f88"; 207 - containerdSha256 = "0k1zjn0mpd7q3p5srxld2fr4k6ijzbk0r34r6w69sh0d0rd2fvbs"; 208 - tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; 209 - tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; 210 - }; 211 - 212 - docker_18_05 = dockerGen rec { 213 - version = "18.05.0-ce"; 214 - rev = "f150324782643a5268a04e7d1a675587125da20e"; # git commit 215 - sha256 = "0vgh03qwlfm25sm3yaa6vf5ap2ag575f814ccgcrp5zlcal13r0z"; 216 - runcRev = "4fc53a81fb7c994640722ac585fa9ca548971871"; 217 - runcSha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062"; 218 - containerdRev = "773c489c9c1b21a6d78b5c538cd395416ec50f88"; 219 - containerdSha256 = "0k1zjn0mpd7q3p5srxld2fr4k6ijzbk0r34r6w69sh0d0rd2fvbs"; 220 - tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; 221 - tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; 200 + docker_18_06 = dockerGen rec { 201 + version = "18.06.0-ce"; 202 + rev = "0ffa8257ec673ed6849b73b03fb01b0cac90fdb3"; # git commit 203 + sha256 = "1w6jgqbc53pkgfkf2p6z5g316q1r5jvnw4lq11j4qdkw7vy8q5d9"; 204 + runcRev = "69663f0bd4b60df09991c08812a60108003fa340"; 205 + runcSha256 = "1l37r97l3ra4ph069w190d05r0a43s76nn9jvvlkbwrip1cp6gyq"; 206 + containerdRev = "d64c661f1d51c48782c9cec8fda7604785f93587"; 207 + containerdSha256 = "0pk1kii8bmlvziblrqwb88w5cd486pmb7vw8p7kcyn9lqsw32ria"; 208 + tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; 209 + tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; 222 210 }; 223 211 }
+4 -6
pkgs/top-level/all-packages.nix
··· 15135 15135 dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) { 15136 15136 }; 15137 15137 15138 - # go 1.9 pin until https://github.com/moby/moby/pull/35739 15139 - inherit (callPackage ../applications/virtualization/docker { go = go_1_9; }) 15140 - docker_18_03 15141 - docker_18_05; 15138 + inherit (callPackage ../applications/virtualization/docker {}) 15139 + docker_18_06; 15142 15140 15143 - docker = docker_18_03; 15144 - docker-edge = docker_18_05; 15141 + docker = docker_18_06; 15142 + docker-edge = docker_18_06; 15145 15143 15146 15144 docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; 15147 15145