diff options
Diffstat (limited to 'pkgs/development/libraries/haskell')
28 files changed, 135 insertions, 174 deletions
diff --git a/pkgs/development/libraries/haskell/CouchDB/default.nix b/pkgs/development/libraries/haskell/CouchDB/default.nix index 4a413e2e7b8..ac8ab3d7728 100644 --- a/pkgs/development/libraries/haskell/CouchDB/default.nix +++ b/pkgs/development/libraries/haskell/CouchDB/default.nix @@ -6,6 +6,7 @@ cabal.mkDerivation (self: { sha256 = "0a9g0iblfyqppcy1ni3ac8f3yv5km95bfblhwqlsk6khydi5ka98"; buildDepends = [ HTTP json mtl network utf8String ]; testDepends = [ HTTP HUnit json mtl network utf8String ]; + doCheck = false; meta = { homepage = "http://github.com/arjunguha/haskell-couchdb/"; description = "CouchDB interface"; diff --git a/pkgs/development/libraries/haskell/HList/default.nix b/pkgs/development/libraries/haskell/HList/default.nix index 99cb73dcf1f..ae6f8e435f7 100644 --- a/pkgs/development/libraries/haskell/HList/default.nix +++ b/pkgs/development/libraries/haskell/HList/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "HList"; - version = "0.3.0.1"; - sha256 = "03mp99pb8whh3whyffyj8wbld8lv8i930dyjdpyfwiaj13x05iy4"; + version = "0.3.1.0"; + sha256 = "1cq7l7cv62jf47s75ycsgxg75kkrgnnrpb6y22cskc97hkfsnjmk"; buildDepends = [ mtl ]; testDepends = [ cmdargs doctest filepath hspec lens mtl syb ]; buildTools = [ diffutils ]; diff --git a/pkgs/development/libraries/haskell/adjunctions/default.nix b/pkgs/development/libraries/haskell/adjunctions/default.nix new file mode 100644 index 00000000000..bdfec2f01d4 --- /dev/null +++ b/pkgs/development/libraries/haskell/adjunctions/default.nix @@ -0,0 +1,19 @@ +{ cabal, comonad, contravariant, distributive, free, mtl +, semigroupoids, semigroups, tagged, transformers, void +}: + +cabal.mkDerivation (self: { + pname = "adjunctions"; + version = "4.0.1"; + sha256 = "0z13rmh9yp8jg2jzj3bmysqc4h2nblshx125h2sx51wllnvxzh5l"; + buildDepends = [ + comonad contravariant distributive free mtl semigroupoids + semigroups tagged transformers void + ]; + meta = { + homepage = "http://github.com/ekmett/adjunctions/"; + description = "Adjunctions and representable functors"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix b/pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix new file mode 100644 index 00000000000..f084fda35c5 --- /dev/null +++ b/pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "annotated-wl-pprint"; + version = "0.5.3"; + sha256 = "0g8b4hmgh7jhiknfrlaqr9sxr7a6sikkpaws15dy8mg4r792bbis"; + meta = { + homepage = "https://github.com/david-christiansen/annotated-wl-pprint"; + description = "The Wadler/Leijen Pretty Printer, with annotation support"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/connection/default.nix b/pkgs/development/libraries/haskell/connection/default.nix index 186557d81b0..69083520c18 100644 --- a/pkgs/development/libraries/haskell/connection/default.nix +++ b/pkgs/development/libraries/haskell/connection/default.nix @@ -1,13 +1,14 @@ -{ cabal, certificate, cprngAes, dataDefault, network, socks, tls -, tlsExtra +{ cabal, cprngAes, dataDefaultClass, network, socks, tls, x509 +, x509Store, x509System, x509Validation }: cabal.mkDerivation (self: { pname = "connection"; - version = "0.1.3.1"; - sha256 = "1z9vb20466lg7l8z4abfbsdzpix18hswpqcl7s2gv838s2wvd16w"; + version = "0.2.0"; + sha256 = "17fzkgrjavmcxhdjj7agkx16jwpf6ql31nw1ni8gczkbp7azd0kp"; buildDepends = [ - certificate cprngAes dataDefault network socks tls tlsExtra + cprngAes dataDefaultClass network socks tls x509 x509Store + x509System x509Validation ]; meta = { homepage = "http://github.com/vincenthz/hs-connection"; diff --git a/pkgs/development/libraries/haskell/ekg/default.nix b/pkgs/development/libraries/haskell/ekg/default.nix index dd3c40a7d2c..28ef546163a 100644 --- a/pkgs/development/libraries/haskell/ekg/default.nix +++ b/pkgs/development/libraries/haskell/ekg/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ekg"; - version = "0.3.1.3"; - sha256 = "1d8ly1lc92gh26bdqg3ql6n2iai3nyvwic6sj8pani58iv0p4ppc"; + version = "0.3.1.4"; + sha256 = "0hr9962yx463rq53xfqfm7vlv9izn47v3css3m6n4v694qlyz95i"; buildDepends = [ aeson filepath network snapCore snapServer text time transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/fay-base/default.nix b/pkgs/development/libraries/haskell/fay-base/default.nix index 8e1212f5e5a..53f6fdce41c 100644 --- a/pkgs/development/libraries/haskell/fay-base/default.nix +++ b/pkgs/development/libraries/haskell/fay-base/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "fay-base"; - version = "0.18.0.0"; - sha256 = "010zjcs4y0zdb4gijrw10sjc56i271s35bkwg5c0lblyr62nml0s"; + version = "0.19"; + sha256 = "03jf1ig3s2dcdd26j3d3iwm9hbiq5f5q5hyg22jdvl7lmvigw36j"; buildDepends = [ fay ]; meta = { homepage = "https://github.com/faylang/fay-base"; diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix index d7c8ba5a447..adc29231d62 100644 --- a/pkgs/development/libraries/haskell/fay/default.nix +++ b/pkgs/development/libraries/haskell/fay/default.nix @@ -1,22 +1,22 @@ { cabal, aeson, attoparsec, Cabal, cpphs, dataDefault, filepath , ghcPaths, haskellNames, haskellPackages, haskellSrcExts, HUnit , languageEcmascript, mtl, optparseApplicative, prettyShow, safe -, sourcemap, split, syb, testFramework, testFrameworkHunit -, testFrameworkTh, text, time, uniplate, unorderedContainers -, utf8String, vector +, scientific, sourcemap, split, syb, testFramework +, testFrameworkHunit, testFrameworkTh, text, time, uniplate +, unorderedContainers, utf8String, vector }: cabal.mkDerivation (self: { pname = "fay"; - version = "0.18.1.3"; - sha256 = "1m747l2555w1jkdwh8b851mxvngiy7l7sbkwvm2il6k5ygcz5gbv"; + version = "0.19.0.1"; + sha256 = "036z4wz7vziaczhx1ysbm7d2302n2sb6l1z48py8spai5awkbvh0"; isLibrary = true; isExecutable = true; buildDepends = [ aeson attoparsec Cabal cpphs dataDefault filepath ghcPaths haskellNames haskellPackages haskellSrcExts HUnit languageEcmascript mtl optparseApplicative prettyShow safe - sourcemap split syb testFramework testFrameworkHunit + scientific sourcemap split syb testFramework testFrameworkHunit testFrameworkTh text time uniplate unorderedContainers utf8String vector ]; diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix index a481d451973..4e679da1bdb 100644 --- a/pkgs/development/libraries/haskell/free/default.nix +++ b/pkgs/development/libraries/haskell/free/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "free"; - version = "4.2"; - sha256 = "0g2k36xqma8r6shrih40w5xv0pgs5ldr9lhc5hjpwmh4n3hgdhfb"; + version = "4.4"; + sha256 = "19c6zy7gxsd121g1kny9y8rv33gsxv3kfsi37iyn6q0p8r38wbcy"; buildDepends = [ bifunctors comonad distributive mtl profunctors semigroupoids semigroups transformers diff --git a/pkgs/development/libraries/haskell/hit/default.nix b/pkgs/development/libraries/haskell/hit/default.nix index 0c4020f746c..4dc73996cd1 100644 --- a/pkgs/development/libraries/haskell/hit/default.nix +++ b/pkgs/development/libraries/haskell/hit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hit"; - version = "0.5.3"; - sha256 = "0s6nfjdasf62x28vzks809slnh0p6j3g101jzqlfh7nrnj5k6q1d"; + version = "0.5.4"; + sha256 = "1gr2f1bzncg8zlxk343p1ifnf2a2px000syzmr7hcf4yhhfavrhz"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/http-client-tls/default.nix b/pkgs/development/libraries/haskell/http-client-tls/default.nix index 82866abe9c3..201e1e11564 100644 --- a/pkgs/development/libraries/haskell/http-client-tls/default.nix +++ b/pkgs/development/libraries/haskell/http-client-tls/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "http-client-tls"; - version = "0.2.0.2"; - sha256 = "0v5730rssddc28f1q6ndkcjrfz8r5a1wmxk1azpmdxlq6nh4i9q9"; + version = "0.2.0.3"; + sha256 = "0v8zbwlvdmkap5qbw9aw75krvw8j4q90fn301al13azzgjp71gmb"; buildDepends = [ connection dataDefault httpClient network tls ]; testDepends = [ hspec httpClient httpTypes ]; doCheck = false; diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index 704ec8db48e..819902d6139 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "lens"; - version = "3.10.1"; - sha256 = "0xjjld1ra1a0a739ia8swgbpw7r72hv0bs9akbqr9wyw8qdzibnh"; + version = "3.10.2"; + sha256 = "0hdj75sg8r1m2jdpfh81zdcwbhp6mb7xipp6q57pv6n90xc6dnxw"; buildDepends = [ bifunctors comonad contravariant distributive filepath genericDeriving hashable MonadCatchIOTransformers mtl parallel @@ -23,6 +23,9 @@ cabal.mkDerivation (self: { testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text transformers unorderedContainers vector ]; + patchPhase = '' + sed -i lens.cabal -e 's|MonadCatchIO-transformers >=.*,|MonadCatchIO-transformers,|' + ''; doCheck = false; meta = { homepage = "http://github.com/ekmett/lens/"; diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix index a358528ee28..a0d1e67ee6f 100644 --- a/pkgs/development/libraries/haskell/linear/default.nix +++ b/pkgs/development/libraries/haskell/linear/default.nix @@ -1,16 +1,17 @@ -{ cabal, binary, distributive, doctest, filepath, hashable, HUnit -, lens, reflection, semigroupoids, semigroups, simpleReflect -, tagged, testFramework, testFrameworkHunit, transformers -, unorderedContainers, vector +{ cabal, adjunctions, binary, distributive, doctest, filepath +, hashable, HUnit, lens, reflection, semigroupoids, semigroups +, simpleReflect, tagged, testFramework, testFrameworkHunit +, transformers, unorderedContainers, vector, void }: cabal.mkDerivation (self: { pname = "linear"; - version = "1.4"; - sha256 = "1a2l68q0l2vlp4wpf5wqvpnag326s38k2ifh8hcfczjhsg9cq45a"; + version = "1.6"; + sha256 = "1aka0da4mwv9cdj76armlava0d4c5f8s2pv10fk6b5glyb0c1a7x"; buildDepends = [ - binary distributive hashable reflection semigroupoids semigroups - tagged transformers unorderedContainers vector + adjunctions binary distributive hashable lens reflection + semigroupoids semigroups tagged transformers unorderedContainers + vector void ]; testDepends = [ binary doctest filepath HUnit lens simpleReflect testFramework diff --git a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix index bd9261f901e..87bd36503e1 100644 --- a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix +++ b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monadcryptorandom"; - version = "0.6"; - sha256 = "0gms6xsnr6g5lk36z92yygwmyrl568y1h76ww676wb3qph42xx3x"; + version = "0.6.1"; + sha256 = "0j99j0f2qwhslimfgslsdlv0xihsddas3i69pfnjwnsd9zg5pgj2"; buildDepends = [ cryptoApi mtl tagged transformers ]; meta = { homepage = "https://github.com/TomMD/monadcryptorandom"; diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix index 2cb5e5a5cfc..28cf920cf28 100644 --- a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix @@ -1,17 +1,17 @@ { cabal, aeson, certificate, conduit, connection, cprngAes , cryptoApi, cryptoRandomApi, dataDefault, HUnit, monadControl, mtl , network, networkConduit, pem, systemFileio, systemFilepath, tls -, tlsExtra, transformers +, transformers }: cabal.mkDerivation (self: { pname = "network-conduit-tls"; - version = "1.0.3"; - sha256 = "0l8h9pfrrqzkf45cp5r8kxpzc2fi6m01s4zkrh0d226rbps3gmvc"; + version = "1.0.4.1"; + sha256 = "1l79v4ippyfw6pl4h3vqswh79vcif80phf6kq5fr4xmv3b6nbc06"; buildDepends = [ aeson certificate conduit connection cprngAes cryptoApi cryptoRandomApi dataDefault monadControl network networkConduit pem - systemFileio systemFilepath tls tlsExtra transformers + systemFileio systemFilepath tls transformers ]; testDepends = [ conduit connection HUnit mtl networkConduit ]; meta = { diff --git a/pkgs/development/libraries/haskell/pqueue/default.nix b/pkgs/development/libraries/haskell/pqueue/default.nix new file mode 100644 index 00000000000..8634c414318 --- /dev/null +++ b/pkgs/development/libraries/haskell/pqueue/default.nix @@ -0,0 +1,13 @@ +{ cabal, deepseq }: + +cabal.mkDerivation (self: { + pname = "pqueue"; + version = "1.2.1"; + sha256 = "1fily60f4njby7zknmik7a2wxsm3y77ckr69w9bb3fgq22gbzky6"; + buildDepends = [ deepseq ]; + meta = { + description = "Reliable, persistent, fast priority queues"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix index ee408fea480..c224da3a339 100644 --- a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "reactive-banana-wx"; - version = "0.7.1.0"; - sha256 = "06hkb8v6rjpw95vf16xh547igxxzddr6wpjiwhqwpwhz2alavk2v"; + version = "0.8.0.0"; + sha256 = "0qfd839nm2ppjhhhnn6s1hbx1mnrzjqx450p4jadsrs1y2403c9n"; isLibrary = true; isExecutable = true; buildDepends = [ cabalMacosx reactiveBanana wx wxcore ]; diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix index 0bf7747d46b..535b289a389 100644 --- a/pkgs/development/libraries/haskell/reactive-banana/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix @@ -1,19 +1,21 @@ -{ cabal, hashable, HUnit, testFramework, testFrameworkHunit +{ cabal, hashable, HUnit, pqueue, testFramework, testFrameworkHunit , transformers, unorderedContainers, vault }: cabal.mkDerivation (self: { pname = "reactive-banana"; - version = "0.7.1.3"; - sha256 = "117y1sk97kpiq0cippq0ydl2zqb99q49y2m2m6pgg2nh6gz6a3zb"; - buildDepends = [ hashable transformers unorderedContainers vault ]; + version = "0.8.0.0"; + sha256 = "15dzvn7cbs9kg410lyd1kj6kf2r7ap2n9bc59byzkb0r8wzn9ra1"; + buildDepends = [ + hashable pqueue transformers unorderedContainers vault + ]; testDepends = [ - hashable HUnit testFramework testFrameworkHunit transformers + hashable HUnit pqueue testFramework testFrameworkHunit transformers unorderedContainers vault ]; meta = { homepage = "http://haskell.org/haskellwiki/Reactive-banana"; - description = "Practical library for functional reactive programming (FRP)"; + description = "Library for functional reactive programming (FRP)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ diff --git a/pkgs/development/libraries/haskell/reflection/default.nix b/pkgs/development/libraries/haskell/reflection/default.nix index 5f227d60ca8..a02a7ec6907 100644 --- a/pkgs/development/libraries/haskell/reflection/default.nix +++ b/pkgs/development/libraries/haskell/reflection/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "reflection"; - version = "1.3.2"; - sha256 = "0jmdygvmvhw20aqjk7k0jah93ggfgf2bgq5zpwnz9bwgi9gs17x6"; + version = "1.4"; + sha256 = "0i6yb3fa9wizyaz8x9b7yzkw9jf7zahdrkr2y0iw7igdxqn4n0k7"; buildDepends = [ tagged ]; meta = { homepage = "http://github.com/ekmett/reflection"; diff --git a/pkgs/development/libraries/haskell/sourcemap/default.nix b/pkgs/development/libraries/haskell/sourcemap/default.nix index 602654b0a01..ce0c89d4596 100644 --- a/pkgs/development/libraries/haskell/sourcemap/default.nix +++ b/pkgs/development/libraries/haskell/sourcemap/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "sourcemap"; - version = "0.1.2.0"; - sha256 = "040j2k1cwzlq5pybs6cg7wmf0x5i22zdidv2xvzdvgi5v7gf6kp1"; + version = "0.1.3.0"; + sha256 = "1flfsjs2z2zjzqwvmc2vcibvxh19s89ah4s560xr2s5mhdqwbkk5"; buildDepends = [ aeson attoparsec text unorderedContainers utf8String ]; diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix deleted file mode 100644 index 6d63c267c61..00000000000 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ cabal, certificate, cipherAes, cipherRc4, cryptohash -, cryptoPubkey, cryptoRandom, mtl, network, pem, time, tls, vector -}: - -cabal.mkDerivation (self: { - pname = "tls-extra"; - version = "0.6.6"; - sha256 = "0k0sj3nq1lrvbmd582mjj8cxbxigivz1hm8hhij1ncl2pgnq5xyv"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - certificate cipherAes cipherRc4 cryptohash cryptoPubkey - cryptoRandom mtl network pem time tls vector - ]; - jailbreak = true; - meta = { - homepage = "http://github.com/vincenthz/hs-tls"; - description = "TLS extra default values and helpers"; - 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/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index 0f354d8b77e..638299d4a42 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -1,18 +1,23 @@ -{ cabal, cereal, certificate, cprngAes, cryptohash, cryptoPubkey -, cryptoRandom, mtl, network, QuickCheck, testFramework -, testFrameworkQuickcheck2, time +{ cabal, asn1Encoding, asn1Types, cereal, cipherAes, cipherRc4 +, cprngAes, cryptohash, cryptoNumbers, cryptoPubkey +, cryptoPubkeyTypes, cryptoRandom, dataDefaultClass, mtl, network +, QuickCheck, testFramework, testFrameworkQuickcheck2, time, x509 +, x509Store, x509Validation }: cabal.mkDerivation (self: { pname = "tls"; - version = "1.1.5"; - sha256 = "1ja03x3i7dgjpy22h4shnni1xslph8i8q4accqq8njpqpz54c84c"; + version = "1.2.2"; + sha256 = "156l859mfpdax5rg1frwa5ms5bzggaja0mi795hh8i5c3ah7hfcp"; buildDepends = [ - cereal certificate cryptohash cryptoPubkey cryptoRandom mtl network + asn1Encoding asn1Types cereal cipherAes cipherRc4 cryptohash + cryptoNumbers cryptoPubkey cryptoPubkeyTypes cryptoRandom + dataDefaultClass mtl network x509 x509Store x509Validation ]; testDepends = [ - cereal certificate cprngAes cryptoPubkey cryptoRandom mtl - QuickCheck testFramework testFrameworkQuickcheck2 time + cereal cprngAes cryptoPubkey cryptoRandom dataDefaultClass mtl + QuickCheck testFramework testFrameworkQuickcheck2 time x509 + x509Validation ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix index df57bbbdac7..4667ed956f0 100644 --- a/pkgs/development/libraries/haskell/unbound/default.nix +++ b/pkgs/development/libraries/haskell/unbound/default.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, RepLib, transformers }: +{ cabal, binary, mtl, RepLib, transformers }: cabal.mkDerivation (self: { pname = "unbound"; - version = "0.4.2"; - sha256 = "1bnnnv4rmzb0pw7i56nzr7k7pahr9rcmlfi4xkpsjhrxmizcfml9"; - buildDepends = [ mtl RepLib transformers ]; + version = "0.4.3"; + sha256 = "1lv60zpsvjfp9qnckwbphkfv0x9pz2qvaab3p4kj38fnlq2y20i4"; + buildDepends = [ binary mtl RepLib transformers ]; meta = { homepage = "http://code.google.com/p/replib/"; description = "Generic support for programming with names and binders"; diff --git a/pkgs/development/libraries/haskell/vector-th-unbox/default.nix b/pkgs/development/libraries/haskell/vector-th-unbox/default.nix index 8f5ec4b52bf..db328836616 100644 --- a/pkgs/development/libraries/haskell/vector-th-unbox/default.nix +++ b/pkgs/development/libraries/haskell/vector-th-unbox/default.nix @@ -1,10 +1,11 @@ -{ cabal, vector }: +{ cabal, dataDefault, vector }: cabal.mkDerivation (self: { pname = "vector-th-unbox"; - version = "0.2.0.1"; - sha256 = "1q01yk6cyjxbdnmq31d5mfac09hbql43d7xiw1snc96nmkklfpjv"; + version = "0.2.0.2"; + sha256 = "1c8xy0rcl8il9ssclqshwi8dd2xx6bl1rfhrfm9h7wklw64db9xp"; buildDepends = [ vector ]; + testDepends = [ dataDefault vector ]; meta = { description = "Deriver for Data.Vector.Unboxed using Template Haskell"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 3022b0565de..f3d2dfbd0cd 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "2.0.3.2"; - sha256 = "0zhwk78ny7ak6sf974gqg3zjrrmivgb7dvxs5jbqghq0a6xs97zi"; + version = "2.0.3.3"; + sha256 = "11ma8pazvysvpiy8y7xfh7kpmsfiw94bd6vyyi3ji8q71rzjlf62"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase diff --git a/pkgs/development/libraries/haskell/warp-tls/default.nix b/pkgs/development/libraries/haskell/warp-tls/default.nix index 88e50b2488e..c93352cf65c 100644 --- a/pkgs/development/libraries/haskell/warp-tls/default.nix +++ b/pkgs/development/libraries/haskell/warp-tls/default.nix @@ -1,15 +1,14 @@ -{ cabal, certificate, conduit, cprngAes, cryptocipher -, cryptoRandomApi, network, networkConduit, pem, tls, tlsExtra -, transformers, wai, warp +{ cabal, conduit, cprngAes, dataDefaultClass, network +, networkConduit, tls, transformers, wai, warp }: cabal.mkDerivation (self: { pname = "warp-tls"; - version = "2.0.1"; - sha256 = "0qz02awxrfqmmckias21dh0irmf44vamv24jjjrbb6bjxbr4ldd0"; + version = "2.0.2"; + sha256 = "02wj9hwxd0x49g7kl68h3r4b9hc29yqfjagyybnr42xzwl6bdpyg"; buildDepends = [ - certificate conduit cprngAes cryptocipher cryptoRandomApi network - networkConduit pem tls tlsExtra transformers wai warp + conduit cprngAes dataDefaultClass network networkConduit tls + transformers wai warp ]; meta = { homepage = "http://github.com/yesodweb/wai"; diff --git a/pkgs/development/libraries/haskell/x509-store/default.nix b/pkgs/development/libraries/haskell/x509-store/default.nix index bc1c0c47dc9..100b5ca2835 100644 --- a/pkgs/development/libraries/haskell/x509-store/default.nix +++ b/pkgs/development/libraries/haskell/x509-store/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "x509-store"; - version = "1.4.3"; - sha256 = "1px5r5y4vaxx479d4av333g1sc03mz1aalpvwwkbi5bwnxydvf01"; + version = "1.4.4"; + sha256 = "0i3hfrddr0wpfl75a76a1j24az08z4x7ya8l5qcdk7c1lr2c2bw8"; buildDepends = [ asn1Encoding asn1Types cryptoPubkeyTypes filepath mtl pem time x509 ]; diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix deleted file mode 100644 index ee9fa20c8de..00000000000 --- a/pkgs/development/libraries/haskell/yesod-platform/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ cabal, aeson, ansiTerminal, asn1Data, asn1Types, attoparsec -, attoparsecConduit, authenticate, base64Bytestring -, baseUnicodeSymbols, blazeBuilder, blazeBuilderConduit, blazeHtml -, blazeMarkup, byteable, byteorder, caseInsensitive, cereal -, certificate, cipherAes, cipherBlowfish, cipherCamellia, cipherDes -, cipherRc4, clientsession, conduit, connection, controlMonadLoop -, cookie, cprngAes, cryptoApi, cryptocipher, cryptoCipherTypes -, cryptoConduit, cryptohash, cryptohashCryptoapi, cryptoNumbers -, cryptoPubkey, cryptoPubkeyTypes, cryptoRandom, cryptoRandomApi -, cssText, dataDefault, dataDefaultClass, dataDefaultInstancesBase -, dataDefaultInstancesContainers, dataDefaultInstancesDlist -, dataDefaultInstancesOldLocale, dlist, emailValidate, entropy -, esqueleto, failure, fastLogger, fileEmbed, filesystemConduit -, hamlet, hjsmin, hspec, hspecExpectations, htmlConduit -, httpAttoparsec, httpClient, httpClientConduit, httpClientTls -, httpConduit, httpDate, httpTypes, languageJavascript, liftedBase -, mimeMail, mimeTypes, mmorph, monadControl, monadLogger -, monadLoops, networkConduit, pathPieces, pem, persistent -, persistentTemplate, poolConduit, primitive, processConduit -, publicsuffixlist, pureMD5, pwstoreFast, quickcheckIo -, resourcePool, resourcet, safe, scientific, securemem, semigroups -, setenv, SHA, shakespeare, shakespeareCss, shakespeareI18n -, shakespeareJs, shakespeareText, silently, simpleSendfile, skein -, socks, stmChans, stringsearch, systemFileio, systemFilepath -, tagged, tagsoup, tagstreamConduit, tls, tlsExtra -, transformersBase, unixCompat, unorderedContainers, utf8Light -, utf8String, vector, void, wai, waiAppStatic, waiExtra, waiLogger -, waiTest, warp, warpTls, word8, xmlConduit, xmlTypes, xssSanitize -, yaml, yesod, yesodAuth, yesodCore, yesodForm, yesodPersistent -, yesodRoutes, yesodStatic, yesodTest, zlibBindings, zlibConduit -}: - -cabal.mkDerivation (self: { - pname = "yesod-platform"; - version = "1.2.6.1"; - sha256 = "1hwvpyxwirv9maangw4q6nb2m2kqpqvvh1i095fr08f1a1qih77f"; - buildDepends = [ - aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit - authenticate base64Bytestring baseUnicodeSymbols blazeBuilder - blazeBuilderConduit blazeHtml blazeMarkup byteable byteorder - caseInsensitive cereal certificate cipherAes cipherBlowfish - cipherCamellia cipherDes cipherRc4 clientsession conduit connection - controlMonadLoop cookie cprngAes cryptoApi cryptocipher - cryptoCipherTypes cryptoConduit cryptohash cryptohashCryptoapi - cryptoNumbers cryptoPubkey cryptoPubkeyTypes cryptoRandom - cryptoRandomApi cssText dataDefault dataDefaultClass - dataDefaultInstancesBase dataDefaultInstancesContainers - dataDefaultInstancesDlist dataDefaultInstancesOldLocale dlist - emailValidate entropy esqueleto failure fastLogger fileEmbed - filesystemConduit hamlet hjsmin hspec hspecExpectations htmlConduit - httpAttoparsec httpClient httpClientConduit httpClientTls - httpConduit httpDate httpTypes languageJavascript liftedBase - mimeMail mimeTypes mmorph monadControl monadLogger monadLoops - networkConduit pathPieces pem persistent persistentTemplate - poolConduit primitive processConduit publicsuffixlist pureMD5 - pwstoreFast quickcheckIo resourcePool resourcet safe scientific - securemem semigroups setenv SHA shakespeare shakespeareCss - shakespeareI18n shakespeareJs shakespeareText silently - simpleSendfile skein socks stmChans stringsearch systemFileio - systemFilepath tagged tagsoup tagstreamConduit tls tlsExtra - transformersBase unixCompat unorderedContainers utf8Light - utf8String vector void wai waiAppStatic waiExtra waiLogger waiTest - warp warpTls word8 xmlConduit xmlTypes xssSanitize yaml yesod - yesodAuth yesodCore yesodForm yesodPersistent yesodRoutes - yesodStatic yesodTest zlibBindings zlibConduit - ]; - jailbreak = true; - meta = { - homepage = "http://www.yesodweb.com/"; - description = "Meta package for Yesod"; - license = self.stdenv.lib.licenses.mit; - platforms = self.ghc.meta.platforms; - }; -}) |