diff options
author | Katharina Fey <kookie@spacekookie.de> | 2020-06-13 07:10:12 +0200 |
---|---|---|
committer | Katharina Fey <kookie@spacekookie.de> | 2020-06-13 07:10:12 +0200 |
commit | de94c6c62e2f86b3667386a42690d6bb376a2f58 (patch) | |
tree | 2b4bc87db0d46095a7aff46635227a0d7d4b9e06 /nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | |
parent | 880bc0f8c1c70c65fd97d722a81d834ce43fbcd4 (diff) | |
parent | 029a5de08390bb03c3f44230b064fd1850c6658a (diff) |
Merge commit '029a5de08390bb03c3f44230b064fd1850c6658a'
Diffstat (limited to 'nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix')
-rw-r--r-- | nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 54e3557736b..4dd08bbd433 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/nixpkgs/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"; |