ilyakooo0/haskell.nix
1
0
Fork 0
mirror of https://github.com/ilyakooo0/haskell.nix.git synced 2024-10-26 09:37:17 +03:00
Code Issues Projects Releases Wiki Activity

Fix ghcjs 8.6.5 and 8.8.4 (#1447)

Browse Source 
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
This commit is contained in:
Hamish Mackenzie 2022-04-21 12:46:49 +12:00 committed by GitHub
parent f3ea06dcac
commit 1f5c9b28bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ci.nix
View File

@ -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 ["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"])) {

1
lib/ghcjs-project.nix
View File

@ -50,6 +50,7 @@
cabalProjectLocal = ''
constraints: Cabal <3.2.1.0
'';
modules = [{ reinstallableLibGhc = true; }];
materialized = ../materialized/ghcjs/cabal + "/${compiler-nix-name}";
}
, ...