From 4329958cf59292edae124dfb9297a10d58b22f91 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 26 Aug 2016 11:38:32 +0100
Subject: [PATCH 1/2] buildGoPackage: build with go 1.7

---
 pkgs/top-level/all-packages.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f5c5b3f73bad..39bfe8f447a9 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 { };
 

From db3de7a900835e614c304bbeed78bcacd8048b03 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 26 Aug 2016 13:45:16 +0100
Subject: [PATCH 2/2] leaps: mark as broken

The package sha256 is wrong. After fixing it the build has dependency
issues like:

    go/src/github.com/jeffail/leaps/cmd/leaps/bindata_assetfs.go:203:2:
    cannot find package "github.com/elazarl/go-bindata-assetfs" in any
    of:

/cc @qknight
---
 pkgs/development/tools/leaps/default.nix | 1 +
 1 file changed, 1 insertion(+)

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;
   };
 }