Minor cleanups. Remove maximum version of "transformers" dependency.

This commit is contained in:
John Millikin 2012-05-13 14:28:58 -07:00
parent 12aa431864
commit 5001417174
No known key found for this signature in database
GPG key ID: 59A38F85F9C7C59E
4 changed files with 38 additions and 32 deletions

View file

@ -1,17 +1,17 @@
name: gnutls
version: 0.1.1
version: 0.1.2
license: GPL-3
license-file: license.txt
author: John Millikin <jmillikin@gmail.com>
maintainer: John Millikin <jmillikin@gmail.com>
build-type: Simple
cabal-version: >=1.6
cabal-version: >= 1.6
category: Network
stability: experimental
homepage: https://john-millikin.com/software/haskell-gnutls/
bug-reports: mailto:jmillikin@gmail.com
synopsis: Bindings for GNU TLS
synopsis: Bindings for GNU libgnutls
description:
You almost certainly don't want to depend on this release.
.
@ -26,16 +26,16 @@ source-repository head
source-repository this
type: bazaar
location: https://john-millikin.com/branches/haskell-gnutls/0.1/
tag: anansi_0.1.1
tag: haskell-gnutls_0.1.2
library
hs-source-dirs: lib
ghc-options: -Wall -O2
build-depends:
base >=3 && < 5
base >= 4.0 && < 5.0
, bytestring >= 0.9 && < 0.10
, transformers >= 0.2 && < 0.3
, transformers >= 0.2
, monads-tf >= 0.1 && < 0.2
extra-libraries: gnutls, gnutls-extra
@ -45,5 +45,5 @@ library
Network.Protocol.TLS.GNU
other-modules:
Network.Protocol.TLS.GNU.Foreign
Network.Protocol.TLS.GNU.ErrorT
Network.Protocol.TLS.GNU.Foreign

View file

@ -1,19 +1,20 @@
{-# LANGUAGE TypeFamilies #-}
-- Copyright (C) 2010 John Millikin <jmillikin@gmail.com>
--
--
-- This program is free software: you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation, either version 3 of the License, or
-- any later version.
--
--
-- This program is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- GNU General Public License for more details.
--
--
-- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
{-# LANGUAGE TypeFamilies #-}
module Network.Protocol.TLS.GNU
( TLS
, Session
@ -40,22 +41,24 @@ module Network.Protocol.TLS.GNU
, setPriority
, CertificateType (..)
) 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 Control.Monad.Error (ErrorType)
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.Unsafe as B
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.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 Foreign.Concurrent as FC
import Network.Protocol.TLS.GNU.ErrorT
import System.IO.Unsafe (unsafePerformIO)
data Error = Error Integer
deriving (Show)

View file

@ -1,27 +1,28 @@
{-# LANGUAGE TypeFamilies #-}
-- Copyright (C) 2010 John Millikin <jmillikin@gmail.com>
--
--
-- This program is free software: you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation, either version 3 of the License, or
-- any later version.
--
--
-- This program is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- GNU General Public License for more details.
--
--
-- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
{-# LANGUAGE TypeFamilies #-}
module Network.Protocol.TLS.GNU.ErrorT
( ErrorT (..)
, mapErrorT
) where
import Control.Monad (liftM)
import Control.Monad.Trans (MonadIO, liftIO)
import Control.Monad.Trans.Class (MonadTrans, lift)
import Control.Monad (liftM)
import Control.Monad.Trans (MonadIO, liftIO)
import Control.Monad.Trans.Class (MonadTrans, lift)
import qualified Control.Monad.Error as E
import Control.Monad.Error (ErrorType)
import qualified Control.Monad.Reader as R

View file

@ -1,22 +1,24 @@
{-# LANGUAGE ForeignFunctionInterface #-}
-- Copyright (C) 2010 John Millikin <jmillikin@gmail.com>
--
--
-- This program is free software: you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation, either version 3 of the License, or
-- any later version.
--
--
-- This program is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- GNU General Public License for more details.
--
--
-- You should have received a copy of the GNU General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>.
{-# LANGUAGE ForeignFunctionInterface #-}
module Network.Protocol.TLS.GNU.Foreign where
import Foreign
import Foreign.C
import Foreign
import Foreign.C
-- Type aliases {{{