Skip to content

Commit fd31f32

Browse files
hamishmackhamishmack
committed
Add GHC 9.8.3
1 parent 6250a01 commit fd31f32

File tree

6 files changed

+81
-10
lines changed

6 files changed

+81
-10
lines changed

‎ci.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@
8484
&& (__match ".*llvm" compiler-nix-name == null)
8585
&& ((system == "x86_64-linux" && !builtins.elem compiler-nix-name ["ghc884" "ghc902" "ghc928" "ghc948"])
8686
|| (system == "aarch64-linux" && !builtins.elem compiler-nix-name ["ghc884" "ghc902" "ghc928" "ghc948"])
87-
|| (system == "x86_64-darwin" && !builtins.elem compiler-nix-name ["ghc884" "ghc902" "ghc928" "ghc948" "ghc966" "ghc982"])
88-
|| (system == "aarch64-darwin" && !builtins.elem compiler-nix-name ["ghc884" "ghc902" "ghc928" "ghc948" "ghc966" "ghc982"])
87+
|| (system == "x86_64-darwin" && !builtins.elem compiler-nix-name ["ghc884" "ghc902" "ghc928" "ghc948" "ghc966" "ghc982" "ghc983"])
88+
|| (system == "aarch64-darwin" && !builtins.elem compiler-nix-name ["ghc884" "ghc902" "ghc928" "ghc948" "ghc966" "ghc982" "ghc983"])
8989
)) {
9090
inherit (lib.systems.examples) ghcjs;
9191
} // lib.optionalAttrs (

