about summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-common.nix
diff options
context:
space:
mode:
authormaralorn <mail@maralorn.de>2024-03-10 12:38:12 +0100
committermaralorn <mail@maralorn.de>2024-03-10 12:38:34 +0100
commite6bc4928bc0b4764ef848333a9132fb8ee1eeb4d (patch)
tree572d2c7174d27a2711c1043199894b3d0972fd37 /pkgs/development/haskell-modules/configuration-common.nix
parent7e08b93df2ac3598e2b5158ba76bda5e589e91d6 (diff)
downloadnixlib-e6bc4928bc0b4764ef848333a9132fb8ee1eeb4d.tar
nixlib-e6bc4928bc0b4764ef848333a9132fb8ee1eeb4d.tar.gz
nixlib-e6bc4928bc0b4764ef848333a9132fb8ee1eeb4d.tar.bz2
nixlib-e6bc4928bc0b4764ef848333a9132fb8ee1eeb4d.tar.lz
nixlib-e6bc4928bc0b4764ef848333a9132fb8ee1eeb4d.tar.xz
nixlib-e6bc4928bc0b4764ef848333a9132fb8ee1eeb4d.tar.zst
nixlib-e6bc4928bc0b4764ef848333a9132fb8ee1eeb4d.zip
haskellPackages.ghc-debug-brick: Fix build
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix16
1 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 795258b48fca..30fc5988f097 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -260,8 +260,20 @@ self: super: {
   ghcjs-base = null;
   ghcjs-prim = null;
 
-  # 2023-04-17: https://gitlab.haskell.org/ghc/ghc-debug/-/issues/20
-  ghc-debug-brick = doJailbreak super.ghc-debug-brick;
+  # 2024-03-10: Compatibility fixes have been applied upstream, but are unreleased.
+  ghc-debug-brick = appendPatches [
+      (fetchpatch {
+        url = "https://gitlab.haskell.org/ghc/ghc-debug/-/commit/4f195b98a8d3159bd4586af49ea8e269214a848e.patch";
+        sha256 = "sha256-ZMxDkkI365w/qtRc21k9UTcIiTjoOd/BGJgt/6C6P6A=";
+        relative = "ghc-debug-brick";
+        includes = ["ghc-debug-brick.cabal"];
+      })
+      (fetchpatch {
+        url = "https://gitlab.haskell.org/ghc/ghc-debug/-/commit/5b8f848b82ea4c5a1867b9965a973e73e5d58dad.patch";
+        sha256 = "sha256-XydmqScUuXyxqvW1HeKlKiiGFQi/MkM81RMPxmADrhw=";
+        relative = "ghc-debug-brick";
+      })
+    ] super.ghc-debug-brick;
 
   # Test failure.  Tests also disabled in Stackage:
   # https://github.com/jtdaugherty/brick/issues/499