Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1acf6547d0f2
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 44588a4b9763
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 8, 2019

  1. Add option to disable library-for-ghci in the generic haskell builder. 

    (cherry picked from commit b58ecf32c7936564deb68472ad6057b9a313e640)
    @cdepillabout
    cdepillabout committed Apr 8, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    WilliButz
    GPG key ID: 92582A10F1179CB2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    352fceb View commit details

Commits on Apr 11, 2019

  1. Merge pull request #59146 from cdepillabout/backport-library-for-ghci 

    haskell-generic-builder: backport to 19.03 add option to disable library-for-ghci
    @peti
    peti authored Apr 11, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    WilliButz
    GPG key ID: 92582A10F1179CB2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    44588a4 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
@@ -81,6 +81,10 @@ in
# built. Will delay failures, if any, to compile time.
allowInconsistentDependencies ? false
, maxBuildCores ? 4 # GHC usually suffers beyond -j4. https://ghc.haskell.org/trac/ghc/ticket/9221
, # Build a pre-linked .o file for this Haskell library. This can make it
# slightly faster to load this library into GHCi, but takes extra disk space
# and compile time.
enableLibraryForGhci ? true
} @ args:

assert editedCabalFile != null -> revision != null;
@@ -169,7 +173,7 @@ let
(optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature doCheck "tests"))
(enableFeature doBenchmark "benchmarks")
"--enable-library-vanilla" # TODO: Should this be configurable?
"--enable-library-for-ghci" # TODO: Should this be configurable?
(enableFeature enableLibraryForGhci "library-for-ghci")
] ++ optionals (enableDeadCodeElimination && (stdenv.lib.versionOlder "8.0.1" ghc.version)) [
"--ghc-option=-split-sections"
] ++ optionals dontStrip [