on iko/ghcjs-patch-master help sign in
Make reinstallable if reinstallableLibGhc (#279)

This reverts the reinstallable packages to before PR #261 was merged and only flags the additional non-reinstallable packages as non-reinstallable if reinstallableLibGhc is `false`.

commit5bb6704833355ef8b0bec0db5866ba98c33bafc3 authorViktor Kronvall <viktor.kronvall@gmail.com> dateTue 29 Oct 2019, 07:14 (7 years ago) parent1a28ea9
1 file changed+10−8
modules/component-driver.nix+10−8
modules/component-driver.nix+10−8
@@ -52,15 +52,17 @@ in
5252 "deepseq" "array" "ghc-boot-th" "pretty" "template-haskell"
5353 # ghcjs custom packages
5454 "ghcjs-prim" "ghcjs-th"
55−"ghc" "Cabal" "Win32" "array" "base" "binary" "bytestring" "containers" "deepseq"
56−"directory" "filepath" "ghc-boot" "ghc-compact" "ghc-prim"
57−# "ghci" "haskeline"
58−"hpc"
59−"integer-gmp" "mtl" "parsec" "process" "template-haskell" "text" "time" "transformers"
60−"unix" "xhtml"
61−# "stm" "terminfo"
6255 ]
63− ++ lib.optionals (!config.reinstallableLibGhc) [ "ghc" "ghc-boot" ];
56+ ++ lib.optionals (!config.reinstallableLibGhc) [
57+ "ghc-boot"
58+ "ghc" "Cabal" "Win32" "array" "binary" "bytestring" "containers"
59+ "directory" "filepath" "ghc-boot" "ghc-compact" "ghc-prim"
60+ # "ghci" "haskeline"
61+ "hpc"
62+ "mtl" "parsec" "process" "text" "time" "transformers"
63+ "unix" "xhtml"
64+ # "stm" "terminfo"
65+ ];
6466
6567 options.bootPkgs = lib.mkOption {
6668 type = lib.types.listOf lib.types.str;