about summary refs log tree commit diff
path: root/pkgs/development/compilers/ghc
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2022-12-19 12:19:45 +0100
committersternenseemann <sternenseemann@systemli.org>2023-01-03 15:23:53 +0100
commit3665c429d349fbda46b0651e554cca8434452748 (patch)
treeb81bed721d4a6406f4d5f35ea42e408f0fb08abd /pkgs/development/compilers/ghc
parent5df77ad6ee332547670da30e1f9ba868356318b3 (diff)
downloadnixlib-3665c429d349fbda46b0651e554cca8434452748.tar
nixlib-3665c429d349fbda46b0651e554cca8434452748.tar.gz
nixlib-3665c429d349fbda46b0651e554cca8434452748.tar.bz2
nixlib-3665c429d349fbda46b0651e554cca8434452748.tar.lz
nixlib-3665c429d349fbda46b0651e554cca8434452748.tar.xz
nixlib-3665c429d349fbda46b0651e554cca8434452748.tar.zst
nixlib-3665c429d349fbda46b0651e554cca8434452748.zip
haskell.compiler.ghcHEAD: 9.5.20220921 -> 9.7.20221224
Finally building a cross compiler using hadrian is possible, but there
are some outstanding issues regarding external libraries in the package
db which causes issues with ghc-bignum.
Diffstat (limited to 'pkgs/development/compilers/ghc')
-rw-r--r--pkgs/development/compilers/ghc/common-hadrian.nix6
-rw-r--r--pkgs/development/compilers/ghc/head.nix6
2 files changed, 3 insertions, 9 deletions
diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix
index 1ca3c9efde94..c54e6a4baf86 100644
--- a/pkgs/development/compilers/ghc/common-hadrian.nix
+++ b/pkgs/development/compilers/ghc/common-hadrian.nix
@@ -156,12 +156,6 @@
 
 assert !enableNativeBignum -> gmp != null;
 
-assert stdenv.hostPlatform == stdenv.targetPlatform || throw ''
-  hadrian doesn't support building an installable GHC cross-compiler at the moment.
-  Consider using GHC 9.4 or lower which support this via the make build system.
-  See also: https://gitlab.haskell.org/ghc/ghc/-/issues/22090
-'';
-
 let
   src = (if rev != null then fetchgit else fetchurl) ({
     inherit url sha256;
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 6158be43d810..19739ecbd14f 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,5 +1,5 @@
 import ./common-hadrian.nix {
-  version = "9.5.20220921";
-  rev = "2463df2fe21b5b37ecada3df8c6726c534d24590";
-  sha256 = "1k2h4myqbs31fdzw5n4iw0qn44mp7d33kjwrr15ix4r54r8yskzs";
+  version = "9.7.20221224";
+  rev = "a5bd0eb8dd1d03c54e1b0b476ebbc4cc886d6f19";
+  sha256 = "1rrds9alzpy4vyh2isan32h1zmf44nsr8552wbsn1y3fg6bnpbxi";
 }