haskell/stackage
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage.git synced 2026-02-26 13:07:54 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove all patches (waiting on uuid upstream)

Browse Source
This commit is contained in:
Michael Snoyman 2014-09-08 20:56:43 +03:00
parent 5a5abd678f
commit 6dc6608e3d
4 changed files with 3 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Stackage/Config.hs
View File

@ -230,7 +230,7 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
mapM_ (add "FP Complete <michael@fpcomplete.com>") $ words =<< mapM_ (add "FP Complete <michael@fpcomplete.com>") $ words =<<
[ "web-fpco th-expand-syns configurator smtLib" [ "web-fpco th-expand-syns configurator smtLib"
, "fixed-list indents language-c pretty-class" , "fixed-list indents language-c pretty-class"
, "aws csv-conduit cassava" , "csv-conduit cassava"
, "async shelly thyme" , "async shelly thyme"
, "hxt hxt-relaxng dimensional" , "hxt hxt-relaxng dimensional"
, "cairo diagrams-cairo gtk2hs-buildtools" , "cairo diagrams-cairo gtk2hs-buildtools"
@ -241,6 +241,7 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
, "fgl hmatrix hmatrix-gsl" , "fgl hmatrix hmatrix-gsl"
, "alex happy" , "alex happy"
] ]
-- aws
when (ghcVer < GhcMajorVersion 7 8) $ do -- No GHC 7.8 support when (ghcVer < GhcMajorVersion 7 8) $ do -- No GHC 7.8 support
mapM_ (add "FP Complete <michael@fpcomplete.com>") $ words =<< mapM_ (add "FP Complete <michael@fpcomplete.com>") $ words =<<
[ "" -- too unreliable for the moment "distributed-process distributed-process-simplelocalnet" [ "" -- 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 "adjunctions" "< 4.2"
peg "kan-extensions" "< 4.1" peg "kan-extensions" "< 4.1"
peg "semigroupoids" "< 4.1" peg "semigroupoids" "< 4.1"
peg "aws" "< 0.10" --peg "aws" "< 0.10"
peg "pandoc" "< 1.13" peg "pandoc" "< 1.13"
peg "texmath" "<= 0.6.6.3" peg "texmath" "<= 0.6.6.3"

12
patching/patches/aws-0.10.3.patch
View File

@ -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,

12
patching/patches/aws-0.9.3.patch
View File

@ -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,

12
patching/patches/uuid-1.3.3.patch
View File

@ -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.*,