Merge pull request #29173 from orivej/golang
go: buildGoPackage: 1.8 -> 1.9
This commit is contained in:
commit
1e0ec4216f
|
@ -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")
|
||||
'';
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 = {
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue