From 7a10ebe3612ac71232052124fad9f1a00f7d950f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 8 May 2020 11:14:36 +0200 Subject: [PATCH] haskell-pantry: apply upstream patch to fix the build with ghc-8.10.x --- .../haskell-modules/configuration-ghc-8.10.x.nix | 8 ++++++++ 1 file changed, 8 insertions(+) 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 7715705a27e..ff5f1e55063 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -138,4 +138,12 @@ self: super: { ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex super.ghc-lib-parser; }; + # https://github.com/commercialhaskell/pantry/issues/21 + pantry = appendPatch super.pantry (pkgs.fetchpatch { + name = "add-cabal-3.2.x-support.patch"; + url = "https://patch-diff.githubusercontent.com/raw/commercialhaskell/pantry/pull/22.patch"; + sha256 = "198hsfjsy83s7rp71llf05cwa3vkm74g73djg5p4sk4awm9s6vf2"; + excludes = ["package.yaml"]; + }); + }