on iko/ghcjs-patch-master help sign in
Fix ghcjs 8.6.5 and 8.8.4 (#1447)
1f5c9b2Hamish Mackenzie
@@ -58,7 +58,9 @@
58 # We need to use the actual nixpkgs version we're working with here, since the values
58 # We need to use the actual nixpkgs version we're working with here, since the values
59 # of 'lib.systems.examples' are not understood between all versions
59 # of 'lib.systems.examples' are not understood between all versions
60 let lib = nixpkgs.lib;
60 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"]))) {
62 inherit (lib.systems.examples) ghcjs;
64 inherit (lib.systems.examples) ghcjs;
63 } // lib.optionalAttrs (system == "x86_64-linux" &&
65 } // lib.optionalAttrs (system == "x86_64-linux" &&
64 nixpkgsName == "unstable" && (__elem compiler-nix-name ["ghc8107"])) {
66 nixpkgsName == "unstable" && (__elem compiler-nix-name ["ghc8107"])) {
lib/ghcjs-project.nix+1
@@ -50,6 +50,7 @@
50 cabalProjectLocal = ''
50 cabalProjectLocal = ''
51 constraints: Cabal <3.2.1.0
51 constraints: Cabal <3.2.1.0
52 '';
52 '';
53+ modules = [{ reinstallableLibGhc = true; }];
53 materialized = ../materialized/ghcjs/cabal + "/${compiler-nix-name}";
54 materialized = ../materialized/ghcjs/cabal + "/${compiler-nix-name}";
54 }
55 }
55, ...
56, ...