From c1fda16b7f9f580e2fc6f78034a8317ee880ad07 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Tue, 19 Apr 2022 14:22:49 +1200 Subject: [PATCH 1/2] Fix ghcjs 8.6.5 and 8.8.4 --- ci.nix | 2 +- lib/ghcjs-project.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ci.nix b/ci.nix index 8283772409..ebd646ac31 100644 --- a/ci.nix +++ b/ci.nix @@ -58,7 +58,7 @@ # We need to use the actual nixpkgs version we're working with here, since the values # of 'lib.systems.examples' are not understood between all versions let lib = nixpkgs.lib; - in lib.optionalAttrs (nixpkgsName == "unstable" && (__elem compiler-nix-name ["ghc8107"]) && system != "aarch64-darwin") { + in lib.optionalAttrs (nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc865" "ghc884" "ghc8107"] && system != "aarch64-darwin") { inherit (lib.systems.examples) ghcjs; } // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && (__elem compiler-nix-name ["ghc8107"])) { diff --git a/lib/ghcjs-project.nix b/lib/ghcjs-project.nix index 14f15b9ede..cd155cb10c 100644 --- a/lib/ghcjs-project.nix +++ b/lib/ghcjs-project.nix @@ -50,6 +50,7 @@ cabalProjectLocal = '' constraints: Cabal <3.2.1.0 ''; + modules = [{ reinstallableLibGhc = true; }]; materialized = ../materialized/ghcjs/cabal + "/${compiler-nix-name}"; } , ... From 8cd793b2263a99317a4138e06a468c671d089de6 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Wed, 20 Apr 2022 22:40:54 +1200 Subject: [PATCH 2/2] Only build ghcjs 8.10.7 on darwin --- ci.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci.nix b/ci.nix index ebd646ac31..28075f7f9a 100644 --- a/ci.nix +++ b/ci.nix @@ -58,7 +58,9 @@ # We need to use the actual nixpkgs version we're working with here, since the values # of 'lib.systems.examples' are not understood between all versions let lib = nixpkgs.lib; - in lib.optionalAttrs (nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc865" "ghc884" "ghc8107"] && system != "aarch64-darwin") { + in lib.optionalAttrs (nixpkgsName == "unstable" + && ((system == "x86_64-linux" && __elem compiler-nix-name ["ghc865" "ghc884" "ghc8107"]) + || (system == "x86_64-darwin" && __elem compiler-nix-name ["ghc8107"]))) { inherit (lib.systems.examples) ghcjs; } // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && (__elem compiler-nix-name ["ghc8107"])) {