haskell/stackage
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage.git synced 2026-01-23 20:51:57 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Patches for #236 and close

Browse Source
This commit is contained in:
Michael Snoyman 2014-06-30 12:47:10 +03:00
parent c5e2a58f29
commit cd43fe1c2c
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Stackage/Config.hs
View File

@ -430,9 +430,6 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
-- https://github.com/fpco/stackage/issues/231 -- https://github.com/fpco/stackage/issues/231
addRange "Michael Snoyman" "optparse-applicative" "< 0.9" 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 -- https://github.com/fpco/stackage/issues/237
addRange "Michael Snoyman" "lens" "< 4.2" addRange "Michael Snoyman" "lens" "< 4.2"

12
patching/patches/fb-1.0.1.patch Normal file
View File

@ -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

11
patching/patches/pandoc-1.12.4.2.patch
View File

@ -1,6 +1,6 @@
diff -ru orig/pandoc.cabal new/pandoc.cabal diff -ru orig/pandoc.cabal new/pandoc.cabal
--- orig/pandoc.cabal 2014-05-16 09:31:57.224498068 +0300 --- orig/pandoc.cabal 2014-06-30 12:44:21.647556135 +0300
+++ new/pandoc.cabal 2014-05-16 09:31:56.000000000 +0300 +++ new/pandoc.cabal 2014-06-30 12:44:21.000000000 +0300
@@ -192,10 +192,6 @@ @@ -192,10 +192,6 @@
type: git type: git
location: git://github.com/jgm/pandoc.git location: git://github.com/jgm/pandoc.git
@ -12,9 +12,12 @@ diff -ru orig/pandoc.cabal new/pandoc.cabal
Flag http-conduit Flag http-conduit
Description: Enable downloading of resources over https. Description: Enable downloading of resources over https.
Default: True 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, 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, yaml >= 0.8.8.2 && < 0.9,
- scientific >= 0.2 && < 0.3, - scientific >= 0.2 && < 0.3,
+ scientific >= 0.2 && < 0.4, + scientific >= 0.2 && < 0.4,