Skip to content

Commit 194335f

Browse files
Try #1597:
2 parents c5b6b0c + 7a28669 commit 194335f

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

ci.nix

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
inherit (import ./ci-lib.nix { inherit pkgs; }) dimension platformFilterGeneric filterAttrsOnlyRecursive;
1111
inherit (pkgs.haskell-nix) sources;
1212
nixpkgsVersions = {
13-
"R2111" = "nixpkgs-2111";
1413
"R2205" = "nixpkgs-2205";
1514
"unstable" = "nixpkgs-unstable";
1615
};
@@ -30,17 +29,14 @@
3029
# cabal-install and nix-tools plans. When removing a ghc version
3130
# from here (so that is no longer cached) also remove ./materialized/ghcXXX.
3231
# Update supported-ghc-versions.md to reflect any changes made here.
33-
nixpkgs.lib.optionalAttrs (nixpkgsName == "R2111") {
32+
nixpkgs.lib.optionalAttrs (nixpkgsName == "R2205") {
3433
ghc865 = false;
35-
ghc8107 = true;
36-
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2205") {
37-
ghc865 = false;
38-
ghc8107 = true;
34+
ghc8107 = false;
3935
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
4036
ghc865 = false;
4137
ghc884 = false; # Native version is used to boot 9.0.1
4238
ghc8107 = true;
43-
ghc902 = true;
39+
ghc902 = false;
4440
ghc924 = true;
4541
});
4642
systems = nixpkgsName: nixpkgs: compiler-nix-name: nixpkgs.lib.genAttrs (

docs/reference/supported-ghc-versions.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ really should use an instance of Nixpkgs provided by `haskell.nix` itself.
2121

2222
| Nixpkgs version | Nixpkgs pinning | GHC version | `compiler-nix-name` | Tested in CI? |
2323
|------------------|--------------------|-------------|-----------------------|---------------|
24-
| 21.11 | `nixpkgs-2111` | 8.6.5 | `ghc865` | No |
25-
| 21.11 | `nixpkgs-2111` | 8.10.7 | `ghc8107` | Yes |
24+
| 22.05 | `nixpkgs-2205` | 8.6.5 | `ghc865` | No |
25+
| 22.05 | `nixpkgs-2205` | 8.10.7 | `ghc8107` | No |
2626
| unstable | `nixpkgs-unstable` | 8.6.5 | `ghc865` | No |
2727
| unstable | `nixpkgs-unstable` | 8.8.4 | `ghc884` | No |
2828
| unstable | `nixpkgs-unstable` | 8.10.7 | `ghc8107` | Yes |
29-
| unstable | `nixpkgs-unstable` | 9.0.2 | `ghc902` | Yes |
29+
| unstable | `nixpkgs-unstable` | 9.0.2 | `ghc902` | No |
3030
| unstable | `nixpkgs-unstable` | 9.2.4 | `ghc924` | Yes |
3131

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

0 commit comments

Comments
 (0)