Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add GHC 9.12.2 #2331

Merged
merged 1 commit into from
Mar 17, 2025
Merged

Add GHC 9.12.2 #2331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ci.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
ghc96 = true;
ghc98 = true;
ghc910 = true;
ghc9121 = true;
ghc912 = true;
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
ghc96 = false;
ghc96X = true;
Expand All @@ -70,7 +70,6 @@
ghc910 = true;
ghc910llvm = true;
ghc912 = true;
ghc912X = true;
ghc913 = true;
})));
crossSystems = nixpkgsName: nixpkgs: compiler-nix-name:
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/supported-ghc-versions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ really should use an instance of Nixpkgs provided by `haskell.nix` itself.
| unstable | `nixpkgs-unstable` | 9.6.6 | `ghc96` or `ghc966` | Yes |
| unstable | `nixpkgs-unstable` | 9.8.4 | `ghc98` or `ghc984` | Yes |
| unstable | `nixpkgs-unstable` | 9.10.1 | `ghc910` or `ghc9101` | Yes |
| unstable | `nixpkgs-unstable` | 9.12.1 | `ghc912` or `ghc9121` | Yes |
| unstable | `nixpkgs-unstable` | 9.12.2 | `ghc912` or `ghc9122` | Yes |

See [ci.nix](https://github.com/input-output-hk/haskell.nix/blob/master/ci.nix)
for the source of truth about what is built and tested (in the off chance this
Expand Down
1 change: 1 addition & 0 deletions lazy-inputs/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ in {
inherit ((callFlake { pkgs = final; src = ./ghc984; }).defaultNix) ghc984;
inherit ((callFlake { pkgs = final; src = ./ghc9101; }).defaultNix) ghc9101;
inherit ((callFlake { pkgs = final; src = ./ghc9121; }).defaultNix) ghc9121;
inherit ((callFlake { pkgs = final; src = ./ghc9122; }).defaultNix) ghc9122;
inherit ((callFlake { pkgs = final; src = ./ghc912X; }).defaultNix) ghc912X;
inherit ((callFlake { pkgs = final; src = ./ghc913; }).defaultNix) ghc913;
} // prev.haskell-nix.sources;
Expand Down
30 changes: 30 additions & 0 deletions lazy-inputs/ghc9122/flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions lazy-inputs/ghc9122/flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
description = "Lazy Input for Haskell.nix";

inputs = {
ghc9122 = {
flake = false;
url = "git+https://github.com/stable-haskell/ghc?ref=ghc-9.12.2-iog&submodules=1";
};
};

outputs = inputs: inputs;
}
35 changes: 34 additions & 1 deletion overlays/bootstrap.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ let
"9.6" = "9.6.6";
"9.8" = "9.8.4";
"9.10" = "9.10.1";
"9.12" = "9.12.1";
"9.12" = "9.12.2";
};
gitInputs = {
ghc96X = "9.6.7";
Expand Down Expand Up @@ -1000,6 +1000,39 @@ in {

ghc-patches = ghc-patches "9.12.1";
});
ghc9122 = traceWarnOld "9.12" (final.callPackage ../compiler/ghc {
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc9122; };

bootPkgs = bootPkgsGhc94 // {
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc9122
else final.buildPackages.buildPackages.haskell.compiler.ghc9122
or final.buildPackages.buildPackages.haskell.compiler.ghc9121
or final.buildPackages.buildPackages.haskell.compiler.ghc9101
or final.buildPackages.buildPackages.haskell.compiler.ghc984
or final.buildPackages.buildPackages.haskell.compiler.ghc983
or final.buildPackages.buildPackages.haskell.compiler.ghc982
or final.buildPackages.buildPackages.haskell.compiler.ghc981
or final.buildPackages.buildPackages.haskell.compiler.ghc966
or final.buildPackages.buildPackages.haskell.compiler.ghc965
or final.buildPackages.buildPackages.haskell.compiler.ghc964
or final.buildPackages.buildPackages.haskell.compiler.ghc963
or final.buildPackages.buildPackages.haskell.compiler.ghc962
or final.buildPackages.buildPackages.haskell.compiler.ghc945
or final.buildPackages.buildPackages.haskell.compiler.ghc944
or final.buildPackages.buildPackages.haskell.compiler.ghc943;
};
inherit sphinx;

buildLlvmPackages = final.buildPackages.llvmPackages_15;
llvmPackages = final.llvmPackages_15;

src-spec.file = final.haskell-nix.sources.ghc9122;
src-spec.version = "9.12.2";
src-spec.needsBooting = true;

ghc-patches = ghc-patches "9.12.2";
});
} // (__listToAttrs (final.lib.mapAttrsToList (source-name: ver:
let
src = final.haskell-nix.sources.${source-name};
Expand Down
Loading