Skip to content

Commit 0f7c5af

Browse files
authored
Add ghc 8.10.3 (#980)
1 parent c78f424 commit 0f7c5af

File tree

115 files changed

+19038
-542
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+19038
-542
lines changed

ci.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2009") {
2828
ghc883 = false;
2929
ghc884 = true;
30-
ghc8101 = false;
31-
ghc8102 = true;
30+
ghc8102 = false;
31+
ghc8103 = true;
3232
ghc810220201118 = false;
3333
});
3434
systems = nixpkgs: nixpkgs.lib.filterAttrs (_: v: builtins.elem v supportedSystems) {
@@ -43,7 +43,7 @@
4343
in lib.optionalAttrs (nixpkgsName == "R2009" && (__elem compiler-nix-name ["ghc865" "ghc884"])) {
4444
inherit (lib.systems.examples) ghcjs;
4545
} // lib.optionalAttrs (system == "x86_64-linux" && (
46-
(nixpkgsName == "R2009" && __elem compiler-nix-name ["ghc8101" "ghc8102" "ghc810220201118"])
46+
(nixpkgsName == "R2009" && __elem compiler-nix-name ["ghc8101" "ghc8102" "ghc8103" "ghc810220201118"])
4747
|| (nixpkgsName == "R2003" && __elem compiler-nix-name ["ghc865"]))) {
4848
# Windows cross compilation is currently broken on macOS
4949
inherit (lib.systems.examples) mingwW64;

lib/ghcjs-project.nix

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,16 @@
3535
version = "3.2.5";
3636
materialized = ../materialized/ghcjs/alex + "/${compiler-nix-name}";
3737
}
38-
, cabal-install ? pkgs.haskell-nix.cabal-install.${compiler-nix-name}
38+
, cabal-install ? pkgs.haskell-nix.tool compiler-nix-name "cabal" {
39+
index-state = pkgs.haskell-nix.internalHackageIndexState;
40+
version = "3.2.0.0";
41+
# Cabal 3.2.1.0 no longer supports he mix of `cabal-version`,
42+
# lack of `custom-setup` and `v1-install` used by ghcjs boot.
43+
cabalProjectLocal = ''
44+
constraints: Cabal <3.2.1.0
45+
'';
46+
materialized = ../materialized/ghcjs/cabal + "/${compiler-nix-name}";
47+
}
3948
, ...
4049
}@args:
4150
let

materialized/dummy-ghc/aarch64-unknown-linux-gnu-aarch64-unknown-linux-gnu-ghc-8.10.3-x86_64-linux/ghc-pkg/dump-global

Lines changed: 1443 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/dummy-ghc/aarch64-unknown-linux-gnu-aarch64-unknown-linux-gnu-ghc-8.10.3-x86_64-linux/ghc-pkg/version

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/dummy-ghc/aarch64-unknown-linux-gnu-aarch64-unknown-linux-gnu-ghc-8.10.3-x86_64-linux/ghc/info

Lines changed: 69 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/dummy-ghc/aarch64-unknown-linux-gnu-aarch64-unknown-linux-gnu-ghc-8.10.3-x86_64-linux/ghc/numeric-version

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/dummy-ghc/aarch64-unknown-linux-gnu-aarch64-unknown-linux-gnu-ghc-8.10.3-x86_64-linux/ghc/supported-languages

Lines changed: 255 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/dummy-ghc/aarch64-unknown-linux-gnu-aarch64-unknown-linux-gnu-ghc-8.10.3-x86_64-linux/ghc/version

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)