nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 23:22:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25579 from vdemeester/docker-edge-update-17.05

Browse Source 
docker-edge: 17.04 to 17.05
This commit is contained in:
Tim Steinbach 2017-05-11 12:49:37 -04:00 committed by GitHub
commit de9c869df2
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,14 +157,14 @@ rec {
tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
};
docker_17_04 = dockerGen rec {
version = "17.04.0-ce";
rev = "4845c56"; # git commit
sha256 = "04farary19ws7xzsyack0sbrxjzp5xwjh26frxbpdd0a88pxnbj7";
docker_17_05 = dockerGen rec {
version = "17.05.0-ce";
rev = "90d35abf7b3535c1c319c872900fbd76374e521c"; # git commit
sha256 = "1m4fcawjj14qws57813wjxjwgnrfxgxnnzlj61csklp0s9dhg7df";
runcRev = "9c2d8d184e5da67c95d601382adf14862e4f2228";
runcSha256 = "131jv8f77pbdlx88ar0zjwdsp0a5v8kydaw0w0cl3i0j3622ydjl";
containerdRev = "422e31ce907fd9c3833a38d7b8fdd023e5a76e73";
containerdSha256 = "1g0k82f1mk3vn57k130q776wp5c226d06qbiq1q148pqxxhym2r2";
containerdRev = "9048e5e50717ea4497b757314bad98ea3763c145";
containerdSha256 = "1r9xhvzzh7md08nqb0rbp5d1rdr7jylb3da954d0267i0kh2iksa";
tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
};

4
pkgs/applications/virtualization/docker/proxy.nix
View File

@ -4,13 +4,13 @@ with lib;
stdenv.mkDerivation rec {
name = "docker-proxy-${rev}";
rev = "0f534354b813003a754606689722fe253101bc4e";
rev = "7b2b1feb1de4817d522cc372af149ff48d25028e";
src = fetchFromGitHub {
inherit rev;
owner = "docker";
repo = "libnetwork";
sha256 = "1ah7h417llcq0xzdbp497pchb9m9qvjhrwajcjb0ybrs8v889m31";
sha256 = "1ng577k11cyv207bp0vaz5jjfcn2igd6w95zn4izcq1nldzp5935";
};
buildInputs = [ go ];

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

@ -13423,10 +13423,11 @@ with pkgs;
inherit (callPackage ../applications/virtualization/docker { })
docker_17_03
docker_17_04;
docker_17_04
docker_17_05;
docker = docker_17_03;
docker-edge = docker_17_04;
docker-edge = docker_17_05;
docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };