nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 08:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33746 from NeQuissimus/docker_18_01

Browse Source 
docker-edge: 17.12.0 -> 18.01.0
This commit is contained in:
Tim Steinbach 2018-01-30 14:06:19 +00:00 committed by GitHub
commit 078fc69425
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/virtualization/docker/default.nix
View File

@ -208,4 +208,16 @@ rec {
tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; 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";
};
} }

5
pkgs/top-level/all-packages.nix
View File

@ -14662,10 +14662,11 @@ with pkgs;
}; };
inherit (callPackage ../applications/virtualization/docker { }) inherit (callPackage ../applications/virtualization/docker { })
docker_17_12; docker_17_12
docker_18_01;
docker = docker_17_12; docker = docker_17_12;
docker-edge = docker_17_12; docker-edge = docker_18_01;
docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };