dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

ghc: 8.10.6 -> 8.10.7

Browse Source 
https://www.haskell.org/ghc/download_ghc_8_10_7.html
This commit is contained in:
sternenseemann 2021-08-27 00:36:49 +02:00
parent c4ed2a618c
commit 9eca744cc0
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/ghc/8.10.6.nix → pkgs/development/compilers/ghc/8.10.7.nix
View File

@ -135,12 +135,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;

2
pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
View File

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

2
pkgs/top-level/all-packages.nix
View File

@ -11445,7 +11445,7 @@ with pkgs;
# Please update doc/languages-frameworks/haskell.section.md, “Our # Please update doc/languages-frameworks/haskell.section.md, “Our
# current default compiler is”, if you bump this: # current default compiler is”, if you bump this:
haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8106; haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8107;
inherit (haskellPackages) ghc; inherit (haskellPackages) ghc;

8
pkgs/top-level/haskell-packages.nix
View File

@ -68,7 +68,7 @@ in {
buildLlvmPackages = buildPackages.llvmPackages_7; buildLlvmPackages = buildPackages.llvmPackages_7;
llvmPackages = pkgs.llvmPackages_7; llvmPackages = pkgs.llvmPackages_7;
}; };
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
# Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them
bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 || stdenv.targetPlatform.isMusl then bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 || stdenv.targetPlatform.isMusl then
@ -161,9 +161,9 @@ in {
ghc = bh.compiler.ghc884; ghc = bh.compiler.ghc884;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { }; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.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 {

18
pkgs/top-level/release-haskell.nix
View File

@ -50,7 +50,7 @@ let
# list of all compilers to test specific packages on # list of all compilers to test specific packages on
all = with compilerNames; [ all = with compilerNames; [
ghc884 ghc884
ghc8106 ghc8107
ghc901 ghc901
]; ];
@ -278,14 +278,14 @@ let
# Test some statically linked packages to catch regressions # Test some statically linked packages to catch regressions
# and get some cache going for static compilation with GHC. # and get some cache going for static compilation with GHC.
# Use integer-simple to avoid GMP linking problems (LGPL) # Use integer-simple to avoid GMP linking problems (LGPL)
pkgsStatic.haskell.packages.integer-simple.ghc8106 = pkgsStatic.haskell.packages.integer-simple.ghc8107 =
removePlatforms removePlatforms
[ [
"aarch64-linux" # times out on Hydra "aarch64-linux" # times out on Hydra
"x86_64-darwin" # TODO: reenable when static libiconv works on darwin "x86_64-darwin" # TODO: reenable when static libiconv works on darwin
] ]
{ {
inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.integer-simple.ghc8106) inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.integer-simple.ghc8107)
hello hello
lens lens
random random
@ -300,12 +300,12 @@ 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 ghc8106 ]; Cabal_3_6_0_0 = with compilerNames; [ ghc884 ghc8107 ];
cabal2nix-unstable = all; cabal2nix-unstable = all;
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 ghc8106 ]; haskell-language-server = with compilerNames; [ ghc884 ghc8107 ];
hoogle = all; hoogle = all;
hsdns = all; hsdns = all;
jailbreak-cabal = all; jailbreak-cabal = all;
@ -379,7 +379,7 @@ let
constituents = accumulateDerivations [ constituents = accumulateDerivations [
jobs.pkgsMusl.haskell.compiler.ghc8102Binary jobs.pkgsMusl.haskell.compiler.ghc8102Binary
jobs.pkgsMusl.haskell.compiler.ghc884 jobs.pkgsMusl.haskell.compiler.ghc884
jobs.pkgsMusl.haskell.compiler.ghc8106 jobs.pkgsMusl.haskell.compiler.ghc8107
jobs.pkgsMusl.haskell.compiler.ghc901 jobs.pkgsMusl.haskell.compiler.ghc901
]; ];
}; };
@ -394,9 +394,9 @@ let
]; ];
}; };
constituents = accumulateDerivations [ constituents = accumulateDerivations [
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8106.hello jobs.pkgsStatic.haskell.packages.integer-simple.ghc8107.hello
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8106.lens jobs.pkgsStatic.haskell.packages.integer-simple.ghc8107.lens
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8106.random jobs.pkgsStatic.haskell.packages.integer-simple.ghc8107.random
]; ];
}; };
} }