git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Fix ghcjs 8.6.5 and 8.8.4 (#1447)

Also hydra now builds ghcjs 8.8.4, 8.6.5 and 8.10.7 on x86_64-linux build ghcjs 8.10.7 on x86_64-darwin

commit1f5c9b28bfb0178520fbbdc0db55848330d896f9 authorHamish Mackenzie <Hamish.K.Mackenzie@gmail.com> dateThu 21 Apr 2022, 12:46 (5 years ago) parentf3ea06d
2 files changed+4−1
compare with iko/ghcjs-patch-master
unifiedsplit
ci.nix+3−1 lib/ghcjs-project.nix+1
ci.nix+3−1
@@ -58,7 +58,9 @@
5858 # We need to use the actual nixpkgs version we're working with here, since the values
5959 # of 'lib.systems.examples' are not understood between all versions
6060 let lib = nixpkgs.lib;
61− in lib.optionalAttrs (nixpkgsName == "unstable" && (__elem compiler-nix-name ["ghc8107"]) && system != "aarch64-darwin") {
61+ in lib.optionalAttrs (nixpkgsName == "unstable"
62+ && ((system == "x86_64-linux" && __elem compiler-nix-name ["ghc865" "ghc884" "ghc8107"])
63+ || (system == "x86_64-darwin" && __elem compiler-nix-name ["ghc8107"]))) {
6264 inherit (lib.systems.examples) ghcjs;
6365 } // lib.optionalAttrs (system == "x86_64-linux" &&
6466 nixpkgsName == "unstable" && (__elem compiler-nix-name ["ghc8107"])) {
lib/ghcjs-project.nix+1
@@ -50,6 +50,7 @@
5050 cabalProjectLocal = ''
5151 constraints: Cabal <3.2.1.0
5252 '';
53+ modules = [{ reinstallableLibGhc = true; }];
5354 materialized = ../materialized/ghcjs/cabal + "/${compiler-nix-name}";
5455 }
5556, ...