diff options
| author | Peter Simons <simons@cryp.to> | 2018-05-23 16:32:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-23 16:32:49 +0200 |
| commit | 1e225e6481530170068103d3916108ba5ee7a9d3 (patch) | |
| tree | cac147dabf21f2e0608b8bd573f7ffc66a95eec5 | |
| parent | e3f35d14914820d27617bb1c34affe8ce2a0eae0 (diff) | |
| parent | 3394c96655822c36437a31bda3c006009b5ffc84 (diff) | |
| download | nixlib-1e225e6481530170068103d3916108ba5ee7a9d3.tar nixlib-1e225e6481530170068103d3916108ba5ee7a9d3.tar.gz nixlib-1e225e6481530170068103d3916108ba5ee7a9d3.tar.bz2 nixlib-1e225e6481530170068103d3916108ba5ee7a9d3.tar.lz nixlib-1e225e6481530170068103d3916108ba5ee7a9d3.tar.xz nixlib-1e225e6481530170068103d3916108ba5ee7a9d3.tar.zst nixlib-1e225e6481530170068103d3916108ba5ee7a9d3.zip | |
Merge pull request #40993 from obsidiansystems/tiny-haskell-builder
haskell generic-builder: Tiny changes that preserve hases
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 3ab77c42cbba..f08130a3157a 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -20,7 +20,7 @@ in , buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [], benchmarkToolDepends ? [] , configureFlags ? [] , description ? "" -, doCheck ? !isCross && (stdenv.lib.versionOlder "7.4" ghc.version) +, doCheck ? !isCross && stdenv.lib.versionOlder "7.4" ghc.version , doBenchmark ? false , doHoogle ? true , editedCabalFile ? null @@ -172,7 +172,7 @@ let buildTools ++ libraryToolDepends ++ executableToolDepends; propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends; otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ - optionals (allPkgconfigDepends != []) allPkgconfigDepends ++ + allPkgconfigDepends ++ optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++ optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends); allBuildInputs = propagatedBuildInputs ++ otherBuildInputs; |