diff --git a/Stackage/Config.hs b/Stackage/Config.hs index 66d2b137..3455c554 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -230,7 +230,7 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do mapM_ (add "FP Complete ") $ words =<< [ "web-fpco th-expand-syns configurator smtLib" , "fixed-list indents language-c pretty-class" - , "aws csv-conduit cassava" + , "csv-conduit cassava" , "async shelly thyme" , "hxt hxt-relaxng dimensional" , "cairo diagrams-cairo gtk2hs-buildtools" @@ -241,6 +241,7 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do , "fgl hmatrix hmatrix-gsl" , "alex happy" ] + -- aws when (ghcVer < GhcMajorVersion 7 8) $ do -- No GHC 7.8 support mapM_ (add "FP Complete ") $ words =<< [ "" -- too unreliable for the moment "distributed-process distributed-process-simplelocalnet" @@ -548,7 +549,7 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do peg "adjunctions" "< 4.2" peg "kan-extensions" "< 4.1" peg "semigroupoids" "< 4.1" - peg "aws" "< 0.10" + --peg "aws" "< 0.10" peg "pandoc" "< 1.13" peg "texmath" "<= 0.6.6.3" diff --git a/patching/patches/aws-0.10.3.patch b/patching/patches/aws-0.10.3.patch deleted file mode 100644 index 1db0ac5d..00000000 --- a/patching/patches/aws-0.10.3.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN orig/aws.cabal new/aws.cabal ---- orig/aws.cabal 2014-08-27 18:53:03.893146895 +0300 -+++ new/aws.cabal 2014-08-27 18:53:03.000000000 +0300 -@@ -118,7 +118,7 @@ - bytestring >= 0.9 && < 0.11, - case-insensitive >= 0.2 && < 1.3, - cereal >= 0.3 && < 0.5, -- conduit >= 1.1 && < 1.2, -+ conduit >= 1.1 && < 1.3, - conduit-extra >= 1.1 && < 1.2, - containers >= 0.4, - cryptohash >= 0.11 && < 0.12, diff --git a/patching/patches/aws-0.9.3.patch b/patching/patches/aws-0.9.3.patch deleted file mode 100644 index 737b3671..00000000 --- a/patching/patches/aws-0.9.3.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN orig/aws.cabal new/aws.cabal ---- orig/aws.cabal 2014-08-28 07:02:24.655832025 +0300 -+++ new/aws.cabal 2014-08-28 07:02:24.000000000 +0300 -@@ -109,7 +109,7 @@ - bytestring >= 0.9 && < 0.11, - case-insensitive >= 0.2 && < 1.3, - cereal >= 0.3 && < 0.5, -- conduit >= 1.1 && < 1.2, -+ conduit >= 1.1 && < 1.3, - conduit-extra >= 1.1 && < 1.2, - containers >= 0.4, - cryptohash >= 0.11 && < 0.12, diff --git a/patching/patches/uuid-1.3.3.patch b/patching/patches/uuid-1.3.3.patch deleted file mode 100644 index 43269cd1..00000000 --- a/patching/patches/uuid-1.3.3.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru orig/uuid.cabal new/uuid.cabal ---- orig/uuid.cabal 2014-06-10 13:09:03.962534162 +0300 -+++ new/uuid.cabal 2014-06-10 13:09:03.000000000 +0300 -@@ -67,7 +67,7 @@ - uuid, - bytestring >= 0.9 && < 1.1, - HUnit >=1.2 && < 1.3, -- QuickCheck >=2.4 && < 2.7, -+ QuickCheck >=2.4 && < 2.8, - random >= 1.0.1 && < 1.1, - test-framework == 0.8.*, - test-framework-hunit == 0.3.*,