diff options
author | Peter Simons <simons@cryp.to> | 2017-12-29 19:32:12 +0100 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2017-12-30 13:53:05 +0100 |
commit | 016aa581a757d468e35a03c6f8a3a0309af95e31 (patch) | |
tree | a9436b33b4856b00e0349864e6c3a8441606625c /pkgs/development/haskell-modules | |
parent | a05d950812dbb1002e34db788b80ee20d3b5739c (diff) | |
download | nixlib-016aa581a757d468e35a03c6f8a3a0309af95e31.tar nixlib-016aa581a757d468e35a03c6f8a3a0309af95e31.tar.gz nixlib-016aa581a757d468e35a03c6f8a3a0309af95e31.tar.bz2 nixlib-016aa581a757d468e35a03c6f8a3a0309af95e31.tar.lz nixlib-016aa581a757d468e35a03c6f8a3a0309af95e31.tar.xz nixlib-016aa581a757d468e35a03c6f8a3a0309af95e31.tar.zst nixlib-016aa581a757d468e35a03c6f8a3a0309af95e31.zip |
haskell: extend generic builder to recognize mis-configured Cabal 2.x builds
Cabal 1.x says: | Warning: This package indirectly depends on multiple versions of the same | package. This is highly likely to cause a compile failure. But in version 2.x, that warning is split into two lines differently: | Warning: | This package indirectly depends on multiple versions of the same package. This is very likely to cause a compile failure. This commit modifies the call to "egrep" to recognize both versions by virtue of the "-z" flag, which essentially interprets the whole configure-time output as one long line.
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 96de6ab6d3f7..c633310a37a4 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -276,7 +276,7 @@ stdenv.mkDerivation ({ echo configureFlags: $configureFlags ${setupCommand} configure $configureFlags 2>&1 | ${coreutils}/bin/tee "$NIX_BUILD_TOP/cabal-configure.log" - if ${gnugrep}/bin/egrep -q '^Warning:.*depends on multiple versions' "$NIX_BUILD_TOP/cabal-configure.log"; then + if ${gnugrep}/bin/egrep -q -z 'Warning:.*depends on multiple versions' "$NIX_BUILD_TOP/cabal-configure.log"; then echo >&2 "*** abort because of serious configure-time warning from Cabal" exit 1 fi |