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 /pkgs/development | |
| 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
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/go-modules/generic/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
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 |