Skip to content

Commit ff5f27b

Browse files
hamishmackhamishmack
committed
Add GHC 9.8.4
1 parent 5ce912e commit ff5f27b

File tree

7 files changed

+81
-10
lines changed

7 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" "ghc983"])
88-
|| (system == "aarch64-darwin" && !builtins.elem compiler-nix-name ["ghc884" "ghc902" "ghc928" "ghc948" "ghc966" "ghc982" "ghc983"])
87+
|| (system == "x86_64-darwin" && !builtins.elem compiler-nix-name ["ghc884" "ghc902" "ghc928" "ghc948" "ghc966" "ghc982" "ghc983" "ghc984"])
88+
|| (system == "aarch64-darwin" && !builtins.elem compiler-nix-name ["ghc884" "ghc902" "ghc928" "ghc948" "ghc966" "ghc982" "ghc983" "ghc984"])
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
@@ -32,6 +32,7 @@ in {
3232
inherit ((callFlake { pkgs = final; src = ./ghc981; }).defaultNix) ghc981;
3333
inherit ((callFlake { pkgs = final; src = ./ghc982; }).defaultNix) ghc982;
3434
inherit ((callFlake { pkgs = final; src = ./ghc983; }).defaultNix) ghc983;
35+
inherit ((callFlake { pkgs = final; src = ./ghc984; }).defaultNix) ghc984;
3536
inherit ((callFlake { pkgs = final; src = ./ghc9101; }).defaultNix) ghc9101;
3637
inherit ((callFlake { pkgs = final; src = ./ghc912X; }).defaultNix) ghc912X;
3738
inherit ((callFlake { pkgs = final; src = ./ghc913; }).defaultNix) ghc913;

‎lazy-inputs/ghc984/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/ghc984/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+
ghc984 = {
6+
flake = false;
7+
url = "git+https://github.com/stable-haskell/ghc?ref=ghc-9.8.4-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.3";
10+
"9.8" = "9.8.4";
1111
"9.10" = "9.10.1";
1212
};
1313
gitInputs = {
@@ -851,13 +851,40 @@ in {
851851

852852
ghc-patches = ghc-patches "9.8.3";
853853
});
854+
ghc984 = traceWarnOld "9.8" (final.callPackage ../compiler/ghc {
855+
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc984; };
856+
857+
bootPkgs = bootPkgsGhc94 // {
858+
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
859+
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc984
860+
else final.buildPackages.buildPackages.haskell.compiler.ghc966
861+
or final.buildPackages.buildPackages.haskell.compiler.ghc965
862+
or final.buildPackages.buildPackages.haskell.compiler.ghc964
863+
or final.buildPackages.buildPackages.haskell.compiler.ghc963
864+
or final.buildPackages.buildPackages.haskell.compiler.ghc962
865+
or final.buildPackages.buildPackages.haskell.compiler.ghc945
866+
or final.buildPackages.buildPackages.haskell.compiler.ghc944
867+
or final.buildPackages.buildPackages.haskell.compiler.ghc943;
868+
};
869+
inherit sphinx;
870+
871+
buildLlvmPackages = final.buildPackages.llvmPackages_12;
872+
llvmPackages = final.llvmPackages_12;
873+
874+
src-spec.file = final.haskell-nix.sources.ghc984;
875+
src-spec.version = "9.8.4";
876+
src-spec.needsBooting = true;
877+
878+
ghc-patches = ghc-patches "9.8.4";
879+
});
854880
ghc9101 = traceWarnOld "9.10" (final.callPackage ../compiler/ghc {
855881
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc9101; };
856882

857883
bootPkgs = bootPkgsGhc94 // {
858884
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
859885
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc9101
860-
else final.buildPackages.buildPackages.haskell.compiler.ghc983
886+
else final.buildPackages.buildPackages.haskell.compiler.ghc984
887+
or final.buildPackages.buildPackages.haskell.compiler.ghc983
861888
or final.buildPackages.buildPackages.haskell.compiler.ghc982
862889
or final.buildPackages.buildPackages.haskell.compiler.ghc981
863890
or final.buildPackages.buildPackages.haskell.compiler.ghc966
@@ -894,7 +921,8 @@ in {
894921
bootPkgs = bootPkgsGhc94 // {
895922
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
896923
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc9101 # TODO use ${compiler-nix-name}
897-
else final.buildPackages.buildPackages.haskell.compiler.ghc983
924+
else final.buildPackages.buildPackages.haskell.compiler.ghc984
925+
or final.buildPackages.buildPackages.haskell.compiler.ghc983
898926
or final.buildPackages.buildPackages.haskell.compiler.ghc982
899927
or final.buildPackages.buildPackages.haskell.compiler.ghc981
900928
or final.buildPackages.buildPackages.haskell.compiler.ghc966

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ in builtins.listToAttrs (builtins.concatMap (system: builtins.concatMap (compile
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" "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"])) [
50+
(system == "x86_64-linux" && __elem compiler-nix-name ["ghc8107" "ghc961" "ghc962" "ghc963" "ghc964" "ghc965" "ghc981" "ghc982" "ghc983" "ghc984" "ghc9101"])
51+
|| (system == "aarch64-linux" && __elem compiler-nix-name ["ghc961" "ghc962" "ghc963" "ghc964" "ghc965" "ghc981" "ghc982" "ghc983" "ghc984" "ghc9101"])
52+
|| (system == "x86_64-darwin" && __elem compiler-nix-name ["ghc8107" "ghc961" "ghc962" "ghc963" "ghc964" "ghc964" "ghc981" "ghc982" "ghc983" "ghc984" "ghc9101"])
53+
|| (system == "aarch64-darwin" && __elem compiler-nix-name ["ghc961" "ghc962" "ghc963" "ghc964" "ghc981" "ghc965" "ghc982" "ghc983" "ghc984" "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; }

‎test/haskell-language-server/cabal.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ in recurseIntoAttrs {
1717
stdenv.hostPlatform != stdenv.buildPlatform
1818
|| __compareVersions buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.0.1" < 0
1919
|| __compareVersions buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.11.0" >= 0
20-
|| compiler-nix-name == "ghc983";
20+
|| __elem compiler-nix-name ["ghc983" "ghc984"];
2121
}

0 commit comments

Comments
 (0)