5a5abd6 · stackage · git.iko.soy

Stackage/Config.hs+6−14

compare with master

unifiedsplit

@@ -190,6 +190,9 @@ defaultExpectedFailures ghcVer = execWriter $ do

190 -- Requires too new a version of time

191 when (ghcVer < GhcMajorVersion 7 8) $ add "cookie"

192

193+ -- Restrictive checkers upper bound in test suite

194+ add "incremental-parser"

195+

193 where

196 where

194 add = tell . singleton . PackageName

197 add = tell . singleton . PackageName

195

198

@@ -212,13 +215,6 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do

212 , "bzlib-conduit case-insensitive"

215 , "bzlib-conduit case-insensitive"

213 , "conduit-extra conduit-combinators yesod-websockets"

216 , "conduit-extra conduit-combinators yesod-websockets"

214 ]

217 ]

215− -- Temporary upper bounds while persistent2 is tested

216− addRange "Michael Snoyman" "persistent" "< 2"

217− addRange "Michael Snoyman" "persistent-mysql" "< 2"

218− addRange "Michael Snoyman" "persistent-template" "< 2"

219− addRange "Michael Snoyman" "persistent-postgresql" "< 2"

220− addRange "Michael Snoyman" "persistent-mongoDB" "< 2"

221− addRange "Michael Snoyman" "persistent-sqlite" "< 2"

222

218

223 -- https://github.com/fpco/stackage/issues/261

219 -- https://github.com/fpco/stackage/issues/261

224 addRange "Michael Snoyman" "cabal-install" $

220 addRange "Michael Snoyman" "cabal-install" $

@@ -258,7 +254,6 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do

258 ]

254 ]

259

255

260 -- Deprecated version

256 -- Deprecated version

261− addRange "FP Complete <michael@fpcomplete.com>" "persistent-mongoDB" "< 1.3.1 || > 1.3.1"

262 when (ghcVer < GhcMajorVersion 7 6) $ do

257 when (ghcVer < GhcMajorVersion 7 6) $ do

263 when requireHP $ do

258 when requireHP $ do

264 addRange "FP Complete <michael@fpcomplete.com>" "hxt" "<= 9.3.0.1"

259 addRange "FP Complete <michael@fpcomplete.com>" "hxt" "<= 9.3.0.1"

@@ -351,8 +346,10 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do

351

346

352 mapM_ (add "Patrick Brisbin") $ words "gravatar"

347 mapM_ (add "Patrick Brisbin") $ words "gravatar"

353

348

349+ {- persistent 2.0/conduit 1.2

354 mapM_ (add "Felipe Lessa <felipe.lessa@gmail.com>") $ words

350 mapM_ (add "Felipe Lessa <felipe.lessa@gmail.com>") $ words

355 "esqueleto fb fb-persistent yesod-fb yesod-auth-fb"

351 "esqueleto fb fb-persistent yesod-fb yesod-auth-fb"

352+ -}

356

353

357 mapM_ (add "Alexander Altman <alexanderaltman@me.com>") $ words

354 mapM_ (add "Alexander Altman <alexanderaltman@me.com>") $ words

358 "base-unicode-symbols containers-unicode-symbols"

355 "base-unicode-symbols containers-unicode-symbols"

@@ -501,17 +498,11 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do

501 addRange "Michael Snoyman" "pandoc" "== 1.12.4.2"

498 addRange "Michael Snoyman" "pandoc" "== 1.12.4.2"

502 addRange "Michael Snoyman" "texmath" "<= 0.6.6.3"

499 addRange "Michael Snoyman" "texmath" "<= 0.6.6.3"

503

500

504− -- https://github.com/fpco/stackage/issues/242

505− addRange "Michael Snoyman" "mongoDB" "< 1.6"

506−

507 -- Requires too new a version of text

501 -- Requires too new a version of text

508 when (ghcVer == GhcMajorVersion 7 4 && requireHP) $ do

502 when (ghcVer == GhcMajorVersion 7 4 && requireHP) $ do

509 addRange "Michael Snoyman" "attoparsec" "< 0.11.2.1"

503 addRange "Michael Snoyman" "attoparsec" "< 0.11.2.1"

510 addRange "Michael Snoyman" "parsers" "< 0.11"

504 addRange "Michael Snoyman" "parsers" "< 0.11"

511

505

512− -- local patch

513− addRange "Michael Snoyman" "bson" "== 0.2.4"

514−

515 -- 0.16.2 fixes dependency issues with different version of GHC

506 -- 0.16.2 fixes dependency issues with different version of GHC

516 -- and Haskell Platform. Now builds on GHC 7.4-7.8. Version 1.0 is

507 -- and Haskell Platform. Now builds on GHC 7.4-7.8. Version 1.0 is

517 -- guaranteed to break the API. See

508 -- guaranteed to break the API. See

@@ -532,6 +523,7 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do

532

523

533 -- https://github.com/fpco/stackage/issues/276

524 -- https://github.com/fpco/stackage/issues/276

534 addRange "Michael Snoyman" "network" "< 2.6"

525 addRange "Michael Snoyman" "network" "< 2.6"

526+ addRange "Michael Snoyman" "network-uri" "< 2.6"

535

527

536 -- https://github.com/fpco/stackage/issues/279

528 -- https://github.com/fpco/stackage/issues/279

537 addRange "Michael Snoyman" "MonadRandom" "< 0.2"

529 addRange "Michael Snoyman" "MonadRandom" "< 0.2"

Stackage/Select.hs+1−1

@@ -40,7 +40,7 @@ defaultSelectSettings version = SelectSettings

40 Just v | Just range <- simpleParse "< 0.5", v `withinRange` range

41 -> Set.singleton "containers-old"

42 _ -> Set.empty)

43− , disabledFlags = Set.fromList (words "bytestring-in-base test-hlint")

43+ , disabledFlags = Set.fromList (words "bytestring-in-base test-hlint network-uri")

44 `Set.union`

