Skip to content

Remove nixpkgs 21.11 from CI and reduce tests #1597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 18, 2022
Merged

Remove nixpkgs 21.11 from CI and reduce tests #1597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a28669
Remove nixpkgs 21.11 from CI and reduce tests
hamishmack Aug 18, 2022
0a503a5
Use nixpkgs-unstable for broken out jobs
hamishmack Aug 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions ci.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
inherit (import ./ci-lib.nix { inherit pkgs; }) dimension platformFilterGeneric filterAttrsOnlyRecursive;
inherit (pkgs.haskell-nix) sources;
nixpkgsVersions = {
"R2111" = "nixpkgs-2111";
"R2205" = "nixpkgs-2205";
"unstable" = "nixpkgs-unstable";
};
Expand All @@ -30,17 +29,14 @@
# cabal-install and nix-tools plans. When removing a ghc version
# from here (so that is no longer cached) also remove ./materialized/ghcXXX.
# Update supported-ghc-versions.md to reflect any changes made here.
nixpkgs.lib.optionalAttrs (nixpkgsName == "R2111") {
nixpkgs.lib.optionalAttrs (nixpkgsName == "R2205") {
ghc865 = false;
ghc8107 = true;
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2205") {
ghc865 = false;
ghc8107 = true;
ghc8107 = false;
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
ghc865 = false;
ghc884 = false; # Native version is used to boot 9.0.1
ghc8107 = true;
ghc902 = true;
ghc902 = false;
ghc924 = true;
});
systems = nixpkgsName: nixpkgs: compiler-nix-name: nixpkgs.lib.genAttrs (
Expand Down
6 changes: 3 additions & 3 deletions docs/reference/supported-ghc-versions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ really should use an instance of Nixpkgs provided by `haskell.nix` itself.

| Nixpkgs version | Nixpkgs pinning | GHC version | `compiler-nix-name` | Tested in CI? |
|------------------|--------------------|-------------|-----------------------|---------------|
| 21.11 | `nixpkgs-2111` | 8.6.5 | `ghc865` | No |
| 21.11 | `nixpkgs-2111` | 8.10.7 | `ghc8107` | Yes |
| 22.05 | `nixpkgs-2205` | 8.6.5 | `ghc865` | No |
| 22.05 | `nixpkgs-2205` | 8.10.7 | `ghc8107` | No |
| unstable | `nixpkgs-unstable` | 8.6.5 | `ghc865` | No |
| unstable | `nixpkgs-unstable` | 8.8.4 | `ghc884` | No |
| unstable | `nixpkgs-unstable` | 8.10.7 | `ghc8107` | Yes |
| unstable | `nixpkgs-unstable` | 9.0.2 | `ghc902` | Yes |
| unstable | `nixpkgs-unstable` | 9.0.2 | `ghc902` | No |
| unstable | `nixpkgs-unstable` | 9.2.4 | `ghc924` | Yes |

See [ci.nix](https://github.com/input-output-hk/haskell.nix/blob/master/ci.nix)
Expand Down
4 changes: 2 additions & 2 deletions release.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ let
# added here will also included without aggregation, making it easier
# to find a failing test. Keep in mind though that adding too many
# of these will slow down eval times.
x86_64-linux = allJobs.R2111.ghc8107.x86_64-linux.native or {};
x86_64-darwin = allJobs.R2111.ghc8107.x86_64-darwin.native or {};
x86_64-linux = allJobs.unstable.ghc8107.x86_64-linux.native or {};
x86_64-darwin = allJobs.unstable.ghc8107.x86_64-darwin.native or {};
};
names = x: lib.filter (n: n != "recurseForDerivations" && n != "meta")
(builtins.attrNames x);
Expand Down