From ba976c728dd0422abc98f0b9b81f613d7dab17a1 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 22 Dec 2025 22:09:46 +0100 Subject: [PATCH] haskellPackages.call-stack: fix tests with GHC>=9.10 --- .../haskell-modules/configuration-common.nix | 10 ++++++++++ .../haskell-modules/configuration-ghc-9.10.x.nix | 1 - .../haskell-modules/configuration-ghc-9.12.x.nix | 2 -- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2cd32ca78e9ba..d3725c918f054 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -648,6 +648,16 @@ with haskellLib; # https://github.com/awakesecurity/nix-deploy/issues/35 nix-deploy = doJailbreak super.nix-deploy; + call-stack = appendPatches [ + # Fixes test suites with GHC >= 9.10 + (pkgs.fetchpatch { + name = "call-stack-tests-normalize-pkg-name.patch"; + url = "https://github.com/sol/call-stack/commit/cbbee23ce309d18201951e16a8b6d30b57e2bdf9.patch"; + sha256 = "sha256-xkdjf8zXW+UMxot2Z8WYYmvAJsT+VGKXWGt19mZZwCg="; + includes = [ "test/Data/CallStackSpec.hs" ]; + }) + ] super.call-stack; + # Too strict upper bound on algebraic-graphs # https://github.com/awakesecurity/nix-graph/issues/5 nix-graph = doJailbreak super.nix-graph; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix index ca028a6364789..66942b6809d40 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix @@ -88,7 +88,6 @@ in # # Test suite issues # - call-stack = dontCheck super.call-stack; # https://github.com/sol/call-stack/issues/19 monad-dijkstra = dontCheck super.monad-dijkstra; # needs hlint 3.10 # Workaround https://github.com/haskell/haskell-language-server/issues/4674 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 9b6a04bd8b821..51f9eb8df6493 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix @@ -106,8 +106,6 @@ with haskellLib; # Test suite issues # - call-stack = dontCheck super.call-stack; # https://github.com/sol/call-stack/issues/19 - relude = dontCheck super.relude; # https://gitlab.haskell.org/ghc/ghc/-/issues/25930