haskell/stackage
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage.git synced 2026-01-12 15:28:29 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

A bunch of patches for #237

Browse Source
This commit is contained in:
Michael Snoyman 2014-08-10 08:48:23 +03:00
parent f7e9f3ef04
commit ee141adeea
6 changed files with 104 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Stackage/Config.hs
View File

@ -467,12 +467,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/237
addRange "Michael Snoyman" "lens" "< 4.2"
addRange "Michael Snoyman" "contravariant" "< 1"
addRange "Michael Snoyman" "kan-extensions" "< 4.1"
addRange "Michael Snoyman" "adjunctions" "< 4.2"
-- https://github.com/fpco/stackage/issues/242
addRange "Michael Snoyman" "mongoDB" "< 1.5"

12
patching/patches/BlogLiterately-0.7.1.7.patch Normal file
View File

@ -0,0 +1,12 @@
diff -ruN orig/BlogLiterately.cabal new/BlogLiterately.cabal
--- orig/BlogLiterately.cabal 2014-08-10 08:43:22.242711731 +0300
+++ new/BlogLiterately.cabal 2014-08-10 08:43:22.000000000 +0300
@@ -63,7 +63,7 @@
pandoc-citeproc >= 0.1.2 && < 0.4,
highlighting-kate >= 0.5 && < 0.6,
data-default >= 0.5 && < 0.6,
- lens >= 3.8 && < 4.3
+ lens
Exposed-modules: Text.BlogLiterately
Text.BlogLiterately.Block
Text.BlogLiterately.Ghci

27
patching/patches/diagrams-builder-0.6.patch Normal file
View File

@ -0,0 +1,27 @@
diff -ruN orig/diagrams-builder.cabal new/diagrams-builder.cabal
--- orig/diagrams-builder.cabal 2014-08-10 08:43:22.462711726 +0300
+++ new/diagrams-builder.cabal 2014-08-10 08:43:22.000000000 +0300
@@ -57,7 +57,7 @@
split >= 0.2 && < 0.3,
haskell-src-exts >= 1.14 && < 1.16,
cmdargs >= 0.6 && < 0.11,
- lens >= 3.9 && < 4.3,
+ lens,
hashable >= 1.1 && < 1.3,
exceptions >= 0.3 && < 0.7
hs-source-dirs: src
@@ -100,7 +100,7 @@
diagrams-lib >= 0.6 && < 1.3,
diagrams-cairo >= 0.6 && < 1.3,
cmdargs >= 0.6 && < 0.11,
- lens >= 3.8 && < 4.3
+ lens
executable diagrams-builder-svg
main-is: diagrams-builder-svg.hs
@@ -141,4 +141,4 @@
diagrams-lib >= 0.6 && < 1.3,
diagrams-postscript >= 0.6 && < 1.2,
cmdargs >= 0.6 && < 0.11,
- lens >= 3.8 && < 4.3
+ lens

21
patching/patches/diagrams-haddock-0.2.2.10.patch Normal file
View File

@ -0,0 +1,21 @@
diff -ruN orig/diagrams-haddock.cabal new/diagrams-haddock.cabal
--- orig/diagrams-haddock.cabal 2014-08-10 08:43:22.698711721 +0300
+++ new/diagrams-haddock.cabal 2014-08-10 08:43:22.000000000 +0300
@@ -48,7 +48,7 @@
diagrams-lib >= 0.6 && < 1.3,
diagrams-svg >= 0.8.0.1 && < 1.2,
vector-space >= 0.8 && < 0.9,
- lens >= 3.8 && < 4.3,
+ lens,
cpphs >= 1.15,
cautious-file >= 1.0 && < 1.1,
uniplate >= 1.6 && < 1.7,
@@ -81,7 +81,7 @@
tasty-quickcheck >= 0.8 && < 0.9,
parsec >= 3,
haskell-src-exts >= 1.14 && < 1.16,
- lens >= 3.8 && < 4.3,
+ lens,
diagrams-haddock
hs-source-dirs: test
default-language: Haskell2010

12
patching/patches/force-layout-0.3.0.5.patch Normal file
View File

@ -0,0 +1,12 @@
diff -ruN orig/force-layout.cabal new/force-layout.cabal
--- orig/force-layout.cabal 2014-08-10 08:43:22.898711717 +0300
+++ new/force-layout.cabal 2014-08-10 08:43:22.000000000 +0300
@@ -23,7 +23,7 @@
build-depends: base >= 4.2 && < 4.8,
vector-space >=0.7 && <0.9,
vector-space-points >= 0.1.1 && < 0.3,
- lens >= 3 && < 4.3,
+ lens,
containers >=0.4 && < 0.6,
data-default-class >= 0.0.1 && < 0.1
hs-source-dirs: src

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

@ -1,6 +1,6 @@
diff -ru orig/pandoc.cabal new/pandoc.cabal
--- orig/pandoc.cabal 2014-06-30 12:44:21.647556135 +0300
+++ new/pandoc.cabal 2014-06-30 12:44:21.000000000 +0300
diff -ruN orig/pandoc.cabal new/pandoc.cabal
--- orig/pandoc.cabal 2014-08-10 08:46:45.330707408 +0300
+++ new/pandoc.cabal 2014-08-10 08:46:44.000000000 +0300
@@ -192,10 +192,6 @@
type: git
location: git://github.com/jgm/pandoc.git
@ -12,6 +12,15 @@ diff -ru orig/pandoc.cabal new/pandoc.cabal
Flag http-conduit
Description: Enable downloading of resources over https.
Default: True
@@ -223,7 +219,7 @@
random >= 1 && < 1.1,
extensible-exceptions >= 0.1 && < 0.2,
pandoc-types >= 1.12.3.3 && < 1.13,
- aeson >= 0.7 && < 0.8,
+ aeson >= 0.7 && < 0.9,
tagsoup >= 0.13.1 && < 0.14,
base64-bytestring >= 0.1 && < 1.1,
zlib >= 0.5 && < 0.6,
@@ -232,9 +228,9 @@
temporary >= 1.1 && < 1.3,
blaze-html >= 0.5 && < 0.8,
@ -35,4 +44,23 @@ diff -ru orig/pandoc.cabal new/pandoc.cabal
if os(windows)
Cpp-options: -D_WINDOWS
Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind
Only in orig/src/Text/Pandoc: Data.hsb
@@ -329,7 +321,7 @@
bytestring >= 0.9 && < 0.11,
extensible-exceptions >= 0.1 && < 0.2,
highlighting-kate >= 0.5.8 && < 0.6,
- aeson >= 0.7 && < 0.8,
+ aeson >= 0.7 && < 0.9,
yaml >= 0.8.8.2 && < 0.9,
containers >= 0.1 && < 0.6,
HTTP >= 4000.0.5 && < 4000.3
diff -ruN orig/src/Text/Pandoc/Data.hsb new/src/Text/Pandoc/Data.hsb
--- orig/src/Text/Pandoc/Data.hsb 2014-08-10 08:46:45.294707409 +0300
+++ new/src/Text/Pandoc/Data.hsb 1970-01-01 02:00:00.000000000 +0200
@@ -1,7 +0,0 @@
-{-# LANGUAGE OverloadedStrings #-}
--- to be processed using hsb2hs
-module Text.Pandoc.Data (dataFiles) where
-import qualified Data.ByteString as B
-
-dataFiles :: [(FilePath, B.ByteString)]
-dataFiles = %blobs "data"