From 9d300310141c824fe68b6905b7b3921ce05e0b7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Fri, 5 May 2023 19:49:09 +0200 Subject: [PATCH] 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. --- pkgs/development/compilers/ghc/head.nix | 6 +++--- pkgs/development/tools/haskell/hadrian/default.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index a2cf737a2e1..76d63c9d695 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 de10210ecd3..5911c34982b 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;