From 5a5abd678fa3adda205cb93c0f9ad1722658cebd Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 8 Sep 2014 20:50:38 +0300 Subject: [PATCH] Get rid of almost all patches --- Stackage/Config.hs | 20 ++---- Stackage/Select.hs | 2 +- patching/patches/bson-0.2.4.patch | 12 ---- patching/patches/fb-1.0.4.patch | 12 ---- patching/patches/hOpenPGP-1.5.1.patch | 12 ---- .../patches/imagesize-conduit-1.0.0.4.patch | 12 ---- patching/patches/kan-extensions-4.1.patch | 11 ---- patching/patches/pandoc-1.12.4.2.patch | 66 ------------------- .../patches/tagstream-conduit-0.5.5.1.patch | 12 ---- patching/patches/yesod-auth-fb-1.6.3.patch | 12 ---- 10 files changed, 7 insertions(+), 164 deletions(-) delete mode 100644 patching/patches/bson-0.2.4.patch delete mode 100644 patching/patches/fb-1.0.4.patch delete mode 100644 patching/patches/hOpenPGP-1.5.1.patch delete mode 100644 patching/patches/imagesize-conduit-1.0.0.4.patch delete mode 100644 patching/patches/kan-extensions-4.1.patch delete mode 100644 patching/patches/pandoc-1.12.4.2.patch delete mode 100644 patching/patches/tagstream-conduit-0.5.5.1.patch delete mode 100644 patching/patches/yesod-auth-fb-1.6.3.patch diff --git a/Stackage/Config.hs b/Stackage/Config.hs index 611bff74..66d2b137 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -190,6 +190,9 @@ defaultExpectedFailures ghcVer = execWriter $ do -- Requires too new a version of time when (ghcVer < GhcMajorVersion 7 8) $ add "cookie" + -- Restrictive checkers upper bound in test suite + add "incremental-parser" + where add = tell . singleton . PackageName @@ -212,13 +215,6 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do , "bzlib-conduit case-insensitive" , "conduit-extra conduit-combinators yesod-websockets" ] - -- Temporary upper bounds while persistent2 is tested - addRange "Michael Snoyman" "persistent" "< 2" - addRange "Michael Snoyman" "persistent-mysql" "< 2" - addRange "Michael Snoyman" "persistent-template" "< 2" - addRange "Michael Snoyman" "persistent-postgresql" "< 2" - addRange "Michael Snoyman" "persistent-mongoDB" "< 2" - addRange "Michael Snoyman" "persistent-sqlite" "< 2" -- https://github.com/fpco/stackage/issues/261 addRange "Michael Snoyman" "cabal-install" $ @@ -258,7 +254,6 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do ] -- Deprecated version - addRange "FP Complete " "persistent-mongoDB" "< 1.3.1 || > 1.3.1" when (ghcVer < GhcMajorVersion 7 6) $ do when requireHP $ do addRange "FP Complete " "hxt" "<= 9.3.0.1" @@ -351,8 +346,10 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do mapM_ (add "Patrick Brisbin") $ words "gravatar" + {- persistent 2.0/conduit 1.2 mapM_ (add "Felipe Lessa ") $ words "esqueleto fb fb-persistent yesod-fb yesod-auth-fb" + -} mapM_ (add "Alexander Altman ") $ words "base-unicode-symbols containers-unicode-symbols" @@ -501,17 +498,11 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do addRange "Michael Snoyman" "pandoc" "== 1.12.4.2" addRange "Michael Snoyman" "texmath" "<= 0.6.6.3" - -- https://github.com/fpco/stackage/issues/242 - addRange "Michael Snoyman" "mongoDB" "< 1.6" - -- Requires too new a version of text when (ghcVer == GhcMajorVersion 7 4 && requireHP) $ do addRange "Michael Snoyman" "attoparsec" "< 0.11.2.1" addRange "Michael Snoyman" "parsers" "< 0.11" - -- local patch - addRange "Michael Snoyman" "bson" "== 0.2.4" - -- 0.16.2 fixes dependency issues with different version of GHC -- and Haskell Platform. Now builds on GHC 7.4-7.8. Version 1.0 is -- guaranteed to break the API. See @@ -532,6 +523,7 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do -- https://github.com/fpco/stackage/issues/276 addRange "Michael Snoyman" "network" "< 2.6" + addRange "Michael Snoyman" "network-uri" "< 2.6" -- https://github.com/fpco/stackage/issues/279 addRange "Michael Snoyman" "MonadRandom" "< 0.2" diff --git a/Stackage/Select.hs b/Stackage/Select.hs index 26b2e574..9435bb7f 100644 --- a/Stackage/Select.hs +++ b/Stackage/Select.hs @@ -40,7 +40,7 @@ defaultSelectSettings version = SelectSettings Just v | Just range <- simpleParse "< 0.5", v `withinRange` range -> Set.singleton "containers-old" _ -> Set.empty) - , disabledFlags = Set.fromList (words "bytestring-in-base test-hlint") + , disabledFlags = Set.fromList (words "bytestring-in-base test-hlint network-uri") `Set.union` (if version <= GhcMajorVersion 7 4 then Set.singleton "bytestring-builder" diff --git a/patching/patches/bson-0.2.4.patch b/patching/patches/bson-0.2.4.patch deleted file mode 100644 index 5469a47c..00000000 --- a/patching/patches/bson-0.2.4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru orig/bson.cabal new/bson.cabal ---- orig/bson.cabal 2014-03-13 08:24:42.121883180 +0200 -+++ new/bson.cabal 2014-03-13 08:24:41.000000000 +0200 -@@ -26,7 +26,7 @@ - Build-depends: base < 5 - , time - , bytestring -- , binary == 0.7.* -+ , binary - , cryptohash - , data-binary-ieee754 - , mtl >= 2 diff --git a/patching/patches/fb-1.0.4.patch b/patching/patches/fb-1.0.4.patch deleted file mode 100644 index 60585a04..00000000 --- a/patching/patches/fb-1.0.4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN orig/fb.cabal new/fb.cabal ---- orig/fb.cabal 2014-08-27 18:46:01.681159581 +0300 -+++ new/fb.cabal 2014-08-27 18:46:01.000000000 +0300 -@@ -91,7 +91,7 @@ - , monad-logger >= 0.3 - if flag(conduit11) - build-depends: -- conduit == 1.1.* -+ conduit >= 1.1 && < 1.3 - , conduit-extra == 1.1.* - else - build-depends: diff --git a/patching/patches/hOpenPGP-1.5.1.patch b/patching/patches/hOpenPGP-1.5.1.patch deleted file mode 100644 index 9e27a483..00000000 --- a/patching/patches/hOpenPGP-1.5.1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN orig/hOpenPGP.cabal new/hOpenPGP.cabal ---- orig/hOpenPGP.cabal 2014-08-27 18:36:43.353176357 +0300 -+++ new/hOpenPGP.cabal 2014-08-27 18:36:43.000000000 +0300 -@@ -173,7 +173,7 @@ - , bzlib - , cereal - , cereal-conduit >= 0.6 && < 0.8 -- , conduit >= 0.5 && < 1.2 -+ , conduit >= 0.5 && < 1.3 - , conduit-extra >= 1.1 - , containers - , crypto-cipher-types diff --git a/patching/patches/imagesize-conduit-1.0.0.4.patch b/patching/patches/imagesize-conduit-1.0.0.4.patch deleted file mode 100644 index f0549fc2..00000000 --- a/patching/patches/imagesize-conduit-1.0.0.4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN orig/imagesize-conduit.cabal new/imagesize-conduit.cabal ---- orig/imagesize-conduit.cabal 2014-08-27 18:36:43.889176341 +0300 -+++ new/imagesize-conduit.cabal 2014-08-27 18:36:43.000000000 +0300 -@@ -21,7 +21,7 @@ - Library - Exposed-modules: Data.Conduit.ImageSize - Build-depends: base >= 4 && < 5 -- , conduit >= 1.1 && < 1.2 -+ , conduit >= 1.1 && < 1.3 - , conduit-extra >= 1.1 && < 1.2 - , bytestring >= 0.10 - ghc-options: -Wall diff --git a/patching/patches/kan-extensions-4.1.patch b/patching/patches/kan-extensions-4.1.patch deleted file mode 100644 index 64d48d71..00000000 --- a/patching/patches/kan-extensions-4.1.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ruN orig/kan-extensions.cabal new/kan-extensions.cabal ---- orig/kan-extensions.cabal 2014-08-25 17:24:28.206498700 +0300 -+++ new/kan-extensions.cabal 2014-08-25 17:24:28.000000000 +0300 -@@ -51,6 +51,7 @@ - mtl >= 2.0.1 && < 2.3, - pointed >= 4 && < 5, - semigroupoids >= 4 && < 5, -+ tagged, - transformers >= 0.2 && < 0.5 - - exposed-modules: diff --git a/patching/patches/pandoc-1.12.4.2.patch b/patching/patches/pandoc-1.12.4.2.patch deleted file mode 100644 index 2409e3b9..00000000 --- a/patching/patches/pandoc-1.12.4.2.patch +++ /dev/null @@ -1,66 +0,0 @@ -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 - --Flag embed_data_files -- Description: Embed data files in binary for relocatable executable. -- Default: False -- - 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, - blaze-markup >= 0.5.1 && < 0.7, -- attoparsec >= 0.10 && < 0.12, -+ attoparsec >= 0.10 && < 0.13, - yaml >= 0.8.8.2 && < 0.9, -- scientific >= 0.2 && < 0.3, -+ scientific >= 0.2 && < 0.4, - vector >= 0.10 && < 0.11, - hslua >= 0.3 && < 0.4, - binary >= 0.5 && < 0.8 -@@ -243,10 +239,6 @@ - Build-Depends: http-conduit >= 1.9 && < 2.2, - http-types >= 0.8 && < 0.9 - cpp-options: -DHTTP_CONDUIT -- if flag(embed_data_files) -- cpp-options: -DEMBED_DATA_FILES -- -- Build-Tools: hsb2hs -- not yet recognized by cabal -- other-modules: Text.Pandoc.Data - if os(windows) - Cpp-options: -D_WINDOWS - Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind -@@ -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" diff --git a/patching/patches/tagstream-conduit-0.5.5.1.patch b/patching/patches/tagstream-conduit-0.5.5.1.patch deleted file mode 100644 index 703f0568..00000000 --- a/patching/patches/tagstream-conduit-0.5.5.1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN orig/tagstream-conduit.cabal new/tagstream-conduit.cabal ---- orig/tagstream-conduit.cabal 2014-08-27 18:15:50.061214015 +0300 -+++ new/tagstream-conduit.cabal 2014-08-27 18:15:49.000000000 +0300 -@@ -38,7 +38,7 @@ - , text - , case-insensitive - , transformers >= 0.2 -- , conduit >= 0.5 && < 1.2 -+ , conduit >= 0.5 && < 1.3 - , conduit-extra - , resourcet - , attoparsec diff --git a/patching/patches/yesod-auth-fb-1.6.3.patch b/patching/patches/yesod-auth-fb-1.6.3.patch deleted file mode 100644 index fc432230..00000000 --- a/patching/patches/yesod-auth-fb-1.6.3.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN orig/yesod-auth-fb.cabal new/yesod-auth-fb.cabal ---- orig/yesod-auth-fb.cabal 2014-08-27 18:46:01.913159574 +0300 -+++ new/yesod-auth-fb.cabal 2014-08-27 18:46:01.000000000 +0300 -@@ -53,7 +53,7 @@ - , transformers >= 0.1.3 && < 0.5 - , yesod-fb == 0.3.* - , fb >= 0.14 && < 1.1 -- , conduit >= 1.0 && < 1.2 -+ , conduit >= 1.0 && < 1.3 - , bytestring >= 0.9 && < 0.11 - , aeson >= 0.6 - , time >= 1.0 && < 1.5