diff options
| author | Domen Kožar <domen@enlambda.com> | 2017-02-27 12:57:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-27 12:57:25 +0100 |
| commit | 14b6f2a8378e277ec1e07c59d5de9ff88d1246a4 (patch) | |
| tree | d00630cbd888791694a3cafdb48d59f58d06caaa /pkgs | |
| parent | e649974271addcee9f7368bcbb5048367fb6cb56 (diff) | |
| parent | fdd9d7fe4c184a94de50b9ecfee74be0295f4a1b (diff) | |
| download | nixlib-14b6f2a8378e277ec1e07c59d5de9ff88d1246a4.tar nixlib-14b6f2a8378e277ec1e07c59d5de9ff88d1246a4.tar.gz nixlib-14b6f2a8378e277ec1e07c59d5de9ff88d1246a4.tar.bz2 nixlib-14b6f2a8378e277ec1e07c59d5de9ff88d1246a4.tar.lz nixlib-14b6f2a8378e277ec1e07c59d5de9ff88d1246a4.tar.xz nixlib-14b6f2a8378e277ec1e07c59d5de9ff88d1246a4.tar.zst nixlib-14b6f2a8378e277ec1e07c59d5de9ff88d1246a4.zip | |
Merge pull request #23235 from expipiplus1/haskell-bench
haskell-packages: Add minimal benchDepends support
Diffstat (limited to 'pkgs')
| -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; } |