diff options
Diffstat (limited to 'pkgs/development')
63 files changed, 377 insertions, 158 deletions
diff --git a/pkgs/development/libraries/haskell/HFuse/default.nix b/pkgs/development/libraries/haskell/HFuse/default.nix index bbb145fd8bf8..9d37b580d802 100644 --- a/pkgs/development/libraries/haskell/HFuse/default.nix +++ b/pkgs/development/libraries/haskell/HFuse/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { extraLibraries = [ fuse ]; preConfigure = '' sed -i -e "s@ Extra-Lib-Dirs: /usr/local/lib@ Extra-Lib-Dirs: ${fuse}/lib@" HFuse.cabal + sed -i -e "s@ Include-Dirs: /usr/include, /usr/local/include, .@ Include-Dirs: ${fuse}/include@" HFuse.cabal sed -i -e "s/LANGUAGE FlexibleContexts/LANGUAGE FlexibleContexts, RankNTypes/" System/Fuse.hsc sed -i -e "s/E(Exception/E(catch, Exception, IOException/" System/Fuse.hsc sed -i -e "s/IO(catch,/IO(/" System/Fuse.hsc diff --git a/pkgs/development/libraries/haskell/boomerang/default.nix b/pkgs/development/libraries/haskell/boomerang/default.nix index 963448a56e73..3e65c0a2dd4a 100644 --- a/pkgs/development/libraries/haskell/boomerang/default.nix +++ b/pkgs/development/libraries/haskell/boomerang/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "boomerang"; - version = "1.3.3"; - sha256 = "1i44j3qyjkq69h65wfsrps5zp097i3nh9fwcb2f1spr8nznb5mff"; + version = "1.4.0"; + sha256 = "1z6sx2r886jms59ah31is0fqkwix2kwxmpnrc6bb2r6xazznxfc9"; buildDepends = [ mtl text ]; meta = { description = "Library for invertible parsing and printing"; diff --git a/pkgs/development/libraries/haskell/cereal-conduit/default.nix b/pkgs/development/libraries/haskell/cereal-conduit/default.nix index 464e8dbb5e76..fc76f85cebc4 100644 --- a/pkgs/development/libraries/haskell/cereal-conduit/default.nix +++ b/pkgs/development/libraries/haskell/cereal-conduit/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cereal-conduit"; - version = "0.7"; - sha256 = "0cf0lp47qiilrdrzmn58hwh3q7fh7g55f2a1r1bw31xapp1cvbix"; + version = "0.7.1"; + sha256 = "0ry6vc3nkb1lj0p103b8pyd3472hx62s3c7yw3fk8mbjlygxyv43"; buildDepends = [ cereal conduit transformers ]; testDepends = [ cereal conduit HUnit mtl resourcet transformers ]; meta = { diff --git a/pkgs/development/libraries/haskell/cipher-blowfish/default.nix b/pkgs/development/libraries/haskell/cipher-blowfish/default.nix index af8114c6d028..535a4b97fcad 100644 --- a/pkgs/development/libraries/haskell/cipher-blowfish/default.nix +++ b/pkgs/development/libraries/haskell/cipher-blowfish/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cipher-blowfish"; - version = "0.0.1"; - sha256 = "0bz8jd65idcalyzcbmgz16hr6y5mnw7mckk5yvrm9k19cr6mwq52"; + version = "0.0.2"; + sha256 = "08jc1qsvnyk7zm7bp0nibkc6lx3bkid79cn1r6fidmccf716r3sp"; buildDepends = [ byteable cryptoCipherTypes securemem vector ]; testDepends = [ byteable cryptoCipherTests cryptoCipherTypes QuickCheck diff --git a/pkgs/development/libraries/haskell/cipher-des/default.nix b/pkgs/development/libraries/haskell/cipher-des/default.nix index 588a28f3a258..0340372d54b7 100644 --- a/pkgs/development/libraries/haskell/cipher-des/default.nix +++ b/pkgs/development/libraries/haskell/cipher-des/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cipher-des"; - version = "0.0.3"; - sha256 = "1gcpwfxrlgwl34yy7k3vhpmcrmyiirbmz40zssk2lv6cfrylc4z7"; + version = "0.0.4"; + sha256 = "18xpc7v0xyh0qb7p03ail1lyh376h1vg000xn22b5shpgp5kxiqq"; buildDepends = [ byteable cryptoCipherTypes securemem ]; testDepends = [ byteable cryptoCipherTests cryptoCipherTypes QuickCheck diff --git a/pkgs/development/libraries/haskell/citeproc-hs/default.nix b/pkgs/development/libraries/haskell/citeproc-hs/default.nix index 2c68fd24d1fa..573c5085b109 100644 --- a/pkgs/development/libraries/haskell/citeproc-hs/default.nix +++ b/pkgs/development/libraries/haskell/citeproc-hs/default.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { filepath hexpat hsBibutils HTTP json mtl network pandocTypes parsec syb time utf8String ]; + jailbreak = true; meta = { homepage = "http://gorgias.mine.nu/repos/citeproc-hs/"; description = "A Citation Style Language implementation in Haskell"; diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 8c550065debe..0e1757f7b507 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.0.7.3"; - sha256 = "0ih3ymv5m3c66wr9xydc1dxgpvh5b92dyyc7v67li6n3w7dzi6fp"; + version = "1.0.7.4"; + sha256 = "1bvi9gw9sfi1fml339rn3cfq4i3yd9j9vw41p5cpz5pnv3gw225x"; buildDepends = [ liftedBase mmorph monadControl mtl resourcet text transformers transformersBase void diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix index fb6d2ff456b8..9425ec375477 100644 --- a/pkgs/development/libraries/haskell/cprng-aes/default.nix +++ b/pkgs/development/libraries/haskell/cprng-aes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cprng-aes"; - version = "0.5.1"; - sha256 = "1bw76y2krcshimvwzph76d69bdfaxfi21w4dxfslmqm78knlls47"; + version = "0.5.2"; + sha256 = "1nf8dd83ywriq2ynv48f2s5lvc9s3srq4j5vbspmf0kc74kmq2pf"; buildDepends = [ byteable cipherAes cryptoRandom random ]; meta = { homepage = "http://github.com/vincenthz/hs-cprng-aes"; diff --git a/pkgs/development/libraries/haskell/crypto-numbers/default.nix b/pkgs/development/libraries/haskell/crypto-numbers/default.nix index eba1b906d5b9..68deb8e3472e 100644 --- a/pkgs/development/libraries/haskell/crypto-numbers/default.nix +++ b/pkgs/development/libraries/haskell/crypto-numbers/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "crypto-numbers"; - version = "0.2.0"; - sha256 = "1s4q9qqb7qb0shaxmhhxixsnhgwn2h6nxxblkfqqqvkdiwis278j"; + version = "0.2.1"; + sha256 = "1bc24xk101x7npv083gzh3vjzwjh65ql85h4z0vxk3lnd0pmdmnq"; buildDepends = [ cryptoRandom vector ]; testDepends = [ byteable cryptoRandom HUnit QuickCheck testFramework diff --git a/pkgs/development/libraries/haskell/crypto-random/default.nix b/pkgs/development/libraries/haskell/crypto-random/default.nix index 583e9e5805b3..1b5e2aa32387 100644 --- a/pkgs/development/libraries/haskell/crypto-random/default.nix +++ b/pkgs/development/libraries/haskell/crypto-random/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "crypto-random"; - version = "0.0.5"; - sha256 = "1wvbbqqfqaylq9w8pyiz243d06ivh982mhb2ci5yhjl06vqv2gk3"; + version = "0.0.7"; + sha256 = "1dj63y85l3f1x7fw8j7hykz56ajd38iikl3f8ygaz8r95pd1zjxw"; buildDepends = [ securemem vector ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-random"; diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix index 7fe2fdcba9f2..0873e65d9daa 100644 --- a/pkgs/development/libraries/haskell/derive/default.nix +++ b/pkgs/development/libraries/haskell/derive/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "derive"; - version = "2.5.12"; - sha256 = "17agsdarxm22z4g911layb5g11gg8r1p2ar86pg1ch1q0jnhfqxr"; + version = "2.5.13"; + sha256 = "0lmwj66s4krh29qqmkyc3cn3j4b4mhyqvlngvmy1xaigmgib5aci"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix index e2dc195b196f..3773192a5dc6 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix @@ -3,11 +3,12 @@ cabal.mkDerivation (self: { pname = "digestive-functors-heist"; - version = "0.7.0.0"; - sha256 = "0ljsr4yy3pb4cjg9dcgfcs9rn1ihg3xi9ak5p3h3kw3w19d1hsaq"; + version = "0.8.0.0"; + sha256 = "1zy2fy30q51q8pqw78f8gxc1x52vw49w3mnqc2hfqw190v5r9dgh"; buildDepends = [ blazeBuilder digestiveFunctors heist mtl text xmlhtml ]; + jailbreak = true; meta = { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Heist frontend for the digestive-functors library"; diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix index 154b7ea06288..1f672c25cfa0 100644 --- a/pkgs/development/libraries/haskell/dimensional/default.nix +++ b/pkgs/development/libraries/haskell/dimensional/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "dimensional"; - version = "0.12.1"; - sha256 = "176mvnd570xskjs6ky1wax9adzzrm9j6ai0fc4hy2z4097ydcgwm"; + version = "0.12.1.1"; + sha256 = "1fjkvyp62bh5gyzhkn189z5mxrr1acwmk39mqxk4579xbchvpyq6"; buildDepends = [ numtype time ]; meta = { homepage = "http://dimensional.googlecode.com/"; diff --git a/pkgs/development/libraries/haskell/exceptions/default.nix b/pkgs/development/libraries/haskell/exceptions/default.nix new file mode 100644 index 000000000000..a15c2cc1e48f --- /dev/null +++ b/pkgs/development/libraries/haskell/exceptions/default.nix @@ -0,0 +1,21 @@ +{ cabal, mtl, QuickCheck, testFramework, testFrameworkQuickcheck2 +, transformers +}: + +cabal.mkDerivation (self: { + pname = "exceptions"; + version = "0.3.2"; + sha256 = "0c1d78wm8is9kyv26drbx3f1sq2bfcq5m6wfw2qzwgalb3z2kxlw"; + buildDepends = [ mtl transformers ]; + testDepends = [ + mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers + ]; + doCheck = false; + meta = { + homepage = "http://github.com/ekmett/exceptions/"; + description = "Extensible optionally-pure exceptions"; + license = "unknown"; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix new file mode 100644 index 000000000000..56bf80d71af4 --- /dev/null +++ b/pkgs/development/libraries/haskell/free/default.nix @@ -0,0 +1,21 @@ +{ cabal, bifunctors, comonad, comonadsFd, comonadTransformers +, distributive, mtl, profunctors, semigroupoids, semigroups +, transformers +}: + +cabal.mkDerivation (self: { + pname = "free"; + version = "3.4.2"; + sha256 = "1x6pdkcxk6z9ndph2yzz5n21afc2330m0ryv4w67jsss5aa69fwb"; + buildDepends = [ + bifunctors comonad comonadsFd comonadTransformers distributive mtl + profunctors semigroupoids semigroups transformers + ]; + meta = { + homepage = "http://github.com/ekmett/free/"; + description = "Monads for free"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/gnutls/default.nix b/pkgs/development/libraries/haskell/gnutls/default.nix index 72f98677ce66..8e77a0626ced 100644 --- a/pkgs/development/libraries/haskell/gnutls/default.nix +++ b/pkgs/development/libraries/haskell/gnutls/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "gnutls"; - version = "0.1.4"; - sha256 = "0xgjp274m4z005z77lhmh7blg6rw9g28jm0sd376rr49hykbxwd1"; + version = "0.1.5"; + sha256 = "1sf6b4g0jwk1jrzjq4vwwak57lzm1zc43ggysp973q5icm6gs8wp"; buildDepends = [ monadsTf transformers ]; extraLibraries = [ gnutls ]; pkgconfigDepends = [ gnutls ]; diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index c5d0b335531e..c29672767a6b 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hamlet"; - version = "1.1.7.1"; - sha256 = "1kcjzvslxis8qapy7g1cqkqqamrnkyammy33pan7ckzv5fd59q5p"; + version = "1.1.7.2"; + sha256 = "1pfpygbabfmgx01vjkxhf3p9map2v7x8jys06jd6qgc4j90dnk1c"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index 22ad08afe380..9def726fb69c 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "heist"; - version = "0.12.0"; - sha256 = "0fdqvippsxljylchfcr32lw367i17cpv4yavjvmhfd923vgmmfj9"; + version = "0.13.0"; + sha256 = "1f406i7jdz45s88n0nrd76vj927a0fx02nf1f98r4in0ic5anp11"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors filepath hashable MonadCatchIOTransformers mtl random text time diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix index ff6c0f204d70..d409501d706b 100644 --- a/pkgs/development/libraries/haskell/hspec-meta/default.nix +++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hspec-meta"; - version = "1.7.1"; - sha256 = "08g327jnv7alamabxafhsv7ssisgymgsf91khr73zja5x8idfkxc"; + version = "1.7.2"; + sha256 = "03ksxx7w61iw3hf055mjb47bjh8srwxpqxs5bxqdqrilfd1cixmj"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index 0c9783c9a9c9..6d9caf6e6b63 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hspec"; - version = "1.7.1"; - sha256 = "0fc8phc36876f8qydc5iwz3i7nri0n6b4dlxv0w4rcxgv9hp7ls0"; + version = "1.7.2"; + sha256 = "0f0l5kzkpn957v7ibaxz9bxmjmbjaw50z2xs23g2w06zwnxii90h"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index c44e489519ca..a4f458f83953 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -1,4 +1,4 @@ -{ cabal, blazeBuilder, caseInsensitive, classyPrelude, conduit +{ cabal, basicPrelude, blazeBuilder, caseInsensitive, conduit , dataDefault, hspec, httpConduit, httpTypes, liftedBase , monadControl, network, networkConduit, text, transformers, wai , waiLogger, warp, word8 @@ -6,10 +6,10 @@ cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.2.1"; - sha256 = "1f1087igr4kisb3z3lxznb85sfhzr2s08am1za3jg8cgffmrais8"; + version = "0.2.1.1"; + sha256 = "12hfbl8239ivrqvd5pi1avlcb381q861958qwyf20jc5jpwvjjgj"; buildDepends = [ - blazeBuilder caseInsensitive classyPrelude conduit dataDefault + basicPrelude blazeBuilder caseInsensitive conduit dataDefault httpConduit httpTypes liftedBase monadControl network networkConduit text wai waiLogger warp word8 ]; diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index 8bc221f14933..20541aa4a2ff 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "lens"; - version = "3.9.0.2"; - sha256 = "0ch38z33zgdyzjmc7jqwabwq68iidicpzhbwzpd4fvcqdp27apl2"; + version = "3.9.1"; + sha256 = "141v7b5ag6jxnim1hdyxqi5m2sm1j5fpspkcs8qnznfcd33gyfja"; buildDepends = [ bifunctors comonad comonadsFd comonadTransformers contravariant distributive filepath genericDeriving hashable @@ -26,9 +26,6 @@ cabal.mkDerivation (self: { transformers unorderedContainers vector ]; doCheck = false; - patchPhase = '' - sed -i -e 's|generic-deriving.*,|generic-deriving,|' lens.cabal - ''; meta = { homepage = "http://github.com/ekmett/lens/"; description = "Lenses, Folds and Traversals"; diff --git a/pkgs/development/libraries/haskell/network-simple/default.nix b/pkgs/development/libraries/haskell/network-simple/default.nix new file mode 100644 index 000000000000..72d8c8af8c89 --- /dev/null +++ b/pkgs/development/libraries/haskell/network-simple/default.nix @@ -0,0 +1,15 @@ +{ cabal, exceptions, network, transformers }: + +cabal.mkDerivation (self: { + pname = "network-simple"; + version = "0.3.0"; + sha256 = "046nbgdwazbqffcim1gxry1mf35yg41g52zdk86h9whhiwjzlywz"; + buildDepends = [ exceptions network transformers ]; + meta = { + homepage = "https://github.com/k0001/network-simple"; + description = "Simple network sockets usage patterns"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/pipes-aeson/default.nix b/pkgs/development/libraries/haskell/pipes-aeson/default.nix new file mode 100644 index 000000000000..156b89244ee6 --- /dev/null +++ b/pkgs/development/libraries/haskell/pipes-aeson/default.nix @@ -0,0 +1,19 @@ +{ cabal, aeson, attoparsec, pipes, pipesAttoparsec, pipesParse +, transformers +}: + +cabal.mkDerivation (self: { + pname = "pipes-aeson"; + version = "0.2.0"; + sha256 = "12y5dywrhx3mvmlq26bc1cwybnclqbf91zvlz5ig2pi01ji3q94y"; + buildDepends = [ + aeson attoparsec pipes pipesAttoparsec pipesParse transformers + ]; + meta = { + homepage = "https://github.com/k0001/pipes-aeson"; + description = "Encode and decode JSON streams using Aeson and Pipes"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix new file mode 100644 index 000000000000..50f169928db5 --- /dev/null +++ b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix @@ -0,0 +1,22 @@ +{ cabal, attoparsec, HUnit, mmorph, pipes, pipesParse, QuickCheck +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text +, transformers +}: + +cabal.mkDerivation (self: { + pname = "pipes-attoparsec"; + version = "0.3.0"; + sha256 = "1jsgssfs0ndn8aayc0rxyb4vlp2fny8npmnvym7v1yhp2qv84c7b"; + buildDepends = [ attoparsec pipes pipesParse text transformers ]; + testDepends = [ + attoparsec HUnit mmorph pipes pipesParse QuickCheck testFramework + testFrameworkHunit testFrameworkQuickcheck2 text transformers + ]; + meta = { + homepage = "https://github.com/k0001/pipes-attoparsec"; + description = "Attoparsec and Pipes integration"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix index 970321bf2862..3a14619d2662 100644 --- a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix +++ b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix @@ -1,13 +1,15 @@ -{ cabal, pipes, stm }: +{ cabal, async, pipes, stm }: cabal.mkDerivation (self: { pname = "pipes-concurrency"; - version = "1.2.1"; - sha256 = "036cn6pafqpf2811iigablks3zk747bnzji9ykrgwhpja427vlbl"; + version = "2.0.0"; + sha256 = "1f9l6qlaf8dyldzwaavj3k5akm74ycga5j173ypdna3pv0jbzfrk"; buildDepends = [ pipes stm ]; + testDepends = [ async pipes stm ]; meta = { description = "Concurrency for the pipes ecosystem"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/pipes-network/default.nix b/pkgs/development/libraries/haskell/pipes-network/default.nix new file mode 100644 index 000000000000..89c67fb79ca2 --- /dev/null +++ b/pkgs/development/libraries/haskell/pipes-network/default.nix @@ -0,0 +1,17 @@ +{ cabal, network, networkSimple, pipes, pipesSafe, transformers }: + +cabal.mkDerivation (self: { + pname = "pipes-network"; + version = "0.6.0"; + sha256 = "1jfj5bmpvf9vvq86jz8hbhzzjawchri90vx11fxcbz2ckks673k9"; + buildDepends = [ + network networkSimple pipes pipesSafe transformers + ]; + meta = { + homepage = "https://github.com/k0001/pipes-network"; + description = "Use network sockets together with the pipes library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/pipes-parse/default.nix b/pkgs/development/libraries/haskell/pipes-parse/default.nix index 2a5e62926b92..2584e001c4f7 100644 --- a/pkgs/development/libraries/haskell/pipes-parse/default.nix +++ b/pkgs/development/libraries/haskell/pipes-parse/default.nix @@ -1,13 +1,14 @@ -{ cabal, pipes }: +{ cabal, free, pipes, transformers }: cabal.mkDerivation (self: { pname = "pipes-parse"; - version = "1.0.0"; - sha256 = "0fk39a6d0ik5ghwyj6yyi9d0cj2sp22812fin7amcxcafrplf88w"; - buildDepends = [ pipes ]; + version = "2.0.0"; + sha256 = "092y0a4lvll451gnbz6ddrqgh22bd69wi00c0zd8s0hmf2f53y0s"; + buildDepends = [ free pipes transformers ]; meta = { description = "Parsing infrastructure for the pipes ecosystem"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/pipes-safe/default.nix b/pkgs/development/libraries/haskell/pipes-safe/default.nix index 09c58f0a0179..fd722c0fb05a 100644 --- a/pkgs/development/libraries/haskell/pipes-safe/default.nix +++ b/pkgs/development/libraries/haskell/pipes-safe/default.nix @@ -1,13 +1,14 @@ -{ cabal, pipes, transformers }: +{ cabal, exceptions, pipes, transformers }: cabal.mkDerivation (self: { pname = "pipes-safe"; - version = "1.2.0"; - sha256 = "0ki9i9378j8kgw5dd91b38r686pcr9fl2vf9dfgfshia072ppggj"; - buildDepends = [ pipes transformers ]; + version = "2.0.0"; + sha256 = "1g7ha6x87qyk3f9vrl0djzdvaq80q4q6hh7lya4kgm3cbz00a0yv"; + buildDepends = [ exceptions pipes transformers ]; meta = { description = "Safety for the pipes ecosystem"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/pipes-zlib/default.nix b/pkgs/development/libraries/haskell/pipes-zlib/default.nix new file mode 100644 index 000000000000..171b8c90b561 --- /dev/null +++ b/pkgs/development/libraries/haskell/pipes-zlib/default.nix @@ -0,0 +1,15 @@ +{ cabal, pipes, transformers, zlib, zlibBindings }: + +cabal.mkDerivation (self: { + pname = "pipes-zlib"; + version = "0.3.0"; + sha256 = "15d475rxziazxlbcbm8snik45z88kk7gxbxrpv4070bwylh3z0wc"; + buildDepends = [ pipes transformers zlib zlibBindings ]; + meta = { + homepage = "https://github.com/k0001/pipes-zlib"; + description = "Zlib compression and decompression for Pipes streams"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/pipes/default.nix b/pkgs/development/libraries/haskell/pipes/default.nix index 87c173850f9b..a78028416076 100644 --- a/pkgs/development/libraries/haskell/pipes/default.nix +++ b/pkgs/development/libraries/haskell/pipes/default.nix @@ -1,13 +1,14 @@ -{ cabal, mmorph, transformers }: +{ cabal, mmorph, mtl, transformers, void }: cabal.mkDerivation (self: { pname = "pipes"; - version = "3.3.0"; - sha256 = "1bgznfv7hxqwj5f7vkm8d41phw63bl2swzr0wrz0pcqxlr42likb"; - buildDepends = [ mmorph transformers ]; + version = "4.0.0"; + sha256 = "0zsz739hjmfirwv9sacibpikwz48l006g95m8da1rqk5p1yyr2lm"; + buildDepends = [ mmorph mtl transformers void ]; meta = { description = "Compositional pipelines"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/project-template/default.nix b/pkgs/development/libraries/haskell/project-template/default.nix index fa60370f1f5e..f4c9214b0b63 100644 --- a/pkgs/development/libraries/haskell/project-template/default.nix +++ b/pkgs/development/libraries/haskell/project-template/default.nix @@ -1,19 +1,19 @@ -{ cabal, base64Bytestring, base64Conduit, classyPrelude, conduit +{ cabal, base64Bytestring, base64Conduit, basicPrelude, conduit , hspec, mtl, QuickCheck, resourcet, systemFileio, systemFilepath , text, transformers }: cabal.mkDerivation (self: { pname = "project-template"; - version = "0.1.3"; - sha256 = "1nsc4i3s9a7d0nysswhylvnr79z0ax9biiwr7b6jn7jzx0f2bdmm"; + version = "0.1.3.2"; + sha256 = "076xq5hwi7bfn3cmx8zd19vnj6lj2p7qm2waam94qqw2m466xq50"; buildDepends = [ - base64Bytestring base64Conduit classyPrelude conduit mtl resourcet + base64Bytestring base64Conduit basicPrelude conduit mtl resourcet systemFileio systemFilepath text transformers ]; testDepends = [ - base64Bytestring classyPrelude conduit hspec QuickCheck - transformers + base64Bytestring basicPrelude conduit hspec QuickCheck + systemFilepath text transformers ]; meta = { homepage = "https://github.com/fpco/haskell-ide"; diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index 3887abad71c7..b0953cf9f7c3 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "0.4.7.2"; - sha256 = "0gchdip4srilgqwxdzlamplwqsyrn4df0m72i8pjqpk7zwn96q1w"; + version = "0.4.8"; + sha256 = "10pp4hm5c2k2fqzqpagy03gmr526ac2ji8h7k0mcypf4v0ga620m"; buildDepends = [ liftedBase mmorph monadControl mtl transformers transformersBase ]; diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index df12c935d71d..f24d60612d6f 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "1.0.6.2"; - sha256 = "1w29k0k5124vygydavb6a5szrv5a6n9qqhf1f27bkk86br55vnw6"; + version = "1.0.6.3"; + sha256 = "1zwvrdb8kgknp2ri3ws6m0jg41d8kdprvjdimwxh98san7vmk744"; buildDepends = [ parsec shakespeare text transformers ]; testDepends = [ hspec HUnit shakespeare text ]; meta = { diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix index 667edcdce1c3..b7710d7c3d54 100644 --- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-i18n"; - version = "1.0.0.3"; - sha256 = "0k5daz6ayc4d6zxsq7p27bp5fq4qr31qxw9z9mwb5xcz2404d00r"; + version = "1.0.0.4"; + sha256 = "1ia73rq9kva2v4vxcyc2nzbvvkrbwrx48gjhnljx39szx1klyk3l"; buildDepends = [ parsec shakespeare text ]; testDepends = [ hspec text ]; meta = { diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index 917ea0c6cad1..6aa34026ce88 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-js"; - version = "1.1.4.1"; - sha256 = "1mvsdbc3c6vgdpdb4m8b2d28vrh79v64vb9wkpnvhfg0jn7kb5c0"; + version = "1.2.0"; + sha256 = "1g37m7shqxfv7i2dk5qhvxldfzh1xipd91vcyqhks1jwa5byarzj"; buildDepends = [ aeson shakespeare text ]; testDepends = [ aeson hspec HUnit shakespeare text ]; meta = { diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix index e2ff7ff27e1b..d05e2247710c 100644 --- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-text"; - version = "1.0.0.6"; - sha256 = "1qlf51rpyzgnxdhyfs6g3vh8zq5vyq263qhm577w7rc9s4hjxk45"; + version = "1.0.0.7"; + sha256 = "0vl8884a0x927svvkza5xzjn4g1rip8dak1zh9wkm4d0q7lhv2px"; buildDepends = [ shakespeare text ]; testDepends = [ hspec HUnit text ]; meta = { diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 4864adfe83a8..231470dca5a3 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare"; - version = "1.0.5.1"; - sha256 = "1qsg23jqv6lzwqk42yapqydx3fn6crkrzim8wr7ds55z6iblxbq6"; + version = "1.2.0"; + sha256 = "0lzzdkry3sm5i5hhdygsikpnaps66k1sfdxi2mp0ly5aqi1n1blz"; buildDepends = [ parsec systemFileio systemFilepath text time ]; testDepends = [ hspec parsec systemFileio systemFilepath text time diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 11ef315a523e..b93adda166c7 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.12.1"; - sha256 = "0mmmai257r3ssmy58v4c3hds0i0hwrww6r495j8yb2r90b31b1gg"; + version = "0.13.0"; + sha256 = "03m6fi8dbc69i6mafyq2xxdmqp1zm0akfilahvjd7cknf4qhdyq7"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/statvfs/default.nix b/pkgs/development/libraries/haskell/statvfs/default.nix new file mode 100644 index 000000000000..604edc831395 --- /dev/null +++ b/pkgs/development/libraries/haskell/statvfs/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "statvfs"; + version = "0.1"; + sha256 = "1v45lx7wr27f5sx7cpfsapx1r6akgf1q3hpip1ibbsbhj65ws2r2"; + meta = { + description = "Get unix filesystem statistics with statfs, statvfs"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/system-posix-redirect/default.nix b/pkgs/development/libraries/haskell/system-posix-redirect/default.nix new file mode 100644 index 000000000000..b8a65e41fd8e --- /dev/null +++ b/pkgs/development/libraries/haskell/system-posix-redirect/default.nix @@ -0,0 +1,12 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "system-posix-redirect"; + version = "1.1"; + sha256 = "08l8n671ypmharmkm9s8wv5ipcznn7hv5zadf96liml3v16d8fcr"; + meta = { + description = "A toy module that allows you to temporarily redirect a program's stdout"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix index 1e372d8f5bae..60999f51898c 100644 --- a/pkgs/development/libraries/haskell/thyme/default.nix +++ b/pkgs/development/libraries/haskell/thyme/default.nix @@ -1,5 +1,5 @@ -{ cabal, attoparsec, deepseq, lens, QuickCheck -, random, text, time, transformers, vector +{ cabal, attoparsec, Cabal, deepseq, filepath, lens, QuickCheck +, random, systemPosixRedirect, text, time, transformers, vector , vectorSpace }: @@ -11,7 +11,10 @@ cabal.mkDerivation (self: { attoparsec deepseq lens QuickCheck random text time transformers vector vectorSpace ]; - # have some strange test depends + testDepends = [ + attoparsec Cabal filepath lens QuickCheck random + systemPosixRedirect text time vectorSpace + ]; doCheck = false; meta = { homepage = "https://github.com/liyang/thyme"; diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index 569999149895..0f354d8b77e5 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "tls"; - version = "1.1.4"; - sha256 = "0fq6hnc3j54kkzlvcvhskjrj740p44y65fggnj3m4kgfiwjphw5p"; + version = "1.1.5"; + sha256 = "1ja03x3i7dgjpy22h4shnni1xslph8i8q4accqq8njpqpz54c84c"; buildDepends = [ cereal certificate cryptohash cryptoPubkey cryptoRandom mtl network ]; diff --git a/pkgs/development/libraries/haskell/unix-bytestring/default.nix b/pkgs/development/libraries/haskell/unix-bytestring/default.nix index 49022b12a29d..174fc925aae7 100644 --- a/pkgs/development/libraries/haskell/unix-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/unix-bytestring/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "unix-bytestring"; - version = "0.3.6"; - sha256 = "0m2ndw6r88vb4cqdkd8jg8dlk9h99mp3rand5j1gxxdjfv7q63ap"; + version = "0.3.7"; + sha256 = "1qwgs2bwga057csfa8izq0kc5vwi2vcaz2snlcgp0h9vql3qmvrg"; meta = { homepage = "http://code.haskell.org/~wren/"; description = "Unix/Posix-specific functions for ByteStrings"; diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.2.3.1.nix b/pkgs/development/libraries/haskell/unordered-containers/0.2.3.2.nix index af4f93c7457a..669f45d83f2d 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/0.2.3.1.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/0.2.3.2.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "unordered-containers"; - version = "0.2.3.1"; - sha256 = "10wz5y42r9b2ym7vl5sqrcawyjixmhy370h0kzpvczs8mlzvrlx8"; + version = "0.2.3.2"; + sha256 = "0fgfb2zqa2zi2hb9nkj92nwnxr54wkqa6gmqbcn4h5zks5anfvn5"; buildDepends = [ deepseq hashable ]; testDepends = [ ChasingBottoms hashable HUnit QuickCheck testFramework diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix index f73633b4f248..4632d599a2e6 100644 --- a/pkgs/development/libraries/haskell/vault/default.nix +++ b/pkgs/development/libraries/haskell/vault/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.3.0.0"; sha256 = "1lvv2sw5j48jbxniw55bxq88dhn46l7lk0blv2cnaf1vw6wms4m8"; buildDepends = [ hashable unorderedContainers ]; + jailbreak = true; meta = { homepage = "https://github.com/HeinrichApfelmus/vault"; description = "a persistent store for values of arbitrary types"; diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 917000364c35..9789c80e8c16 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -1,19 +1,19 @@ { cabal, ansiTerminal, base64Bytestring, blazeBuilder , blazeBuilderConduit, caseInsensitive, conduit, dataDefault -, dateCache, fastLogger, hspec, httpTypes, HUnit, network -, resourcet, stringsearch, text, time, transformers, void, wai -, waiLogger, waiTest, word8, zlib, zlibBindings, zlibConduit +, dateCache, fastLogger, hspec, httpTypes, HUnit, liftedBase +, network, resourcet, stringsearch, text, time, transformers, void +, wai, waiLogger, waiTest, word8, zlib, zlibBindings, zlibConduit }: cabal.mkDerivation (self: { pname = "wai-extra"; - version = "1.3.4.4"; - sha256 = "0x7nm3vrp1jhcdvcspdpgpgm12rcafng81f9kq9c01z5270myg2f"; + version = "1.3.4.5"; + sha256 = "062d7f8p2xgzn94fllgfc2bhbjv4vgp9j1adjaw9f0s1asnsdmnj"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault dateCache fastLogger httpTypes - network resourcet stringsearch text time transformers void wai - waiLogger word8 zlibConduit + liftedBase network resourcet stringsearch text time transformers + void wai waiLogger word8 zlibConduit ]; testDepends = [ blazeBuilder conduit dataDefault fastLogger hspec httpTypes HUnit diff --git a/pkgs/development/libraries/haskell/xml-hamlet/default.nix b/pkgs/development/libraries/haskell/xml-hamlet/default.nix index 9c85223d654b..e2719984708a 100644 --- a/pkgs/development/libraries/haskell/xml-hamlet/default.nix +++ b/pkgs/development/libraries/haskell/xml-hamlet/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "xml-hamlet"; - version = "0.4.0.4"; - sha256 = "1s4s5z1xir9zmcbfz8mrznf2byclmg0qjjhwmpal2r9ly9g3na98"; + version = "0.4.0.5"; + sha256 = "1w1ixjdbpbny332j24d5yjxc4i7cg83jc4yjdm6yl94y1sr90yc5"; buildDepends = [ parsec shakespeare text xmlConduit ]; testDepends = [ hspec HUnit parsec shakespeare text xmlConduit ]; meta = { diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index 1e22f1ae4bac..7e2bd368c7e2 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -4,14 +4,17 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.8.4.1"; - sha256 = "0zbnyf5hp206ywqkdd7c1hsdbn4wxwk7p3rzn53m7rzxvfshlbbx"; + version = "0.8.5"; + sha256 = "12jj785gzcnrif460cx2k69pc2h9h956g0w1gp8pcr5hawrvd6rg"; + isLibrary = true; + isExecutable = true; buildDepends = [ aeson attoparsec conduit resourcet text transformers unorderedContainers vector ]; testDepends = [ - conduit hspec HUnit text transformers unorderedContainers + aeson conduit hspec HUnit text transformers unorderedContainers + vector ]; meta = { homepage = "http://github.com/snoyberg/yaml/"; diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 66ed9df2d20c..c437b5b86244 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.2.1"; - sha256 = "0xvb2v1c7zih4r1acd21s0fl18ygcajry5w6yiqqhnhx8wcniiqv"; + version = "1.2.2.1"; + sha256 = "1f3zdqywak54f2s11v26iyzb3svb0mdpfskxhps30jmkji2ph2iz"; buildDepends = [ aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index 3dfedd471fec..3afb8747547c 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.2.1"; - sha256 = "0m68wm46qh8bwaccq2y8l4hh4xby0kczvhgd7caaxhmv6j3srrf2"; + version = "1.2.3.2"; + sha256 = "10q4xjhcrskz3h0nay2vxfz2b3c2d532bvbggl2615aih05zdhwc"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 3fcec1a7d9fb..bd2d0d97b2f0 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.4"; - sha256 = "0vgxspdxdjfdfgyx20lp460np7v1qjv6wzw95kj5cb5yiqv1nr9d"; + version = "1.2.4.2"; + sha256 = "0zrhqh3phla8p7fjv30n4ypicbd6x6rwkrhpag79p1w4wwvkjxnn"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit cookie dataDefault diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 926cba46499f..aca42bfce6ca 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.1"; - sha256 = "0zkwpymxwxca2p8i0fhq58wq7ic0dlyc3z89ypqglnp6h2mv2lwx"; + version = "1.3.2.1"; + sha256 = "0lybrw244y2ca1jvz218jh2kfypj4wblpdvk4n8wllll79dm3pq7"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi dataDefault emailValidate hamlet network persistent resourcet diff --git a/pkgs/development/libraries/haskell/yesod-platform/default.nix b/pkgs/development/libraries/haskell/yesod-platform/default.nix index 3d900d94cdab..9fe24ca4a747 100644 --- a/pkgs/development/libraries/haskell/yesod-platform/default.nix +++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix @@ -3,9 +3,10 @@ , baseUnicodeSymbols, blazeBuilder, blazeBuilderConduit, blazeHtml , blazeMarkup, byteable, byteorder, caseInsensitive, cereal , certificate, cipherAes, cipherRc4, clientsession, conduit, cookie -, cprngAes, cryptoApi, cryptoConduit, cryptohash, cryptoNumbers -, cryptoPubkey, cryptoPubkeyTypes, cryptoRandomApi, cssText -, dataDefault, dataDefaultClass, dataDefaultInstancesBase +, cprngAes, cryptoApi, cryptoCipherTypes, cryptoConduit, cryptohash +, cryptohashCryptoapi, cryptoNumbers, cryptoPubkey +, cryptoPubkeyTypes, cryptoRandom, cssText, dataDefault +, dataDefaultClass, dataDefaultInstancesBase , dataDefaultInstancesContainers, dataDefaultInstancesDlist , dataDefaultInstancesOldLocale, dateCache, dlist, emailValidate , entropy, failure, fastLogger, fileEmbed, filesystemConduit @@ -15,13 +16,13 @@ , monadControl, monadLogger, networkConduit, pathPieces, pem , persistent, persistentTemplate, poolConduit, primitive , publicsuffixlist, pureMD5, pwstoreFast, quickcheckIo -, resourcePool, resourcet, safe, semigroups, setenv, SHA +, resourcePool, resourcet, safe, securemem, semigroups, setenv, SHA , shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs , shakespeareText, silently, simpleSendfile, skein, socks , stringsearch, systemFileio, systemFilepath, tagged, tagsoup , tagstreamConduit, tls, tlsExtra, transformersBase, unixCompat -, unorderedContainers, utf8Light, utf8String, vault, vector, void -, wai, waiAppStatic, waiExtra, waiLogger, waiTest, warp, word8 +, unorderedContainers, utf8Light, utf8String, vector, void, wai +, waiAppStatic, waiExtra, waiLogger, waiTest, warp, word8 , xmlConduit, xmlTypes, xssSanitize, yaml, yesod, yesodAuth , yesodCore, yesodForm, yesodPersistent, yesodRoutes, yesodStatic , yesodTest, zlibBindings, zlibConduit @@ -29,33 +30,34 @@ cabal.mkDerivation (self: { pname = "yesod-platform"; - version = "1.2.3"; - sha256 = "16hp64gqgvpmlrwg6h8ldakw2n3x985cnv4pzmv9akjq27jq8rjl"; + version = "1.2.4.2"; + sha256 = "1hmzdwjqi3cxdmyvcr48kprrsa8h548z272mif07114d0qh48x4w"; buildDepends = [ aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit authenticate base64Bytestring baseUnicodeSymbols blazeBuilder blazeBuilderConduit blazeHtml blazeMarkup byteable byteorder caseInsensitive cereal certificate cipherAes cipherRc4 - clientsession conduit cookie cprngAes cryptoApi cryptoConduit - cryptohash cryptoNumbers cryptoPubkey cryptoPubkeyTypes - cryptoRandomApi cssText dataDefault dataDefaultClass - dataDefaultInstancesBase dataDefaultInstancesContainers - dataDefaultInstancesDlist dataDefaultInstancesOldLocale dateCache - dlist emailValidate entropy failure fastLogger fileEmbed - filesystemConduit hamlet hjsmin hspec hspecExpectations htmlConduit - httpAttoparsec httpConduit httpDate httpTypes languageJavascript - liftedBase mimeMail mimeTypes mmorph monadControl monadLogger - networkConduit pathPieces pem persistent persistentTemplate - poolConduit primitive publicsuffixlist pureMD5 pwstoreFast - quickcheckIo resourcePool resourcet safe semigroups setenv SHA - shakespeare shakespeareCss shakespeareI18n shakespeareJs - shakespeareText silently simpleSendfile skein socks stringsearch - systemFileio systemFilepath tagged tagsoup tagstreamConduit tls - tlsExtra transformersBase unixCompat unorderedContainers utf8Light - utf8String vault vector void wai waiAppStatic waiExtra waiLogger - waiTest warp word8 xmlConduit xmlTypes xssSanitize yaml yesod - yesodAuth yesodCore yesodForm yesodPersistent yesodRoutes - yesodStatic yesodTest zlibBindings zlibConduit + clientsession conduit cookie cprngAes cryptoApi cryptoCipherTypes + cryptoConduit cryptohash cryptohashCryptoapi cryptoNumbers + cryptoPubkey cryptoPubkeyTypes cryptoRandom cssText dataDefault + dataDefaultClass dataDefaultInstancesBase + dataDefaultInstancesContainers dataDefaultInstancesDlist + dataDefaultInstancesOldLocale dateCache dlist emailValidate entropy + failure fastLogger fileEmbed filesystemConduit hamlet hjsmin hspec + hspecExpectations htmlConduit httpAttoparsec httpConduit httpDate + httpTypes languageJavascript liftedBase mimeMail mimeTypes mmorph + monadControl monadLogger networkConduit pathPieces pem persistent + persistentTemplate poolConduit primitive publicsuffixlist pureMD5 + pwstoreFast quickcheckIo resourcePool resourcet safe securemem + semigroups setenv SHA shakespeare shakespeareCss shakespeareI18n + shakespeareJs shakespeareText silently simpleSendfile skein socks + stringsearch systemFileio systemFilepath tagged tagsoup + tagstreamConduit tls tlsExtra transformersBase unixCompat + unorderedContainers utf8Light utf8String vector void wai + waiAppStatic waiExtra waiLogger waiTest warp word8 xmlConduit + xmlTypes xssSanitize yaml yesod yesodAuth yesodCore yesodForm + yesodPersistent yesodRoutes yesodStatic yesodTest zlibBindings + zlibConduit ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index fd68a161c68c..556b210b91b2 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.2.2"; - sha256 = "06ac99srh44rwj6mwyl7h0d0ckyb19dvpabylbawmks25v5ig0y3"; + version = "1.2.2.1"; + sha256 = "0xhpsqfshnay7kaz0czr7ass84cbjlgz2n13jk08hs8g8dw72as4"; buildDepends = [ aeson blazeHtml blazeMarkup dataDefault hamlet monadControl networkConduit safe shakespeareCss shakespeareJs text transformers diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix new file mode 100644 index 000000000000..508b188aef72 --- /dev/null +++ b/pkgs/development/libraries/java/jzmq/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchgit, automake, autoconf, libtool, pkgconfig, zeromq2, jdk}: + +stdenv.mkDerivation rec { + name = "jzmq-2.1.0"; + + src = fetchgit { + url = git://github.com/zeromq/jzmq.git; + rev = "946fd39780423b2df6e5efd9fa2cd863fd79c9db"; + }; + + buildInputs = [ automake autoconf libtool pkgconfig zeromq2 jdk ]; + + preConfigurePhases = ["./autogen.sh"]; + preConfigure = '' + sed -i -e 's|(JAVAC)|(JAVAC) -encoding utf8|' src/Makefile.in + ${if stdenv.system == "x86_64-darwin" then + '' sed -i -e 's~/Headers~/include~' -e 's~_JNI_INC_SUBDIRS=\".*\"~_JNI_INC_SUBDIRS=\"darwin\"~' configure + '' else ""} + ''; + + + maintainers = [ stdenv.lib.maintainers.vizanto ]; + meta = { + homepage = "http://www.zeromq.org"; + description = "Java bindings for ZeroMQ"; + }; +} diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index ce305a2880bd..ea45902b7493 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -26,7 +26,7 @@ with { inherit (stdenv.lib) optional optionals; }; let result = { - libav_9 = libavFun "9.8" "0r7hg9wg3cxjsmwzpa6f2p1a092g2iazyjjy23604ccskzbnirg3"; + libav_9 = libavFun "9.9" "1rwphyqb2c4zyp20y4ywxjiddmd46vd4dbpdm1lxqm3q63rmmdk9"; libav_0_8 = libavFun "0.8.8" "1wnbmbs0z4f55y8r9bwb63l04zn383l1avy4c9x1ffb2xccgcp79"; }; diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix new file mode 100644 index 000000000000..a1d2b3b8e244 --- /dev/null +++ b/pkgs/development/libraries/libnetfilter_queue/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, libmnl, libnfnetlink }: + +stdenv.mkDerivation rec { + name = "libnetfilter_queue-1.0.2"; + + src = fetchurl { + url = "ftp://ftp.netfilter.org/pub/libnetfilter_queue/${name}.tar.bz2"; + sha256 = "0chsmj9ky80068vn458ijz9sh4sk5yc08dw2d6b8yddybpmr1143"; + }; + + buildInputs = [ pkgconfig libmnl libnfnetlink ]; + + meta = { + homepage = "http://www.netfilter.org/projects/libnetfilter_queue/"; + description = "userspace API to packets queued by the kernel packet filter"; + + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/recursive-pth-loader/default.nix b/pkgs/development/python-modules/recursive-pth-loader/default.nix index 959882be9380..9a17e722679f 100644 --- a/pkgs/development/python-modules/recursive-pth-loader/default.nix +++ b/pkgs/development/python-modules/recursive-pth-loader/default.nix @@ -7,11 +7,15 @@ stdenv.mkDerivation rec { buildInputs = [ python ]; + patchPhase = "cat ${./sitecustomize.py} > sitecustomize.py"; + + buildPhase = "${python}/bin/${python.executable} -m compileall ."; + installPhase = '' dst=$out/lib/${python.libPrefix}/site-packages mkdir -p $dst - cat ${./sitecustomize.py} >> $dst/sitecustomize.py + cp sitecustomize.* $dst/ ''; meta = { diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix index cb0ad759d55a..efdc65c389e6 100644 --- a/pkgs/development/tools/haskell/HaRe/default.nix +++ b/pkgs/development/tools/haskell/HaRe/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "HaRe"; - version = "0.7.0.1"; - sha256 = "1ykbyc6p71k6rs85vcsjgk47cxd2lda3iw78jzs0fx43qr1dywnl"; + version = "0.7.0.2"; + sha256 = "05dlrx4wfadv798098bclkmsmm6f226n9rqp19ajdwaa11x5mf8d"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix index 7e8b3ea11ff5..4cb75151b001 100644 --- a/pkgs/development/tools/haskell/keter/default.nix +++ b/pkgs/development/tools/haskell/keter/default.nix @@ -1,23 +1,25 @@ -{ cabal, attoparsec, blazeBuilder, caseInsensitive, conduit -, dataDefault, filepath, fsnotify, httpConduit, httpReverseProxy -, httpTypes, mtl, network, networkConduit, networkConduitTls -, random, regexTdfa, systemFileio, systemFilepath, tar, text, time -, transformers, unixCompat, unixProcessConduit, wai, waiAppStatic -, warp, warpTls, yaml, zlib +{ cabal, aeson, async, attoparsec, blazeBuilder, caseInsensitive +, conduit, dataDefault, filepath, fsnotify, httpConduit +, httpReverseProxy, httpTypes, mtl, network, networkConduit +, networkConduitTls, random, regexTdfa, stm, systemFileio +, systemFilepath, tar, text, time, transformers, unixCompat +, unixProcessConduit, unorderedContainers, vector, wai +, waiAppStatic, waiExtra, warp, warpTls, yaml, zlib }: cabal.mkDerivation (self: { pname = "keter"; - version = "0.4.0"; - sha256 = "0ny8z2rfn090vci262xvyrdbkmdb7qjb4x15r81l2691ibf09ppv"; + version = "1.0.1"; + sha256 = "0ghgwp1winf0jj70jrwsk4b85f8m4v78n8kijhqghh4kskh457b5"; isLibrary = true; isExecutable = true; buildDepends = [ - attoparsec blazeBuilder caseInsensitive conduit dataDefault - filepath fsnotify httpConduit httpReverseProxy httpTypes mtl - network networkConduit networkConduitTls random regexTdfa - systemFileio systemFilepath tar text time transformers unixCompat - unixProcessConduit wai waiAppStatic warp warpTls yaml zlib + aeson async attoparsec blazeBuilder caseInsensitive conduit + dataDefault filepath fsnotify httpConduit httpReverseProxy + httpTypes mtl network networkConduit networkConduitTls random + regexTdfa stm systemFileio systemFilepath tar text time + transformers unixCompat unixProcessConduit unorderedContainers + vector wai waiAppStatic waiExtra warp warpTls yaml zlib ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/tools/haskell/splot/default.nix b/pkgs/development/tools/haskell/splot/default.nix index 460dc3f8c432..4e99a1e68cdc 100644 --- a/pkgs/development/tools/haskell/splot/default.nix +++ b/pkgs/development/tools/haskell/splot/default.nix @@ -1,5 +1,5 @@ -{ cabal, bytestringLexing, cairo, colour, HUnit, mtl -, strptime, time, vcsRevision +{ cabal, bytestringLexing, cairo, colour, HUnit, mtl, strptime +, time, vcsRevision }: cabal.mkDerivation (self: { @@ -9,8 +9,7 @@ cabal.mkDerivation (self: { isLibrary = false; isExecutable = true; buildDepends = [ - bytestringLexing cairo colour HUnit mtl strptime time - vcsRevision + bytestringLexing cairo colour HUnit mtl strptime time vcsRevision ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Splot"; diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index d076d8ba4db0..9b1499c15375 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, m4, perl }: +{ stdenv, fetchurl, m4, perl, flex }: stdenv.mkDerivation rec { name = "bison-3.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1j14fqgi9wzqgsy4fhkcdrv4hv6rrvhvn84axs520w9b022mbb79"; }; - nativeBuildInputs = [ m4 ] ++ stdenv.lib.optional doCheck perl; + nativeBuildInputs = [ m4 ] ++ stdenv.lib.optionals doCheck [perl flex]; propagatedBuildInputs = [ m4 ]; doCheck = true; |