Skip to content

Add GHC-9.2.6 #1842

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

Merged
merged 13 commits into from
Feb 14, 2023
8 changes: 4 additions & 4 deletions ci.nix
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@
ghc865 = false;
ghc8107 = false;
ghc902 = false;
ghc925 = false;
ghc926 = false;
ghc944 = false;
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
ghc865 = false;
ghc884 = false; # Native version is used to boot 9.0.1
ghc8107 = true;
ghc902 = false;
ghc925 = true;
ghc926 = true;
ghc944 = true;
}));
crossSystems = nixpkgsName: nixpkgs: compiler-nix-name:
Expand All @@ -73,10 +73,10 @@
|| (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" "ghc925" "ghc944"])
&& ((system == "x86_64-linux" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc926" "ghc944"])
|| (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" "ghc924" "ghc925"]) {
} // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc922" "ghc923" "ghc924" "ghc926"]) {
# 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/tutorials/development/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ in pkgs.haskell-nix.project {
src = ./.;
};
# Specify the GHC version to use.
compiler-nix-name = "ghc925"; # Not required for `stack.yaml` based projects.
compiler-nix-name = "ghc926"; # Not required for `stack.yaml` based projects.
}
2 changes: 1 addition & 1 deletion docs/tutorials/getting-started-flakes/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
helloProject =
final.haskell-nix.project' {
src = ./.;
compiler-nix-name = "ghc925";
compiler-nix-name = "ghc926";
# This is used by `nix develop .` to open a shell for use with
# `cabal`, `hlint` and `haskell-language-server`
shell.tools = {
Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/getting-started/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ in pkgs.haskell-nix.project {
src = ./.;
};
# Specify the GHC version to use.
compiler-nix-name = "ghc925"; # Not required for `stack.yaml` based projects.
compiler-nix-name = "ghc926"; # Not required for `stack.yaml` based projects.
}
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
};

outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-2105, nixpkgs-2111, nixpkgs-2205, nixpkgs-2211, flake-utils, tullia, ... }@inputs:
let compiler = "ghc925";
let compiler = "ghc926";
config = import ./config.nix;
in {
inherit config;
Expand Down
1,831 changes: 1,831 additions & 0 deletions materialized/dummy-ghc/ghc-9.2.6-aarch64-darwin/ghc-pkg/dump-global

Large diffs are not rendered by default.

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

72 changes: 72 additions & 0 deletions materialized/dummy-ghc/ghc-9.2.6-aarch64-darwin/ghc/info

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