Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e649974271ad
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 14b6f2a8378e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 27, 2017

  1. haskell-packages: Add minimal benchDepends support 

    See also: NixOS/cabal2nix#262
    @expipiplus1
    expipiplus1 committed Feb 27, 2017
    Copy the full SHA
    fdd9d7f View commit details

  2. Merge pull request #23235 from expipiplus1/haskell-bench 

    haskell-packages: Add minimal benchDepends support
    @domenkozar
    domenkozar authored Feb 27, 2017
    Copy the full SHA
    14b6f2a View commit details
Showing with 5 additions and 1 deletion.
  1. +5 −1 pkgs/development/haskell-modules/generic-builder.nix
6 changes: 5 additions & 1 deletion pkgs/development/haskell-modules/generic-builder.nix
View file
Original file line number Diff line number Diff line change
@@ -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; }