about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorNaïm Favier <n@monade.li>2023-05-05 19:49:09 +0200
committersternenseemann <sternenseemann@systemli.org>2023-05-09 18:16:07 +0200
commit9d300310141c824fe68b6905b7b3921ce05e0b7c (patch)
tree59c8671e1350d4ca5fb8b8ae39de4a76cb488d5f /pkgs
parenta6f307ada4ca6a2f3723d54907904f6e1ce30c93 (diff)
haskell.compiler.ghcHEAD: 9.7.20230406 -> 9.7.20230505
https://gitlab.haskell.org/ghc/ghc/-/compare/04b80850...983ce558

Adds support for callbacks to the JS backend.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/compilers/ghc/head.nix6
-rw-r--r--pkgs/development/tools/haskell/hadrian/default.nix4
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index a2cf737a2e134..76d63c9d695da 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.20230406";
-  rev = "04b80850c535fa8c11f435711577296a99499105";
-  sha256 = "190fpgg8sbcfp2l62vaqhk3wddkbz8vf5ivd7hw5gkcyyn5px3q9";
+  version = "9.7.20230505";
+  rev = "983ce55815f2dd57f84ee86eee97febf7d80b470";
+  sha256 = "sha256-U+LZIe9WbF/DF5Zn8w8wkRf4JJHxgdY2ahM517bwRo4=";
 }
diff --git a/pkgs/development/tools/haskell/hadrian/default.nix b/pkgs/development/tools/haskell/hadrian/default.nix
index de10210ecd3e4..5911c34982b0f 100644
--- a/pkgs/development/tools/haskell/hadrian/default.nix
+++ b/pkgs/development/tools/haskell/hadrian/default.nix
@@ -2,7 +2,7 @@
   ghcSrc ? null, ghcVersion ? null
 , mkDerivation, base, bytestring, Cabal, containers, directory
 , extra, filepath, lib, mtl, parsec, shake, text, transformers
-, unordered-containers
+, unordered-containers, cryptohash-sha256, base16-bytestring
 , userSettings ? null
 , writeText
 }:
@@ -35,6 +35,8 @@ mkDerivation {
   executableHaskellDepends = [
     base bytestring Cabal containers directory extra filepath mtl
     parsec shake text transformers unordered-containers
+  ] ++ lib.optionals (lib.versionAtLeast ghcVersion "9.7") [
+    cryptohash-sha256 base16-bytestring
   ];
   description = "GHC build system";
   license = lib.licenses.bsd3;