File tree Expand file tree Collapse file tree 3 files changed +8
-12
lines changed Expand file tree Collapse file tree 3 files changed +8
-12
lines changed Original file line number Diff line number Diff line change 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 } ;
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 (
Original file line number Diff line number Diff 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
3232See [ ci.nix] ( https://github.com/input-output-hk/haskell.nix/blob/master/ci.nix )
Original file line number Diff line number Diff line change 2121 # added here will also included without aggregation, making it easier
2222 # to find a failing test. Keep in mind though that adding too many
2323 # of these will slow down eval times.
24- x86_64-linux = allJobs . R2111 . ghc8107 . x86_64-linux . native or { } ;
25- x86_64-darwin = allJobs . R2111 . ghc8107 . x86_64-darwin . native or { } ;
24+ x86_64-linux = allJobs . unstable . ghc8107 . x86_64-linux . native or { } ;
25+ x86_64-darwin = allJobs . unstable . ghc8107 . x86_64-darwin . native or { } ;
2626 } ;
2727 names = x : lib . filter ( n : n != "recurseForDerivations" && n != "meta" )
2828 ( builtins . attrNames x ) ;
You can’t perform that action at this time.
0 commit comments