From ad62b57855fcf8989d8401ba0b9e744cb6850350 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 5 Jun 2020 21:12:11 +0200 Subject: [PATCH] haskell-cabal-plan: drop obsolete patches --- .../haskell-modules/configuration-ghc-8.10.x.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 54e3557736b..4dd08bbd433 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -102,6 +102,7 @@ self: super: { # Jailbreak to fix the build. aeson-diff = doJailbreak super.aeson-diff; brick = doJailbreak super.brick; + cabal-plan = doJailbreak super.cabal-plan; cborg = doJailbreak super.cborg; cborg-json = doJailbreak super.cborg-json; exact-pi = doJailbreak super.exact-pi; @@ -126,13 +127,6 @@ self: super: { # Only 0.8 is compatible with ghc 8.10 https://hackage.haskell.org/package/apply-refact/changelog apply-refact = super.apply-refact_0_8_0_0; - # Apply patch to fix the build. - cabal-plan = appendPatch super.cabal-plan (pkgs.fetchpatch { - name = "cabal-plan-fix-for-ghc-8.10.x.patch"; - url = "https://github.com/haskell-hvr/cabal-plan/pull/55.patch"; - sha256 = "0lhs4vx5qg5ldhnyb9z7k0jmxhmd2f34x4xbwv6vsljs9vr02pd8"; - }); - # https://github.com/commercialhaskell/pantry/issues/21 pantry = appendPatch super.pantry (pkgs.fetchpatch { name = "add-cabal-3.2.x-support.patch";