Skip to content

Commit 2a8d6cd

Browse files
committed
Add GHC 9.10.1
1 parent 84a2606 commit 2a8d6cd

File tree

2 files changed

+33
-4
lines changed

2 files changed

+33
-4
lines changed

ci.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
ghc96llvm = true;
7474
ghc98 = true;
7575
ghc98llvm = true;
76-
ghc910X = true;
76+
ghc910 = true;
7777
ghc911 = true;
7878
})));
7979
crossSystems = nixpkgsName: nixpkgs: compiler-nix-name:

overlays/bootstrap.nix

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ let
1111
"9.4" = "9.4.8";
1212
"9.6" = "9.6.5";
1313
"9.8" = "9.8.2";
14+
"9.10" = "9.10.1";
1415
};
1516
gitInputs = {
16-
ghc910X = "9.10.0";
1717
ghc911 = "9.11";
1818
};
1919
versionToNixName = v: "ghc${builtins.replaceStrings ["."] [""] v}";
@@ -1101,7 +1101,7 @@ in {
11011101

11021102
bootPkgs = bootPkgsGhc94 // {
11031103
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
1104-
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc965
1104+
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc982
11051105
else final.buildPackages.buildPackages.haskell.compiler.ghc965
11061106
or final.buildPackages.buildPackages.haskell.compiler.ghc964
11071107
or final.buildPackages.buildPackages.haskell.compiler.ghc963
@@ -1123,6 +1123,35 @@ in {
11231123

11241124
ghc-patches = ghc-patches "9.8.2";
11251125
});
1126+
ghc9101 = final.callPackage ../compiler/ghc (traceWarnOld "9.10" {
1127+
extra-passthru = { buildGHC = final.buildPackages.haskell-nix.compiler.ghc9101; };
1128+
1129+
bootPkgs = bootPkgsGhc94 // {
1130+
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
1131+
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc9101
1132+
else final.buildPackages.buildPackages.haskell.compiler.ghc982
1133+
or final.buildPackages.buildPackages.haskell.compiler.ghc981
1134+
or final.buildPackages.buildPackages.haskell.compiler.ghc965
1135+
or final.buildPackages.buildPackages.haskell.compiler.ghc964
1136+
or final.buildPackages.buildPackages.haskell.compiler.ghc963
1137+
or final.buildPackages.buildPackages.haskell.compiler.ghc962
1138+
or final.buildPackages.buildPackages.haskell.compiler.ghc945
1139+
or final.buildPackages.buildPackages.haskell.compiler.ghc944
1140+
or final.buildPackages.buildPackages.haskell.compiler.ghc943;
1141+
};
1142+
inherit sphinx;
1143+
1144+
buildLlvmPackages = final.buildPackages.llvmPackages_12;
1145+
llvmPackages = final.llvmPackages_12;
1146+
1147+
src-spec = rec {
1148+
version = "9.10.1";
1149+
url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
1150+
sha256 = "sha256-vzhqMC1O4FR5H/1RdIkA8V1xdg/RmRV5ItEgzB+J4vc=";
1151+
};
1152+
1153+
ghc-patches = ghc-patches "9.10.1";
1154+
});
11261155
} // (__listToAttrs (final.lib.mapAttrsToList (source-name: ver:
11271156
let
11281157
src = final.haskell-nix.sources.${source-name};
@@ -1136,7 +1165,7 @@ in {
11361165

11371166
bootPkgs = bootPkgsGhc94 // {
11381167
ghc = if final.stdenv.buildPlatform != final.stdenv.targetPlatform
1139-
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc982 # TODO use ${compiler-nix-name}
1168+
then final.buildPackages.buildPackages.haskell-nix.compiler.ghc9101 # TODO use ${compiler-nix-name}
11401169
else final.buildPackages.buildPackages.haskell.compiler.ghc982
11411170
or final.buildPackages.buildPackages.haskell.compiler.ghc981
11421171
or final.buildPackages.buildPackages.haskell.compiler.ghc965

0 commit comments

Comments
 (0)