git.iko.soy/stackage
on master help sign in
Patches for #236 and close
commitcd43fe1c2cfd8175cd4360a04b9426cff3e0aae9 authorMichael Snoyman <michael@snoyman.com> dateMon 30 Jun 2014, 12:47 (12 years ago) parentc5e2a58
3 files changed+19−7
compare with master
unifiedsplit
Stackage/Config.hs−3 patching/patches/fb-1.0.1.patch+12 patching/patches/pandoc-1.12.4.2.patch+7−4
Stackage/Config.hs−3
@@ -430,9 +430,6 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
430430 -- https://github.com/fpco/stackage/issues/231
431431 addRange "Michael Snoyman" "optparse-applicative" "< 0.9"
432432
433− -- https://github.com/fpco/stackage/issues/236
434− addRange "Michael Snoyman" "attoparsec" "< 0.12"
435−
436433 -- https://github.com/fpco/stackage/issues/237
437434 addRange "Michael Snoyman" "lens" "< 4.2"
438435
patching/patches/fb-1.0.1.patchnew file+12
@@ -0,0 +1,12 @@
1+diff -ru orig/fb.cabal new/fb.cabal
2+--- orig/fb.cabal 2014-06-30 12:41:53.267551936 +0300
3++++ new/fb.cabal 2014-06-30 12:41:52.000000000 +0300
4+@@ -76,7 +76,7 @@
5+ , data-default
6+ , http-types
7+ , http-conduit >= 2.0 && < 2.2
8+- , attoparsec >= 0.10.4 && < 0.12
9++ , attoparsec >= 0.10.4 && < 0.13
10+ , unordered-containers
11+ , aeson >= 0.5 && < 0.8
12+ , base16-bytestring >= 0.1
patching/patches/pandoc-1.12.4.2.patch+7−4
@@ -1,6 +1,6 @@
11diff -ru orig/pandoc.cabal new/pandoc.cabal
2−--- orig/pandoc.cabal 2014-05-16 09:31:57.224498068 +0300
3−+++ new/pandoc.cabal 2014-05-16 09:31:56.000000000 +0300
2+--- orig/pandoc.cabal 2014-06-30 12:44:21.647556135 +0300
3++++ new/pandoc.cabal 2014-06-30 12:44:21.000000000 +0300
44@@ -192,10 +192,6 @@
55 type: git
66 location: git://github.com/jgm/pandoc.git
@@ -12,9 +12,12 @@ diff -ru orig/pandoc.cabal new/pandoc.cabal
1212 Flag http-conduit
1313 Description: Enable downloading of resources over https.
1414 Default: True
15−@@ -234,7 +230,7 @@
15+@@ -232,9 +228,9 @@
16+ temporary >= 1.1 && < 1.3,
17+ blaze-html >= 0.5 && < 0.8,
1618 blaze-markup >= 0.5.1 && < 0.7,
17− attoparsec >= 0.10 && < 0.12,
19+- attoparsec >= 0.10 && < 0.12,
20++ attoparsec >= 0.10 && < 0.13,
1821 yaml >= 0.8.8.2 && < 0.9,
1922- scientific >= 0.2 && < 0.3,
2023+ scientific >= 0.2 && < 0.4,