Minor cleanups. Remove maximum version of "transformers" dependency.
This commit is contained in:
parent
12aa431864
commit
5001417174
4 changed files with 38 additions and 32 deletions
14
gnutls.cabal
14
gnutls.cabal
|
@ -1,17 +1,17 @@
|
||||||
name: gnutls
|
name: gnutls
|
||||||
version: 0.1.1
|
version: 0.1.2
|
||||||
license: GPL-3
|
license: GPL-3
|
||||||
license-file: license.txt
|
license-file: license.txt
|
||||||
author: John Millikin <jmillikin@gmail.com>
|
author: John Millikin <jmillikin@gmail.com>
|
||||||
maintainer: John Millikin <jmillikin@gmail.com>
|
maintainer: John Millikin <jmillikin@gmail.com>
|
||||||
build-type: Simple
|
build-type: Simple
|
||||||
cabal-version: >=1.6
|
cabal-version: >= 1.6
|
||||||
category: Network
|
category: Network
|
||||||
stability: experimental
|
stability: experimental
|
||||||
homepage: https://john-millikin.com/software/haskell-gnutls/
|
homepage: https://john-millikin.com/software/haskell-gnutls/
|
||||||
bug-reports: mailto:jmillikin@gmail.com
|
bug-reports: mailto:jmillikin@gmail.com
|
||||||
|
|
||||||
synopsis: Bindings for GNU TLS
|
synopsis: Bindings for GNU libgnutls
|
||||||
description:
|
description:
|
||||||
You almost certainly don't want to depend on this release.
|
You almost certainly don't want to depend on this release.
|
||||||
.
|
.
|
||||||
|
@ -26,16 +26,16 @@ source-repository head
|
||||||
source-repository this
|
source-repository this
|
||||||
type: bazaar
|
type: bazaar
|
||||||
location: https://john-millikin.com/branches/haskell-gnutls/0.1/
|
location: https://john-millikin.com/branches/haskell-gnutls/0.1/
|
||||||
tag: anansi_0.1.1
|
tag: haskell-gnutls_0.1.2
|
||||||
|
|
||||||
library
|
library
|
||||||
hs-source-dirs: lib
|
hs-source-dirs: lib
|
||||||
ghc-options: -Wall -O2
|
ghc-options: -Wall -O2
|
||||||
|
|
||||||
build-depends:
|
build-depends:
|
||||||
base >=3 && < 5
|
base >= 4.0 && < 5.0
|
||||||
, bytestring >= 0.9 && < 0.10
|
, bytestring >= 0.9 && < 0.10
|
||||||
, transformers >= 0.2 && < 0.3
|
, transformers >= 0.2
|
||||||
, monads-tf >= 0.1 && < 0.2
|
, monads-tf >= 0.1 && < 0.2
|
||||||
|
|
||||||
extra-libraries: gnutls, gnutls-extra
|
extra-libraries: gnutls, gnutls-extra
|
||||||
|
@ -45,5 +45,5 @@ library
|
||||||
Network.Protocol.TLS.GNU
|
Network.Protocol.TLS.GNU
|
||||||
|
|
||||||
other-modules:
|
other-modules:
|
||||||
Network.Protocol.TLS.GNU.Foreign
|
|
||||||
Network.Protocol.TLS.GNU.ErrorT
|
Network.Protocol.TLS.GNU.ErrorT
|
||||||
|
Network.Protocol.TLS.GNU.Foreign
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
{-# LANGUAGE TypeFamilies #-}
|
||||||
|
|
||||||
-- Copyright (C) 2010 John Millikin <jmillikin@gmail.com>
|
-- Copyright (C) 2010 John Millikin <jmillikin@gmail.com>
|
||||||
--
|
--
|
||||||
-- This program is free software: you can redistribute it and/or modify
|
-- This program is free software: you can redistribute it and/or modify
|
||||||
|
@ -13,7 +15,6 @@
|
||||||
-- You should have received a copy of the GNU General Public License
|
-- You should have received a copy of the GNU General Public License
|
||||||
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
|
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
{-# LANGUAGE TypeFamilies #-}
|
|
||||||
module Network.Protocol.TLS.GNU
|
module Network.Protocol.TLS.GNU
|
||||||
( TLS
|
( TLS
|
||||||
, Session
|
, Session
|
||||||
|
@ -40,22 +41,24 @@ module Network.Protocol.TLS.GNU
|
||||||
, setPriority
|
, setPriority
|
||||||
, CertificateType (..)
|
, CertificateType (..)
|
||||||
) where
|
) where
|
||||||
import Control.Monad (when, foldM, foldM_)
|
|
||||||
import Control.Monad.Trans (MonadIO, liftIO)
|
import qualified Control.Concurrent.MVar as M
|
||||||
|
import Control.Monad (when, foldM, foldM_)
|
||||||
import qualified Control.Monad.Error as E
|
import qualified Control.Monad.Error as E
|
||||||
import Control.Monad.Error (ErrorType)
|
import Control.Monad.Error (ErrorType)
|
||||||
import qualified Control.Monad.Reader as R
|
import qualified Control.Monad.Reader as R
|
||||||
import qualified Control.Concurrent.MVar as M
|
import Control.Monad.Trans (MonadIO, liftIO)
|
||||||
import qualified Data.ByteString as B
|
import qualified Data.ByteString as B
|
||||||
import qualified Data.ByteString.Unsafe as B
|
|
||||||
import qualified Data.ByteString.Lazy as BL
|
import qualified Data.ByteString.Lazy as BL
|
||||||
import qualified System.IO as IO
|
import qualified Data.ByteString.Unsafe as B
|
||||||
import qualified Foreign as F
|
import qualified Foreign as F
|
||||||
import qualified Foreign.C as F
|
import qualified Foreign.C as F
|
||||||
|
import Foreign.Concurrent as FC
|
||||||
|
import qualified System.IO as IO
|
||||||
|
import System.IO.Unsafe (unsafePerformIO)
|
||||||
|
|
||||||
|
import Network.Protocol.TLS.GNU.ErrorT
|
||||||
import qualified Network.Protocol.TLS.GNU.Foreign as F
|
import qualified Network.Protocol.TLS.GNU.Foreign as F
|
||||||
import Foreign.Concurrent as FC
|
|
||||||
import Network.Protocol.TLS.GNU.ErrorT
|
|
||||||
import System.IO.Unsafe (unsafePerformIO)
|
|
||||||
|
|
||||||
data Error = Error Integer
|
data Error = Error Integer
|
||||||
deriving (Show)
|
deriving (Show)
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
{-# LANGUAGE TypeFamilies #-}
|
||||||
|
|
||||||
-- Copyright (C) 2010 John Millikin <jmillikin@gmail.com>
|
-- Copyright (C) 2010 John Millikin <jmillikin@gmail.com>
|
||||||
--
|
--
|
||||||
-- This program is free software: you can redistribute it and/or modify
|
-- This program is free software: you can redistribute it and/or modify
|
||||||
|
@ -13,15 +15,14 @@
|
||||||
-- You should have received a copy of the GNU General Public License
|
-- You should have received a copy of the GNU General Public License
|
||||||
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
|
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
{-# LANGUAGE TypeFamilies #-}
|
|
||||||
module Network.Protocol.TLS.GNU.ErrorT
|
module Network.Protocol.TLS.GNU.ErrorT
|
||||||
( ErrorT (..)
|
( ErrorT (..)
|
||||||
, mapErrorT
|
, mapErrorT
|
||||||
) where
|
) where
|
||||||
|
|
||||||
import Control.Monad (liftM)
|
import Control.Monad (liftM)
|
||||||
import Control.Monad.Trans (MonadIO, liftIO)
|
import Control.Monad.Trans (MonadIO, liftIO)
|
||||||
import Control.Monad.Trans.Class (MonadTrans, lift)
|
import Control.Monad.Trans.Class (MonadTrans, lift)
|
||||||
import qualified Control.Monad.Error as E
|
import qualified Control.Monad.Error as E
|
||||||
import Control.Monad.Error (ErrorType)
|
import Control.Monad.Error (ErrorType)
|
||||||
import qualified Control.Monad.Reader as R
|
import qualified Control.Monad.Reader as R
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
{-# LANGUAGE ForeignFunctionInterface #-}
|
||||||
|
|
||||||
-- Copyright (C) 2010 John Millikin <jmillikin@gmail.com>
|
-- Copyright (C) 2010 John Millikin <jmillikin@gmail.com>
|
||||||
--
|
--
|
||||||
-- This program is free software: you can redistribute it and/or modify
|
-- This program is free software: you can redistribute it and/or modify
|
||||||
|
@ -13,10 +15,10 @@
|
||||||
-- You should have received a copy of the GNU General Public License
|
-- You should have received a copy of the GNU General Public License
|
||||||
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
|
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
{-# LANGUAGE ForeignFunctionInterface #-}
|
|
||||||
module Network.Protocol.TLS.GNU.Foreign where
|
module Network.Protocol.TLS.GNU.Foreign where
|
||||||
import Foreign
|
|
||||||
import Foreign.C
|
import Foreign
|
||||||
|
import Foreign.C
|
||||||
|
|
||||||
-- Type aliases {{{
|
-- Type aliases {{{
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue