ghc: 8.10.6 -> 8.10.7

https://www.haskell.org/ghc/download_ghc_8_10_7.html

(cherry picked from commit 9eca744cc0484e417deb260076241efb0a6c159d)
This commit is contained in:
sternenseemann 2021-08-27 00:36:49 +02:00 committed by John Ericson
parent 56a9ec15ff
commit 65c3102d78
4 changed files with 10 additions and 10 deletions

View File

@ -104,12 +104,12 @@ let
in in
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
version = "8.10.6"; version = "8.10.7";
name = "${targetPrefix}ghc-${version}"; name = "${targetPrefix}ghc-${version}";
src = fetchurl { src = fetchurl {
url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
sha256 = "43afba72a533408b42c1492bd047b5e37e5f7204e41a5cedd3182cc841610ce9"; sha256 = "e3eef6229ce9908dfe1ea41436befb0455fefb1932559e860ad4c606b0d03c9d";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

View File

@ -1,4 +1,4 @@
{ lib, supportedGhcVersions ? [ "884" "8104" "8106" ], stdenv, haskellPackages { lib, supportedGhcVersions ? [ "884" "8104" "8107" ], stdenv, haskellPackages
, haskell }: , haskell }:
# #
# The recommended way to override this package is # The recommended way to override this package is

View File

@ -75,7 +75,7 @@ in {
buildLlvmPackages = buildPackages.llvmPackages_9; buildLlvmPackages = buildPackages.llvmPackages_9;
llvmPackages = pkgs.llvmPackages_9; llvmPackages = pkgs.llvmPackages_9;
}; };
ghc8106 = callPackage ../development/compilers/ghc/8.10.6.nix { ghc8107 = callPackage ../development/compilers/ghc/8.10.7.nix {
# aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar
bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then
packages.ghc8102BinaryMinimal packages.ghc8102BinaryMinimal
@ -162,9 +162,9 @@ in {
ghc = bh.compiler.ghc8104; ghc = bh.compiler.ghc8104;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
}; };
ghc8106 = callPackage ../development/haskell-modules { ghc8107 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc8106; buildHaskellPackages = bh.packages.ghc8107;
ghc = bh.compiler.ghc8106; ghc = bh.compiler.ghc8107;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
}; };
ghc901 = callPackage ../development/haskell-modules { ghc901 = callPackage ../development/haskell-modules {

View File

@ -47,7 +47,7 @@ let
all = with compilerNames; [ all = with compilerNames; [
ghc884 ghc884
ghc8104 ghc8104
ghc8106 ghc8107
ghc901 ghc901
]; ];
@ -207,11 +207,11 @@ let
# package sets (like Cabal, jailbreak-cabal) are # package sets (like Cabal, jailbreak-cabal) are
# working as expected. # working as expected.
cabal-install = all; cabal-install = all;
Cabal_3_6_0_0 = with compilerNames; [ ghc884 ghc8104 ghc8106 ]; Cabal_3_6_0_0 = with compilerNames; [ ghc884 ghc8104 ghc8107 ];
funcmp = all; funcmp = all;
# Doesn't currently work on ghc-9.0: # Doesn't currently work on ghc-9.0:
# https://github.com/haskell/haskell-language-server/issues/297 # https://github.com/haskell/haskell-language-server/issues/297
haskell-language-server = with compilerNames; [ ghc884 ghc8104 ghc8106 ]; haskell-language-server = with compilerNames; [ ghc884 ghc8104 ghc8107 ];
hoogle = all; hoogle = all;
hsdns = all; hsdns = all;
jailbreak-cabal = all; jailbreak-cabal = all;