Merge pull request #35539 from srhb/35505

dockerTools: Pin go to 1.9
This commit is contained in:
Jörg Thalheim 2018-02-26 16:12:41 +00:00 committed by GitHub
commit 02ba80a339
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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;
@ -14940,7 +14941,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;