diff options
Diffstat (limited to 'pkgs/development/libraries')
32 files changed, 197 insertions, 87 deletions
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix new file mode 100644 index 000000000000..067d3dc93834 --- /dev/null +++ b/pkgs/development/libraries/gvfs/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, pkgconfig, intltool, libtool +, glib, dbus, udev, udisks2, libgcrypt +, libgphoto2, avahi, libarchive, fuse, libcdio +, libxml2, libxslt, docbook_xsl +, lightWeight ? true, gnome, samba, makeWrapper }: + +stdenv.mkDerivation rec { + name = "gvfs-1.14.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gvfs/1.14/${name}.tar.xz"; + sha256 = "1g4ghyf45jg2ajdkv2d972hbckyjh3d9jdrppai85pl9pk2dmfy3"; + }; + + nativeBuildInputs = [ pkgconfig intltool libtool ]; + + buildInputs = + [ makeWrapper glib dbus.libs udev udisks2 libgcrypt + libgphoto2 avahi libarchive fuse libcdio + libxml2 libxslt docbook_xsl + # ToDo: a ligther version of libsoup to have FTP/HTTP support? + ] ++ stdenv.lib.optionals (!lightWeight) (with gnome; [ + gtk libsoup libgnome_keyring gconf samba + # ToDo: not working and probably useless until gnome3 from x-updates + ]); + + enableParallelBuilding = true; + + # ToDo: one probably should specify schemas for samba and others here + fixupPhase = '' + wrapProgram $out/libexec/gvfsd --set GSETTINGS_SCHEMA_DIR "$out/share/glib-2.0/schemas" + ''; + + meta = { + description = "Virtual Filesystem support library" + stdenv.lib.optionalString lightWeight " (light-weight)"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/haskell/acid-state/default.nix b/pkgs/development/libraries/haskell/acid-state/default.nix new file mode 100644 index 000000000000..10f222cfe105 --- /dev/null +++ b/pkgs/development/libraries/haskell/acid-state/default.nix @@ -0,0 +1,18 @@ +{ cabal, cereal, extensibleExceptions, filepath, mtl, network +, safecopy, stm +}: + +cabal.mkDerivation (self: { + pname = "acid-state"; + version = "0.8.3"; + sha256 = "1n7vafw3jz7kmlp5jqn1wv0ip2rcbyfx0cdi2m1a2lvpi6dh97gc"; + buildDepends = [ + cereal extensibleExceptions filepath mtl network safecopy stm + ]; + meta = { + homepage = "http://acid-state.seize.it/"; + description = "Add ACID guarantees to any serializable Haskell data structure"; + license = self.stdenv.lib.licenses.publicDomain; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index 0adaabb4753d..ffdf30268547 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -11,6 +11,7 @@ cabal.mkDerivation (self: { buildDepends = [ asn1Data cryptohash cryptoPubkeyTypes filepath mtl pem time ]; + jailbreak = true; meta = { homepage = "http://github.com/vincenthz/hs-certificate"; description = "Certificates and Key Reader/Writer"; diff --git a/pkgs/development/libraries/haskell/checkers/default.nix b/pkgs/development/libraries/haskell/checkers/default.nix new file mode 100644 index 000000000000..4742f5104daa --- /dev/null +++ b/pkgs/development/libraries/haskell/checkers/default.nix @@ -0,0 +1,13 @@ +{ cabal, QuickCheck, random }: + +cabal.mkDerivation (self: { + pname = "checkers"; + version = "0.3.1"; + sha256 = "0lhy8bk8kkj540kjbc76j4x4xsprqwlmxdrss4r0j1bxgmfwha6p"; + buildDepends = [ QuickCheck random ]; + meta = { + description = "Check properties on standard classes and data structures"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix index ed840b8ba3e0..402e80f6c34e 100644 --- a/pkgs/development/libraries/haskell/crypto-api/default.nix +++ b/pkgs/development/libraries/haskell/crypto-api/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.11"; sha256 = "1v42dmm4cx8brb5mpz34wa20c3s27r0v7qiqlb54svzsl0jkfmiy"; buildDepends = [ cereal entropy tagged transformers ]; + jailbreak = true; meta = { homepage = "http://trac.haskell.org/crypto-api/wiki"; description = "A generic interface for cryptographic operations"; diff --git a/pkgs/development/libraries/haskell/data-inttrie/default.nix b/pkgs/development/libraries/haskell/data-inttrie/default.nix index a9eaf5471865..b23fdeca69d8 100644 --- a/pkgs/development/libraries/haskell/data-inttrie/default.nix +++ b/pkgs/development/libraries/haskell/data-inttrie/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "data-inttrie"; - version = "0.0.8"; - sha256 = "0lzp89lq4gb84rcxqi77yarggz94a206da456208rrr7rhlqxg2x"; + version = "0.1.0"; + sha256 = "00kzf3cw0y0848cprmx3i7g70rmr92hhfzn60a2x98vb8f7y3814"; meta = { homepage = "http://github.com/luqui/data-inttrie"; description = "A lazy, infinite trie of integers"; diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix index 9e0cbbc6bdc3..695ce79f0595 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix @@ -3,8 +3,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors-heist"; - version = "0.6.1.0"; - sha256 = "08h883731cb5kqsv33f6dpf2lgh1r6qn9maqjkn5766vqf7m28nx"; + version = "0.6.2.0"; + sha256 = "03wxdmgwc6qialwhp5zdj3s3a8a8yz6vswfgryjx4izaaq7pdhl1"; buildDepends = [ blazeBuilder digestiveFunctors heist mtl text xmlhtml ]; diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index 7c64e9a2511b..5f960cbb1f00 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -2,10 +2,11 @@ cabal.mkDerivation (self: { pname = "fclabels"; - version = "1.1.5"; - sha256 = "0g9h1mayzf8v9dg84b54cqjbz9m9hdmj9a2zh0lg2kbc1v7iwlx1"; + version = "1.1.6"; + sha256 = "0f5zqbqsm89lp1f7wrmcs8pn7hzbbl8id7xa6ny114bgxrfbrwpk"; buildDepends = [ mtl transformers ]; meta = { + homepage = "https://github.com/sebastiaanvisser/fclabels"; description = "First class accessor labels"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/fsnotify/default.nix b/pkgs/development/libraries/haskell/fsnotify/default.nix index 4fb3d9fded45..1d86fa26d7b5 100644 --- a/pkgs/development/libraries/haskell/fsnotify/default.nix +++ b/pkgs/development/libraries/haskell/fsnotify/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "fsnotify"; - version = "0.0.7.1"; - sha256 = "1hrnhp22s8pcj525m2vi9b7k3pp5qrv44qhqh6c8n0bgilqwg4yd"; + version = "0.0.8"; + sha256 = "05vfiddp5m28rm02ci7fcfg1zgw5ydj084173mpp1w124bfqf940"; buildDepends = [ hinotify systemFileio systemFilepath text time ]; testDepends = [ Cabal Glob hinotify hspec QuickCheck random systemFileio diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix index 7d3d47f1a036..5b87923f06bf 100644 --- a/pkgs/development/libraries/haskell/ghc-vis/default.nix +++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-vis"; - version = "0.6.1"; - sha256 = "0q0v1l44vagcg0nl4iv8m872g4qblj9syjlcgbf6fpgx1fqnyp24"; + version = "0.6.1.1"; + sha256 = "1fg8bxkhw2s3y8w0ljnnqbf8f5ld17p70v4aikc26ybmb0938yl6"; buildDepends = [ cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text transformers xdot diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index 22acb85788d6..fc141f4780d5 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"; - sha256 = "0vx2z8zvlr3860cypa3lkd8q51k6gngw65jqcbik3bxfbjj2qcv3"; + version = "1.1.7.1"; + sha256 = "1kcjzvslxis8qapy7g1cqkqqamrnkyammy33pan7ckzv5fd59q5p"; buildDepends = [ blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text ]; diff --git a/pkgs/development/libraries/haskell/hashable/1.2.0.5.nix b/pkgs/development/libraries/haskell/hashable/1.2.0.6.nix index d7d89ee86122..efe37c9162df 100644 --- a/pkgs/development/libraries/haskell/hashable/1.2.0.5.nix +++ b/pkgs/development/libraries/haskell/hashable/1.2.0.6.nix @@ -1,10 +1,17 @@ -{ cabal, text }: +{ cabal, HUnit, QuickCheck, random, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, text +}: cabal.mkDerivation (self: { pname = "hashable"; - version = "1.2.0.5"; - sha256 = "0frqr294bsx4i21xxd5pw59xpaf0nww0dh4bqn0ywblsm9c7nyqh"; + version = "1.2.0.6"; + sha256 = "0kd0vk87pgrir5zx7b30dvv2lsjjiykqi1gpalkgmgbvhals4p9z"; buildDepends = [ text ]; + testDepends = [ + HUnit QuickCheck random testFramework testFrameworkHunit + testFrameworkQuickcheck2 text + ]; + doCheck = false; meta = { homepage = "http://github.com/tibbe/hashable"; description = "A class for types that can be converted to a hash value"; diff --git a/pkgs/development/libraries/haskell/haskeline/0.6.4.7.nix b/pkgs/development/libraries/haskell/haskeline/0.6.4.7.nix deleted file mode 100644 index 9dff76cfe47e..000000000000 --- a/pkgs/development/libraries/haskell/haskeline/0.6.4.7.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ cabal, extensibleExceptions, filepath, mtl, terminfo, utf8String -}: - -cabal.mkDerivation (self: { - pname = "haskeline"; - version = "0.6.4.7"; - sha256 = "18ma4i2i6hx8bhbkh1d7mqzsqbfj0zc2bkv3czjyylizqwhpq6ih"; - buildDepends = [ - extensibleExceptions filepath mtl terminfo utf8String - ]; - configureFlags = "-fterminfo"; - meta = { - homepage = "http://trac.haskell.org/haskeline"; - description = "A command-line interface for user input, written in Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskeline/0.7.0.3.nix b/pkgs/development/libraries/haskell/haskeline/default.nix index c804e328500d..1e8c406c21b3 100644 --- a/pkgs/development/libraries/haskell/haskeline/0.7.0.3.nix +++ b/pkgs/development/libraries/haskell/haskeline/default.nix @@ -1,10 +1,10 @@ -{ cabal, filepath, terminfo, transformers }: +{ cabal, filepath, terminfo, transformers, utf8String }: cabal.mkDerivation (self: { pname = "haskeline"; version = "0.7.0.3"; sha256 = "10xc229ddk4g87i78vgjbfr7sii28fx00qwnggb5x7sfigfca8sg"; - buildDepends = [ filepath terminfo transformers ]; + buildDepends = [ filepath terminfo transformers utf8String ]; configureFlags = "-fterminfo"; meta = { homepage = "http://trac.haskell.org/haskeline"; diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/default.nix index 21aba33a004f..3043da1bb6c9 100644 --- a/pkgs/development/libraries/haskell/optparse-applicative/default.nix +++ b/pkgs/development/libraries/haskell/optparse-applicative/default.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { testDepends = [ HUnit testFramework testFrameworkHunit testFrameworkThPrime ]; + jailbreak = true; meta = { homepage = "https://github.com/pcapriotti/optparse-applicative"; description = "Utilities and combinators for parsing command line options"; diff --git a/pkgs/development/libraries/haskell/pretty-show/1.2.nix b/pkgs/development/libraries/haskell/pretty-show/1.2.nix new file mode 100644 index 000000000000..545816a57a02 --- /dev/null +++ b/pkgs/development/libraries/haskell/pretty-show/1.2.nix @@ -0,0 +1,16 @@ +{ cabal, haskellLexer }: + +cabal.mkDerivation (self: { + pname = "pretty-show"; + version = "1.2"; + sha256 = "0lbalmyrqisgd2spbvzifsy25lr6cl9sgz78hav8q8r406k7nf2l"; + isLibrary = true; + isExecutable = true; + buildDepends = [ haskellLexer ]; + meta = { + homepage = "http://wiki.github.com/yav/pretty-show"; + description = "Tools for working with derived Show instances"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/pretty-show/default.nix b/pkgs/development/libraries/haskell/pretty-show/1.5.nix index 6d76aeb9bf6f..6d76aeb9bf6f 100644 --- a/pkgs/development/libraries/haskell/pretty-show/default.nix +++ b/pkgs/development/libraries/haskell/pretty-show/1.5.nix diff --git a/pkgs/development/libraries/haskell/safecopy/default.nix b/pkgs/development/libraries/haskell/safecopy/default.nix new file mode 100644 index 000000000000..c700ff0df3d1 --- /dev/null +++ b/pkgs/development/libraries/haskell/safecopy/default.nix @@ -0,0 +1,14 @@ +{ cabal, cereal, text, time }: + +cabal.mkDerivation (self: { + pname = "safecopy"; + version = "0.8.2"; + sha256 = "0l2kqymsxv244fahxcpxlrspk6xipz3br6j854ipbfh8b0bfvr4m"; + buildDepends = [ cereal text time ]; + meta = { + homepage = "http://acid-state.seize.it/safecopy"; + description = "Binary serialization with version control"; + license = self.stdenv.lib.licenses.publicDomain; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix index dbdce2eabe51..1a1234413aaa 100644 --- a/pkgs/development/libraries/haskell/semigroups/default.nix +++ b/pkgs/development/libraries/haskell/semigroups/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "semigroups"; - version = "0.9"; - sha256 = "0cwyjjlr9zgpxryzdf26pb58dmad0cp8d0493rarhh5zmgighh90"; + version = "0.9.1"; + sha256 = "1i49180fw9bxnszmqc5jl877kjhkaa22py1jwfh69slx4z3giyxq"; buildDepends = [ nats ]; meta = { homepage = "http://github.com/ekmett/semigroups/"; diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 3c300cdea03a..302a6720de41 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -1,4 +1,4 @@ -{ cabal, hspec, parsec, text }: +{ cabal, fetchurl, hspec, parsec, text }: cabal.mkDerivation (self: { pname = "shakespeare"; @@ -6,6 +6,11 @@ cabal.mkDerivation (self: { sha256 = "0aqcgfx3y9sbp7wvjmx6rxwi4r13qrfxs9a40gc00np03bpk1hxb"; buildDepends = [ parsec text ]; testDepends = [ hspec parsec text ]; + patchFlags = "-p2"; + patches = [ (fetchurl { url = "https://github.com/yesodweb/shakespeare/pull/102.patch"; + sha256 = "02fp87sw7k8zyn8kgmjg8974gi7pp5fyvb4f84i983qycmlmh8xq"; + }) + ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "A toolkit for making compile-time interpolated templates"; diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index ec71d27db02c..f7b3bbd5c415 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -2,10 +2,11 @@ cabal.mkDerivation (self: { pname = "skein"; - version = "1.0.0"; - sha256 = "03r9kqbvv6z1d8ivdwrxvac5bnd29w116pbixyrcrbx0sg1wwpfa"; + version = "1.0.1"; + sha256 = "1mvyq6wp03fs6sjppgalaacargvi69yf5d59k473pgr1g89v4ni1"; buildDepends = [ cereal cryptoApi tagged ]; testDepends = [ cereal cryptoApi filepath hspec tagged ]; + jailbreak = true; meta = { homepage = "https://github.com/meteficha/skein"; description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well."; diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 8462b85caf99..3243fce6a368 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -1,28 +1,25 @@ { cabal, aeson, attoparsec, cereal, clientsession, comonad , configurator, directoryTree, dlist, errors, filepath, hashable , heist, lens, logict, MonadCatchIOTransformers, mtl, mwcRandom -, pwstoreFast, regexPosix, snapCore, snapServer, stm, syb, text -, time, transformers, unorderedContainers, vector, vectorAlgorithms -, xmlhtml +, pwstoreFast, regexPosix, snapCore, snapServer, stm, syb, tagged +, text, time, transformers, unorderedContainers, vector +, vectorAlgorithms, xmlhtml }: cabal.mkDerivation (self: { pname = "snap"; - version = "0.11.2"; - sha256 = "1z9n15dhbxg0j17c1ik0vhdhxy2mz70915xd4jffg9jrdvlky51a"; + version = "0.11.2.2"; + sha256 = "1fwm60rx2ginlphi00kn3ghs9rxdx4br8p4f3prpfmhvjikwgv8n"; isLibrary = true; isExecutable = true; buildDepends = [ aeson attoparsec cereal clientsession comonad configurator directoryTree dlist errors filepath hashable heist lens logict MonadCatchIOTransformers mtl mwcRandom pwstoreFast regexPosix - snapCore snapServer stm syb text time transformers + snapCore snapServer stm syb tagged text time transformers unorderedContainers vector vectorAlgorithms xmlhtml ]; jailbreak = true; - patchPhase = '' - sed -i -e 's|lens .*>= 3.7.6.*$|lens|' snap.cabal - ''; meta = { homepage = "http://snapframework.com/"; description = "Top-level package for the Snap Web Framework"; diff --git a/pkgs/development/libraries/haskell/socks/default.nix b/pkgs/development/libraries/haskell/socks/default.nix index 485b912c2a88..311c8b224134 100644 --- a/pkgs/development/libraries/haskell/socks/default.nix +++ b/pkgs/development/libraries/haskell/socks/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "socks"; - version = "0.5.0"; - sha256 = "1lk6yvx5a65nz7z89i0sgqzcqw2v6j645nq15kgbpxhcinfdvqs7"; + version = "0.5.1"; + sha256 = "08zwbkglkahjadqn2m7l0k5yp4lcd9h6kgb8k8mjlwxayx82a0ay"; buildDepends = [ cereal network ]; meta = { homepage = "http://github.com/vincenthz/hs-socks"; diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix index 4e76277394ba..0218db413d5f 100644 --- a/pkgs/development/libraries/haskell/statistics/default.nix +++ b/pkgs/development/libraries/haskell/statistics/default.nix @@ -1,13 +1,13 @@ { cabal, deepseq, erf, HUnit, ieee754, mathFunctions, monadPar , mwcRandom, primitive, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, vector -, vectorAlgorithms, fetchurl +, vectorAlgorithms }: cabal.mkDerivation (self: { pname = "statistics"; - version = "0.10.3.0"; - sha256 = "1ay03y9z84mc4ai6i4g81v129rhg4146kad4ggb2gimbj6851fw1"; + version = "0.10.3.1"; + sha256 = "12abfqxsriqlncr60wwcsm0q41hmqc6vp9p1hmnv2l3qqcisk60s"; buildDepends = [ deepseq erf mathFunctions monadPar mwcRandom primitive vector vectorAlgorithms @@ -18,10 +18,6 @@ cabal.mkDerivation (self: { vectorAlgorithms ]; doCheck = false; - patches = [ - (fetchurl { url = "https://github.com/bos/statistics/commit/6b88143c9f931dd4fa95c1f083999ae12dd01b55.patch"; - sha256 = "0bl10qhp73cijxlpkjfmnkbl49jlj85xxvyhlca6jw7awcka6d2l"; }) - ]; meta = { homepage = "https://github.com/bos/statistics"; description = "A library of statistical types, data, and functions"; diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix index 6c4c4d70cacd..e48bcb39f09a 100644 --- a/pkgs/development/libraries/haskell/tagged/default.nix +++ b/pkgs/development/libraries/haskell/tagged/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "tagged"; - version = "0.4.5"; - sha256 = "1ipj7ff2ya3r3w39clcrxs766hm568lj2kb2kd3npg87jj05wgv0"; + version = "0.6"; + sha256 = "0w2sx6lys074y5ck2ll53dmak39pfnckbh6llgmicrj4zhgcd8jm"; meta = { homepage = "http://github.com/ekmett/tagged"; description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; diff --git a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix new file mode 100644 index 000000000000..a3d02329dfdf --- /dev/null +++ b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix @@ -0,0 +1,18 @@ +{ cabal, blazeBuilder, blazeBuilderConduit, conduit, httpTypes +, transformers, wai, warp, zlibConduit +}: + +cabal.mkDerivation (self: { + pname = "wai-handler-launch"; + version = "1.3.1.4"; + sha256 = "0ii74p2400a4w0pcswk8j57wbasi17alifs4xgwv79b235wnn317"; + buildDepends = [ + blazeBuilder blazeBuilderConduit conduit httpTypes transformers wai + warp zlibConduit + ]; + meta = { + description = "Launch a web app in the default browser"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index 388c238944c9..832cebab1222 100644 --- a/pkgs/development/libraries/haskell/wai-test/default.nix +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -1,16 +1,17 @@ { cabal, blazeBuilder, blazeBuilderConduit, caseInsensitive -, conduit, cookie, httpTypes, HUnit, network, text, transformers -, wai +, conduit, cookie, hspec, httpTypes, HUnit, network, text +, transformers, wai }: cabal.mkDerivation (self: { pname = "wai-test"; - version = "1.3.0.5"; - sha256 = "0v0x1sk7q36xy8syinc96y1jsyjvw6756cich4hxq86l2jfbgccw"; + version = "1.3.1"; + sha256 = "0dw9lbwb27yr3953ill0r727ivqav5b2ica8gbaalvnh3h5c8akg"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit cookie httpTypes HUnit network text transformers wai ]; + testDepends = [ hspec wai ]; meta = { homepage = "http://www.yesodweb.com/book/web-application-interface"; description = "Unit test framework (built on HUnit) for WAI applications"; diff --git a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix index 9d92f264930e..5d8a155ea721 100644 --- a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix @@ -1,13 +1,15 @@ -{ cabal, QuickCheck, testFramework, testFrameworkQuickcheck2 -, zeromq +{ cabal, ansiTerminal, checkers, MonadCatchIOTransformers +, QuickCheck, transformers, zeromq }: cabal.mkDerivation (self: { pname = "zeromq3-haskell"; - version = "0.2"; - sha256 = "12qljfkcd4l9h3l80jibxgw2an6v782w0sxwvzxqmma29jv6hvky"; + version = "0.3.1"; + sha256 = "0wr157wl2qpnbfsqy4nlsnd6nbkl063387f7ab4qa07yhj5av80f"; + buildDepends = [ MonadCatchIOTransformers transformers ]; testDepends = [ - QuickCheck testFramework testFrameworkQuickcheck2 + ansiTerminal checkers MonadCatchIOTransformers QuickCheck + transformers ]; extraLibraries = [ zeromq ]; doCheck = false; diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 8fbc7da49c27..b1aaaa7f2c85 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -1,9 +1,9 @@ { fetchurl, stdenv, libtool, gettext, zlib, bzip2, flac, libvorbis , exiv2, libgsf, rpm, pkgconfig -, gtkSupport ? true, glib ? null, gtk ? null +, gtkSupport ? true, glib ? null, gtk3 ? null , videoSupport ? true, ffmpeg ? null, libmpeg2 ? null}: -assert gtkSupport -> glib != null && gtk != null; +assert gtkSupport -> glib != null && gtk3 != null; assert videoSupport -> ffmpeg != null && libmpeg2 != null; stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { [ libtool gettext zlib bzip2 flac libvorbis exiv2 libgsf rpm pkgconfig - ] ++ stdenv.lib.optionals gtkSupport [ glib gtk ] + ] ++ stdenv.lib.optionals gtkSupport [ glib gtk3 ] ++ stdenv.lib.optionals videoSupport [ ffmpeg libmpeg2 ]; configureFlags = "--disable-ltdl-install " diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 3edc8d0ac6ca..e1feda6abd4a 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,18 +1,20 @@ -{stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}: +{ stdenv, fetchurl, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext, libxml2 }: stdenv.mkDerivation rec { - name = "libgphoto2-2.4.14"; + name = "libgphoto2-2.5.1.1"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "14h20s0kwqr1nsj90dgjwzs0r3h7z1cpmnivrikd0rrg4m2jvcsr"; + sha256 = "057dnyrxr0vy2zs4fhscpig42kvlsy9fg4gj20fhvjcvp3pak8xl"; }; - + nativeBuildInputs = [ pkgconfig gettext ]; - buildInputs = [ libtool libjpeg ]; + buildInputs = [ libtool libjpeg libxml2 ]; # These are mentioned in the Requires line of libgphoto's pkg-config file. - propagatedBuildInputs = [ libusb libexif ]; + propagatedBuildInputs = [ libusb1 libexif ]; + + NIX_CFLAGS_COMPILE = "-I${libxml2}/include/libxml2"; # bogus detection again meta = { homepage = http://www.gphoto.org/proj/libgphoto2/; @@ -20,10 +22,10 @@ stdenv.mkDerivation rec { longDescription = '' This is the library backend for gphoto2. It contains the code for PTP, MTP, and other vendor specific protocols for controlling and transferring data - from digital cameras. + from digital cameras. ''; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus - license = stdenv.lib.licenses.lgpl21Plus; + license = stdenv.lib.licenses.lgpl21Plus; platforms = with stdenv.lib.platforms; unix; maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 386b92f26847..33397e8b98eb 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, zlib, ctl, ilmbase }: stdenv.mkDerivation rec { - name = "openexr-1.6.1"; + name = "openexr-1.7.1"; src = fetchurl { url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz"; diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix index 7a3d6eacde57..c5fac00be14d 100644 --- a/pkgs/development/libraries/soprano/default.nix +++ b/pkgs/development/libraries/soprano/default.nix @@ -2,11 +2,11 @@ , pkgconfig }: stdenv.mkDerivation rec { - name = "soprano-2.8.0"; + name = "soprano-2.9.0"; src = fetchurl { url = "mirror://sourceforge/soprano/${name}.tar.bz2"; - sha256 = "1israssklrb4mhx2dgkfnabh21ll1jyis1c5c42rc9gi23mkb7ah"; + sha256 = "1sz4d1rqvdhfmbf7afdwdd49ynvjwawhym3qwbld83nydqw274xk"; }; patches = [ ./find-virtuoso.patch ]; |