From dd75aa6b9ba76ec0b8c9ac161b891b518f70d3da Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 17 Nov 2020 01:22:06 +0100 Subject: [PATCH] haskellPackages.stack: Fix build of dependencies * persistent-sqlite * pantry --- pkgs/development/haskell-modules/configuration-common.nix | 2 ++ .../haskell-modules/configuration-ghc-8.10.x.nix | 8 -------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b4f240e7595b..b0aba7df518e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1423,4 +1423,6 @@ self: super: { # https://github.com/haskell/hackage-security/issues/247 hackage-security = dontCheck super.hackage-security; + # 2020-11-17: persistent-test is ahead of the persistent version in stack + persistent-sqlite = dontCheck super.persistent-sqlite; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super 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 c796b76ab1c8..5080472666b4 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -83,14 +83,6 @@ self: super: { sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; }); - # 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"]; - }); - # hnix 0.9.0 does not provide an executable for ghc < 8.10, so define completions here for now. hnix = generateOptparseApplicativeCompletion "hnix" (overrideCabal super.hnix (drv: {