|
6 | 6 | "9.0" = "9.0.2";
|
7 | 7 | "9.2" = "9.2.8";
|
8 | 8 | "9.4" = "9.4.8";
|
9 |
| - "9.6" = "9.6.5"; |
| 9 | + "9.6" = "9.6.6"; |
10 | 10 | "9.8" = "9.8.2";
|
11 | 11 | "9.10" = "9.10.1";
|
12 | 12 | };
|
|
603 | 603 | bootPkgs = bootPkgsGhc94 // {
|
604 | 604 | ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
|
605 | 605 | 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 |
607 | 608 | or final.buildPackages.buildPackages.haskell.compiler.ghc964
|
608 | 609 | or final.buildPackages.buildPackages.haskell.compiler.ghc963
|
609 | 610 | or final.buildPackages.buildPackages.haskell.compiler.ghc962
|
|
628 | 629 | bootPkgs = bootPkgsGhc94 // {
|
629 | 630 | ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
|
630 | 631 | 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 |
632 | 634 | or final.buildPackages.buildPackages.haskell.compiler.ghc964
|
633 | 635 | or final.buildPackages.buildPackages.haskell.compiler.ghc963
|
634 | 636 | or final.buildPackages.buildPackages.haskell.compiler.ghc962
|
|
653 | 655 | bootPkgs = bootPkgsGhc94 // {
|
654 | 656 | ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
|
655 | 657 | 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 |
657 | 660 | or final.buildPackages.buildPackages.haskell.compiler.ghc964
|
658 | 661 | or final.buildPackages.buildPackages.haskell.compiler.ghc963
|
659 | 662 | or final.buildPackages.buildPackages.haskell.compiler.ghc962
|
|
678 | 681 | bootPkgs = bootPkgsGhc94 // {
|
679 | 682 | ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
|
680 | 683 | 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 |
682 | 686 | or final.buildPackages.buildPackages.haskell.compiler.ghc964
|
683 | 687 | or final.buildPackages.buildPackages.haskell.compiler.ghc963
|
684 | 688 | or final.buildPackages.buildPackages.haskell.compiler.ghc962
|
@@ -722,13 +726,40 @@ in {
|
722 | 726 |
|
723 | 727 | ghc-patches = ghc-patches "9.6.5";
|
724 | 728 | });
|
| 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 | + }); |
725 | 755 | ghc981 = traceWarnOld "9.8" (final.callPackage ../compiler/ghc {
|
726 | 756 | extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc981; };
|
727 | 757 |
|
728 | 758 | bootPkgs = bootPkgsGhc94 // {
|
729 | 759 | 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 |
732 | 763 | or final.buildPackages.buildPackages.haskell.compiler.ghc964
|
733 | 764 | or final.buildPackages.buildPackages.haskell.compiler.ghc963
|
734 | 765 | or final.buildPackages.buildPackages.haskell.compiler.ghc962
|
|
752 | 783 |
|
753 | 784 | bootPkgs = bootPkgsGhc94 // {
|
754 | 785 | 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 |
757 | 789 | or final.buildPackages.buildPackages.haskell.compiler.ghc964
|
758 | 790 | or final.buildPackages.buildPackages.haskell.compiler.ghc963
|
759 | 791 | or final.buildPackages.buildPackages.haskell.compiler.ghc962
|
|
780 | 812 | then final.buildPackages.buildPackages.haskell-nix.compiler.ghc9101
|
781 | 813 | else final.buildPackages.buildPackages.haskell.compiler.ghc982
|
782 | 814 | or final.buildPackages.buildPackages.haskell.compiler.ghc981
|
| 815 | + or final.buildPackages.buildPackages.haskell.compiler.ghc966 |
783 | 816 | or final.buildPackages.buildPackages.haskell.compiler.ghc965
|
784 | 817 | or final.buildPackages.buildPackages.haskell.compiler.ghc964
|
785 | 818 | or final.buildPackages.buildPackages.haskell.compiler.ghc963
|
|
815 | 848 | then final.buildPackages.buildPackages.haskell-nix.compiler.ghc9101 # TODO use ${compiler-nix-name}
|
816 | 849 | else final.buildPackages.buildPackages.haskell.compiler.ghc982
|
817 | 850 | or final.buildPackages.buildPackages.haskell.compiler.ghc981
|
| 851 | + or final.buildPackages.buildPackages.haskell.compiler.ghc966 |
818 | 852 | or final.buildPackages.buildPackages.haskell.compiler.ghc965
|
819 | 853 | or final.buildPackages.buildPackages.haskell.compiler.ghc964
|
820 | 854 | or final.buildPackages.buildPackages.haskell.compiler.ghc963
|
|
0 commit comments