Skip to content

Commit 330bfa5

Browse files
authored
Nix/Hydra/GHA: add GHC 9.10, drop GHC 9.8 (#1188)
Also drop GHC 9.8 as it is broken due to shipping a buggy `stm` version, see input-output-hk/io-sim#166.
2 parents 85f7348 + cfa8d08 commit 330bfa5

File tree

6 files changed

+59
-42
lines changed

6 files changed

+59
-42
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
strategy:
3939
fail-fast: false
4040
matrix:
41-
ghc: ["8.10.7", "9.6.6", "9.8.2", "9.10.1"]
41+
ghc: ["8.10.7", "9.6.6", "9.10.1"]
4242
variant: [default, no-thunks]
4343
test-set: [all, no-thunks-safe]
4444
exclude:

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ index-state:
1616
-- Bump this if you need newer packages from Hackage
1717
, hackage.haskell.org 2024-07-23T00:03:37Z
1818
-- Bump this if you need newer packages from CHaP
19-
, cardano-haskell-packages 2024-07-24T06:25:44Z
19+
, cardano-haskell-packages 2024-08-15T10:40:33Z
2020

2121
packages:
2222
ouroboros-consensus

flake.lock

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

flake.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@
7373
default = ghc96;
7474
ghc96 = hydraJobs.native.haskell96.devShell;
7575
ghc96-profiled = hydraJobs.native.haskell96.devShellProfiled;
76-
ghc98 = hydraJobs.native.haskell98.devShell;
77-
ghc98-profiled = hydraJobs.native.haskell98.devShellProfiled;
76+
ghc910 = hydraJobs.native.haskell910.devShell;
77+
ghc910-profiled = hydraJobs.native.haskell910.devShellProfiled;
7878

7979
website = pkgs.mkShell {
8080
packages = [ pkgs.nodejs pkgs.yarn ];

nix/ci.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ let
4747
(mkHaskellJobsFor pkgs.hsPkgs.projectVariants.ghc810)
4848
[ "checks" "devShell" "devShellProfiled" ];
4949

50-
# also already test GHC 9.8, but only on Linux to reduce CI load
51-
haskell98 = mkHaskellJobsFor pkgs.hsPkgs.projectVariants.ghc98;
50+
# also already test GHC 9.10, but only on Linux to reduce CI load
51+
haskell910 = mkHaskellJobsFor pkgs.hsPkgs.projectVariants.ghc910;
5252
};
5353
} // lib.optionalAttrs (buildSystem == "x86_64-linux") {
5454
windows = {

nix/haskell.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ let
1717
compiler-nix-name = "ghc966";
1818
flake.variants = {
1919
ghc810 = { compiler-nix-name = lib.mkForce "ghc8107"; };
20-
ghc98 = { compiler-nix-name = lib.mkForce "ghc982"; };
20+
ghc910 = { compiler-nix-name = lib.mkForce "ghc9101"; };
2121
};
2222
inputMap = {
2323
"https://chap.intersectmbo.org/" = inputs.CHaP;

0 commit comments

Comments
 (0)