Skip to content

Commit

Permalink
Add ghc 8.10.3 (#980)
Browse files Browse the repository at this point in the history
  • Loading branch information
hamishmack committed Jan 11, 2021
1 parent c78f424 commit 0f7c5af
Show file tree
Hide file tree
Showing 115 changed files with 19,038 additions and 542 deletions.
6 changes: 3 additions & 3 deletions ci.nix
Expand Up @@ -27,8 +27,8 @@
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2009") {
ghc883 = false;
ghc884 = true;
ghc8101 = false;
ghc8102 = true;
ghc8102 = false;
ghc8103 = true;
ghc810220201118 = false;
});
systems = nixpkgs: nixpkgs.lib.filterAttrs (_: v: builtins.elem v supportedSystems) {
Expand All @@ -43,7 +43,7 @@
in lib.optionalAttrs (nixpkgsName == "R2009" && (__elem compiler-nix-name ["ghc865" "ghc884"])) {
inherit (lib.systems.examples) ghcjs;
} // lib.optionalAttrs (system == "x86_64-linux" && (
(nixpkgsName == "R2009" && __elem compiler-nix-name ["ghc8101" "ghc8102" "ghc810220201118"])
(nixpkgsName == "R2009" && __elem compiler-nix-name ["ghc8101" "ghc8102" "ghc8103" "ghc810220201118"])
|| (nixpkgsName == "R2003" && __elem compiler-nix-name ["ghc865"]))) {
# Windows cross compilation is currently broken on macOS
inherit (lib.systems.examples) mingwW64;
Expand Down
11 changes: 10 additions & 1 deletion lib/ghcjs-project.nix
Expand Up @@ -35,7 +35,16 @@
version = "3.2.5";
materialized = ../materialized/ghcjs/alex + "/${compiler-nix-name}";
}
, cabal-install ? pkgs.haskell-nix.cabal-install.${compiler-nix-name}
, cabal-install ? pkgs.haskell-nix.tool compiler-nix-name "cabal" {
index-state = pkgs.haskell-nix.internalHackageIndexState;
version = "3.2.0.0";
# Cabal 3.2.1.0 no longer supports he mix of `cabal-version`,
# lack of `custom-setup` and `v1-install` used by ghcjs boot.
cabalProjectLocal = ''
constraints: Cabal <3.2.1.0
'';
materialized = ../materialized/ghcjs/cabal + "/${compiler-nix-name}";
}
, ...
}@args:
let
Expand Down

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 0f7c5af

Please sign in to comment.