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: e3f35d149148
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1e225e648153
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 23, 2018

  1. haskell generic-builder: Tiny changes that preserve hases 

    These bring us closer to staging at no cost
    @Ericson2314
    Ericson2314 committed May 23, 2018
    Copy the full SHA
    3394c96 View commit details

  2. Merge pull request #40993 from obsidiansystems/tiny-haskell-builder 

    haskell generic-builder: Tiny changes that preserve hases
    @peti
    peti authored May 23, 2018
    Copy the full SHA
    1e225e6 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/development/haskell-modules/generic-builder.nix
4 changes: 2 additions & 2 deletions pkgs/development/haskell-modules/generic-builder.nix
View file
Original file line number Diff line number Diff line change
@@ -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;