on master help sign in
Remove all patches (waiting on uuid upstream)
commit6dc6608e3d12b80c0d21ae6843216ad0c6bcd870 authorMichael Snoyman <michael@snoyman.com> dateMon 8 Sep 2014, 20:56 (12 years ago) parent5a5abd6
4 files changed+3−38
Stackage/Config.hs+3−2 patching/patches/aws-0.10.3.patch−12 patching/patches/aws-0.9.3.patch−12 patching/patches/uuid-1.3.3.patch−12
Stackage/Config.hs+3−2
@@ -230,7 +230,7 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
230230 mapM_ (add "FP Complete <michael@fpcomplete.com>") $ words =<<
231231 [ "web-fpco th-expand-syns configurator smtLib"
232232 , "fixed-list indents language-c pretty-class"
233− , "aws csv-conduit cassava"
233+ , "csv-conduit cassava"
234234 , "async shelly thyme"
235235 , "hxt hxt-relaxng dimensional"
236236 , "cairo diagrams-cairo gtk2hs-buildtools"
@@ -241,6 +241,7 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
241241 , "fgl hmatrix hmatrix-gsl"
242242 , "alex happy"
243243 ]
244+ -- aws
244245 when (ghcVer < GhcMajorVersion 7 8) $ do -- No GHC 7.8 support
245246 mapM_ (add "FP Complete <michael@fpcomplete.com>") $ words =<<
246247 [ "" -- too unreliable for the moment "distributed-process distributed-process-simplelocalnet"
@@ -548,7 +549,7 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
548549 peg "adjunctions" "< 4.2"
549550 peg "kan-extensions" "< 4.1"
550551 peg "semigroupoids" "< 4.1"
551− peg "aws" "< 0.10"
552+ --peg "aws" "< 0.10"
552553 peg "pandoc" "< 1.13"
553554 peg "texmath" "<= 0.6.6.3"
554555
patching/patches/aws-0.10.3.patchdeleted−12
@@ -1,12 +0,0 @@
1−diff -ruN orig/aws.cabal new/aws.cabal
2−--- orig/aws.cabal 2014-08-27 18:53:03.893146895 +0300
3−+++ new/aws.cabal 2014-08-27 18:53:03.000000000 +0300
4−@@ -118,7 +118,7 @@
5− bytestring >= 0.9 && < 0.11,
6− case-insensitive >= 0.2 && < 1.3,
7− cereal >= 0.3 && < 0.5,
8−- conduit >= 1.1 && < 1.2,
9−+ conduit >= 1.1 && < 1.3,
10− conduit-extra >= 1.1 && < 1.2,
11− containers >= 0.4,
12− cryptohash >= 0.11 && < 0.12,
patching/patches/aws-0.9.3.patchdeleted−12
@@ -1,12 +0,0 @@
1−diff -ruN orig/aws.cabal new/aws.cabal
2−--- orig/aws.cabal 2014-08-28 07:02:24.655832025 +0300
3−+++ new/aws.cabal 2014-08-28 07:02:24.000000000 +0300
4−@@ -109,7 +109,7 @@
5− bytestring >= 0.9 && < 0.11,
6− case-insensitive >= 0.2 && < 1.3,
7− cereal >= 0.3 && < 0.5,
8−- conduit >= 1.1 && < 1.2,
9−+ conduit >= 1.1 && < 1.3,
10− conduit-extra >= 1.1 && < 1.2,
11− containers >= 0.4,
12− cryptohash >= 0.11 && < 0.12,
patching/patches/uuid-1.3.3.patchdeleted−12
@@ -1,12 +0,0 @@
1−diff -ru orig/uuid.cabal new/uuid.cabal
2−--- orig/uuid.cabal 2014-06-10 13:09:03.962534162 +0300
3−+++ new/uuid.cabal 2014-06-10 13:09:03.000000000 +0300
4−@@ -67,7 +67,7 @@
5− uuid,
6− bytestring >= 0.9 && < 1.1,
7− HUnit >=1.2 && < 1.3,
8−- QuickCheck >=2.4 && < 2.7,
9−+ QuickCheck >=2.4 && < 2.8,
10− random >= 1.0.1 && < 1.1,
11− test-framework == 0.8.*,
12− test-framework-hunit == 0.3.*,