diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix index 5ee945d26782..4edd801d08d8 100644 --- a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix +++ b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "MonadCatchIO-transformers"; - version = "0.2.2.3"; - sha256 = "1qwy9rrmf3kl7rb7v46n81xmrwy4xl63lfnlsiz1qc0hybjkl7m6"; + version = "0.3.0.0"; + sha256 = "0v7k6npfr1x9s4bk409y6sc1vhzs5pm4mwpky356z7kdvz2z274c"; buildDepends = [ extensibleExceptions transformers ]; meta = { description = "Monad-transformer compatible version of the Control.Exception module"; diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix index 173ddc314952..3f9b37535952 100644 --- a/pkgs/development/libraries/haskell/RSA/default.nix +++ b/pkgs/development/libraries/haskell/RSA/default.nix @@ -1,12 +1,12 @@ -{ cabal, binary, pureMD5, random, SHA }: +{ cabal, binary, cryptoApi, monadcryptorandom, pureMD5, SHA }: cabal.mkDerivation (self: { pname = "RSA"; - version = "1.0.6.3"; - sha256 = "0lk3nsh6nvacv1xzrg2pxxhd5gglmy40dkb8a47c9r9px0q6yjpj"; + version = "1.2.0.0"; + sha256 = "0x4wa0yq4k43ccdakqcmy0mxvdlvrkfg6kc1j2hv7hh8b4vjisms"; isLibrary = true; isExecutable = true; - buildDepends = [ binary pureMD5 random SHA ]; + buildDepends = [ binary cryptoApi monadcryptorandom pureMD5 SHA ]; meta = { description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1."; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index e885c39cb05f..7e77aa41f5e8 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -1,15 +1,12 @@ -{ cabal, asn1Data, base64Bytestring, cryptoPubkeyTypes, mtl, time -}: +{ cabal, asn1Data, cryptoPubkeyTypes, mtl, pem, time }: cabal.mkDerivation (self: { pname = "certificate"; - version = "1.1.1"; - sha256 = "1n9sj69haqsiny1zn1lb09q86ga4ccypbdbkxsk5bzv10ygkk7d9"; + version = "1.2.1"; + sha256 = "0lhw38jqkiw7dwckwcqwmsi9br1insb5dp8wajcpgas6xn6cy2qy"; isLibrary = true; isExecutable = true; - buildDepends = [ - asn1Data base64Bytestring cryptoPubkeyTypes mtl time - ]; + buildDepends = [ asn1Data cryptoPubkeyTypes mtl pem time ]; meta = { homepage = "http://github.com/vincenthz/hs-certificate"; description = "Certificates and Key Reader/Writer"; diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix index 51b827c9e252..742da01b464c 100644 --- a/pkgs/development/libraries/haskell/crypto-api/default.nix +++ b/pkgs/development/libraries/haskell/crypto-api/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "crypto-api"; - version = "0.9"; - sha256 = "11372brnpiqdm6fdfp95wyyl8nvhbagnq0q2bdhn4xsskpnp4hnp"; + version = "0.10.1"; + sha256 = "1l73c9pik6109frzyrxh8kpdsfpa9wf6ijnd8zfbnhmk5pn6jaww"; buildDepends = [ cereal entropy largeword tagged ]; meta = { homepage = "http://trac.haskell.org/crypto-api/wiki"; diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index 4fa65cb16d90..8ef4c9408f51 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -5,6 +5,9 @@ cabal.mkDerivation (self: { version = "0.3.1"; sha256 = "0hb9wkq70bmx54vksj78f0av1byvksjhqlr730cfc5fc6w60kzqk"; buildDepends = [ cereal conduit cryptoApi transformers ]; + patchPhase = '' + sed -i -e 's|crypto-api >= 0.9 && < 0.10|crypto-api|' crypto-conduit.cabal + ''; meta = { homepage = "https://github.com/meteficha/crypto-conduit"; description = "Conduit interface for cryptographic operations (from crypto-api)"; diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 50a7188cbad9..d4c6e27fa3dc 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "1.4.1"; - sha256 = "1jv5nk2h17hf2fp1r6ych9grnlx2hsclxgn10d5f1vx21xbd0hkl"; + version = "1.4.1.2"; + sha256 = "1ji7pdqrzhzlmy2ig21s8fcfcqa29lc9k56l29zkw9qqgdaq5x3s"; buildDepends = [ asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive certificate conduit cookie diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix deleted file mode 100644 index 1104794be20a..000000000000 --- a/pkgs/development/libraries/haskell/http-enumerator/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ cabal, asn1Data, attoparsec, attoparsecEnumerator -, base64Bytestring, blazeBuilder, blazeBuilderEnumerator -, caseInsensitive, certificate, cprngAes, dataDefault, enumerator -, failure, httpTypes, monadControl, network, tls, tlsExtra -, transformers, utf8String, zlibEnum -}: - -cabal.mkDerivation (self: { - pname = "http-enumerator"; - version = "0.7.3.2"; - sha256 = "1djr41fc8blpmwcj3ckix0xnc0kfasbmkx82wpzrq23h54jrbdjl"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - asn1Data attoparsec attoparsecEnumerator base64Bytestring - blazeBuilder blazeBuilderEnumerator caseInsensitive certificate - cprngAes dataDefault enumerator failure httpTypes monadControl - network tls tlsExtra transformers utf8String zlibEnum - ]; - meta = { - homepage = "http://github.com/snoyberg/http-enumerator"; - description = "HTTP client package with enumerator interface and HTTPS support"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/pem/default.nix b/pkgs/development/libraries/haskell/pem/default.nix index 35d8a49c2c83..ff9b91fe0dac 100644 --- a/pkgs/development/libraries/haskell/pem/default.nix +++ b/pkgs/development/libraries/haskell/pem/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "pem"; - version = "0.1.0"; - sha256 = "0qhkmxfhzpzg3ycdzr4b7zzf84vmhbqv2irh95ymmdbr0cc5hhn9"; + version = "0.1.1"; + sha256 = "0klb39w6mihx35xgdw5wvi1q6r61xgrsqvcqi4c5r6psv5z94cil"; buildDepends = [ attoparsec base64Bytestring cereal mtl ]; meta = { homepage = "http://github.com/vincenthz/hs-pem"; diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index a1123c793f3c..9d2a13b11a32 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -5,6 +5,9 @@ cabal.mkDerivation (self: { version = "0.1.0.5"; sha256 = "12hyyydznss802v4pwfcpjr0y7241114a9z82xxq60q8dval8fyb"; buildDepends = [ cereal cryptoApi tagged ]; + patchPhase = '' + sed -i -e 's|tagged *>= 0.2 && < 0.3|tagged|' -e 's|crypto-api *>= 0.6 && < 0.10|crypto-api|' skein.cabal + ''; meta = { description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well."; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index 21d95eca679b..c9352d812766 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -17,6 +17,9 @@ cabal.mkDerivation (self: { MonadCatchIOTransformers mtl mwcRandom regexPosix text time transformers unixCompat unorderedContainers vector zlibEnum ]; + patchPhase = '' + sed -i -e 's|MonadCatchIO-transformers >= 0.2.1 && < 0.3|MonadCatchIO-transformers|' snap-core.cabal + ''; meta = { homepage = "http://snapframework.com/"; description = "Snap: A Haskell Web Framework (core interfaces and types)"; diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index 028d8175861d..731903f3cfab 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -16,6 +16,9 @@ cabal.mkDerivation (self: { PSQueue snapCore text time transformers unixCompat vector vectorAlgorithms ]; + patchPhase = '' + sed -i -e 's|MonadCatchIO-transformers >= 0.2.1 && < 0.3|MonadCatchIO-transformers|' snap-server.cabal + ''; meta = { homepage = "http://snapframework.com/"; description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework"; diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix index 07d671ac33da..2611c988d593 100644 --- a/pkgs/development/libraries/haskell/tagged/default.nix +++ b/pkgs/development/libraries/haskell/tagged/default.nix @@ -1,13 +1,12 @@ -{ cabal, dataDefault, semigroups }: +{ cabal }: cabal.mkDerivation (self: { pname = "tagged"; - version = "0.2.3.1"; - sha256 = "0ldc9w35yzlrz78kakkqial32g2c7da9b5v334jh5wpgsn7lrm3n"; - buildDepends = [ dataDefault semigroups ]; + version = "0.4.2"; + sha256 = "16c2006b7f87003z6vz13fisw18iiqncjqk9x0f4wwzj6i70wgbw"; meta = { homepage = "http://github.com/ekmett/tagged"; - description = "Provides newtype wrappers for phantom types to avoid unsafely passing dummy arguments"; + description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index 98bbcdde1625..d3fd7241340e 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls-extra"; - version = "0.4.4"; - sha256 = "1yj4v140pgvgpjv1g8h3dv00k983vjnsvdgc6y4w8ij8s4jvfbay"; + version = "0.4.5"; + sha256 = "0pra0ah086y214hs4zvgkv3p4g6iara27im7x7z1djbj96ikah8a"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index 765d9621224b..4337165fbbf8 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tls"; - version = "0.9.2"; - sha256 = "0qhgf3lxclcjgvnqz6zc41l4s6fzlwpg96jdp6n7q8snn4mdfn5s"; + version = "0.9.3"; + sha256 = "172aq99w8zdr52b2gjqg2sfcd9412wbh4cpayzc3ck2j8wfdlzp5"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 9671fc2583a8..d05d4620c574 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.0.0"; - sha256 = "1wdzz6xy55430xgaibzqwij1c4yswkz3da22n2016xl5nyspaijl"; + version = "1.0.1"; + sha256 = "0rbpf2fldpd46dbcd77zryb91gh3q86k5xdb07clsy384qx7ynq6"; buildDepends = [ aeson authenticate blazeHtml hamlet httpConduit liftedBase mimeMail persistent persistentTemplate pureMD5 pwstoreFast random SHA diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 732c89622fa7..ff8318e1fa77 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.0.1"; - sha256 = "0ff72z0ixx5xdd2n6vrn474ga4n5zzr1z566s9wb54lqxd8vrdn0"; + version = "1.0.1.1"; + sha256 = "17dg6n37hdyizw3g5jqsg08ax31ilm4nlsvvsiaf6ywr7q0wrylz"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f446f1fac99a..00b60bf5ef67 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -904,8 +904,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); httpDate = callPackage ../development/libraries/haskell/http-date {}; - httpEnumerator = callPackage ../development/libraries/haskell/http-enumerator {}; - httpTypes = callPackage ../development/libraries/haskell/http-types {}; HUnit_1_2_0_3 = callPackage ../development/libraries/haskell/HUnit/1.2.0.3.nix {};