about summary refs log tree commit diff
path: root/pkgs/development/compilers/ghc
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2023-10-21 12:35:29 +0200
committersternenseemann <sternenseemann@systemli.org>2023-11-06 15:26:58 +0100
commit2ec6f635344b634beb6b58137a78df83ab18f95e (patch)
tree48166f604881fd3c026114c690a73e975a19b2de /pkgs/development/compilers/ghc
parentfd8a8c9160438e002bf471fe2be3411559836060 (diff)
downloadnixlib-2ec6f635344b634beb6b58137a78df83ab18f95e.tar
nixlib-2ec6f635344b634beb6b58137a78df83ab18f95e.tar.gz
nixlib-2ec6f635344b634beb6b58137a78df83ab18f95e.tar.bz2
nixlib-2ec6f635344b634beb6b58137a78df83ab18f95e.tar.lz
nixlib-2ec6f635344b634beb6b58137a78df83ab18f95e.tar.xz
nixlib-2ec6f635344b634beb6b58137a78df83ab18f95e.tar.zst
nixlib-2ec6f635344b634beb6b58137a78df83ab18f95e.zip
haskell.compiler.ghcHEAD: 9.7.20230527 -> 9.9.20231014
Diffstat (limited to 'pkgs/development/compilers/ghc')
-rw-r--r--pkgs/development/compilers/ghc/common-hadrian.nix2
-rw-r--r--pkgs/development/compilers/ghc/head.nix6
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix
index e876c4be0af7..d2d6dade497e 100644
--- a/pkgs/development/compilers/ghc/common-hadrian.nix
+++ b/pkgs/development/compilers/ghc/common-hadrian.nix
@@ -150,7 +150,7 @@
 
   # GHC's build system hadrian built from the GHC-to-build's source tree
   # using our bootstrap GHC.
-, hadrian ? bootPkgs.callPackage ../../tools/haskell/hadrian {
+, hadrian ? import ../../tools/haskell/hadrian/make-hadrian.nix { inherit bootPkgs lib; } {
     ghcSrc = ghcSrc;
     ghcVersion = version;
     userSettings = hadrianUserSettings;
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 951b708381f1..6b8d657f34ec 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.7.20230527";
-  rev = "69fdbece5f6ca0a718bb9f1fef7b0ab57cf6b664";
-  sha256 = "13rf1d27wdich0kmbds55by9vj3wz0v9clba9p8qpwz7x7wpcjz2";
+  version = "9.9.20231014";
+  rev = "13d3c613c3c1e4942c698449bdf58a6a13b76695";
+  sha256 = "13xp4ijnym2qbw2qbxkvfb79l7034vrcm9j2j9kirbhjxzdshvx9";
 }