diff options
author | Robin Gloster <mail@glob.in> | 2016-08-26 15:41:08 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-26 15:41:08 +0000 |
commit | fee9b3410e99b5db76eab3f7af379e8882cc6a90 (patch) | |
tree | aa7e5ce35fd1ae46f7960d0914b0065bf222cfe1 | |
parent | 3de68a39791df7d518ee59fcc2b9e6576571d2a4 (diff) | |
parent | db3de7a900835e614c304bbeed78bcacd8048b03 (diff) | |
download | nixlib-fee9b3410e99b5db76eab3f7af379e8882cc6a90.tar nixlib-fee9b3410e99b5db76eab3f7af379e8882cc6a90.tar.gz nixlib-fee9b3410e99b5db76eab3f7af379e8882cc6a90.tar.bz2 nixlib-fee9b3410e99b5db76eab3f7af379e8882cc6a90.tar.lz nixlib-fee9b3410e99b5db76eab3f7af379e8882cc6a90.tar.xz nixlib-fee9b3410e99b5db76eab3f7af379e8882cc6a90.tar.zst nixlib-fee9b3410e99b5db76eab3f7af379e8882cc6a90.zip |
Merge pull request #18014 from zimbatm/buildGoPackage-1.7
Build go package 1.7
-rw-r--r-- | pkgs/development/tools/leaps/default.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix index c80861b2fd75..d3e820767884 100644 --- a/pkgs/development/tools/leaps/default.nix +++ b/pkgs/development/tools/leaps/default.nix @@ -21,5 +21,6 @@ buildGoPackage rec { license = "MIT"; maintainers = with stdenv.lib.maintainers; [ qknight ]; meta.platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b103bb20f8e4..aba9a8f87bb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10009,7 +10009,11 @@ in go = go_1_6; }; - buildGoPackage = buildGo16Package; + buildGo17Package = callPackage ../development/go-modules/generic { + go = go_1_7; + }; + + buildGoPackage = buildGo17Package; go2nix = callPackage ../development/tools/go2nix { }; |