b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

haskellng: remove amazonka patches.

Browse source 
New amazonka was released.

@peti Long-term, is there a way to have hackage2nix warn about patched
packages?
This commit is contained in:
Shea Levy 2015-01-10 11:35:25 -05:00
parent 0b09d52085
commit e4c9a521ef
3 changed files with 0 additions and 148 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -374,20 +374,6 @@ self: super: {
zeromq3-haskell = overrideCabal super.zeromq3-haskell (drv: { doCheck = false; });
zip-archive = overrideCabal super.zip-archive (drv: { doCheck = false; });
zlib-conduit = overrideCabal super.zlib-conduit (drv: { noHaddock = true; });
amazonka-core = overrideCabal super.amazonka-core (drv: {
# these are upstream
patches = [ ./patches/amazonka-fixes.patch ];
# brendanhay/amazonka#54
doCheck = false;
});
amazonka = overrideCabal super.amazonka (drv: {
# brendanhay/amazonka#56
patches = [ ./patches/amazonka-new-monad-control.patch ];
});
}
// {
# Not on Hackage yet.

73
pkgs/development/haskell-modules/patches/amazonka-fixes.patch
View file

@ -1,73 +0,0 @@
From 06e10485e60ec5637896dacf62f41a57fcb04bed Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 9 Jan 2015 17:34:22 -0500
Subject: [PATCH] Don't derive the Whole typeclass
It was not preserved when Numeric.Natural was brought into base, which
practically means it is difficult if not impossible to build this
against newer GHCs, and also suggests that the class itself is not all
that useful.
---
amazonka-elb/gen/Network/AWS/ELB/Types.hs | 2 +-
core/src/Network/AWS/Data/Internal/Numeric.hs | 1 -
core/src/Network/AWS/Prelude.hs | 3 +--
gen/output/elb.json | 3 +--
gen/src/Gen/Output.hs | 5 +----
5 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/src/Network/AWS/Data/Internal/Numeric.hs b/src/Network/AWS/Data/Internal/Numeric.hs
index 93b92c4..445ad8e 100644
--- a/src/Network/AWS/Data/Internal/Numeric.hs
+++ b/src/Network/AWS/Data/Internal/Numeric.hs
@@ -34,7 +34,6 @@ newtype Nat = Nat { unNat :: Natural }
, Num
, Real
, Integral
- , Whole
, ToByteString
, FromText
, ToText
diff --git a/src/Network/AWS/Prelude.hs b/src/Network/AWS/Prelude.hs
index 1e858ee..289f51f 100644
--- a/src/Network/AWS/Prelude.hs
+++ b/src/Network/AWS/Prelude.hs
@@ -36,7 +36,6 @@ module Network.AWS.Prelude
, Generic
, IsString (..)
, Semigroup
- , Whole
-- * Retries
, Retry (..)
@@ -75,7 +74,7 @@ import GHC.Generics (Generic)
import Network.HTTP.Client (HttpException, RequestBody)
import Network.HTTP.Types.Method (StdMethod(..))
import Network.HTTP.Types.Status (Status(..))
-import Numeric.Natural (Natural, Whole)
+import Numeric.Natural (Natural)
import Control.Applicative as Export
import Data.Bifunctor as Export
From 647dd8b69ec66110473195d36ff57172a592bc3b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 9 Jan 2015 17:54:54 -0500
Subject: [PATCH] In the base-4.8.0.0 candidate, Data.Function defines (&)
This conflicts with Control.Lens.&
---
core/src/Network/AWS/Signing/Internal/V4.hs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Network/AWS/Signing/Internal/V4.hs b/src/Network/AWS/Signing/Internal/V4.hs
index f48c0ed..34a8516 100644
--- a/src/Network/AWS/Signing/Internal/V4.hs
+++ b/src/Network/AWS/Signing/Internal/V4.hs
@@ -26,7 +26,7 @@ import qualified Data.ByteString.Base16 as Base16
import qualified Data.ByteString.Char8 as BS
import qualified Data.CaseInsensitive as CI
import qualified Data.Foldable as Fold
-import Data.Function
+import Data.Function hiding ((&))
import Data.List (groupBy, intersperse, sortBy, sort)
import Data.Maybe
import Data.Monoid

61
pkgs/development/haskell-modules/patches/amazonka-new-monad-control.patch
View file

@ -1,61 +0,0 @@
From 3a91e0114214083d3f84375152a35d4247bb7a81 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 9 Jan 2015 18:54:59 -0500
Subject: [PATCH] amazonka: Build against monad-control >=1
---
amazonka/amazonka.cabal | 2 +-
amazonka/src/Control/Monad/Trans/AWS.hs | 15 +++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/amazonka.cabal b/amazonka.cabal
index 455b7b2..48c5f1c 100644
--- a/amazonka.cabal
+++ b/amazonka.cabal
@@ -49,7 +49,7 @@ library
, http-conduit >= 2.1.4 && < 2.3
, lens >= 4.4 && < 5
, mmorph >= 1 && < 2
- , monad-control >= 0.3.2 && < 1
+ , monad-control >= 1
, mtl >= 2.2.1 && < 2.3
, resourcet >= 1.1 && < 1.3
, retry >= 0.5
diff --git a/src/Control/Monad/Trans/AWS.hs b/src/Control/Monad/Trans/AWS.hs
index bc13925..75f2a4d 100644
--- a/src/Control/Monad/Trans/AWS.hs
+++ b/src/Control/Monad/Trans/AWS.hs
@@ -172,26 +172,25 @@ instance MonadBase b m => MonadBase b (AWST m) where
{-# INLINE liftBase #-}
instance MonadTransControl AWST where
- newtype StT AWST a = StTAWS
- { unStTAWS :: StT (ExceptT Error) (StT (ReaderT (Env, InternalState)) a)
- }
+ type StT AWST a =
+ StT (ExceptT Error) (StT (ReaderT (Env, InternalState)) a)
liftWith f = AWST $
liftWith $ \g ->
liftWith $ \h ->
- f (liftM StTAWS . h . g . unAWST)
+ f (h . g . unAWST)
{-# INLINE liftWith #-}
- restoreT = AWST . restoreT . restoreT . liftM unStTAWS
+ restoreT = AWST . restoreT . restoreT
{-# INLINE restoreT #-}
instance MonadBaseControl b m => MonadBaseControl b (AWST m) where
- newtype StM (AWST m) a = StMAWST { unStMAWST :: ComposeSt AWST m a }
+ type StM (AWST m) a = ComposeSt AWST m a
- liftBaseWith = defaultLiftBaseWith StMAWST
+ liftBaseWith = defaultLiftBaseWith
{-# INLINE liftBaseWith #-}
- restoreM = defaultRestoreM unStMAWST
+ restoreM = defaultRestoreM
{-# INLINE restoreM #-}
instance MFunctor AWST where