about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2017-12-19 15:57:15 +0100
committerPeter Simons <simons@cryp.to>2017-12-20 09:17:45 +0100
commit46351ad4b772ef1b89fce157afade47151333ad0 (patch)
tree4b2bb8674ba94ef3b4f0a497ff4794a34300088e /pkgs
parentd5676b04331efa730aa86c6a3c6cc0769b44a1e1 (diff)
downloadnixlib-46351ad4b772ef1b89fce157afade47151333ad0.tar
nixlib-46351ad4b772ef1b89fce157afade47151333ad0.tar.gz
nixlib-46351ad4b772ef1b89fce157afade47151333ad0.tar.bz2
nixlib-46351ad4b772ef1b89fce157afade47151333ad0.tar.lz
nixlib-46351ad4b772ef1b89fce157afade47151333ad0.tar.xz
nixlib-46351ad4b772ef1b89fce157afade47151333ad0.tar.zst
nixlib-46351ad4b772ef1b89fce157afade47151333ad0.zip
haskell-pandoc: drop obsolete constraints
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix20
1 files changed, 0 insertions, 20 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c8cba69cf654..66abc59664c9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -498,26 +498,6 @@ self: super: {
   # https://github.com/junjihashimoto/test-sandbox-compose/issues/2
   test-sandbox-compose = dontCheck super.test-sandbox-compose;
 
-  # Relax overspecified constraints. Unfortunately, jailbreak won't work.
-  pandoc = overrideCabal super.pandoc (drv: {
-    preConfigure = "sed -i -e 's,time .* < 1.6,time >= 1.5,' -e 's,haddock-library >= 1.1 && < 1.3,haddock-library >= 1.1,' pandoc.cabal";
-  });
-
-  # pandoc 2 dependency resolution
-  hslua_0_9_3 = super.hslua_0_9_3.override { lua5_1 = pkgs.lua5_3; };
-  hslua-module-text = super.hslua-module-text.override { hslua = self.hslua_0_9_3; };
-  texmath_0_10 = super.texmath_0_10.override { pandoc-types = self.pandoc-types_1_17_3; };
-  pandoc_2_0_5 = super.pandoc_2_0_5.override {
-    doctemplates = self.doctemplates_0_2_1;
-    pandoc-types = self.pandoc-types_1_17_3;
-    skylighting = self.skylighting_0_4_4_1;
-    texmath = self.texmath_0_10;
-  };
-  pandoc-citeproc_0_12_1_1 = super.pandoc-citeproc_0_12_1_1.override {
-    pandoc = self.pandoc_2_0_5;
-    pandoc-types = self.pandoc-types_1_17_3;
-  };
-
   # https://github.com/tych0/xcffib/issues/37
   xcffib = dontCheck super.xcffib;