Skip to content

Commit 772915b

Browse files
committed
Add GHC 9.10.2
1 parent cd4f09f commit 772915b

File tree

4 files changed

+76
-2
lines changed

4 files changed

+76
-2
lines changed

lazy-inputs/default.nix

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ in {
3636
inherit ((callFlake { pkgs = final; src = ./ghc983; }).defaultNix) ghc983;
3737
inherit ((callFlake { pkgs = final; src = ./ghc984; }).defaultNix) ghc984;
3838
inherit ((callFlake { pkgs = final; src = ./ghc9101; }).defaultNix) ghc9101;
39+
inherit ((callFlake { pkgs = final; src = ./ghc9102; }).defaultNix) ghc9102;
3940
inherit ((callFlake { pkgs = final; src = ./ghc9121; }).defaultNix) ghc9121;
4041
inherit ((callFlake { pkgs = final; src = ./ghc9122; }).defaultNix) ghc9122;
4142
inherit ((callFlake { pkgs = final; src = ./ghc912X; }).defaultNix) ghc912X;

lazy-inputs/ghc9102/flake.lock

+30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lazy-inputs/ghc9102/flake.nix

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
description = "Lazy Input for Haskell.nix";
3+
4+
inputs = {
5+
ghc9102 = {
6+
flake = false;
7+
url = "git+https://github.com/stable-haskell/ghc?ref=ghc-9.10.2-iog&submodules=1";
8+
};
9+
};
10+
11+
outputs = inputs: inputs;
12+
}

overlays/bootstrap.nix

+33-2
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.1";
13+
"9.10" = "9.10.2";
1414
"9.12" = "9.12.2";
1515
};
1616
gitInputs = {
@@ -305,7 +305,7 @@ in {
305305
++ fromUntil "9.9" "9.11" ./patches/ghc/ghc-9.9-Cabal-3.11.patch
306306
++ fromUntil "9.8" "9.8.3" ./patches/ghc/ghc-9.8-text-upper-bound.patch
307307
++ fromUntil "9.8.3" "9.8.4" ./patches/ghc/ghc-9.8.3-text-upper-bound.patch
308-
++ fromUntil "9.10" "9.11" ./patches/ghc/ghc-9.10-containers-upper-bound.patch
308+
++ fromUntil "9.10" "9.10.2" ./patches/ghc/ghc-9.10-containers-upper-bound.patch
309309
++ fromUntil "9.10" "9.14" ./patches/ghc/ghc-9.10-merge-objects.patch
310310

311311
# This patch will make windows stop emitting absolute relocations. This is one way in which binutils 2.36+ (with ASLR enabled), will just choke on the
@@ -981,6 +981,37 @@ in {
981981

982982
ghc-patches = ghc-patches "9.10.1";
983983
});
984+
ghc9102 = traceWarnOld "9.10" (final.callPackage ../compiler/ghc {
985+
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc9102; };
986+
987+
bootPkgs = bootPkgsGhc94 // {
988+
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
989+
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc9102
990+
else # GHC 9.10.1 does not seem to build with ghc 9.8.4
991+
# final.buildPackages.buildPackages.haskell.compiler.ghc984
992+
# or final.buildPackages.buildPackages.haskell.compiler.ghc983
993+
final.buildPackages.buildPackages.haskell.compiler.ghc982
994+
or final.buildPackages.buildPackages.haskell.compiler.ghc981
995+
or final.buildPackages.buildPackages.haskell.compiler.ghc966
996+
or final.buildPackages.buildPackages.haskell.compiler.ghc965
997+
or final.buildPackages.buildPackages.haskell.compiler.ghc964
998+
or final.buildPackages.buildPackages.haskell.compiler.ghc963
999+
or final.buildPackages.buildPackages.haskell.compiler.ghc962
1000+
or final.buildPackages.buildPackages.haskell.compiler.ghc945
1001+
or final.buildPackages.buildPackages.haskell.compiler.ghc944
1002+
or final.buildPackages.buildPackages.haskell.compiler.ghc943;
1003+
};
1004+
inherit sphinx;
1005+
1006+
buildLlvmPackages = final.buildPackages.llvmPackages_15;
1007+
llvmPackages = final.llvmPackages_15;
1008+
1009+
src-spec.file = final.haskell-nix.sources.ghc9102;
1010+
src-spec.version = "9.10.2";
1011+
src-spec.needsBooting = true;
1012+
1013+
ghc-patches = ghc-patches "9.10.2";
1014+
});
9841015
ghc9121 = traceWarnOld "9.12" (final.callPackage ../compiler/ghc {
9851016
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc9121; };
9861017

0 commit comments

Comments
 (0)