9bbc69a · haskell.nix · git.iko.soy

git.iko.soy/haskell.nix

on iko/ghcjs-patch-master help sign in

Don't null out all compiler.packages; only nonreinstallable packages

9bbc69aWill Fancher8 years ago

modules/component-driver.nix+6−2

@@ -5,6 +5,9 @@ let

5 inherit haskellLib;

6 ghc = config.ghc.package;

7 };

9+ nonReinstallablePkgs = [ "rts" "ghc" "ghc-prim" "integer-gmp" "integer-simple" "base"

10+ "array" "deepseq" "pretty" "ghc-boot-th" "template-haskell"];

8in

11in

10{

13{

@@ -13,6 +16,7 @@ in

13 };

16 };

15 config.hsPkgs = { buildPackages = config.hsPkgs; }

18 config.hsPkgs = { buildPackages = config.hsPkgs; }

16− // lib.mapAttrs (_: _: null) config.compiler.packages

19+ // lib.mapAttrs

17− // lib.mapAttrs (_: pkg: if pkg == null then null else new-builder pkg) config.packages;

20+ (name: pkg: if pkg == null || builtins.elem name nonReinstallablePkgs then null else new-builder pkg)

21+ config.packages;

18}

22}