on iko/ghcjs-patch-master help sign in
fix it
b2e94e9Moritz Angermann
new-package-set.nix+1−1
@@ -151,7 +151,7 @@
151 # we can never reinstall the following set of packages:
151 # we can never reinstall the following set of packages:
152 nonReinstallables
152 nonReinstallables
153 = [ "rts" "ghc" "base" "ghc-prim" "array" "integer-gmp" "integer-simple"
153 = [ "rts" "ghc" "base" "ghc-prim" "array" "integer-gmp" "integer-simple"
154− "deepseq" "pretty" "ghc-boot-th" "template-haskell" ];
154+ "deepseq" "pretty" "ghc-boot-th" "template-haskell" "terminfo" ];
155 # Thus the final plan will contain
155 # Thus the final plan will contain
156 # { packages = hsPkgs: { "package" = { flags = ...; package = ...; components = ...; }; ... };
156 # { packages = hsPkgs: { "package" = { flags = ...; package = ...; components = ...; }; ... };
157 # compiler = ... };
157 # compiler = ... };
nix/component-driver.nix+1
@@ -6,5 +6,6 @@ let
6in
6in
7lib.fix (self:
7lib.fix (self:
8 { buildPackages = self; }
8 { buildPackages = self; }
9+ // lib.mapAttrs (_: _: null) plan.compiler.packages
9 // lib.mapAttrs (_: pkg: if pkg == null then null else new-builder (lib.fix pkg)) (plan.packages self)
10 // lib.mapAttrs (_: pkg: if pkg == null then null else new-builder (lib.fix pkg)) (plan.packages self)
10)
11)