Skip to content

Commit cd91692

Browse files
authored
GHC 8.10.4 (#1033)
* Adds GHC 8.10.4 support * Drops GHC 8.8.3, 8.10.2 and 8.10.3 from CI * Adds warning to encourage people to use less buggy ghc
1 parent 34f03f7 commit cd91692

File tree

82 files changed

+14432
-52
lines changed

Some content is hidden

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

82 files changed

+14432
-52
lines changed

ci.nix

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,12 @@
2727
ghc865 = true;
2828
ghc884 = false; # Just included because the native version is needed at eval time
2929
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2009") {
30-
ghc883 = false;
3130
ghc884 = true;
32-
ghc8102 = false;
33-
ghc8103 = true;
31+
ghc8104 = true;
3432
ghc810220201118 = false;
3533
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
3634
ghc884 = true;
37-
ghc8103 = true;
35+
ghc8104 = true;
3836
});
3937
systems = nixpkgs: nixpkgs.lib.filterAttrs (_: v: builtins.elem v supportedSystems) {
4038
# I wanted to take these from 'lib.systems.examples', but apparently there isn't one for linux!
@@ -48,7 +46,7 @@
4846
in lib.optionalAttrs (nixpkgsName == "R2009" && (__elem compiler-nix-name ["ghc865" "ghc884"])) {
4947
inherit (lib.systems.examples) ghcjs;
5048
} // lib.optionalAttrs (system == "x86_64-linux" && (
51-
(nixpkgsName == "R2009" && __elem compiler-nix-name ["ghc8101" "ghc8102" "ghc8103" "ghc810220201118"])
49+
(nixpkgsName == "R2009" && __elem compiler-nix-name ["ghc8101" "ghc8102" "ghc8103" "ghc8104" "ghc810220201118"])
5250
|| (nixpkgsName == "R2003" && __elem compiler-nix-name ["ghc865"]))) {
5351
# Windows cross compilation is currently broken on macOS
5452
inherit (lib.systems.examples) mingwW64;

docs/reference/supported-ghc-versions.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ The following GHC versions are defined in `haskell.nix` (i.e. there is a derivat
55
- 8.4.4
66
- 8.6.{1,2,3,4,5}
77
- 8.8.{1,2,3,4}
8-
- 8.10.{1,2,3}
8+
- 8.10.{1,2,3,4}
99

1010
The following table shows the nixpkgs/GHC versions which are built by CI, and which of those are tested.
1111
If you use a combination of nixpkgs version and GHC version which is in this table, you should get cache hits from our cache.
@@ -15,13 +15,11 @@ The "nixpkgs versions" refer to the versions that `haskell.nix` provides; if you
1515
|------------------|-------------|---------|
1616
| 20.03 | 8.6.5 | Y |
1717
| 20.09 | 8.6.5 | Y |
18-
| 20.09 | 8.8.3 | N |
1918
| 20.09 | 8.8.4 | Y |
20-
| 20.09 | 8.10.2 | N |
21-
| 20.09 | 8.10.3 | Y |
19+
| 20.09 | 8.10.4 | Y |
2220
| nixpkgs-unstable | 8.6.5 | Y |
2321
| nixpkgs-unstable | 8.8.4 | Y |
24-
| nixpkgs-unstable | 8.10.3 | Y |
22+
| nixpkgs-unstable | 8.10.4 | Y |
2523

2624
See [ci.nix](https://github.com/input-output-hk/haskell.nix/blob/master/ci.nix) for the source of truth about what is built and tested.
2725

materialized/dummy-ghc/aarch64-unknown-linux-gnu-aarch64-unknown-linux-gnu-ghc-8.10.4-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.4-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.4-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.4-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.4-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.4-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)