Skip to content

Commit d021c1b

Browse files
authored
Add GHC 9.12.2 (#2331)
1 parent bf15486 commit d021c1b

File tree

6 files changed

+79
-4
lines changed

6 files changed

+79
-4
lines changed

ci.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
ghc96 = true;
6262
ghc98 = true;
6363
ghc910 = true;
64-
ghc9121 = true;
64+
ghc912 = true;
6565
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
6666
ghc96 = false;
6767
ghc96X = true;
@@ -70,7 +70,6 @@
7070
ghc910 = true;
7171
ghc910llvm = true;
7272
ghc912 = true;
73-
ghc912X = true;
7473
ghc913 = true;
7574
})));
7675
crossSystems = nixpkgsName: nixpkgs: compiler-nix-name:

docs/reference/supported-ghc-versions.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ really should use an instance of Nixpkgs provided by `haskell.nix` itself.
2525
| unstable | `nixpkgs-unstable` | 9.6.6 | `ghc96` or `ghc966` | Yes |
2626
| unstable | `nixpkgs-unstable` | 9.8.4 | `ghc98` or `ghc984` | Yes |
2727
| unstable | `nixpkgs-unstable` | 9.10.1 | `ghc910` or `ghc9101` | Yes |
28-
| unstable | `nixpkgs-unstable` | 9.12.1 | `ghc912` or `ghc9121` | Yes |
28+
| 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)
3131
for the source of truth about what is built and tested (in the off chance this

lazy-inputs/default.nix

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

lazy-inputs/ghc9122/flake.lock

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

lazy-inputs/ghc9122/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+
ghc9122 = {
6+
flake = false;
7+
url = "git+https://github.com/stable-haskell/ghc?ref=ghc-9.12.2-iog&submodules=1";
8+
};
9+
};
10+
11+
outputs = inputs: inputs;
12+
}

overlays/bootstrap.nix

+34-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ let
1111
"9.6" = "9.6.6";
1212
"9.8" = "9.8.4";
1313
"9.10" = "9.10.1";
14-
"9.12" = "9.12.1";
14+
"9.12" = "9.12.2";
1515
};
1616
gitInputs = {
1717
ghc96X = "9.6.7";
@@ -1000,6 +1000,39 @@ in {
10001000

10011001
ghc-patches = ghc-patches "9.12.1";
10021002
});
1003+
ghc9122 = traceWarnOld "9.12" (final.callPackage ../compiler/ghc {
1004+
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc9122; };
1005+
1006+
bootPkgs = bootPkgsGhc94 // {
1007+
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
1008+
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc9122
1009+
else final.buildPackages.buildPackages.haskell.compiler.ghc9122
1010+
or final.buildPackages.buildPackages.haskell.compiler.ghc9121
1011+
or final.buildPackages.buildPackages.haskell.compiler.ghc9101
1012+
or final.buildPackages.buildPackages.haskell.compiler.ghc984
1013+
or final.buildPackages.buildPackages.haskell.compiler.ghc983
1014+
or final.buildPackages.buildPackages.haskell.compiler.ghc982
1015+
or final.buildPackages.buildPackages.haskell.compiler.ghc981
1016+
or final.buildPackages.buildPackages.haskell.compiler.ghc966
1017+
or final.buildPackages.buildPackages.haskell.compiler.ghc965
1018+
or final.buildPackages.buildPackages.haskell.compiler.ghc964
1019+
or final.buildPackages.buildPackages.haskell.compiler.ghc963
1020+
or final.buildPackages.buildPackages.haskell.compiler.ghc962
1021+
or final.buildPackages.buildPackages.haskell.compiler.ghc945
1022+
or final.buildPackages.buildPackages.haskell.compiler.ghc944
1023+
or final.buildPackages.buildPackages.haskell.compiler.ghc943;
1024+
};
1025+
inherit sphinx;
1026+
1027+
buildLlvmPackages = final.buildPackages.llvmPackages_15;
1028+
llvmPackages = final.llvmPackages_15;
1029+
1030+
src-spec.file = final.haskell-nix.sources.ghc9122;
1031+
src-spec.version = "9.12.2";
1032+
src-spec.needsBooting = true;
1033+
1034+
ghc-patches = ghc-patches "9.12.2";
1035+
});
10031036
} // (__listToAttrs (final.lib.mapAttrsToList (source-name: ver:
10041037
let
10051038
src = final.haskell-nix.sources.${source-name};

0 commit comments

Comments
 (0)