go: buildGoPackage: 1.8 -> 1.9

See #29173, #32003 for the reasons to update buildGoPackage in the release. (cherry picked from commit 1e0ec42)
NixOS · Nov 25, 2017 · 87bfe2c · grahamc · Nov 26, 2017 · grahamc
1 parent cfc55fe
commit 87bfe2c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/pkgs/applications/networking/syncthing012/default.nix b/pkgs/applications/networking/syncthing012/default.nix
@@ -5,8 +5,6 @@ buildGoPackage rec {
   version = "0.12.15";
   rev = "v${version}";
 
-  buildFlags = "--tags noupgrade,release";
-
   goPackagePath = "github.com/syncthing/syncthing";
 
   src = fetchFromGitHub {
@@ -22,4 +20,8 @@ buildGoPackage rec {
     # Mostly a cosmetic change
     sed -i 's,unknown-dev,${version},g' cmd/syncthing/main.go
   '';
+
+  preBuild = ''
+    export buildFlagsArray+=("-tags" "noupgrade release")
+  '';
 }
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
@@ -123,7 +123,7 @@ go.stdenv.mkDerivation (
       [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0
       local OUT
       if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v $d 2>&1)"; then
-        if ! echo "$OUT" | grep -q 'no buildable Go source files'; then
+        if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then
           echo "$OUT" >&2
           return 1
         fi

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -11118,7 +11118,7 @@ with pkgs;
     go = go_1_9;
   };
 
-  buildGoPackage = buildGo18Package;
+  buildGoPackage = buildGo19Package;
 
   go2nix = callPackage ../development/tools/go2nix { };
 
@@ -12002,7 +12002,10 @@ with pkgs;
 
   cifs-utils = callPackage ../os-specific/linux/cifs-utils { };
 
-  cockroachdb = callPackage ../servers/sql/cockroachdb { };
+  cockroachdb = callPackage ../servers/sql/cockroachdb {
+    # Go 1.9 build fails with "go1.8.* required (see CONTRIBUTING.md)".
+    buildGoPackage = buildGo18Package;
+  };
 
   conky = callPackage ../os-specific/linux/conky ({
     lua = lua5_1; # conky can use 5.2, but toluapp can not