From bc242d50b4ed74acf0263621d5c49e3f183ceda5 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 13 Feb 2024 00:58:26 +0100 Subject: haskellPackages.matterhorn: 50200.19.0 -> 90000.0.0 --- .../haskell-modules/configuration-common.nix | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'pkgs/development/haskell-modules/configuration-common.nix') 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 -- cgit 1.4.1