|
10 | 10 | "9.4" = "9.4.8";
|
11 | 11 | "9.6" = "9.6.7";
|
12 | 12 | "9.8" = "9.8.4";
|
13 |
| - "9.10" = "9.10.1"; |
| 13 | + "9.10" = "9.10.2"; |
14 | 14 | "9.12" = "9.12.2";
|
15 | 15 | };
|
16 | 16 | gitInputs = {
|
|
305 | 305 | ++ fromUntil "9.9" "9.11" ./patches/ghc/ghc-9.9-Cabal-3.11.patch
|
306 | 306 | ++ fromUntil "9.8" "9.8.3" ./patches/ghc/ghc-9.8-text-upper-bound.patch
|
307 | 307 | ++ fromUntil "9.8.3" "9.8.4" ./patches/ghc/ghc-9.8.3-text-upper-bound.patch
|
308 |
| - ++ fromUntil "9.10" "9.11" ./patches/ghc/ghc-9.10-containers-upper-bound.patch |
| 308 | + ++ fromUntil "9.10" "9.10.2" ./patches/ghc/ghc-9.10-containers-upper-bound.patch |
309 | 309 | ++ fromUntil "9.10" "9.14" ./patches/ghc/ghc-9.10-merge-objects.patch
|
310 | 310 |
|
311 | 311 | # This patch will make windows stop emitting absolute relocations. This is one way in which binutils 2.36+ (with ASLR enabled), will just choke on the
|
@@ -981,6 +981,37 @@ in {
|
981 | 981 |
|
982 | 982 | ghc-patches = ghc-patches "9.10.1";
|
983 | 983 | });
|
| 984 | + ghc9102 = traceWarnOld "9.10" (final.callPackage ../compiler/ghc { |
| 985 | + extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc9102; }; |
| 986 | + |
| 987 | + bootPkgs = bootPkgsGhc94 // { |
| 988 | + ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform |
| 989 | + then final.buildPackages.buildPackages.haskell-nix.compiler.ghc9102 |
| 990 | + else # GHC 9.10.1 does not seem to build with ghc 9.8.4 |
| 991 | + # final.buildPackages.buildPackages.haskell.compiler.ghc984 |
| 992 | + # or final.buildPackages.buildPackages.haskell.compiler.ghc983 |
| 993 | + final.buildPackages.buildPackages.haskell.compiler.ghc982 |
| 994 | + or final.buildPackages.buildPackages.haskell.compiler.ghc981 |
| 995 | + or final.buildPackages.buildPackages.haskell.compiler.ghc966 |
| 996 | + or final.buildPackages.buildPackages.haskell.compiler.ghc965 |
| 997 | + or final.buildPackages.buildPackages.haskell.compiler.ghc964 |
| 998 | + or final.buildPackages.buildPackages.haskell.compiler.ghc963 |
| 999 | + or final.buildPackages.buildPackages.haskell.compiler.ghc962 |
| 1000 | + or final.buildPackages.buildPackages.haskell.compiler.ghc945 |
| 1001 | + or final.buildPackages.buildPackages.haskell.compiler.ghc944 |
| 1002 | + or final.buildPackages.buildPackages.haskell.compiler.ghc943; |
| 1003 | + }; |
| 1004 | + inherit sphinx; |
| 1005 | + |
| 1006 | + buildLlvmPackages = final.buildPackages.llvmPackages_15; |
| 1007 | + llvmPackages = final.llvmPackages_15; |
| 1008 | + |
| 1009 | + src-spec.file = final.haskell-nix.sources.ghc9102; |
| 1010 | + src-spec.version = "9.10.2"; |
| 1011 | + src-spec.needsBooting = true; |
| 1012 | + |
| 1013 | + ghc-patches = ghc-patches "9.10.2"; |
| 1014 | + }); |
984 | 1015 | ghc9121 = traceWarnOld "9.12" (final.callPackage ../compiler/ghc {
|
985 | 1016 | extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc9121; };
|
986 | 1017 |
|
|
0 commit comments