From 62079ef824f6f8673877203d89892a10c6acdd86 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 Sep 2017 09:48:10 +0200 Subject: [PATCH] haskell-pandoc: new versions compile with Cabal 2.x out of the box --- .../haskell-modules/configuration-ghc-8.2.x.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index 39b2ff9d67c..c44edf6b02a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -71,18 +71,6 @@ self: super: { # https://github.com/aristidb/aws/issues/238 aws = doJailbreak super.aws; - # https://github.com/jgm/pandoc/issues/3876 - pandoc = let fixSetup = pkgs.fetchpatch { - url = "https://github.com/jgm/pandoc/pull/3899.patch"; - sha256 = "0lk9vs2l1wc1kr0y8fkdcarfi4sjd3dl81r52n39r25xx9kqawv7"; - }; - in overrideCabal super.pandoc (drv: { - editedCabalFile = null; - patches = drv.patches or [] ++ [fixSetup]; - setupHaskellDepends = drv.setupHaskellDepends or [self.Cabal_1_24_2_0]; - preCompileBuildDriver = "setupCompileFlags+=' -package=Cabal-1.24.2.0'"; - }); - # LTS-9 versions do not compile. path = dontCheck super.path; path-io = super.path-io_1_3_3;