about summary refs log tree commit diff
diff options
context:
space:
mode:
authormaralorn <mail@maralorn.de>2024-04-23 00:28:01 +0200
committermaralorn <mail@maralorn.de>2024-04-23 00:28:01 +0200
commit1c8747bc8c51518ce0467a80212c04ee0b6406f6 (patch)
tree1aa8647659c7cdeabdffe9f6342c0e24e78a9816
parentc4192037f7febee4b23b6aefc7a81f9f35189cb9 (diff)
haskellPackages.ghc-debug-brick: Fix build
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix15
1 files changed, 1 insertions, 14 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f629e35bc9a5b..6fdbda02c4d1d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -270,20 +270,7 @@ self: super: {
   ghcjs-base = null;
   ghcjs-prim = null;
 
-  # 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;
+  ghc-debug-client = doJailbreak super.ghc-debug-client;
 
   # Test failure.  Tests also disabled in Stackage:
   # https://github.com/jtdaugherty/brick/issues/499