From 861a5305c0cc62d737ec03e46539d2bfe02ce317 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 19 Apr 2025 22:34:08 +0200 Subject: [PATCH 1/3] haskell.packages.ghc9122.interpolate: disable tests due to GHC bug --- .../haskell-modules/configuration-ghc-9.12.x.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix index e2d5923607c1c..9d6674c5c4ae1 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix @@ -173,6 +173,13 @@ with haskellLib; # https://github.com/sjakobi/newtype-generics/pull/28/files newtype-generics = warnAfterVersion "0.6.2" (doJailbreak super.newtype-generics); + # Test failure because of GHC bug: + # https://gitlab.haskell.org/ghc/ghc/-/issues/25937 + # https://github.com/sol/interpolate/issues/20 + interpolate = + assert super.ghc.version == "9.12.2"; + dontCheck super.interpolate; + # # Multiple issues # From c3857c6972cff6a9c4026e53788ff4b29d4c07f8 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 19 Apr 2025 22:42:48 +0200 Subject: [PATCH 2/3] haskell.packages.ghc9122.hpack: 0.37.0 -> 0.38.0 Comes with a jailbreak for Cabal 3.14. --- pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix index 9d6674c5c4ae1..f758eb0d53c4a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix @@ -211,4 +211,7 @@ with haskellLib; } ) ); + + # Allow Cabal 3.14 + hpack = doDistribute self.hpack_0_38_0; } From a7ab1a41e9e602d2a507c0a87d08d206752bfe3c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 23 Apr 2025 18:26:32 +0200 Subject: [PATCH 3/3] haskellPackages.cabal2nix-unstable: 2025-04-22 -> 2025-04-23 --- pkgs/development/haskell-modules/cabal2nix-unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index 4a212e7f76d9d..e9bd6d1518d05 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -35,10 +35,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2025-04-22"; + version = "unstable-2025-04-23"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/e6ed81965def7775aabdda7456d0c13f626295ee.tar.gz"; - sha256 = "1fh428r4wfrqjj77dxy1l3d9scm4ywz89rp7dhp07y3bq5yr7hs4"; + url = "https://github.com/NixOS/cabal2nix/archive/43fbd58ec8ef82c4fa627c89218d215442bcc3ac.tar.gz"; + sha256 = "1620iaxs99rjq15v01xhqjzalvdbk7d69w7bz1ih782g7jqhkqsq"; }; postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot"; isLibrary = true;