45 (if version <= GhcMajorVersion 7 4

46 then Set.singleton "bytestring-builder"

patching/patches/bson-0.2.4.patchdeleted−12

@@ -1,12 +0,0 @@

1−diff -ru orig/bson.cabal new/bson.cabal

2−--- orig/bson.cabal 2014-03-13 08:24:42.121883180 +0200

3−+++ new/bson.cabal 2014-03-13 08:24:41.000000000 +0200

4−@@ -26,7 +26,7 @@

5− Build-depends: base < 5

6− , time

7− , bytestring

8−- , binary == 0.7.*

9−+ , binary

10− , cryptohash

11− , data-binary-ieee754

12− , mtl >= 2

patching/patches/fb-1.0.4.patchdeleted−12

@@ -1,12 +0,0 @@

1−diff -ruN orig/fb.cabal new/fb.cabal

2−--- orig/fb.cabal 2014-08-27 18:46:01.681159581 +0300

3−+++ new/fb.cabal 2014-08-27 18:46:01.000000000 +0300

4−@@ -91,7 +91,7 @@

5− , monad-logger >= 0.3

6− if flag(conduit11)

7− build-depends:

8−- conduit == 1.1.*

9−+ conduit >= 1.1 && < 1.3

10− , conduit-extra == 1.1.*

11− else

12− build-depends:

patching/patches/hOpenPGP-1.5.1.patchdeleted−12

@@ -1,12 +0,0 @@

1−diff -ruN orig/hOpenPGP.cabal new/hOpenPGP.cabal

2−--- orig/hOpenPGP.cabal 2014-08-27 18:36:43.353176357 +0300

3−+++ new/hOpenPGP.cabal 2014-08-27 18:36:43.000000000 +0300

4−@@ -173,7 +173,7 @@

5− , bzlib

6− , cereal

7− , cereal-conduit >= 0.6 && < 0.8

8−- , conduit >= 0.5 && < 1.2

9−+ , conduit >= 0.5 && < 1.3

10− , conduit-extra >= 1.1

11− , containers

12− , crypto-cipher-types

patching/patches/imagesize-conduit-1.0.0.4.patchdeleted−12

@@ -1,12 +0,0 @@

1−diff -ruN orig/imagesize-conduit.cabal new/imagesize-conduit.cabal

2−--- orig/imagesize-conduit.cabal 2014-08-27 18:36:43.889176341 +0300

3−+++ new/imagesize-conduit.cabal 2014-08-27 18:36:43.000000000 +0300

4−@@ -21,7 +21,7 @@

5− Library

6− Exposed-modules: Data.Conduit.ImageSize

7− Build-depends: base >= 4 && < 5

8−- , conduit >= 1.1 && < 1.2

9−+ , conduit >= 1.1 && < 1.3

10− , conduit-extra >= 1.1 && < 1.2

11− , bytestring >= 0.10

12− ghc-options: -Wall

patching/patches/kan-extensions-4.1.patchdeleted−11

@@ -1,11 +0,0 @@

1−diff -ruN orig/kan-extensions.cabal new/kan-extensions.cabal

2−--- orig/kan-extensions.cabal 2014-08-25 17:24:28.206498700 +0300

3−+++ new/kan-extensions.cabal 2014-08-25 17:24:28.000000000 +0300

4−@@ -51,6 +51,7 @@

5− mtl >= 2.0.1 && < 2.3,

6− pointed >= 4 && < 5,

7− semigroupoids >= 4 && < 5,

8−+ tagged,

9− transformers >= 0.2 && < 0.5

10−

11− exposed-modules:

patching/patches/pandoc-1.12.4.2.patchdeleted−66

@@ -1,66 +0,0 @@

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

4−@@ -192,10 +192,6 @@

5− type: git

6− location: git://github.com/jgm/pandoc.git

7−

8−-Flag embed_data_files

9−- Description: Embed data files in binary for relocatable executable.

10−- Default: False

11−-

12− Flag http-conduit

13− Description: Enable downloading of resources over https.

14− 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,

24−@@ -232,9 +228,9 @@

25− temporary >= 1.1 && < 1.3,

26− blaze-html >= 0.5 && < 0.8,

27− blaze-markup >= 0.5.1 && < 0.7,

28−- attoparsec >= 0.10 && < 0.12,

29−+ attoparsec >= 0.10 && < 0.13,

30− yaml >= 0.8.8.2 && < 0.9,

31−- scientific >= 0.2 && < 0.3,

32−+ scientific >= 0.2 && < 0.4,

33− vector >= 0.10 && < 0.11,

34− hslua >= 0.3 && < 0.4,

35− binary >= 0.5 && < 0.8

36−@@ -243,10 +239,6 @@

37− Build-Depends: http-conduit >= 1.9 && < 2.2,

38− http-types >= 0.8 && < 0.9

39− cpp-options: -DHTTP_CONDUIT

40−- if flag(embed_data_files)

41−- cpp-options: -DEMBED_DATA_FILES

42−- -- Build-Tools: hsb2hs -- not yet recognized by cabal

43−- other-modules: Text.Pandoc.Data

44− if os(windows)

45− Cpp-options: -D_WINDOWS

46− Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind

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"

patching/patches/tagstream-conduit-0.5.5.1.patchdeleted−12

@@ -1,12 +0,0 @@

1−diff -ruN orig/tagstream-conduit.cabal new/tagstream-conduit.cabal

2−--- orig/tagstream-conduit.cabal 2014-08-27 18:15:50.061214015 +0300

3−+++ new/tagstream-conduit.cabal 2014-08-27 18:15:49.000000000 +0300

4−@@ -38,7 +38,7 @@

5− , text

6− , case-insensitive

7− , transformers >= 0.2

8−- , conduit >= 0.5 && < 1.2

9−+ , conduit >= 0.5 && < 1.3

10− , conduit-extra

11− , resourcet

12− , attoparsec

patching/patches/yesod-auth-fb-1.6.3.patchdeleted−12

@@ -1,12 +0,0 @@

1−diff -ruN orig/yesod-auth-fb.cabal new/yesod-auth-fb.cabal

2−--- orig/yesod-auth-fb.cabal 2014-08-27 18:46:01.913159574 +0300

3−+++ new/yesod-auth-fb.cabal 2014-08-27 18:46:01.000000000 +0300

4−@@ -53,7 +53,7 @@

5− , transformers >= 0.1.3 && < 0.5

6− , yesod-fb == 0.3.*

7− , fb >= 0.14 && < 1.1

8−- , conduit >= 1.0 && < 1.2

9−+ , conduit >= 1.0 && < 1.3

10− , bytestring >= 0.9 && < 0.11

11− , aeson >= 0.6

12− , time >= 1.0 && < 1.5