From 825e417457d803fbc5e7ae8bc19fa9dfc29c32c4 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 27 Sep 2017 08:16:42 -0400 Subject: [PATCH] docker: add 17.09.0-ce --- .../virtualization/docker/default.nix | 23 ++++++++++++------- pkgs/top-level/all-packages.nix | 10 ++++---- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 043f27e13d2..f28ec6275b8 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -44,6 +44,13 @@ rec { rev = containerdRev; sha256 = containerdSha256; }; + + # This should go into the containerd derivation once 1.0.0 is out + preBuild = '' + mkdir $(pwd)/vendor/src + mv $(pwd)/vendor/{github.com,golang.org,google.golang.org} $(pwd)/vendor/src/ + ln -s $(pwd) vendor/src/github.com/containerd/containerd + ''; }); docker-tini = tini.overrideAttrs (oldAttrs: rec { name = "docker-init"; @@ -188,14 +195,14 @@ rec { tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; - docker_17_07 = dockerGen rec { - version = "17.07.0-ce"; - rev = "87847530f7176a48348d196f7c23bbd058052af1"; # git commit - sha256 = "0zw9zlzbd7il33ch17ypwpa73gsb930sf2njnphg7ylvnqp8qzsp"; - runcRev = "2d41c047c83e09a6d61d464906feb2a2f3c52aa4"; - runcSha256 = "0v5iv29ck6lkxvxh7a56gfrlgfs0bjvjhrq3p6qqv9qjzv825byq"; - containerdRev = "3addd840653146c90a254301d6c3a663c7fd6429"; - containerdSha256 = "0as4s5wd57pdh1cyavkccpgs46kvlhr41v07qrv0phzffdhq3d5j"; + docker_17_09 = dockerGen rec { + version = "17.09.0-ce"; + rev = "afdb6d44a80f777069885a9ee0e0f86cf841b1bb"; # git commit + sha256 = "03g0imdcxqx9y4hhyymxqzvm8bqg4cqrmb7sjbxfdgrhzh9kcn1p"; + runcRev = "3f2f8b84a77f73d38244dd690525642a72156c64"; + runcSha256 = "0vaagmav8443kmyxac2y1y5l2ipcs1c7gdmsnvj48y9bafqx72rq"; + containerdRev = "06b9cb35161009dcb7123345749fef02f7cea8e0"; + containerdSha256 = "10hms8a2nn69nfnwly6923jzx40c3slpsdhjhff4bxh36flpf9gd"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72ddcb185e0..5bd78b21e84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9281,8 +9281,8 @@ with pkgs; libminc = callPackage ../development/libraries/libminc { }; - libmirage = callPackage ../misc/emulators/cdemu/libmirage.nix { }; - + libmirage = callPackage ../misc/emulators/cdemu/libmirage.nix { }; + libmkv = callPackage ../development/libraries/libmkv { }; libmms = callPackage ../development/libraries/libmms { }; @@ -13981,10 +13981,10 @@ with pkgs; inherit (callPackage ../applications/virtualization/docker { }) docker_17_06 - docker_17_07; + docker_17_09; - docker = docker_17_06; - docker-edge = docker_17_07; + docker = docker_17_09; + docker-edge = docker_17_09; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };