diff options
| author | Joe Hermaszewski <git@monoid.al> | 2017-02-27 11:47:00 +0000 |
|---|---|---|
| committer | Joe Hermaszewski <git@monoid.al> | 2017-02-27 11:56:33 +0000 |
| commit | fdd9d7fe4c184a94de50b9ecfee74be0295f4a1b (patch) | |
| tree | 90cdd1c9a3fd31e5f0d48d8cec385def4bcc7a8f /pkgs/development | |
| parent | 0bfbd039f989df1994728ab21a451b0b9dc5211c (diff) | |
haskell-packages: Add minimal benchDepends support
See also: https://github.com/NixOS/cabal2nix/pull/262
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 1998b090687d..a75392bef747 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -13,6 +13,7 @@ , configureFlags ? [] , description ? "" , doCheck ? !isCross && (stdenv.lib.versionOlder "7.4" ghc.version) +, doBench ? false , doHoogle ? true , editedCabalFile ? null , enableLibraryProfiling ? false @@ -38,6 +39,7 @@ , passthru ? {} , pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [] , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [] +, benchDepends ? [] , testTarget ? "" , broken ? false , preCompileBuildDriver ? "", postCompileBuildDriver ? "" @@ -145,7 +147,8 @@ let otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ setupHaskellDepends ++ buildTools ++ libraryToolDepends ++ executableToolDepends ++ optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++ - optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends); + optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++ + optionals doBench benchDepends; allBuildInputs = propagatedBuildInputs ++ otherBuildInputs; haskellBuildInputs = stdenv.lib.filter isHaskellPkg allBuildInputs; @@ -341,6 +344,7 @@ stdenv.mkDerivation ({ // optionalAttrs (preBuild != "") { inherit preBuild; } // optionalAttrs (postBuild != "") { inherit postBuild; } // optionalAttrs (doCheck) { inherit doCheck; } +// optionalAttrs (doBench) { inherit doBench; } // optionalAttrs (checkPhase != "") { inherit checkPhase; } // optionalAttrs (preCheck != "") { inherit preCheck; } // optionalAttrs (postCheck != "") { inherit postCheck; } |