diff options
| author | Peter Simons <simons@cryp.to> | 2015-06-01 17:32:37 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-06-02 10:32:31 +0200 |
| commit | 682e37e58653b6b41077a7a26b2c62f1789703a6 (patch) | |
| tree | 680458e17a9fa99c586fce68b259628bcba42c12 | |
| parent | 873fa649e8e851ea255fe87c6a8f79097aee6d23 (diff) | |
| download | nixlib-682e37e58653b6b41077a7a26b2c62f1789703a6.tar nixlib-682e37e58653b6b41077a7a26b2c62f1789703a6.tar.gz nixlib-682e37e58653b6b41077a7a26b2c62f1789703a6.tar.bz2 nixlib-682e37e58653b6b41077a7a26b2c62f1789703a6.tar.lz nixlib-682e37e58653b6b41077a7a26b2c62f1789703a6.tar.xz nixlib-682e37e58653b6b41077a7a26b2c62f1789703a6.tar.zst nixlib-682e37e58653b6b41077a7a26b2c62f1789703a6.zip | |
haskell-iconv: GHC 7.10.x support was added upstream
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/iconv-fix-ghc710.patch | 41 |
2 files changed, 0 insertions, 44 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 964b221d38cd..ac02bbc88180 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -292,7 +292,4 @@ self: super: { x509-store = appendConfigureFlag super.x509-store "-fignore-me-1"; x509-system = appendConfigureFlag super.x509-system "-fignore-me-1"; - # Fix compilation under GHC 7.10, patch has been sent upstream. - iconv = appendPatch super.iconv ./iconv-fix-ghc710.patch; - } diff --git a/pkgs/development/haskell-modules/iconv-fix-ghc710.patch b/pkgs/development/haskell-modules/iconv-fix-ghc710.patch deleted file mode 100644 index a7c35647a29e..000000000000 --- a/pkgs/development/haskell-modules/iconv-fix-ghc710.patch +++ /dev/null @@ -1,41 +0,0 @@ -Running command 'diff -urN old-iconv new-iconv' -Fri May 29 00:42:30 CEST 2015 Robert Helgesson <robert@rycee.net> - * Add Functor and Applicative instances for IConv - - This makes iconv successfully build under GHC 7.10. -diff -urN old-iconv/Codec/Text/IConv/Internal.hs new-iconv/Codec/Text/IConv/Internal.hs ---- old-iconv/Codec/Text/IConv/Internal.hs 2015-05-31 11:26:06.410968449 +0200 -+++ new-iconv/Codec/Text/IConv/Internal.hs 2015-05-31 11:26:06.410968449 +0200 -@@ -49,6 +49,7 @@ - import System.IO.Unsafe (unsafeInterleaveIO, unsafePerformIO) - import System.IO (hPutStrLn, stderr) - import Control.Exception (assert) -+import Control.Monad (ap, liftM) - - import Prelude hiding (length) - -@@ -192,8 +193,8 @@ - -} - - ------------------------------ ---- IConv monad -+---------------------------------------- -+-- IConv functor, applicative, and monad - -- - - newtype IConv a = I { -@@ -202,6 +203,13 @@ - -> IO (Buffers, a) - } - -+instance Functor IConv where -+ fmap = liftM -+ -+instance Applicative IConv where -+ pure = return -+ (<*>) = ap -+ - instance Monad IConv where - (>>=) = bindI - -- m >>= f = (m `bindI` \a -> consistencyCheck `thenI` returnI a) `bindI` f |