From 9eca744cc0484e417deb260076241efb0a6c159d Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 27 Aug 2021 00:36:49 +0200 Subject: [PATCH] ghc: 8.10.6 -> 8.10.7 https://www.haskell.org/ghc/download_ghc_8_10_7.html --- .../compilers/ghc/{8.10.6.nix => 8.10.7.nix} | 4 ++-- .../haskell-language-server/withWrapper.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/haskell-packages.nix | 8 ++++---- pkgs/top-level/release-haskell.nix | 18 +++++++++--------- 5 files changed, 17 insertions(+), 17 deletions(-) rename pkgs/development/compilers/ghc/{8.10.6.nix => 8.10.7.nix} (99%) diff --git a/pkgs/development/compilers/ghc/8.10.6.nix b/pkgs/development/compilers/ghc/8.10.7.nix similarity index 99% rename from pkgs/development/compilers/ghc/8.10.6.nix rename to pkgs/development/compilers/ghc/8.10.7.nix index 748116afb105..6794b855c715 100644 --- a/pkgs/development/compilers/ghc/8.10.6.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -135,12 +135,12 @@ let in stdenv.mkDerivation (rec { - version = "8.10.6"; + version = "8.10.7"; name = "${targetPrefix}ghc-${version}"; src = fetchurl { url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "43afba72a533408b42c1492bd047b5e37e5f7204e41a5cedd3182cc841610ce9"; + sha256 = "e3eef6229ce9908dfe1ea41436befb0455fefb1932559e860ad4c606b0d03c9d"; }; enableParallelBuilding = true; diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index 3b57693a28c1..3a356b36be9a 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -1,4 +1,4 @@ -{ lib, supportedGhcVersions ? [ "884" "8106" ], stdenv, haskellPackages +{ lib, supportedGhcVersions ? [ "884" "8107" ], stdenv, haskellPackages , haskell }: # # The recommended way to override this package is diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3e7c50b3cca..277cc5b45ae7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11445,7 +11445,7 @@ with pkgs; # Please update doc/languages-frameworks/haskell.section.md, “Our # current default compiler is”, if you bump this: - haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8106; + haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8107; inherit (haskellPackages) ghc; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 49538a5efec8..189f50305171 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -68,7 +68,7 @@ in { buildLlvmPackages = buildPackages.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 # 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 @@ -161,9 +161,9 @@ in { ghc = bh.compiler.ghc884; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { }; }; - ghc8106 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc8106; - ghc = bh.compiler.ghc8106; + ghc8107 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc8107; + ghc = bh.compiler.ghc8107; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; }; ghc901 = callPackage ../development/haskell-modules { diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index a987dc579dcb..26f538ff3386 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -50,7 +50,7 @@ let # list of all compilers to test specific packages on all = with compilerNames; [ ghc884 - ghc8106 + ghc8107 ghc901 ]; @@ -278,14 +278,14 @@ let # Test some statically linked packages to catch regressions # and get some cache going for static compilation with GHC. # Use integer-simple to avoid GMP linking problems (LGPL) - pkgsStatic.haskell.packages.integer-simple.ghc8106 = + pkgsStatic.haskell.packages.integer-simple.ghc8107 = removePlatforms [ "aarch64-linux" # times out on Hydra "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 lens random @@ -300,12 +300,12 @@ let # package sets (like Cabal, jailbreak-cabal) are # working as expected. cabal-install = all; - Cabal_3_6_0_0 = with compilerNames; [ ghc884 ghc8106 ]; + Cabal_3_6_0_0 = with compilerNames; [ ghc884 ghc8107 ]; cabal2nix-unstable = all; funcmp = all; # Doesn't currently work on ghc-9.0: # 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; hsdns = all; jailbreak-cabal = all; @@ -379,7 +379,7 @@ let constituents = accumulateDerivations [ jobs.pkgsMusl.haskell.compiler.ghc8102Binary jobs.pkgsMusl.haskell.compiler.ghc884 - jobs.pkgsMusl.haskell.compiler.ghc8106 + jobs.pkgsMusl.haskell.compiler.ghc8107 jobs.pkgsMusl.haskell.compiler.ghc901 ]; }; @@ -394,9 +394,9 @@ let ]; }; constituents = accumulateDerivations [ - jobs.pkgsStatic.haskell.packages.integer-simple.ghc8106.hello - jobs.pkgsStatic.haskell.packages.integer-simple.ghc8106.lens - jobs.pkgsStatic.haskell.packages.integer-simple.ghc8106.random + jobs.pkgsStatic.haskell.packages.integer-simple.ghc8107.hello + jobs.pkgsStatic.haskell.packages.integer-simple.ghc8107.lens + jobs.pkgsStatic.haskell.packages.integer-simple.ghc8107.random ]; }; }