From cd43fe1c2cfd8175cd4360a04b9426cff3e0aae9 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 30 Jun 2014 12:47:10 +0300 Subject: [PATCH] Patches for #236 and close --- Stackage/Config.hs | 3 --- patching/patches/fb-1.0.1.patch | 12 ++++++++++++ patching/patches/pandoc-1.12.4.2.patch | 11 +++++++---- 3 files changed, 19 insertions(+), 7 deletions(-) create mode 100644 patching/patches/fb-1.0.1.patch diff --git a/Stackage/Config.hs b/Stackage/Config.hs index 9336b1ef..3b944338 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -430,9 +430,6 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do -- https://github.com/fpco/stackage/issues/231 addRange "Michael Snoyman" "optparse-applicative" "< 0.9" - -- https://github.com/fpco/stackage/issues/236 - addRange "Michael Snoyman" "attoparsec" "< 0.12" - -- https://github.com/fpco/stackage/issues/237 addRange "Michael Snoyman" "lens" "< 4.2" diff --git a/patching/patches/fb-1.0.1.patch b/patching/patches/fb-1.0.1.patch new file mode 100644 index 00000000..0f7d0078 --- /dev/null +++ b/patching/patches/fb-1.0.1.patch @@ -0,0 +1,12 @@ +diff -ru orig/fb.cabal new/fb.cabal +--- orig/fb.cabal 2014-06-30 12:41:53.267551936 +0300 ++++ new/fb.cabal 2014-06-30 12:41:52.000000000 +0300 +@@ -76,7 +76,7 @@ + , data-default + , http-types + , http-conduit >= 2.0 && < 2.2 +- , attoparsec >= 0.10.4 && < 0.12 ++ , attoparsec >= 0.10.4 && < 0.13 + , unordered-containers + , aeson >= 0.5 && < 0.8 + , base16-bytestring >= 0.1 diff --git a/patching/patches/pandoc-1.12.4.2.patch b/patching/patches/pandoc-1.12.4.2.patch index 7dabdf28..bdaa0280 100644 --- a/patching/patches/pandoc-1.12.4.2.patch +++ b/patching/patches/pandoc-1.12.4.2.patch @@ -1,6 +1,6 @@ diff -ru orig/pandoc.cabal new/pandoc.cabal ---- orig/pandoc.cabal 2014-05-16 09:31:57.224498068 +0300 -+++ new/pandoc.cabal 2014-05-16 09:31:56.000000000 +0300 +--- orig/pandoc.cabal 2014-06-30 12:44:21.647556135 +0300 ++++ new/pandoc.cabal 2014-06-30 12:44:21.000000000 +0300 @@ -192,10 +192,6 @@ type: git location: git://github.com/jgm/pandoc.git @@ -12,9 +12,12 @@ diff -ru orig/pandoc.cabal new/pandoc.cabal Flag http-conduit Description: Enable downloading of resources over https. Default: True -@@ -234,7 +230,7 @@ +@@ -232,9 +228,9 @@ + temporary >= 1.1 && < 1.3, + blaze-html >= 0.5 && < 0.8, blaze-markup >= 0.5.1 && < 0.7, - attoparsec >= 0.10 && < 0.12, +- attoparsec >= 0.10 && < 0.12, ++ attoparsec >= 0.10 && < 0.13, yaml >= 0.8.8.2 && < 0.9, - scientific >= 0.2 && < 0.3, + scientific >= 0.2 && < 0.4,