‎lazy-inputs/default.nix‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ in {
3131
inherit ((callFlake { pkgs = final; src = ./ghc966; }).defaultNix) ghc966;
3232
inherit ((callFlake { pkgs = final; src = ./ghc981; }).defaultNix) ghc981;
3333
inherit ((callFlake { pkgs = final; src = ./ghc982; }).defaultNix) ghc982;
34+
inherit ((callFlake { pkgs = final; src = ./ghc983; }).defaultNix) ghc983;
3435
inherit ((callFlake { pkgs = final; src = ./ghc9101; }).defaultNix) ghc9101;
3536
inherit ((callFlake { pkgs = final; src = ./ghc912X; }).defaultNix) ghc912X;
3637
inherit ((callFlake { pkgs = final; src = ./ghc913; }).defaultNix) ghc913;

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

‎overlays/bootstrap.nix‎

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ let
77
"9.2" = "9.2.8";
88
"9.4" = "9.4.8";
99
"9.6" = "9.6.6";
10-
"9.8" = "9.8.2";
10+
"9.8" = "9.8.3";
1111
"9.10" = "9.10.1";
1212
};
1313
gitInputs = {
@@ -814,13 +814,40 @@ in {
814814

815815
ghc-patches = ghc-patches "9.8.2";
816816
});
817+
ghc983 = traceWarnOld "9.8" (final.callPackage ../compiler/ghc {
818+
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc983; };
819+
820+
bootPkgs = bootPkgsGhc94 // {
821+
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
822+
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc966
823+
else final.buildPackages.buildPackages.haskell.compiler.ghc966
824+
or final.buildPackages.buildPackages.haskell.compiler.ghc965
825+
or final.buildPackages.buildPackages.haskell.compiler.ghc964
826+
or final.buildPackages.buildPackages.haskell.compiler.ghc963
827+
or final.buildPackages.buildPackages.haskell.compiler.ghc962
828+
or final.buildPackages.buildPackages.haskell.compiler.ghc945
829+
or final.buildPackages.buildPackages.haskell.compiler.ghc944
830+
or final.buildPackages.buildPackages.haskell.compiler.ghc943;
831+
};
832+
inherit sphinx;
833+
834+
buildLlvmPackages = final.buildPackages.llvmPackages_12;
835+
llvmPackages = final.llvmPackages_12;
836+
837+
src-spec.file = final.haskell-nix.sources.ghc983;
838+
src-spec.version = "9.8.3";
839+
src-spec.needsBooting = true;
840+
841+
ghc-patches = ghc-patches "9.8.3";
842+
});
817843
ghc9101 = traceWarnOld "9.10" (final.callPackage ../compiler/ghc {
818844
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc9101; };
819845

820846
bootPkgs = bootPkgsGhc94 // {
821847
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
822848
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc9101
823-
else final.buildPackages.buildPackages.haskell.compiler.ghc982
849+
else final.buildPackages.buildPackages.haskell.compiler.ghc983
850+
or final.buildPackages.buildPackages.haskell.compiler.ghc982
824851
or final.buildPackages.buildPackages.haskell.compiler.ghc981
825852
or final.buildPackages.buildPackages.haskell.compiler.ghc966
826853
or final.buildPackages.buildPackages.haskell.compiler.ghc965
@@ -856,7 +883,8 @@ in {
856883
bootPkgs = bootPkgsGhc94 // {
857884
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
858885
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc9101 # TODO use ${compiler-nix-name}
859-
else final.buildPackages.buildPackages.haskell.compiler.ghc982
886+
else final.buildPackages.buildPackages.haskell.compiler.ghc983
887+
or final.buildPackages.buildPackages.haskell.compiler.ghc982
860888
or final.buildPackages.buildPackages.haskell.compiler.ghc981
861889
or final.buildPackages.buildPackages.haskell.compiler.ghc966
862890
or final.buildPackages.buildPackages.haskell.compiler.ghc965

‎scripts/check-compiler-materialization/default.nix‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ in builtins.listToAttrs (builtins.concatMap (system: builtins.concatMap (compile
4141
] ++ eval.lib.optionals (
4242
(system == "aarch64-linux" && !__elem compiler-nix-name ["ghc8107" "ghc901" "ghc902" "ghc921" "ghc922" "ghc923" "ghc924" "ghc925" "ghc926" "ghc941" "ghc942" "ghc943"])
4343
|| (system == "x86_64-linux" && !__elem compiler-nix-name ["ghc8107" "ghc901" "ghc902"
44-
"ghc921" "ghc922" "ghc923" "ghc924" "ghc925" "ghc926" "ghc941" "ghc942" "ghc943" "ghc944" "ghc945" "ghc947" "ghc961" "ghc962" "ghc963" "ghc964" "ghc965" "ghc9820230704"])) [
44+
"ghc921" "ghc922" "ghc923" "ghc924" "ghc925" "ghc926" "ghc941" "ghc942" "ghc943" "ghc944" "ghc945" "ghc947" "ghc961" "ghc962" "ghc963" "ghc964" "ghc965"])) [
4545
{ name = "${prefix}-arm-musl"; value = (pkgs.pkgsCross.aarch64-multiplatform-musl.haskell-nix.roots' compiler-nix-name).ghc-extra-projects-nix or {}; }
4646
{ name = "${prefix}-iserv-arm-musl"; value = pkgs.pkgsCross.aarch64-multiplatform-musl.haskell-nix.iserv-proxy-exes.${compiler-nix-name}.iserv-proxy.project.plan-nix; }
4747
{ name = "${prefix}-iserv-int-arm-musl"; value = pkgs.pkgsCross.aarch64-multiplatform-musl.haskell-nix.iserv-proxy-exes.${compiler-nix-name}.iserv-proxy-interpreter.project.plan-nix; }
4848
{ name = "${prefix}-hello-arm-musl"; value = (pkgs.pkgsCross.aarch64-multiplatform-musl.haskell-nix.tool compiler-nix-name "hello" {}).project.plan-nix; }
4949
] ++ eval.lib.optionals (
50-
(system == "x86_64-linux" && __elem compiler-nix-name ["ghc8107" "ghc961" "ghc962" "ghc963" "ghc964" "ghc965" "ghc981" "ghc982" "ghc9820230704"])
51-
|| (system == "aarch64-linux" && __elem compiler-nix-name ["ghc961" "ghc962" "ghc963" "ghc964" "ghc965" "ghc981" "ghc982" "ghc9820230704"])
52-
|| (system == "x86_64-darwin" && __elem compiler-nix-name ["ghc8107" "ghc961" "ghc962" "ghc963" "ghc964" "ghc964" "ghc981" "ghc982" "ghc9820230704"])
53-
|| (system == "aarch64-darwin" && __elem compiler-nix-name ["ghc961" "ghc962" "ghc963" "ghc964" "ghc981" "ghc965" "ghc982" "ghc9820230704"])) [
50+
(system == "x86_64-linux" && __elem compiler-nix-name ["ghc8107" "ghc961" "ghc962" "ghc963" "ghc964" "ghc965" "ghc981" "ghc982" "ghc983" "ghc9101"])
51+
|| (system == "aarch64-linux" && __elem compiler-nix-name ["ghc961" "ghc962" "ghc963" "ghc964" "ghc965" "ghc981" "ghc982" "ghc983" "ghc9101"])
52+
|| (system == "x86_64-darwin" && __elem compiler-nix-name ["ghc8107" "ghc961" "ghc962" "ghc963" "ghc964" "ghc964" "ghc981" "ghc982" "ghc983" "ghc9101"])
53+
|| (system == "aarch64-darwin" && __elem compiler-nix-name ["ghc961" "ghc962" "ghc963" "ghc964" "ghc981" "ghc965" "ghc982" "ghc983" "ghc9101"])) [
5454
{ name = "${prefix}-boot-ghcjs"; value = pkgs.pkgsCross.ghcjs.ghc-boot-packages-nix.${compiler-nix-name}; }
5555
{ name = "${prefix}-ghcjs"; value = (pkgs.pkgsCross.ghcjs.haskell-nix.roots' compiler-nix-name).ghc-extra-projects-nix or {}; }
5656
{ name = "${prefix}-hello-ghcjs"; value = (pkgs.pkgsCross.ghcjs.haskell-nix.tool compiler-nix-name "hello" {}).project.plan-nix; }

0 commit comments

Comments
 (0)