From be5090fa5279e4ebde857175193ce74e912db183 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Sun, 25 Feb 2018 13:38:22 +0100 Subject: [PATCH 1/2] dockerTools: Pin go to 1.9 This is the Go version that Docker currently uses: https://github.com/moby/moby/pull/35739 Fixes #35505 --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5563685c36..9d9167636d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -121,7 +121,8 @@ with pkgs; dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh; - dockerTools = callPackage ../build-support/docker { }; + # go 1.9 pin until https://github.com/moby/moby/pull/35739 + dockerTools = callPackage ../build-support/docker { go = go_1_9; }; docker_compose = pythonPackages.docker_compose; From d61a6324616a5f7654a069ee16a6b92b129818b1 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Sun, 25 Feb 2018 18:08:49 +0100 Subject: [PATCH 2/2] docker: pin go to 1.9 This is the version used upstream, see: https://github.com/moby/moby/pull/35739 --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d9167636d1..bb88737804f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14925,7 +14925,8 @@ with pkgs; dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) { }; - inherit (callPackage ../applications/virtualization/docker { }) + # go 1.9 pin until https://github.com/moby/moby/pull/35739 + inherit (callPackage ../applications/virtualization/docker { go = go_1_9; }) docker_17_12 docker_18_02;