Skip to content

Commit 42e625f

Browse files
committed
Merge branch 'master' of github.com:input-output-hk/haskell.nix into circuithub
2 parents b445608 + a93ef34 commit 42e625f

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/component-driver.nix

Lines changed: 4 additions & 2 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" ]

0 commit comments

Comments
 (0)