diff options
| author | Joe Hermaszewski <git@monoid.al> | 2017-02-27 11:47:00 +0000 |
|---|---|---|
| committer | Joe Hermaszewski <git@monoid.al> | 2017-02-27 12:23:11 +0000 |
| commit | 4ab570a6d0be024a89febe6834e6a02061b3ce27 (patch) | |
| tree | 8db0905f20a3782ae81389492b7a09eb730e9276 /pkgs | |
| parent | ba78819782cec6e9846d02944f34254615e8dc80 (diff) | |
| download | nixlib-4ab570a6d0be024a89febe6834e6a02061b3ce27.tar nixlib-4ab570a6d0be024a89febe6834e6a02061b3ce27.tar.gz nixlib-4ab570a6d0be024a89febe6834e6a02061b3ce27.tar.bz2 nixlib-4ab570a6d0be024a89febe6834e6a02061b3ce27.tar.lz nixlib-4ab570a6d0be024a89febe6834e6a02061b3ce27.tar.xz nixlib-4ab570a6d0be024a89febe6834e6a02061b3ce27.tar.zst nixlib-4ab570a6d0be024a89febe6834e6a02061b3ce27.zip | |
haskell-packages: Add minimal benchDepends support
See also: https://github.com/NixOS/cabal2nix/pull/262
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index a75392bef747..a22d2c67dfda 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -9,7 +9,7 @@ , src ? fetchurl { url = "mirror://hackage/${pname}-${version}.tar.gz"; inherit sha256; } , buildDepends ? [], setupHaskellDepends ? [], libraryHaskellDepends ? [], executableHaskellDepends ? [] , buildTarget ? "" -, buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [] +, buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [], benchToolDepends ? [] , configureFlags ? [] , description ? "" , doCheck ? !isCross && (stdenv.lib.versionOlder "7.4" ghc.version) @@ -37,9 +37,9 @@ # TODO Do we care about haddock when cross-compiling? , doHaddock ? !isCross && (!stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8") , passthru ? {} -, pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [] +, pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchPkgconfigDepends ? [] , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [] -, benchDepends ? [] +, benchDepends ? [], benchHaskellDepends ? [], benchSystemDepends ? [] , testTarget ? "" , broken ? false , preCompileBuildDriver ? "", postCompileBuildDriver ? "" @@ -141,14 +141,14 @@ let isSystemPkg = x: !isHaskellPkg x; allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++ - optionals doCheck testPkgconfigDepends; + optionals doCheck testPkgconfigDepends ++ optionals doBench benchPkgconfigDepends; propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends; otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ setupHaskellDepends ++ buildTools ++ libraryToolDepends ++ executableToolDepends ++ optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++ optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++ - optionals doBench benchDepends; + optionals doBench (benchDepends ++ benchHaskellDepends ++ benchSystemDepends ++ benchToolDepends); allBuildInputs = propagatedBuildInputs ++ otherBuildInputs; haskellBuildInputs = stdenv.lib.filter isHaskellPkg allBuildInputs; |