Skip to content
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.

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

Add ghc 9.2.4 #1566

Merged
merged 7 commits into from
Jul 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion build.nix
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ in rec {
"ghc884" = "3.3.6";
}.compiler-nix-name or "latest";
};
} // pkgs.lib.optionalAttrs (!__elem compiler-nix-name ["ghc921" "ghc922" "ghc923"]) {
} // pkgs.lib.optionalAttrs (!__elem compiler-nix-name ["ghc921" "ghc922" "ghc923" "ghc924"]) {
hls-latest = tool compiler-nix-name "haskell-language-server" { inherit evalPackages; };
})
);
Expand Down
8 changes: 4 additions & 4 deletions ci.nix
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
ghc884 = false; # Native version is used to boot 9.0.1
ghc8107 = true;
ghc902 = true;
ghc923 = true;
ghc924 = true;
});
systems = nixpkgsName: nixpkgs: compiler-nix-name: nixpkgs.lib.genAttrs (
nixpkgs.lib.filter (v:
Expand All @@ -62,14 +62,14 @@
# of 'lib.systems.examples' are not understood between all versions
let lib = nixpkgs.lib;
in lib.optionalAttrs (nixpkgsName == "unstable"
&& ((system == "x86_64-linux" && __elem compiler-nix-name ["ghc865" "ghc884" "ghc8107"])
&& ((system == "x86_64-linux" && __elem compiler-nix-name ["ghc865" "ghc884" "ghc8107"])
|| (system == "x86_64-darwin" && __elem compiler-nix-name ["ghc8107"]))) {
inherit (lib.systems.examples) ghcjs;
} // lib.optionalAttrs (nixpkgsName == "unstable"
&& ((system == "x86_64-linux" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc923"])
&& ((system == "x86_64-linux" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc924"])
|| (system == "x86_64-darwin" && __elem compiler-nix-name []))) { # TODO add ghc versions when we have more darwin build capacity
inherit (lib.systems.examples) mingwW64;
} // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc922" "ghc923"]) {
} // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc922" "ghc923" "ghc924"]) {
# Musl cross only works on linux
# aarch64 cross only works on linux
inherit (lib.systems.examples) musl64 aarch64-multiplatform;
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/supported-ghc-versions.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ really should use an instance of Nixpkgs provided by `haskell.nix` itself.
| 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.2.3 | `ghc923` | Yes |
| unstable | `nixpkgs-unstable` | 9.2.4 | `ghc924` | Yes |

See [ci.nix](https://github.com/input-output-hk/haskell.nix/blob/master/ci.nix)
for the source of truth about what is built and tested (in the off chance this
Expand Down
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
};

outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-2105, nixpkgs-2111, nixpkgs-2205, flake-utils, ... }@inputs:
let compiler = "ghc923";
let compiler = "ghc924";
config = import ./config.nix;
in {
inherit config;
Expand Down

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading