Skip to content

Commit 5cc5467

Browse files
authored
Add GHC 9.10.2 (#2353)
* Add GHC 9.10.2 * Update patch version bounds * Update patch version bounds * Add materialization * Disable HLS build for GHC 9.10.2 * Add materialization * Add materialization * Disable broken TH test for android armv7a * Update docs * Update github action
1 parent 6e4c225 commit 5cc5467

Some content is hidden

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

94 files changed

+3657
-20
lines changed

.github/workflows/pipeline.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -225,12 +225,12 @@ jobs:
225225
- name: "Check that evaluation of hydra jobs works without using remote builders for GHC 9.6.7"
226226
run: nix path-info --derivation .#requiredJobs.x86_64-darwin.required-unstable-ghc967-native --show-trace --builders ''
227227

228-
hydra-without-remote-builders-ghc9101:
228+
hydra-without-remote-builders-ghc9102:
229229
runs-on: [self-hosted, linux]
230230
steps:
231231
- uses: actions/checkout@v4
232-
- name: "Check that evaluation of hydra jobs works without using remote builders for GHC 9.10.1"
233-
run: nix path-info --derivation .#requiredJobs.x86_64-darwin.required-unstable-ghc9101-native --show-trace --builders ''
232+
- name: "Check that evaluation of hydra jobs works without using remote builders for GHC 9.10.2"
233+
run: nix path-info --derivation .#requiredJobs.x86_64-darwin.required-unstable-ghc9102-native --show-trace --builders ''
234234

235235
hix-cabal:
236236
runs-on: [self-hosted, linux]

build.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ in rec {
5757
inherit evalPackages;
5858
src = pkgs.haskell-nix.sources."hls-2.2";
5959
};
60-
} // pkgs.lib.optionalAttrs (ghcFromTo "9.0" "9.11") {
60+
} // pkgs.lib.optionalAttrs (ghcFromTo "9.0" "9.10.2") {
6161
"hls" = tool compiler-nix-name "haskell-language-server" {
6262
inherit evalPackages;
6363
src = pkgs.haskell-nix.sources."hls-2.10";

docs/reference/supported-ghc-versions.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ really should use an instance of Nixpkgs provided by `haskell.nix` itself.
2424
|------------------|--------------------|-------------|-----------------------|---------------|
2525
| unstable | `nixpkgs-unstable` | 9.6.7 | `ghc96` or `ghc967` | Yes |
2626
| unstable | `nixpkgs-unstable` | 9.8.4 | `ghc98` or `ghc984` | Yes |
27-
| unstable | `nixpkgs-unstable` | 9.10.1 | `ghc910` or `ghc9101` | Yes |
27+
| unstable | `nixpkgs-unstable` | 9.10.2 | `ghc910` or `ghc9102` | Yes |
2828
| unstable | `nixpkgs-unstable` | 9.12.2 | `ghc912` or `ghc9122` | Yes |
2929

3030
See [ci.nix](https://github.com/input-output-hk/haskell.nix/blob/master/ci.nix)

lazy-inputs/default.nix

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ in {
3636
inherit ((callFlake { pkgs = final; src = ./ghc983; }).defaultNix) ghc983;
3737
inherit ((callFlake { pkgs = final; src = ./ghc984; }).defaultNix) ghc984;
3838
inherit ((callFlake { pkgs = final; src = ./ghc9101; }).defaultNix) ghc9101;
39+
inherit ((callFlake { pkgs = final; src = ./ghc9102; }).defaultNix) ghc9102;
3940
inherit ((callFlake { pkgs = final; src = ./ghc9121; }).defaultNix) ghc9121;
4041
inherit ((callFlake { pkgs = final; src = ./ghc9122; }).defaultNix) ghc9122;
4142
inherit ((callFlake { pkgs = final; src = ./ghc912X; }).defaultNix) ghc912X;

lazy-inputs/ghc9102/flake.lock

+30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lazy-inputs/ghc9102/flake.nix

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
description = "Lazy Input for Haskell.nix";
3+
4+
inputs = {
5+
ghc9102 = {
6+
flake = false;
7+
url = "git+https://github.com/stable-haskell/ghc?ref=ghc-9.10.2-iog&submodules=1";
8+
};
9+
};
10+
11+
outputs = inputs: inputs;
12+
}

materialized/ghc-boot-packages-nix/ghc9102-aarch64/base.nix

+34
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/ghc-boot-packages-nix/ghc9102-aarch64/deriveConstants.nix

+39
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/ghc-boot-packages-nix/ghc9102-aarch64/genprimopcode.nix

+40
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/ghc-boot-packages-nix/ghc9102-aarch64/ghc-bignum.nix

+37
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/ghc-boot-packages-nix/ghc9102-aarch64/ghc-boot.nix

+47
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/ghc-boot-packages-nix/ghc9102-aarch64/ghc-heap.nix

+36
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/ghc-boot-packages-nix/ghc9102-aarch64/ghc-internal.nix

+49
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)