Skip to content

Commit e59e94e

Browse files
authored
Add ghc810 ghc92 ghc94 ghc96, to select latest (#1973)
Fixes #1968
1 parent f94ebdf commit e59e94e

File tree

6 files changed

+16
-7
lines changed

6 files changed

+16
-7
lines changed

docs/tutorials/development/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ in pkgs.haskell-nix.project {
2626
src = ./.;
2727
};
2828
# Specify the GHC version to use.
29-
compiler-nix-name = "ghc928"; # Not required for `stack.yaml` based projects.
29+
compiler-nix-name = "ghc92"; # Not required for `stack.yaml` based projects.
3030
}

docs/tutorials/getting-started-flakes/flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
helloProject =
1313
final.haskell-nix.project' {
1414
src = ./.;
15-
compiler-nix-name = "ghc928";
15+
compiler-nix-name = "ghc92";
1616
# This is used by `nix develop .` to open a shell for use with
1717
# `cabal`, `hlint` and `haskell-language-server`
1818
shell.tools = {

docs/tutorials/getting-started/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ in pkgs.haskell-nix.project {
2626
src = ./.;
2727
};
2828
# Specify the GHC version to use.
29-
compiler-nix-name = "ghc928"; # Not required for `stack.yaml` based projects.
29+
compiler-nix-name = "ghc92"; # Not required for `stack.yaml` based projects.
3030
}

hix/init/nix/hix.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{pkgs, ...}: {
22
# name = "project-name";
3-
compiler-nix-name = "ghc8107"; # Version of GHC to use
3+
compiler-nix-name = "ghc92"; # Version of GHC to use
44

55
# Cross compilation support:
66
# crossPlatforms = p: pkgs.lib.optionals pkgs.stdenv.hostPlatform.isx86_64 ([

modules/cabal-project.nix

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,15 @@ in {
1414
compiler-nix-name = mkOption {
1515
type = str;
1616
description = "The name of the ghc compiler to use eg. \"ghc884\"";
17+
# Map short version names to the latest GHC version.
18+
# TODO: perhaps combine this with the `latestVer` mapping in `overlays/boostrap.nix`.
19+
apply = v: {
20+
ghc810 = "ghc8107";
21+
ghc90 = "ghc902";
22+
ghc92 = "ghc928";
23+
ghc94 = "ghc945";
24+
ghc96 = "ghc962";
25+
}.${v} or v;
1726
};
1827
compilerSelection = mkOption {
1928
type = unspecified;

overlays/bootstrap.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ let
1515
"8.8" = "8.8.4";
1616
"8.10" = "8.10.7";
1717
"9.0" = "9.0.2";
18-
"9.2" = "9.2.7";
19-
"9.4" = "9.4.4";
20-
"9.6" = "9.6.1";
18+
"9.2" = "9.2.8";
19+
"9.4" = "9.4.5";
20+
"9.6" = "9.6.2";
2121
};
2222
traceWarnOld = v: x:
2323
let

0 commit comments

Comments
 (0)