Skip to content

Commit 353236e

Browse files
committed
Add ghc 9.6.7
1 parent 0cc4995 commit 353236e

File tree

5 files changed

+74
-5
lines changed

5 files changed

+74
-5
lines changed

ci.nix

+3-4
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
ghc912 = true;
6565
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
6666
ghc96 = true;
67-
ghc96X = true;
6867
ghc98 = true;
6968
ghc98llvm = false;
7069
ghc910 = true;
@@ -80,13 +79,13 @@
8079
&& (__match ".*llvm" compiler-nix-name == null)
8180
&& ((system == "x86_64-linux" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc948"])
8281
|| (system == "aarch64-linux" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc948"])
83-
|| (system == "x86_64-darwin" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc948" "ghc966" "ghc96720250227" "ghc982" "ghc983" "ghc984"])
84-
|| (system == "aarch64-darwin" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc948" "ghc966" "ghc96720250227" "ghc982" "ghc983" "ghc984"])
82+
|| (system == "x86_64-darwin" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc948" "ghc966" "ghc967" "ghc96720250227" "ghc982" "ghc983" "ghc984"])
83+
|| (system == "aarch64-darwin" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc948" "ghc966" "ghc967" "ghc96720250227" "ghc982" "ghc983" "ghc984"])
8584
)) {
8685
inherit (lib.systems.examples) ghcjs;
8786
} // lib.optionalAttrs (nixpkgsName == "unstable"
8887
&& (__match ".*llvm" compiler-nix-name == null)
89-
&& ((system == "x86_64-linux" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc966" "ghc96720250227"]) # Not sure why GHC 9.6.6 TH code now wants `log1pf`
88+
&& ((system == "x86_64-linux" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc966" "ghc967" "ghc96720250227"]) # Not sure why GHC 9.6.6 TH code now wants `log1pf`
9089
|| (system == "x86_64-darwin" && builtins.elem compiler-nix-name []))) { # TODO add ghc versions when we have more darwin build capacity
9190
inherit (lib.systems.examples) mingwW64;
9291
} // lib.optionalAttrs (nixpkgsName == "unstable"

lazy-inputs/default.nix

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ in {
2929
inherit ((callFlake { pkgs = final; src = ./ghc964; }).defaultNix) ghc964;
3030
inherit ((callFlake { pkgs = final; src = ./ghc965; }).defaultNix) ghc965;
3131
inherit ((callFlake { pkgs = final; src = ./ghc966; }).defaultNix) ghc966;
32+
inherit ((callFlake { pkgs = final; src = ./ghc967; }).defaultNix) ghc967;
3233
inherit ((callFlake { pkgs = final; src = ./ghc96X; }).defaultNix) ghc96X;
3334
inherit ((callFlake { pkgs = final; src = ./ghc981; }).defaultNix) ghc981;
3435
inherit ((callFlake { pkgs = final; src = ./ghc982; }).defaultNix) ghc982;

lazy-inputs/ghc967/flake.lock

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

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

overlays/bootstrap.nix

+28-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ let
88
"9.0" = "9.0.2";
99
"9.2" = "9.2.8";
1010
"9.4" = "9.4.8";
11-
"9.6" = "9.6.6";
11+
"9.6" = "9.6.7";
1212
"9.8" = "9.8.4";
1313
"9.10" = "9.10.1";
1414
"9.12" = "9.12.2";
@@ -819,6 +819,33 @@ in {
819819

820820
ghc-patches = ghc-patches "9.6.6";
821821
});
822+
ghc967 = traceWarnOld "9.6" (final.callPackage ../compiler/ghc {
823+
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc967; };
824+
825+
bootPkgs = bootPkgsGhc94 // {
826+
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
827+
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc967
828+
else final.buildPackages.buildPackages.haskell.compiler.ghc967
829+
or final.buildPackages.buildPackages.haskell.compiler.ghc966
830+
or final.buildPackages.buildPackages.haskell.compiler.ghc965
831+
or final.buildPackages.buildPackages.haskell.compiler.ghc964
832+
or final.buildPackages.buildPackages.haskell.compiler.ghc963
833+
or final.buildPackages.buildPackages.haskell.compiler.ghc962
834+
or final.buildPackages.buildPackages.haskell.compiler.ghc945
835+
or final.buildPackages.buildPackages.haskell.compiler.ghc944
836+
or final.buildPackages.buildPackages.haskell.compiler.ghc943;
837+
};
838+
inherit sphinx;
839+
840+
buildLlvmPackages = final.buildPackages.llvmPackages_12;
841+
llvmPackages = final.llvmPackages_12;
842+
843+
src-spec.file = final.haskell-nix.sources.ghc967;
844+
src-spec.version = "9.6.7";
845+
src-spec.needsBooting = true;
846+
847+
ghc-patches = ghc-patches "9.6.7";
848+
});
822849
ghc981 = traceWarnOld "9.8" (final.callPackage ../compiler/ghc {
823850
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc981; };
824851

0 commit comments

Comments
 (0)