diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-02-26 16:12:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-26 16:12:41 +0000 |
| commit | 02ba80a3393c3fdeae697a3146dbcc8448b9c4a6 (patch) | |
| tree | d9115815ce2635ea75fe1fd71dd238593a1ef919 /pkgs/top-level | |
| parent | a99d1f65f0f4a02f3909ce0bdc2965c2161ea381 (diff) | |
| parent | d61a6324616a5f7654a069ee16a6b92b129818b1 (diff) | |
| download | nixlib-02ba80a3393c3fdeae697a3146dbcc8448b9c4a6.tar nixlib-02ba80a3393c3fdeae697a3146dbcc8448b9c4a6.tar.gz nixlib-02ba80a3393c3fdeae697a3146dbcc8448b9c4a6.tar.bz2 nixlib-02ba80a3393c3fdeae697a3146dbcc8448b9c4a6.tar.lz nixlib-02ba80a3393c3fdeae697a3146dbcc8448b9c4a6.tar.xz nixlib-02ba80a3393c3fdeae697a3146dbcc8448b9c4a6.tar.zst nixlib-02ba80a3393c3fdeae697a3146dbcc8448b9c4a6.zip | |
Merge pull request #35539 from srhb/35505
dockerTools: Pin go to 1.9
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 470291b71b02..f1af52ac789f 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; @@ -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; |