Skip to content

Commit 0cff70a

Browse files
committed
Add GHC 9.12.1
1 parent a9847e3 commit 0cff70a

File tree

5 files changed

+77
-0
lines changed

5 files changed

+77
-0
lines changed

ci.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
ghc98llvm = false;
7474
ghc910 = true;
7575
ghc910llvm = true;
76+
ghc9121 = true;
7677
ghc912X = true;
7778
ghc913 = true;
7879
})));

lazy-inputs/default.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ in {
3434
inherit ((callFlake { pkgs = final; src = ./ghc983; }).defaultNix) ghc983;
3535
inherit ((callFlake { pkgs = final; src = ./ghc984; }).defaultNix) ghc984;
3636
inherit ((callFlake { pkgs = final; src = ./ghc9101; }).defaultNix) ghc9101;
37+
inherit ((callFlake { pkgs = final; src = ./ghc9121; }).defaultNix) ghc9121;
3738
inherit ((callFlake { pkgs = final; src = ./ghc912X; }).defaultNix) ghc912X;
3839
inherit ((callFlake { pkgs = final; src = ./ghc913; }).defaultNix) ghc913;
3940
} // prev.haskell-nix.sources;

lazy-inputs/ghc9121/flake.lock

Lines changed: 30 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

overlays/bootstrap.nix

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ let
99
"9.6" = "9.6.6";
1010
"9.8" = "9.8.4";
1111
"9.10" = "9.10.1";
12+
"9.12" = "9.12.1";
1213
};
1314
gitInputs = {
1415
ghc912X = "9.12.0";
@@ -911,6 +912,38 @@ in {
911912

912913
ghc-patches = ghc-patches "9.10.1";
913914
});
915+
ghc9121 = traceWarnOld "9.12" (final.callPackage ../compiler/ghc {
916+
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc9121; };
917+
918+
bootPkgs = bootPkgsGhc94 // {
919+
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
920+
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc9121
921+
else final.buildPackages.buildPackages.haskell.compiler.ghc9121
922+
or final.buildPackages.buildPackages.haskell.compiler.ghc9101
923+
or final.buildPackages.buildPackages.haskell.compiler.ghc984
924+
or final.buildPackages.buildPackages.haskell.compiler.ghc983
925+
or final.buildPackages.buildPackages.haskell.compiler.ghc982
926+
or final.buildPackages.buildPackages.haskell.compiler.ghc981
927+
or final.buildPackages.buildPackages.haskell.compiler.ghc966
928+
or final.buildPackages.buildPackages.haskell.compiler.ghc965
929+
or final.buildPackages.buildPackages.haskell.compiler.ghc964
930+
or final.buildPackages.buildPackages.haskell.compiler.ghc963
931+
or final.buildPackages.buildPackages.haskell.compiler.ghc962
932+
or final.buildPackages.buildPackages.haskell.compiler.ghc945
933+
or final.buildPackages.buildPackages.haskell.compiler.ghc944
934+
or final.buildPackages.buildPackages.haskell.compiler.ghc943;
935+
};
936+
inherit sphinx;
937+
938+
buildLlvmPackages = final.buildPackages.llvmPackages_15;
939+
llvmPackages = final.llvmPackages_15;
940+
941+
src-spec.file = final.haskell-nix.sources.ghc9121;
942+
src-spec.version = "9.12.1";
943+
src-spec.needsBooting = true;
944+
945+
ghc-patches = ghc-patches "9.12.1";
946+
});
914947
} // (__listToAttrs (final.lib.mapAttrsToList (source-name: ver:
915948
let
916949
src = final.haskell-nix.sources.${source-name};

0 commit comments

Comments
 (0)