git.iko.soy/stackage
on master help sign in
A bunch of patches for #237
commitee141adeea200ada177ea57d4d728666952676c4 authorMichael Snoyman <michael@snoyman.com> dateSun 10 Aug 2014, 08:48 (12 years ago) parentf7e9f3e
6 files changed+104−10
compare with master
unifiedsplit
Stackage/Config.hs−6 patching/patches/BlogLiterately-0.7.1.7.patch+12 patching/patches/diagrams-builder-0.6.patch+27 patching/patches/diagrams-haddock-0.2.2.10.patch+21 patching/patches/force-layout-0.3.0.5.patch+12 patching/patches/pandoc-1.12.4.2.patch+32−4
Stackage/Config.hs−6
@@ -467,12 +467,6 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
467467 -- https://github.com/fpco/stackage/issues/231
468468 addRange "Michael Snoyman" "optparse-applicative" "< 0.9"
469469
470− -- https://github.com/fpco/stackage/issues/237
471− addRange "Michael Snoyman" "lens" "< 4.2"
472− addRange "Michael Snoyman" "contravariant" "< 1"
473− addRange "Michael Snoyman" "kan-extensions" "< 4.1"
474− addRange "Michael Snoyman" "adjunctions" "< 4.2"
475−
476470 -- https://github.com/fpco/stackage/issues/242
477471 addRange "Michael Snoyman" "mongoDB" "< 1.5"
478472
patching/patches/BlogLiterately-0.7.1.7.patchnew file+12
@@ -0,0 +1,12 @@
1+diff -ruN orig/BlogLiterately.cabal new/BlogLiterately.cabal
2+--- orig/BlogLiterately.cabal 2014-08-10 08:43:22.242711731 +0300
3++++ new/BlogLiterately.cabal 2014-08-10 08:43:22.000000000 +0300
4+@@ -63,7 +63,7 @@
5+ pandoc-citeproc >= 0.1.2 && < 0.4,
6+ highlighting-kate >= 0.5 && < 0.6,
7+ data-default >= 0.5 && < 0.6,
8+- lens >= 3.8 && < 4.3
9++ lens
10+ Exposed-modules: Text.BlogLiterately
11+ Text.BlogLiterately.Block
12+ Text.BlogLiterately.Ghci
patching/patches/diagrams-builder-0.6.patchnew file+27
@@ -0,0 +1,27 @@
1+diff -ruN orig/diagrams-builder.cabal new/diagrams-builder.cabal
2+--- orig/diagrams-builder.cabal 2014-08-10 08:43:22.462711726 +0300
3++++ new/diagrams-builder.cabal 2014-08-10 08:43:22.000000000 +0300
4+@@ -57,7 +57,7 @@
5+ split >= 0.2 && < 0.3,
6+ haskell-src-exts >= 1.14 && < 1.16,
7+ cmdargs >= 0.6 && < 0.11,
8+- lens >= 3.9 && < 4.3,
9++ lens,
10+ hashable >= 1.1 && < 1.3,
11+ exceptions >= 0.3 && < 0.7
12+ hs-source-dirs: src
13+@@ -100,7 +100,7 @@
14+ diagrams-lib >= 0.6 && < 1.3,
15+ diagrams-cairo >= 0.6 && < 1.3,
16+ cmdargs >= 0.6 && < 0.11,
17+- lens >= 3.8 && < 4.3
18++ lens
19+
20+ executable diagrams-builder-svg
21+ main-is: diagrams-builder-svg.hs
22+@@ -141,4 +141,4 @@
23+ diagrams-lib >= 0.6 && < 1.3,
24+ diagrams-postscript >= 0.6 && < 1.2,
25+ cmdargs >= 0.6 && < 0.11,
26+- lens >= 3.8 && < 4.3
27++ lens
patching/patches/diagrams-haddock-0.2.2.10.patchnew file+21
@@ -0,0 +1,21 @@
1+diff -ruN orig/diagrams-haddock.cabal new/diagrams-haddock.cabal
2+--- orig/diagrams-haddock.cabal 2014-08-10 08:43:22.698711721 +0300
3++++ new/diagrams-haddock.cabal 2014-08-10 08:43:22.000000000 +0300
4+@@ -48,7 +48,7 @@
5+ diagrams-lib >= 0.6 && < 1.3,
6+ diagrams-svg >= 0.8.0.1 && < 1.2,
7+ vector-space >= 0.8 && < 0.9,
8+- lens >= 3.8 && < 4.3,
9++ lens,
10+ cpphs >= 1.15,
11+ cautious-file >= 1.0 && < 1.1,
12+ uniplate >= 1.6 && < 1.7,
13+@@ -81,7 +81,7 @@
14+ tasty-quickcheck >= 0.8 && < 0.9,
15+ parsec >= 3,
16+ haskell-src-exts >= 1.14 && < 1.16,
17+- lens >= 3.8 && < 4.3,
18++ lens,
19+ diagrams-haddock
20+ hs-source-dirs: test
21+ default-language: Haskell2010
patching/patches/force-layout-0.3.0.5.patchnew file+12
@@ -0,0 +1,12 @@
1+diff -ruN orig/force-layout.cabal new/force-layout.cabal
2+--- orig/force-layout.cabal 2014-08-10 08:43:22.898711717 +0300
3++++ new/force-layout.cabal 2014-08-10 08:43:22.000000000 +0300
4+@@ -23,7 +23,7 @@
5+ build-depends: base >= 4.2 && < 4.8,
6+ vector-space >=0.7 && <0.9,
7+ vector-space-points >= 0.1.1 && < 0.3,
8+- lens >= 3 && < 4.3,
9++ lens,
10+ containers >=0.4 && < 0.6,
11+ data-default-class >= 0.0.1 && < 0.1
12+ hs-source-dirs: src
patching/patches/pandoc-1.12.4.2.patch+32−4
@@ -1,6 +1,6 @@
1−diff -ru orig/pandoc.cabal new/pandoc.cabal
2−--- orig/pandoc.cabal 2014-06-30 12:44:21.647556135 +0300
3−+++ new/pandoc.cabal 2014-06-30 12:44:21.000000000 +0300
1+diff -ruN orig/pandoc.cabal new/pandoc.cabal
2+--- orig/pandoc.cabal 2014-08-10 08:46:45.330707408 +0300
3++++ new/pandoc.cabal 2014-08-10 08:46:44.000000000 +0300
44@@ -192,10 +192,6 @@
55 type: git
66 location: git://github.com/jgm/pandoc.git
@@ -12,6 +12,15 @@ diff -ru orig/pandoc.cabal new/pandoc.cabal
1212 Flag http-conduit
1313 Description: Enable downloading of resources over https.
1414 Default: True
15+@@ -223,7 +219,7 @@
16+ random >= 1 && < 1.1,
17+ extensible-exceptions >= 0.1 && < 0.2,
18+ pandoc-types >= 1.12.3.3 && < 1.13,
19+- aeson >= 0.7 && < 0.8,
20++ aeson >= 0.7 && < 0.9,
21+ tagsoup >= 0.13.1 && < 0.14,
22+ base64-bytestring >= 0.1 && < 1.1,
23+ zlib >= 0.5 && < 0.6,
1524@@ -232,9 +228,9 @@
1625 temporary >= 1.1 && < 1.3,
1726 blaze-html >= 0.5 && < 0.8,
@@ -35,4 +44,23 @@ diff -ru orig/pandoc.cabal new/pandoc.cabal
3544 if os(windows)
3645 Cpp-options: -D_WINDOWS
3746 Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind
38−Only in orig/src/Text/Pandoc: Data.hsb
47+@@ -329,7 +321,7 @@
48+ bytestring >= 0.9 && < 0.11,
49+ extensible-exceptions >= 0.1 && < 0.2,
50+ highlighting-kate >= 0.5.8 && < 0.6,
51+- aeson >= 0.7 && < 0.8,
52++ aeson >= 0.7 && < 0.9,
53+ yaml >= 0.8.8.2 && < 0.9,
54+ containers >= 0.1 && < 0.6,
55+ HTTP >= 4000.0.5 && < 4000.3
56+diff -ruN orig/src/Text/Pandoc/Data.hsb new/src/Text/Pandoc/Data.hsb
57+--- orig/src/Text/Pandoc/Data.hsb 2014-08-10 08:46:45.294707409 +0300
58++++ new/src/Text/Pandoc/Data.hsb 1970-01-01 02:00:00.000000000 +0200
59+@@ -1,7 +0,0 @@
60+-{-# LANGUAGE OverloadedStrings #-}
61+--- to be processed using hsb2hs
62+-module Text.Pandoc.Data (dataFiles) where
63+-import qualified Data.ByteString as B
64+-
65+-dataFiles :: [(FilePath, B.ByteString)]
66+-dataFiles = %blobs "data"