summary refs log tree commit diff
path: root/pkgs/top-level/release-haskell.nix
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2021-06-06 10:43:36 +0000
committersternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-08-14 17:12:39 +0200
commitcb330ce4f05f5a6e2da3021e9cbf4ea2eb592631 (patch)
treebcaa9b6f75e3de4744a09c0bc7da0eeb4122805b /pkgs/top-level/release-haskell.nix
parent283d622397539f196416657da9dc804a4ca89846 (diff)
downloadnixpkgs-cb330ce4f05f5a6e2da3021e9cbf4ea2eb592631.tar
nixpkgs-cb330ce4f05f5a6e2da3021e9cbf4ea2eb592631.tar.gz
nixpkgs-cb330ce4f05f5a6e2da3021e9cbf4ea2eb592631.tar.bz2
nixpkgs-cb330ce4f05f5a6e2da3021e9cbf4ea2eb592631.tar.lz
nixpkgs-cb330ce4f05f5a6e2da3021e9cbf4ea2eb592631.tar.xz
nixpkgs-cb330ce4f05f5a6e2da3021e9cbf4ea2eb592631.tar.zst
nixpkgs-cb330ce4f05f5a6e2da3021e9cbf4ea2eb592631.zip
ghc: 8.10.4 -> 8.10.6
The only big change is required for darwin since GHC 8.10.5 now
runs xattr in the install phase on darwin:

* https://gitlab.haskell.org/ghc/ghc/-/commit/11e1dcde0d3137a8ee5cd32697b2925ea4e84b95
* https://gitlab.haskell.org/ghc/ghc/-/commit/ec451cac39de919621c783fec809c26fb9f0d1c8

Unfortunately, it uses the host /usr/bin/xattr by default which is
present in the build due to a lack of sandboxing on darwin. That xattr
version however still requires Python 2.7 whereas Python 3.8 is in PATH
in our build. We solve this by setting the XATTR environment variable.

We can't use python3Packages.xattr since GHC expects Apple's fork of
xattr which provides some extra flags to utilize.

Co-authored-by: Cheng Shao <cheng.shao@tweag.io>
Diffstat (limited to 'pkgs/top-level/release-haskell.nix')
-rw-r--r--pkgs/top-level/release-haskell.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index 400635740ea..d68b0605ddd 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
-    ghc8104
+    ghc8106
     ghc901
   ];
 
@@ -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 ghc8104 ];
+      Cabal_3_6_0_0 = with compilerNames; [ ghc884 ghc8106 ];
       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 ghc8104 ];
+      haskell-language-server = with compilerNames; [ ghc884 ghc8106 ];
       hoogle = all;
       hsdns = all;
       jailbreak-cabal = all;