Skip to content

Commit 3d419f5

Browse files
hamishmackhamishmack
authored
Add ghc 9.6.7 (#2343)
* Add ghc 9.6.7 * Add materialized files * Update github actions to 9.6.7
1 parent 6976ec1 commit 3d419f5

Some content is hidden

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

55 files changed

+1984
-56
lines changed

‎.github/workflows/pipeline.yml‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Run tests with ghc966"
1+
name: "Run tests with ghc967"
22

33
on:
44
pull_request:
@@ -22,120 +22,120 @@ jobs:
2222
runs-on: [self-hosted, linux]
2323
steps:
2424
- uses: actions/checkout@v4
25-
- name: "Run tests with ghc966: Running the nix-build tests..."
26-
run: "./test/tests.sh ghc966 nix-build"
25+
- name: "Run tests with ghc967: Running the nix-build tests..."
26+
run: "./test/tests.sh ghc967 nix-build"
2727

2828
unit-tests:
2929
runs-on: [self-hosted, linux]
3030
steps:
3131
- uses: actions/checkout@v4
32-
- name: "Run tests with ghc966: Running the unit tests..."
33-
run: "./test/tests.sh ghc966 unit-tests"
32+
- name: "Run tests with ghc967: Running the unit tests..."
33+
run: "./test/tests.sh ghc967 unit-tests"
3434

3535
runghc:
3636
runs-on: [self-hosted, linux]
3737
steps:
3838
- uses: actions/checkout@v4
39-
- name: "Run tests with ghc966: Checking that a nix-shell works for runghc..."
40-
run: "./test/tests.sh ghc966 runghc"
39+
- name: "Run tests with ghc967: Checking that a nix-shell works for runghc..."
40+
run: "./test/tests.sh ghc967 runghc"
4141

4242
cabal:
4343
runs-on: [self-hosted, linux]
4444
steps:
4545
- uses: actions/checkout@v4
46-
- name: "Run tests with ghc966: Checking that a nix-shell works for cabal..."
47-
run: "./test/tests.sh ghc966 cabal"
46+
- name: "Run tests with ghc967: Checking that a nix-shell works for cabal..."
47+
run: "./test/tests.sh ghc967 cabal"
4848

4949
cabal-doExactConfig:
5050
runs-on: [self-hosted, linux]
5151
steps:
5252
- uses: actions/checkout@v4
53-
- name: "Run tests with ghc966: Checking that a nix-shell works for cabal (doExactConfig component)..."
54-
run: "./test/tests.sh ghc966 cabal-doExactConfig"
53+
- name: "Run tests with ghc967: Checking that a nix-shell works for cabal (doExactConfig component)..."
54+
run: "./test/tests.sh ghc967 cabal-doExactConfig"
5555

5656
tests-benchmarks:
5757
runs-on: [self-hosted, linux]
5858
steps:
5959
- uses: actions/checkout@v4
60-
- name: "Run tests with ghc966: Checking that a nix-shell works for a project with test-suite build-tools and benchmarks..."
61-
run: "./test/tests.sh ghc966 tests-benchmarks"
60+
- name: "Run tests with ghc967: Checking that a nix-shell works for a project with test-suite build-tools and benchmarks..."
61+
run: "./test/tests.sh ghc967 tests-benchmarks"
6262

6363
multi-target:
6464
runs-on: [self-hosted, linux]
6565
steps:
6666
- uses: actions/checkout@v4
67-
- name: "Run tests with ghc966: Checking that a nix-shell works for a multi-target project..."
68-
run: "./test/tests.sh ghc966 multi-target"
67+
- name: "Run tests with ghc967: Checking that a nix-shell works for a multi-target project..."
68+
run: "./test/tests.sh ghc967 multi-target"
6969

7070
shellFor-single-package:
7171
runs-on: [self-hosted, linux]
7272
steps:
7373
- uses: actions/checkout@v4
74-
- name: "Run tests with ghc966: Checking shellFor works for a cabal project, multiple packages..."
75-
run: "./test/tests.sh ghc966 shellFor-single-package"
74+
- name: "Run tests with ghc967: Checking shellFor works for a cabal project, multiple packages..."
75+
run: "./test/tests.sh ghc967 shellFor-single-package"
7676

7777
shellFor-multiple-package:
7878
runs-on: [self-hosted, linux]
7979
steps:
8080
- uses: actions/checkout@v4
81-
- name: "Run tests with ghc966: Checking shellFor works for a cabal project, single package...y"
82-
run: "./test/tests.sh ghc966 shellFor-multiple-package"
81+
- name: "Run tests with ghc967: Checking shellFor works for a cabal project, single package...y"
82+
run: "./test/tests.sh ghc967 shellFor-multiple-package"
8383

8484
shellFor-hoogle:
8585
runs-on: [self-hosted, linux]
8686
steps:
8787
- uses: actions/checkout@v4
88-
- name: "Run tests with ghc966: Checking shellFor works for a cabal project, single package..."
89-
run: "./test/tests.sh ghc966 shellFor-hoogle"
88+
- name: "Run tests with ghc967: Checking shellFor works for a cabal project, single package..."
89+
run: "./test/tests.sh ghc967 shellFor-hoogle"
9090

9191
shellFor-not-depends:
9292
runs-on: [self-hosted, linux]
9393
steps:
9494
- uses: actions/checkout@v4
95-
- name: "Run tests with ghc966: Checking shellFor does not depend on given packages...y"
96-
run: "./test/tests.sh ghc966 shellFor-not-depends"
95+
- name: "Run tests with ghc967: Checking shellFor does not depend on given packages...y"
96+
run: "./test/tests.sh ghc967 shellFor-not-depends"
9797

9898
maintainer-scripts:
9999
runs-on: [self-hosted, linux]
100100
steps:
101101
- uses: actions/checkout@v4
102-
- name: "Run tests with ghc966: Checking the maintainer scripts...y"
103-
run: "./test/tests.sh ghc966 maintainer-scripts"
102+
- name: "Run tests with ghc967: Checking the maintainer scripts...y"
103+
run: "./test/tests.sh ghc967 maintainer-scripts"
104104

105105
plan-extra-hackages:
106106
runs-on: [self-hosted, linux]
107107
steps:
108108
- uses: actions/checkout@v4
109-
- name: "Run tests with ghc966: Checking that plan construction works with extra Hackages..."
110-
run: "./test/tests.sh ghc966 plan-extra-hackages"
109+
- name: "Run tests with ghc967: Checking that plan construction works with extra Hackages..."
110+
run: "./test/tests.sh ghc967 plan-extra-hackages"
111111

112112
build-extra-hackages:
113113
runs-on: [self-hosted, linux]
114114
steps:
115115
- uses: actions/checkout@v4
116-
- name: "Run tests with ghc966: Checking that package with extra Hackages can be build..."
117-
run: "./test/tests.sh ghc966 build-extra-hackages"
116+
- name: "Run tests with ghc967: Checking that package with extra Hackages can be build..."
117+
run: "./test/tests.sh ghc967 build-extra-hackages"
118118

119119
hix:
120120
runs-on: [self-hosted, linux]
121121
steps:
122122
- uses: actions/checkout@v4
123-
- name: "Run tests with ghc966: End-2-end test of hix project initialization and flakes development shell ..."
124-
run: "./test/tests.sh ghc966 hix"
123+
- name: "Run tests with ghc967: End-2-end test of hix project initialization and flakes development shell ..."
124+
run: "./test/tests.sh ghc967 hix"
125125

126126
# template:
127127
# runs-on: [self-hosted, linux]
128128
# steps:
129129
# - uses: actions/checkout@v4
130-
# - name: "Run tests with ghc966: End-2-end test of hix project initialization and flakes development shell ..."
131-
# run: "./test/tests.sh ghc966 template"
130+
# - name: "Run tests with ghc967: End-2-end test of hix project initialization and flakes development shell ..."
131+
# run: "./test/tests.sh ghc967 template"
132132

133133
docs:
134134
runs-on: [self-hosted, linux]
135135
steps:
136136
- uses: actions/checkout@v4
137137
- name: "Test examples in documentation ..."
138-
run: "./test/tests.sh ghc966 docs"
138+
run: "./test/tests.sh ghc967 docs"
139139

140140
hydra-ifdLevel-0-and-1:
141141
runs-on: [self-hosted, linux]
@@ -178,9 +178,9 @@ jobs:
178178
runs-on: [self-hosted, linux]
179179
steps:
180180
- uses: actions/checkout@v4
181-
- name: "Check closure size with ghc966"
181+
- name: "Check closure size with ghc967"
182182
run: |
183-
nix-build build.nix -A maintainer-scripts.check-closure-size --argstr compiler-nix-name ghc966 -o check-closure-size.sh
183+
nix-build build.nix -A maintainer-scripts.check-closure-size --argstr compiler-nix-name ghc967 -o check-closure-size.sh
184184
echo "+++ Closure size (MB)"
185185
./check-closure-size.sh
186186
@@ -208,7 +208,7 @@ jobs:
208208
- uses: actions/checkout@v4
209209
- name: "Make sure non store paths like can be used as src"
210210
run: |
211-
nix-build build.nix -A maintainer-scripts.check-path-support --argstr compiler-nix-name ghc966 -o check-path-support.sh
211+
nix-build build.nix -A maintainer-scripts.check-path-support --argstr compiler-nix-name ghc967 -o check-path-support.sh
212212
./check-path-support.sh
213213
214214
haskell-nix-roots-do-not-require-IFDs:
@@ -218,12 +218,12 @@ jobs:
218218
- name: "Check that the haskell.nix roots do not require IFDs"
219219
run: nix build .#roots.x86_64-linux --accept-flake-config --option allow-import-from-derivation false
220220

221-
hydra-without-remote-builders-ghc966:
221+
hydra-without-remote-builders-ghc967:
222222
runs-on: [self-hosted, linux]
223223
steps:
224224
- uses: actions/checkout@v4
225-
- name: "Check that evaluation of hydra jobs works without using remote builders for GHC 8.10.7"
226-
run: nix path-info --derivation .#requiredJobs.x86_64-darwin.required-unstable-ghc966-native --show-trace --builders ''
225+
- name: "Check that evaluation of hydra jobs works without using remote builders for GHC 9.6.7"
226+
run: nix path-info --derivation .#requiredJobs.x86_64-darwin.required-unstable-ghc967-native --show-trace --builders ''
227227

228228
hydra-without-remote-builders-ghc9101:
229229
runs-on: [self-hosted, linux]

‎ci.nix‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
ghc912 = true;
6565
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
6666
ghc96 = true;
67-
ghc96X = true;
6867
ghc98 = true;
6968
ghc98llvm = false;
7069
ghc910 = true;
@@ -80,13 +79,13 @@
8079
&& (__match ".*llvm" compiler-nix-name == null)
8180
&& ((system == "x86_64-linux" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc948"])
8281
|| (system == "aarch64-linux" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc948"])
83-
|| (system == "x86_64-darwin" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc948" "ghc966" "ghc96720250227" "ghc982" "ghc983" "ghc984"])
84-
|| (system == "aarch64-darwin" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc948" "ghc966" "ghc96720250227" "ghc982" "ghc983" "ghc984"])
82+
|| (system == "x86_64-darwin" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc948" "ghc966" "ghc967" "ghc96720250227" "ghc982" "ghc983" "ghc984"])
83+
|| (system == "aarch64-darwin" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc948" "ghc966" "ghc967" "ghc96720250227" "ghc982" "ghc983" "ghc984"])
8584
)) {
8685
inherit (lib.systems.examples) ghcjs;
8786
} // lib.optionalAttrs (nixpkgsName == "unstable"
8887
&& (__match ".*llvm" compiler-nix-name == null)
89-
&& ((system == "x86_64-linux" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc966" "ghc96720250227"]) # Not sure why GHC 9.6.6 TH code now wants `log1pf`
88+
&& ((system == "x86_64-linux" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc966" "ghc967" "ghc96720250227"]) # Not sure why GHC 9.6.6 TH code now wants `log1pf`
9089
|| (system == "x86_64-darwin" && builtins.elem compiler-nix-name []))) { # TODO add ghc versions when we have more darwin build capacity
9190
inherit (lib.systems.examples) mingwW64;
9291
} // lib.optionalAttrs (nixpkgsName == "unstable"

‎docs/reference/supported-ghc-versions.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ really should use an instance of Nixpkgs provided by `haskell.nix` itself.
2222

2323
| Nixpkgs version | Nixpkgs pinning | GHC version | `compiler-nix-name` | Tested in CI? |
2424
|------------------|--------------------|-------------|-----------------------|---------------|
25-
| unstable | `nixpkgs-unstable` | 9.6.6 | `ghc96` or `ghc966` | Yes |
25+
| unstable | `nixpkgs-unstable` | 9.6.7 | `ghc96` or `ghc967` | Yes |
2626
| unstable | `nixpkgs-unstable` | 9.8.4 | `ghc98` or `ghc984` | Yes |
2727
| unstable | `nixpkgs-unstable` | 9.10.1 | `ghc910` or `ghc9101` | Yes |
2828
| unstable | `nixpkgs-unstable` | 9.12.2 | `ghc912` or `ghc9122` | Yes |

‎flake.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585

8686
ifdLevel = 3;
8787
runningHydraEvalTest = false;
88-
defaultCompiler = "ghc966";
88+
defaultCompiler = "ghc967";
8989
config = import ./config.nix;
9090

9191
inherit (nixpkgs) lib;

‎lazy-inputs/default.nix‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ in {
2929
inherit ((callFlake { pkgs = final; src = ./ghc964; }).defaultNix) ghc964;
3030
inherit ((callFlake { pkgs = final; src = ./ghc965; }).defaultNix) ghc965;
3131
inherit ((callFlake { pkgs = final; src = ./ghc966; }).defaultNix) ghc966;
32+
inherit ((callFlake { pkgs = final; src = ./ghc967; }).defaultNix) ghc967;
3233
inherit ((callFlake { pkgs = final; src = ./ghc96X; }).defaultNix) ghc96X;
3334
inherit ((callFlake { pkgs = final; src = ./ghc981; }).defaultNix) ghc981;
3435
inherit ((callFlake { pkgs = final; src = ./ghc982; }).defaultNix) ghc982;

‎lazy-inputs/ghc967/flake.lock‎

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

‎lazy-inputs/ghc967/flake.nix‎

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

‎materialized/ghc-boot-packages-nix/ghc967-aarch64/base.nix‎

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

‎materialized/ghc-boot-packages-nix/ghc967-aarch64/deriveConstants.nix‎

Lines changed: 39 additions & 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)