Skip to content

Add ghc 9.2.5 #1779

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 7 commits into from
Nov 15, 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
7 changes: 4 additions & 3 deletions ci.nix
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@
ghc884 = false; # Native version is used to boot 9.0.1
ghc8107 = true;
ghc902 = false;
ghc924 = true;
ghc924 = false;
ghc925 = true;
}));
crossSystems = nixpkgsName: nixpkgs: compiler-nix-name:
# We need to use the actual nixpkgs version we're working with here, since the values
Expand All @@ -65,10 +66,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" "ghc924"])
&& ((system == "x86_64-linux" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc925"])
|| (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"]) {
} // lib.optionalAttrs (system == "x86_64-linux" && nixpkgsName == "unstable" && __elem compiler-nix-name ["ghc8107" "ghc902" "ghc922" "ghc923" "ghc924" "ghc925"]) {
# Musl cross only works on linux
# aarch64 cross only works on linux
inherit (lib.systems.examples) musl64 aarch64-multiplatform;
Expand Down
4 changes: 2 additions & 2 deletions 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 = "ghc924"; # Not required for `stack.yaml` based projects.
}
compiler-nix-name = "ghc925"; # Not required for `stack.yaml` based projects.
}
4 changes: 2 additions & 2 deletions 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 = "ghc924";
compiler-nix-name = "ghc925";
# This is used by `nix develop .` to open a shell for use with
# `cabal`, `hlint` and `haskell-language-server`
shell.tools = {
Expand All @@ -38,4 +38,4 @@
# Built by `nix build .`
packages.default = flake.packages."hello:exe:hello";
});
}
}
4 changes: 2 additions & 2 deletions 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 = "ghc924"; # Not required for `stack.yaml` based projects.
}
compiler-nix-name = "ghc925"; # 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 @@ -61,7 +61,7 @@
};

outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-2105, nixpkgs-2111, nixpkgs-2205, flake-utils, tullia, ... }@inputs:
let compiler = "ghc924";
let compiler = "ghc925";
config = import ./config.nix;
in {
inherit config;
Expand Down
5 changes: 4 additions & 1 deletion lib/ghcjs-project.nix
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,10 @@
version = "3.2.0.0";
# Cabal 3.2.1.0 no longer supports he mix of `cabal-version`,
# lack of `custom-setup` and `v1-install` used by ghcjs boot.
cabalProjectLocal = ''
# Using cabalProject here instead of cabalProjectLocal because
# cabalProjectLocal gets replaced by modules/hackage-quirks.nix
cabalProject = ''
packages: .
constraints: Cabal <3.2.1.0, Cabal-syntax <0
'';
materialized = ../materialized/ghcjs/cabal + "/${compiler-nix-name}";
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.

Loading