summary refs log tree commit diff
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2014-01-26 13:41:13 -0500
committerShea Levy <shea@shealevy.com>2014-01-26 13:41:13 -0500
commit66e789d199cd03704db10bd2163f24756b74baf5 (patch)
treec73517bb2ed48f13a3941d7ca605d0bef8b9b579
parent51a4bf7ae0aa2f77131a0e6f4716d74b361485c5 (diff)
downloadnixpkgs-66e789d199cd03704db10bd2163f24756b74baf5.tar
nixpkgs-66e789d199cd03704db10bd2163f24756b74baf5.tar.gz
nixpkgs-66e789d199cd03704db10bd2163f24756b74baf5.tar.bz2
nixpkgs-66e789d199cd03704db10bd2163f24756b74baf5.tar.lz
nixpkgs-66e789d199cd03704db10bd2163f24756b74baf5.tar.xz
nixpkgs-66e789d199cd03704db10bd2163f24756b74baf5.tar.zst
nixpkgs-66e789d199cd03704db10bd2163f24756b74baf5.zip
trifecta-1.1: Fix compilation with new blaze
Note that jailbreak-cabal breaks the cabal file for trifecta (cc @peti)

Signed-off-by: Shea Levy <shea@shealevy.com>
-rw-r--r--pkgs/development/libraries/haskell/trifecta/1.1.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/libraries/haskell/trifecta/1.1.nix b/pkgs/development/libraries/haskell/trifecta/1.1.nix
index 98772476fc0..67c3ae28d58 100644
--- a/pkgs/development/libraries/haskell/trifecta/1.1.nix
+++ b/pkgs/development/libraries/haskell/trifecta/1.1.nix
@@ -16,7 +16,8 @@ cabal.mkDerivation (self: {
   testDepends = [ doctest filepath ];
   postPatch = ''
     substituteInPlace trifecta.cabal \
-      --replace "blaze-html           >= 0.5     && < 0.6," "blaze-html           >= 0.5     && < 0.7," \
+      --replace "blaze-html           >= 0.5     && < 0.6," "blaze-html           >= 0.5     && < 0.8," \
+      --replace "blaze-markup         >= 0.5     && < 0.6," "blaze-markup         >= 0.5     && < 0.7," \
       --replace "hashable             >= 1.2     && < 1.3," "hashable             >= 1.1     && < 1.3," \
       --replace "fingertree           >= 0.0.1   && < 0.1," "fingertree           >= 0.0.1   && < 0.2," \
       --replace "comonad              == 3.*,"              "comonad              >= 3       && < 5," \