Skip to content

Commit 810d696

Browse files
committed
Add ghc 9.6.6
1 parent 4413d83 commit 810d696

File tree

4 files changed

+86
-9
lines changed

4 files changed

+86
-9
lines changed

lazy-inputs/default.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ in {
2828
inherit ((callFlake { pkgs = final; src = ./ghc963; }).defaultNix) ghc963;
2929
inherit ((callFlake { pkgs = final; src = ./ghc964; }).defaultNix) ghc964;
3030
inherit ((callFlake { pkgs = final; src = ./ghc965; }).defaultNix) ghc965;
31+
inherit ((callFlake { pkgs = final; src = ./ghc966; }).defaultNix) ghc966;
3132
inherit ((callFlake { pkgs = final; src = ./ghc981; }).defaultNix) ghc981;
3233
inherit ((callFlake { pkgs = final; src = ./ghc982; }).defaultNix) ghc982;
3334
inherit ((callFlake { pkgs = final; src = ./ghc9101; }).defaultNix) ghc9101;

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

overlays/bootstrap.nix

Lines changed: 43 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ let
66
"9.0" = "9.0.2";
77
"9.2" = "9.2.8";
88
"9.4" = "9.4.8";
9-
"9.6" = "9.6.5";
9+
"9.6" = "9.6.6";
1010
"9.8" = "9.8.2";
1111
"9.10" = "9.10.1";
1212
};
@@ -603,7 +603,8 @@ in {
603603
bootPkgs = bootPkgsGhc94 // {
604604
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
605605
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc961
606-
else final.buildPackages.buildPackages.haskell.compiler.ghc965
606+
else final.buildPackages.buildPackages.haskell.compiler.ghc966
607+
or final.buildPackages.buildPackages.haskell.compiler.ghc965
607608
or final.buildPackages.buildPackages.haskell.compiler.ghc964
608609
or final.buildPackages.buildPackages.haskell.compiler.ghc963
609610
or final.buildPackages.buildPackages.haskell.compiler.ghc962
@@ -628,7 +629,8 @@ in {
628629
bootPkgs = bootPkgsGhc94 // {
629630
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
630631
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc962
631-
else final.buildPackages.buildPackages.haskell.compiler.ghc965
632+
else final.buildPackages.buildPackages.haskell.compiler.ghc966
633+
or final.buildPackages.buildPackages.haskell.compiler.ghc965
632634
or final.buildPackages.buildPackages.haskell.compiler.ghc964
633635
or final.buildPackages.buildPackages.haskell.compiler.ghc963
634636
or final.buildPackages.buildPackages.haskell.compiler.ghc962
@@ -653,7 +655,8 @@ in {
653655
bootPkgs = bootPkgsGhc94 // {
654656
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
655657
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc963
656-
else final.buildPackages.buildPackages.haskell.compiler.ghc965
658+
else final.buildPackages.buildPackages.haskell.compiler.ghc966
659+
or final.buildPackages.buildPackages.haskell.compiler.ghc965
657660
or final.buildPackages.buildPackages.haskell.compiler.ghc964
658661
or final.buildPackages.buildPackages.haskell.compiler.ghc963
659662
or final.buildPackages.buildPackages.haskell.compiler.ghc962
@@ -678,7 +681,8 @@ in {
678681
bootPkgs = bootPkgsGhc94 // {
679682
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
680683
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc964
681-
else final.buildPackages.buildPackages.haskell.compiler.ghc965
684+
else final.buildPackages.buildPackages.haskell.compiler.ghc966
685+
or final.buildPackages.buildPackages.haskell.compiler.ghc965
682686
or final.buildPackages.buildPackages.haskell.compiler.ghc964
683687
or final.buildPackages.buildPackages.haskell.compiler.ghc963
684688
or final.buildPackages.buildPackages.haskell.compiler.ghc962
@@ -722,13 +726,40 @@ in {
722726

723727
ghc-patches = ghc-patches "9.6.5";
724728
});
729+
ghc966 = traceWarnOld "9.6" (final.callPackage ../compiler/ghc {
730+
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc966; };
731+
732+
bootPkgs = bootPkgsGhc94 // {
733+
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
734+
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc966
735+
else final.buildPackages.buildPackages.haskell.compiler.ghc966
736+
or final.buildPackages.buildPackages.haskell.compiler.ghc965
737+
or final.buildPackages.buildPackages.haskell.compiler.ghc964
738+
or final.buildPackages.buildPackages.haskell.compiler.ghc963
739+
or final.buildPackages.buildPackages.haskell.compiler.ghc962
740+
or final.buildPackages.buildPackages.haskell.compiler.ghc945
741+
or final.buildPackages.buildPackages.haskell.compiler.ghc944
742+
or final.buildPackages.buildPackages.haskell.compiler.ghc943;
743+
};
744+
inherit sphinx;
745+
746+
buildLlvmPackages = final.buildPackages.llvmPackages_12;
747+
llvmPackages = final.llvmPackages_12;
748+
749+
src-spec.file = final.haskell-nix.sources.ghc966;
750+
src-spec.version = "9.6.6";
751+
src-spec.needsBooting = true;
752+
753+
ghc-patches = ghc-patches "9.6.6";
754+
});
725755
ghc981 = traceWarnOld "9.8" (final.callPackage ../compiler/ghc {
726756
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc981; };
727757

728758
bootPkgs = bootPkgsGhc94 // {
729759
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
730-
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc965
731-
else final.buildPackages.buildPackages.haskell.compiler.ghc965
760+
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc966
761+
else final.buildPackages.buildPackages.haskell.compiler.ghc966
762+
or final.buildPackages.buildPackages.haskell.compiler.ghc965
732763
or final.buildPackages.buildPackages.haskell.compiler.ghc964
733764
or final.buildPackages.buildPackages.haskell.compiler.ghc963
734765
or final.buildPackages.buildPackages.haskell.compiler.ghc962
@@ -752,8 +783,9 @@ in {
752783

753784
bootPkgs = bootPkgsGhc94 // {
754785
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
755-
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc965
756-
else final.buildPackages.buildPackages.haskell.compiler.ghc965
786+
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc966
787+
else final.buildPackages.buildPackages.haskell.compiler.ghc966
788+
or final.buildPackages.buildPackages.haskell.compiler.ghc965
757789
or final.buildPackages.buildPackages.haskell.compiler.ghc964
758790
or final.buildPackages.buildPackages.haskell.compiler.ghc963
759791
or final.buildPackages.buildPackages.haskell.compiler.ghc962
@@ -780,6 +812,7 @@ in {
780812
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc9101
781813
else final.buildPackages.buildPackages.haskell.compiler.ghc982
782814
or final.buildPackages.buildPackages.haskell.compiler.ghc981
815+
or final.buildPackages.buildPackages.haskell.compiler.ghc966
783816
or final.buildPackages.buildPackages.haskell.compiler.ghc965
784817
or final.buildPackages.buildPackages.haskell.compiler.ghc964
785818
or final.buildPackages.buildPackages.haskell.compiler.ghc963
@@ -815,6 +848,7 @@ in {
815848
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc9101 # TODO use ${compiler-nix-name}
816849
else final.buildPackages.buildPackages.haskell.compiler.ghc982
817850
or final.buildPackages.buildPackages.haskell.compiler.ghc981
851+
or final.buildPackages.buildPackages.haskell.compiler.ghc966
818852
or final.buildPackages.buildPackages.haskell.compiler.ghc965
819853
or final.buildPackages.buildPackages.haskell.compiler.ghc964
820854
or final.buildPackages.buildPackages.haskell.compiler.ghc963

0 commit comments

Comments
 (0)