summary refs log tree commit diff
diff options
context:
space:
mode:
authorBenjamin Hipple <bhipple@protonmail.com>2018-09-09 11:20:07 -0400
committerBenjamin Hipple <bhipple@protonmail.com>2018-09-09 11:21:59 -0400
commit4d8bb9a34aa3de134133980551b45dc4768f3ddc (patch)
treec81db8e8a8d1d9e6932ba3f4ef65f8accab37245
parent201ee1975810663b23e54f594d5ca6319e0fbdaf (diff)
downloadnixlib-4d8bb9a34aa3de134133980551b45dc4768f3ddc.tar
nixlib-4d8bb9a34aa3de134133980551b45dc4768f3ddc.tar.gz
nixlib-4d8bb9a34aa3de134133980551b45dc4768f3ddc.tar.bz2
nixlib-4d8bb9a34aa3de134133980551b45dc4768f3ddc.tar.lz
nixlib-4d8bb9a34aa3de134133980551b45dc4768f3ddc.tar.xz
nixlib-4d8bb9a34aa3de134133980551b45dc4768f3ddc.tar.zst
nixlib-4d8bb9a34aa3de134133980551b45dc4768f3ddc.zip
dockerTools: unpin go version
The linked PR has been merged, and in fact dockerTools has upgraded to the
latest `go1.11` compiler:

https://github.com/moby/moby/pull/35739
https://github.com/moby/moby/pull/37358
-rw-r--r--pkgs/top-level/all-packages.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc71d5ec6892..188956719884 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -129,8 +129,7 @@ with pkgs;
 
   digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { };
 
-  # go 1.9 pin until https://github.com/moby/moby/pull/35739
-  dockerTools = callPackage ../build-support/docker { go = go_1_9; };
+  dockerTools = callPackage ../build-support/docker { };
 
   docker_compose = pythonPackages.docker_compose;