Skip to content

Commit 08fd22e

Browse files
committed
Add exceptions and stm to nonReinstallablePkgs for ghc901
We did not merge #1183 because we were concerned that it would change the exceptions and stm used for users that did not want to build GHC. However `reinstallableLibGhc = true` is now the default and most projects should not be setting it to `false`. That means this change will now only affect projects that likely want to use the built in `ghc` package.
1 parent 0b0ee03 commit 08fd22e

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

modules/component-driver.nix

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,10 @@ in
6161
]
6262
# TODO make this unconditional
6363
++ lib.optionals (
64-
__elem config.compiler.nix-name ["ghc901" "ghc902" "ghc921" "ghc922" "ghc923" "ghc924" "ghc925" "ghc926" "ghc927" "ghc941" "ghc942" "ghc943" "ghc944" "ghc945" "ghc961" "ghc96020230302"]) [
65-
"ghc-bignum" ]
64+
__elem config.compiler.nix-name ["ghc901" "ghc902" "ghc921" "ghc922" "ghc923" "ghc924" "ghc925" "ghc926" "ghc927" "ghc941" "ghc942" "ghc943" "ghc944" "ghc945" "ghc961" "ghc96020230302"])
65+
([ghc-bignum" ]
66+
# stm and exceptions are needed by the GHC package since 9.0.1
67+
++ lib.optionals (!config.reinstallableLibGhc) ["stm" "exceptions"])
6668
++ lib.optionals (
6769
__elem config.compiler.nix-name ["ghc925" "ghc926" "ghc927" "ghc941" "ghc942" "ghc943" "ghc944" "ghc945" "ghc961" "ghc96020230302"]) [
6870
"system-cxx-std-lib" ]
@@ -90,7 +92,7 @@ in
9092
] ++ lib.optional (!config.reinstallableLibGhc) "ghc"
9193
++ lib.optionals (
9294
__elem config.compiler.nix-name ["ghc901" "ghc902" "ghc921" "ghc922" "ghc923" "ghc924" "ghc925" "ghc926" "ghc927" "ghc941" "ghc942" "ghc943" "ghc944" "ghc945" "ghc961" "ghc96020230302"]) [
93-
"ghc-bignum" ]
95+
"ghc-bignum"]
9496
++ lib.optionals (
9597
__elem config.compiler.nix-name ["ghc941" "ghc942" "ghc943" "ghc944" "ghc945" "ghc961" "ghc96020230302"]) [
9698
"system-cxx-std-lib" ];

0 commit comments

Comments
 (0)