diff options
author | Orivej Desh <orivej@gmx.fr> | 2017-09-28 17:10:45 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-28 17:10:45 +0000 |
commit | 1e0ec4216f2c4d26f96c738ae956cd6cde5e0c09 (patch) | |
tree | 73044f368e2b64a2529bd0debc94bec1690b5c10 | |
parent | 595c8fad83c2f4a9217fb1e0b30492f7476a960a (diff) | |
parent | 2be4d53faa14d873fa8d8584382c7ef9afbd0248 (diff) | |
download | nixlib-1e0ec4216f2c4d26f96c738ae956cd6cde5e0c09.tar nixlib-1e0ec4216f2c4d26f96c738ae956cd6cde5e0c09.tar.gz nixlib-1e0ec4216f2c4d26f96c738ae956cd6cde5e0c09.tar.bz2 nixlib-1e0ec4216f2c4d26f96c738ae956cd6cde5e0c09.tar.lz nixlib-1e0ec4216f2c4d26f96c738ae956cd6cde5e0c09.tar.xz nixlib-1e0ec4216f2c4d26f96c738ae956cd6cde5e0c09.tar.zst nixlib-1e0ec4216f2c4d26f96c738ae956cd6cde5e0c09.zip |
Merge pull request #29173 from orivej/golang
go: buildGoPackage: 1.8 -> 1.9
-rw-r--r-- | pkgs/applications/networking/syncthing012/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/go-modules/generic/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/filesystems/gcsfuse/default.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
4 files changed, 13 insertions, 8 deletions
diff --git a/pkgs/applications/networking/syncthing012/default.nix b/pkgs/applications/networking/syncthing012/default.nix index 5735dd68bcd2..4b5359555f4a 100644 --- 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 index c2e4b39472c4..5a1a0eb52eb3 100644 --- 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/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index 086f0e0f790c..215f02ccdd4e 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -3,15 +3,15 @@ buildGoPackage rec { name = "gcsfuse-${version}"; - version = "v0.19.0"; - rev = "81281027c0093e3f916a6e611a128ec5c3a12ece"; + version = "0.23.0"; + rev = "v${version}"; goPackagePath = "github.com/googlecloudplatform/gcsfuse"; src = fetchgit { inherit rev; url = "https://github.com/googlecloudplatform/gcsfuse"; - sha256 = "1lj9czippsgkhr8y3r7vwxgc8i952v76v1shdv10p43gsxwyyi9a"; + sha256 = "1qxbpsmz22l5w4b7wbgfdq4v85cfc9ka9i8h4c56nals1x5lcsnx"; }; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4324cc0092f2..0fced3a1bb81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11130,7 +11130,7 @@ with pkgs; go = go_1_9; }; - buildGoPackage = buildGo18Package; + buildGoPackage = buildGo19Package; go2nix = callPackage ../development/tools/go2nix { }; @@ -12017,7 +12017,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 |