summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2017-09-14 09:48:10 +0200
committerPeter Simons <simons@cryp.to>2017-09-14 15:25:46 +0200
commit62079ef824f6f8673877203d89892a10c6acdd86 (patch)
tree0da7935ecccb8d690a5d1ef6a476ef9da8e2325e /pkgs/development
parent88630c94ae94c2b3674a402342c52e6131b14824 (diff)
downloadnixlib-62079ef824f6f8673877203d89892a10c6acdd86.tar
nixlib-62079ef824f6f8673877203d89892a10c6acdd86.tar.gz
nixlib-62079ef824f6f8673877203d89892a10c6acdd86.tar.bz2
nixlib-62079ef824f6f8673877203d89892a10c6acdd86.tar.lz
nixlib-62079ef824f6f8673877203d89892a10c6acdd86.tar.xz
nixlib-62079ef824f6f8673877203d89892a10c6acdd86.tar.zst
nixlib-62079ef824f6f8673877203d89892a10c6acdd86.zip
haskell-pandoc: new versions compile with Cabal 2.x out of the box
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix12
1 files changed, 0 insertions, 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 39b2ff9d67c3..c44edf6b02a3 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;