about summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-common.nix
diff options
context:
space:
mode:
authorRobert Hensing <robert@roberthensing.nl>2024-02-13 00:58:26 +0100
committerRobert Hensing <robert@roberthensing.nl>2024-02-13 01:32:58 +0100
commitbc242d50b4ed74acf0263621d5c49e3f183ceda5 (patch)
treed8eabcde1baf17d784be1a7a3f7a1e4a2eb49fe1 /pkgs/development/haskell-modules/configuration-common.nix
parent45efe09c2dcd404864f7a664528a6e4ed35879a4 (diff)
downloadnixlib-bc242d50b4ed74acf0263621d5c49e3f183ceda5.tar
nixlib-bc242d50b4ed74acf0263621d5c49e3f183ceda5.tar.gz
nixlib-bc242d50b4ed74acf0263621d5c49e3f183ceda5.tar.bz2
nixlib-bc242d50b4ed74acf0263621d5c49e3f183ceda5.tar.lz
nixlib-bc242d50b4ed74acf0263621d5c49e3f183ceda5.tar.xz
nixlib-bc242d50b4ed74acf0263621d5c49e3f183ceda5.tar.zst
nixlib-bc242d50b4ed74acf0263621d5c49e3f183ceda5.zip
haskellPackages.matterhorn: 50200.19.0 -> 90000.0.0
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix21
1 files changed, 1 insertions, 20 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 74d1fb8c7570..ce2fe4adcca1 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -495,26 +495,7 @@ self: super: {
   # 2023-04-20: Restrictive bytestring bound in tests.
   storablevector = doJailbreak super.storablevector;
 
-  # Need following changes from develop branch:
-  # - vty >= 6 (& pals) support
-  # Unreasonably difficult to apply as patches
-  matterhorn = lib.pipe
-    super.matterhorn
-    [
-      doJailbreak
-      (overrideSrc {
-        version = "unstable-2024-01-11";
-        src = pkgs.fetchFromGitHub {
-          owner = "matterhorn-chat";
-          repo = "matterhorn";
-          rev = lib.warnIf
-            (super.matterhorn.version != "50200.19.0")
-            "matterhorn on Hackage may have caught up with our pinned commit"
-            "66d23291a1c748e568908b91b1109ed17b6d86e9";
-          sha256 = "0djawpp0zvvc2v020k6p4chvd1dlmcs0fa3d4wlr0cmkha40flpb";
-        };
-      })
-    ];
+  matterhorn = doJailbreak super.matterhorn;
 
   # Too strict bounds on transformers and resourcet
   # https://github.com/alphaHeavy/lzma-conduit/issues/23