Skip to content

Commit b98f743

Browse files
committed
feat: add GHC 9.10.3
1 parent 8244bb2 commit b98f743

File tree

4 files changed

+46
-2
lines changed

4 files changed

+46
-2
lines changed

docs/reference/supported-ghc-versions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ really should use an instance of Nixpkgs provided by `haskell.nix` itself.
2424
|------------------|--------------------|-------------|-----------------------|---------------|
2525
| unstable | `nixpkgs-unstable` | 9.6.7 | `ghc96` or `ghc967` | Yes |
2626
| unstable | `nixpkgs-unstable` | 9.8.4 | `ghc98` or `ghc984` | Yes |
27-
| unstable | `nixpkgs-unstable` | 9.10.2 | `ghc910` or `ghc9102` | Yes |
27+
| unstable | `nixpkgs-unstable` | 9.10.3 | `ghc910` or `ghc9103` | Yes |
2828
| unstable | `nixpkgs-unstable` | 9.12.2 | `ghc912` or `ghc9122` | Yes |
2929

3030
See [ci.nix](https://github.com/input-output-hk/haskell.nix/blob/master/ci.nix)

lazy-inputs/default.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ in {
3737
inherit ((callFlake { pkgs = final; src = ./ghc984; }).defaultNix) ghc984;
3838
inherit ((callFlake { pkgs = final; src = ./ghc9101; }).defaultNix) ghc9101;
3939
inherit ((callFlake { pkgs = final; src = ./ghc9102; }).defaultNix) ghc9102;
40+
inherit ((callFlake { pkgs = final; src = ./ghc9103; }).defaultNix) ghc9103;
4041
inherit ((callFlake { pkgs = final; src = ./ghc9121; }).defaultNix) ghc9121;
4142
inherit ((callFlake { pkgs = final; src = ./ghc9122; }).defaultNix) ghc9122;
4243
inherit ((callFlake { pkgs = final; src = ./ghc912X; }).defaultNix) ghc912X;

lazy-inputs/ghc9103/flake.nix

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
description = "Lazy Input for Haskell.nix";
3+
4+
inputs = {
5+
ghc9103 = {
6+
flake = false;
7+
url = "git+https://github.com/ghc/ghc?rev=3f4d7d38b9661435bdde981451ac50c4335ed090&submodules=1";
8+
};
9+
};
10+
11+
outputs = inputs: inputs;
12+
}

overlays/bootstrap.nix

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ let
1010
"9.4" = "9.4.8";
1111
"9.6" = "9.6.7";
1212
"9.8" = "9.8.4";
13-
"9.10" = "9.10.2";
13+
"9.10" = "9.10.3";
1414
"9.12" = "9.12.2";
1515
};
1616
gitInputs = {
@@ -1024,6 +1024,37 @@ in {
10241024

10251025
ghc-patches = ghc-patches "9.10.2";
10261026
});
1027+
ghc9103 = traceWarnOld "9.10" (final.callPackage ../compiler/ghc {
1028+
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc9103; };
1029+
1030+
bootPkgs = bootPkgsGhc94 // {
1031+
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
1032+
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc9103
1033+
else # GHC 9.10.1 does not seem to build with ghc 9.8.4
1034+
# final.buildPackages.buildPackages.haskell.compiler.ghc984
1035+
# or final.buildPackages.buildPackages.haskell.compiler.ghc983
1036+
final.buildPackages.buildPackages.haskell.compiler.ghc982
1037+
or final.buildPackages.buildPackages.haskell.compiler.ghc981
1038+
or final.buildPackages.buildPackages.haskell.compiler.ghc966
1039+
or final.buildPackages.buildPackages.haskell.compiler.ghc965
1040+
or final.buildPackages.buildPackages.haskell.compiler.ghc964
1041+
or final.buildPackages.buildPackages.haskell.compiler.ghc963
1042+
or final.buildPackages.buildPackages.haskell.compiler.ghc962
1043+
or final.buildPackages.buildPackages.haskell.compiler.ghc945
1044+
or final.buildPackages.buildPackages.haskell.compiler.ghc944
1045+
or final.buildPackages.buildPackages.haskell.compiler.ghc943;
1046+
};
1047+
inherit sphinx;
1048+
1049+
buildLlvmPackages = final.buildPackages.llvmPackages_15;
1050+
llvmPackages = final.llvmPackages_15;
1051+
1052+
src-spec.file = final.haskell-nix.sources.ghc9103;
1053+
src-spec.version = "9.10.3";
1054+
src-spec.needsBooting = true;
1055+
1056+
ghc-patches = ghc-patches "9.10.3";
1057+
});
10271058
ghc9121 = traceWarnOld "9.12" (final.callPackage ../compiler/ghc {
10281059
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc9121; };
10291060

0 commit comments

Comments
 (0)