diff options
Diffstat (limited to 'pkgs/development/libraries')
86 files changed, 277 insertions, 197 deletions
diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 1893a2c94136..e248dbd649e7 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -1,26 +1,26 @@ { stdenv, fetchurl }: -let - inherit (stdenv.lib) optionals; -in - stdenv.mkDerivation rec { - name = "apr-1.4.8"; + name = "apr-1.5.0"; src = fetchurl { url = "mirror://apache/apr/${name}.tar.bz2"; - md5 = "ce2ab01a0c3cdb71cf0a6326b8654f41"; + md5 = "cc93bd2c12d0d037f68e21cc6385dc31"; }; - patches = optionals stdenv.isDarwin [ ./darwin_fix_configure.patch ]; + patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin_fix_configure.patch ]; configureFlags = # Including the Windows headers breaks unistd.h. # Based on ftp://sourceware.org/pub/cygwin/release/libapr1/libapr1-1.3.8-2-src.tar.bz2 stdenv.lib.optional (stdenv.system == "i686-cygwin") "ac_cv_header_windows_h=no"; + enableParallelBuilding = true; + meta = { homepage = http://apr.apache.org/; description = "The Apache Portable Runtime library"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } diff --git a/pkgs/development/libraries/beecrypt/default.nix b/pkgs/development/libraries/beecrypt/default.nix index 430e45ceec18..d90dae2dee0a 100644 --- a/pkgs/development/libraries/beecrypt/default.nix +++ b/pkgs/development/libraries/beecrypt/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, m4}: stdenv.mkDerivation { - name = "beecrypt-4.1.2"; + name = "beecrypt-4.2.1"; src = fetchurl { - url = mirror://sourceforge/beecrypt/beecrypt-4.1.2.tar.gz; - md5 = "820d26437843ab0a6a8a5151a73a657c"; + url = mirror://sourceforge/beecrypt/beecrypt-4.2.1.tar.gz; + sha256 = "0pf5k1c4nsj77jfq5ip0ra1gzx2q47xaa0s008fnn6hd11b1yvr8"; }; buildInputs = [m4]; configureFlags = "--disable-optimized --enable-static"; diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index d04f8c8e750a..9888da5c3ec9 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv }: -let version = "0.9.8"; in +let version = "0.9.11"; in stdenv.mkDerivation { name = "check-${version}"; src = fetchurl { url = "mirror://sourceforge/check/${version}/check-${version}.tar.gz"; - sha256 = "0zvak7vx0zq344x174yg9vkw6fg9kycda15zlbz4yn07pdbgkb42"; + sha256 = "0dk9jx9hjjwsgly0iwvr5hhw870zlx21gwar7zxlzfq0zdzqqkpa"; }; doCheck = true; diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 2c712c5c20ed..40d41b633d26 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "chromaprint-${version}"; - version = "0.7"; + version = "1.1"; src = fetchurl { url = "http://bitbucket.org/acoustid/chromaprint/downloads/${name}.tar.gz"; - sha256 = "00amjzrr4230v3014141hg8k379zpba56xsm572ab49w8kyw6ljf"; + sha256 = "04nd8xmy4kgnpfffj6hw893f80bwhp43i01zpmrinn3497mdf53b"; }; buildInputs = [ cmake fftw boost ]; diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix index 080e854315dc..909e8ba7bf26 100644 --- a/pkgs/development/libraries/classads/default.nix +++ b/pkgs/development/libraries/classads/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, pcre }: -let version = "1.0.4"; in +let version = "1.0.10"; in stdenv.mkDerivation { name = "classads-${version}"; src = fetchurl { url = "ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-${version}.tar.gz"; - sha256 = "80b11c6d383891c90e04e403b2f282e91177940c3fe536082899fbfb9e854d24"; + sha256 = "1czgj53gnfkq3ncwlsrwnr4y91wgz35sbicgkp4npfrajqizxqnd"; }; + buildInputs = [ pcre ]; + configureFlags = '' --enable-namespace --enable-flexible-member ''; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 33bc196143b1..df3ffc8f60f8 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes -, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib }: +, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, +gobjectIntrospection +}: stdenv.mkDerivation { name = "clutter-1.8.2"; @@ -12,10 +14,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango - atk json_glib + atk json_glib gobjectIntrospection ]; - configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK + configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK meta = { description = "Clutter, a library for creating fast, dynamic graphical user interfaces"; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index abb92f7b08b4..b02319fd3e88 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, mesa, glib, gdk_pixbuf, libXfixes, libXcomposite , libXdamage, libintlOrEmpty -, pangoSupport ? true, pango, cairo }: +, pangoSupport ? true, pango, cairo, gobjectIntrospection }: stdenv.mkDerivation rec { name = "cogl-1.8.2"; @@ -12,8 +12,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; + configureFlags = " --enable-introspection " ; + propagatedBuildInputs = - [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage ] + [ mesa glib gdk_pixbuf libXfixes libXcomposite libXdamage +gobjectIntrospection ] ++ libintlOrEmpty; buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ]; diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix index 2504f87a230a..596720c542cb 100644 --- a/pkgs/development/libraries/cppunit/default.nix +++ b/pkgs/development/libraries/cppunit/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "cppunit-1.12.0"; + name = "cppunit-1.12.1"; src = fetchurl { - url = mirror://sourceforge/cppunit/cppunit-1.12.0.tar.gz; - sha256 = "07zyyx5dyai94y8r8va28971f5mw84mb93xx9pm6m4ddpj6c79cq"; + url = mirror://sourceforge/cppunit/cppunit-1.12.1.tar.gz; + sha256 = "0jm49v5rmc5qw34vqs56gy8xja1dhci73bmh23cig4kcir6a0a5c"; }; meta = { diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 56c3c3e7a2bd..d1695f295fcb 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -10,11 +10,11 @@ composableDerivation.composableDerivation {} rec { # (if args.use_svn then ["libtool" "autoconf" "automake" "swig"] else []) # // edf { name = "ruby"; enable = { buildInputs = [ ruby ]; };} - name = "geos-3.3.8"; + name = "geos-3.4.2"; src = fetchurl { url = "http://download.osgeo.org/geos/${name}.tar.bz2"; - sha256 = "0fshz8s9g610ycl4grrmcdcxb01aqpc6qac3x3jjik0vlz8x9v7b"; + sha256 = "0lvcs8x9as5jlxilykgg3i4220x8m4z59b2ngfapl219gvgvzs0m"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index edfbc0e86d7d..eb653591005e 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "glpk-4.47"; + name = "glpk-4.52.1"; src = fetchurl { url = "mirror://gnu/glpk/${name}.tar.gz"; - sha256 = "13gl75w9dqh1a83v8wvlz9ychwljhy26n3l16r9dia3lpbikhm63"; + sha256 = "0nz9ngmx23c8gbjr8l8ygnfaanxj2mwbl8awpg630bgrkxdnhc9j"; }; doCheck = true; diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index eee977e97037..94b422d7a914 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "gsl-1.15"; + name = "gsl-1.16"; src = fetchurl { url = "mirror://gnu/gsl/${name}.tar.gz"; - sha256 = "18qf6jzz1r3mzb5qynywv4xx3z9g61hgkbpkdrhbgqh2g7jhgfc5"; + sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k"; }; # ToDo: there might be more impurities than FMA support check diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix index ca386b15f0e1..820e8eb07c9e 100644 --- a/pkgs/development/libraries/gstreamer/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/gnonlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gst_plugins_base, gstreamer }: stdenv.mkDerivation rec { - name = "gnonlin-0.10.15"; + name = "gnonlin-0.10.17"; src = fetchurl { urls = [ "http://gstreamer.freedesktop.org/src/gnonlin/${name}.tar.bz2" "mirror://gentoo/distfiles/${name}.tar.bz2" ]; - sha256 = "1yz0i3vzpadz5axwdb310bypl4rm1xy2n6mgajja0w2z6afnrfv0"; + sha256 = "0dc9kvr6i7sh91cyhzlbx2bchwg84rfa4679ccppzjf0y65dv8p4"; }; buildInputs = [ gst_plugins_base gstreamer pkgconfig ]; diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix index c24ceacc0216..4a908e46d934 100644 --- a/pkgs/development/libraries/haskell/DAV/default.nix +++ b/pkgs/development/libraries/haskell/DAV/default.nix @@ -1,16 +1,16 @@ -{ cabal, caseInsensitive, httpClient, httpConduit, httpTypes, lens -, liftedBase, mtl, network, optparseApplicative, resourcet +{ cabal, caseInsensitive, httpClient, httpClientTls, httpTypes +, lens, liftedBase, mtl, network, optparseApplicative, resourcet , transformers, xmlConduit, xmlHamlet }: cabal.mkDerivation (self: { pname = "DAV"; - version = "0.5"; - sha256 = "1yda3w8rr8p7jnpjpbjafis7xi01wmd1fwrq4fprzpfgghcjidhq"; + version = "0.5.1"; + sha256 = "12r5hy6g5k5bdf3n84hpq9b90nz6v2v3xwy7prxkvv99iaxf2lsj"; isLibrary = true; isExecutable = true; buildDepends = [ - caseInsensitive httpClient httpConduit httpTypes lens liftedBase + caseInsensitive httpClient httpClientTls httpTypes lens liftedBase mtl network optparseApplicative resourcet transformers xmlConduit xmlHamlet ]; diff --git a/pkgs/development/libraries/haskell/HFuse/default.nix b/pkgs/development/libraries/haskell/HFuse/default.nix index 9d37b580d802..2012739afb45 100644 --- a/pkgs/development/libraries/haskell/HFuse/default.nix +++ b/pkgs/development/libraries/haskell/HFuse/default.nix @@ -18,7 +18,7 @@ cabal.mkDerivation (self: { homepage = "https://github.com/toothbrush/hfuse"; description = "HFuse is a binding for the Linux FUSE library"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; + platforms = self.stdenv.lib.platforms.linux; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.9.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.10.nix index 4ab03112189c..c893d2f1e750 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.9.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.10.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "HTTP"; - version = "4000.2.9"; - sha256 = "0fnf4blh7gw0cbap16ss811wr0haa2gqd0gzdbz668jk58n1gmz7"; + version = "4000.2.10"; + sha256 = "1l97l6am45xgyg0dyxpfgbxc00wp8ishm7spd0hbgmwc5sgnvppg"; buildDepends = [ mtl network parsec ]; testDepends = [ caseInsensitive conduit deepseq httpdShed httpTypes HUnit mtl diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix index eb7c406e81e4..d7736a5d9b9a 100644 --- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix +++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "HsOpenSSL"; - version = "0.10.3.5"; - sha256 = "1yvpvc9ylfqskdv0dqg6cl43w3wg7rggz0lwlrv04a45mrxygh80"; + version = "0.10.3.6"; + sha256 = "0h2q9isbrfvsyr4yzcv7y0vd3gha8ym67l4sn7zlz39n376i2z10"; buildDepends = [ network time ]; extraLibraries = [ openssl ]; meta = { diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix index 973fca3fb991..a9723721e1e9 100644 --- a/pkgs/development/libraries/haskell/ListLike/default.nix +++ b/pkgs/development/libraries/haskell/ListLike/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "ListLike"; - version = "4.0.1"; - sha256 = "1ny6h3f1l0gigyv2rs24s7w158vsflrdx4i9v1al4910cxh56awv"; + version = "4.0.2"; + sha256 = "1ggh8yndnsmccgsl11fia4v2cad0vq3clibgh0311r3c43mwvnah"; buildDepends = [ text vector ]; testDepends = [ HUnit QuickCheck random text vector ]; jailbreak = true; diff --git a/pkgs/development/libraries/haskell/alsa-core/default.nix b/pkgs/development/libraries/haskell/alsa-core/default.nix index 140d554e88c6..f38082fba88b 100644 --- a/pkgs/development/libraries/haskell/alsa-core/default.nix +++ b/pkgs/development/libraries/haskell/alsa-core/default.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Binding to the ALSA Library API (Exceptions)"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; + platforms = self.stdenv.lib.platforms.linux; }; }) diff --git a/pkgs/development/libraries/haskell/alsa-pcm/default.nix b/pkgs/development/libraries/haskell/alsa-pcm/default.nix index 3d1091f27027..39123a176dc7 100644 --- a/pkgs/development/libraries/haskell/alsa-pcm/default.nix +++ b/pkgs/development/libraries/haskell/alsa-pcm/default.nix @@ -16,6 +16,6 @@ cabal.mkDerivation (self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Binding to the ALSA Library API (PCM audio)"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; + platforms = self.stdenv.lib.platforms.linux; }; }) diff --git a/pkgs/development/libraries/haskell/ansi-terminal/default.nix b/pkgs/development/libraries/haskell/ansi-terminal/default.nix index 6d598f29ec95..2e9b1c0c25f4 100644 --- a/pkgs/development/libraries/haskell/ansi-terminal/default.nix +++ b/pkgs/development/libraries/haskell/ansi-terminal/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "ansi-terminal"; - version = "0.6"; - sha256 = "0a5zrq80yrj48s2cm8lns06p6wwnz72vs2wy0ryp0gw6rrg50fkg"; + version = "0.6.1"; + sha256 = "0ncghc0z2xkfn1hfvyl0haf4mia9lhjbiqda11nxkqqfxdyklb2j"; isLibrary = true; isExecutable = true; meta = { - homepage = "http://batterseapower.github.com/ansi-terminal"; + homepage = "https://github.com/feuerbach/ansi-terminal"; description = "Simple ANSI terminal support, with Windows compatibility"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/assert-failure/default.nix b/pkgs/development/libraries/haskell/assert-failure/default.nix new file mode 100644 index 000000000000..abc520e7b4ba --- /dev/null +++ b/pkgs/development/libraries/haskell/assert-failure/default.nix @@ -0,0 +1,14 @@ +{ cabal, prettyShow, text }: + +cabal.mkDerivation (self: { + pname = "assert-failure"; + version = "0.1"; + sha256 = "1xwd6rhka9gzmldkaw3d7262h51wxw9dwgip39q8pjkvvfs5kwkr"; + buildDepends = [ prettyShow text ]; + meta = { + homepage = "https://github.com/Mikolaj/assert-failure"; + description = "Syntactic sugar improving 'assert' and 'error'"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/cufft/default.nix b/pkgs/development/libraries/haskell/cufft/default.nix index 5caec8341392..df9f686383e1 100644 --- a/pkgs/development/libraries/haskell/cufft/default.nix +++ b/pkgs/development/libraries/haskell/cufft/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "cufft"; - version = "0.1.0.1"; - sha256 = "0j1rsixl48z8xszym9s3rw4pwq4s5bz6inqkfsq726gni0nlm8vx"; + version = "0.1.0.3"; + sha256 = "1jj1ixacmhwjcb2syv4fglawpya5vmdhdk2xqrw4wwfxw4wc9ypi"; buildDepends = [ cuda ]; buildTools = [ c2hs ]; meta = { @@ -11,6 +11,5 @@ cabal.mkDerivation (self: { description = "Haskell bindings for the CUFFT library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/data-memocombinators/default.nix b/pkgs/development/libraries/haskell/data-memocombinators/default.nix index df6777313264..3bdaf941c837 100644 --- a/pkgs/development/libraries/haskell/data-memocombinators/default.nix +++ b/pkgs/development/libraries/haskell/data-memocombinators/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "data-memocombinators"; - version = "0.5.0"; - sha256 = "1kh2xj1z68gig8y5fqfwaha0mcd41laa2di9x2hryjwdgzswxy74"; + version = "0.5.1"; + sha256 = "1mvfc1xri3kgkx5q7za01bqg1x3bfvbgcffw5vwl6jmq4hh1sd5l"; buildDepends = [ dataInttrie ]; meta = { homepage = "http://github.com/luqui/data-memocombinators"; diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix index 2207f18c35cd..43f0c4337e74 100644 --- a/pkgs/development/libraries/haskell/digestive-functors/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix @@ -1,15 +1,15 @@ { cabal, HUnit, mtl, QuickCheck, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2, text +, testFrameworkQuickcheck2, text, time }: cabal.mkDerivation (self: { pname = "digestive-functors"; - version = "0.6.1.1"; - sha256 = "05px6xal6kzppph5nm9w60vsdz0d9gng8zp26ipwpxzk57jg4jjw"; - buildDepends = [ mtl text ]; + version = "0.6.2.0"; + sha256 = "1d07ws5s34x9sviq7mfkl6fh1rl28r5x1rmgbkcxil5h6gxn5mi7"; + buildDepends = [ mtl text time ]; testDepends = [ HUnit mtl QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 text + testFrameworkQuickcheck2 text time ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix index 687314266839..46e69c95f940 100644 --- a/pkgs/development/libraries/haskell/doctest/default.nix +++ b/pkgs/development/libraries/haskell/doctest/default.nix @@ -14,6 +14,7 @@ cabal.mkDerivation (self: { stringbuilder syb transformers ]; doCheck = false; + noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.4"; meta = { homepage = "https://github.com/sol/doctest-haskell#readme"; description = "Test interactive Haskell examples"; diff --git a/pkgs/development/libraries/haskell/enummapset-th/default.nix b/pkgs/development/libraries/haskell/enummapset-th/default.nix new file mode 100644 index 000000000000..a675d4d74ea6 --- /dev/null +++ b/pkgs/development/libraries/haskell/enummapset-th/default.nix @@ -0,0 +1,14 @@ +{ cabal, deepseq }: + +cabal.mkDerivation (self: { + pname = "enummapset-th"; + version = "0.6.0.1"; + sha256 = "1v12pfj6k8av58sh6siwzspf2dnbcapmrzfpg2p4yz3bdkc70hh8"; + buildDepends = [ deepseq ]; + meta = { + homepage = "https://github.com/liyang/enummapset-th"; + description = "TH-generated EnumSet/EnumMap wrappers around IntSet/IntMap"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index fb3ccb8e50ec..472d25790481 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -17,7 +17,6 @@ cabal.mkDerivation (self: { ioChoice syb time transformers ]; buildTools = [ emacs ]; - doCheck = false; postInstall = '' cd $out/share/$pname-$version make @@ -25,12 +24,12 @@ cabal.mkDerivation (self: { cd .. ensureDir "$out/share/emacs" mv $pname-$version emacs/site-lisp - mv $out/bin/ghc-mod $out/ghc-mod + mv $out/bin/ghc-mod $out/bin/.ghc-mod-wrapped cat - > $out/bin/ghc-mod <<EOF - #!/bin/sh + #! ${self.stdenv.shell} COMMAND=\$1 shift - eval exec $out/ghc-mod \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@" + eval exec $out/bin/.ghc-mod-wrapped \$COMMAND \$( ${self.ghc.GHCGetPackages} ${self.ghc.version} | tr " " "\n" | tail -n +2 | paste -d " " - - | sed 's/.*/-g "&"/' | tr "\n" " ") "\$@" EOF chmod +x $out/bin/ghc-mod ''; diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix index 5a45e48bdc7b..74368defc9c8 100644 --- a/pkgs/development/libraries/haskell/github/default.nix +++ b/pkgs/development/libraries/haskell/github/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { hashable HTTP httpConduit httpTypes network text time unorderedContainers vector ]; + patches = [ ./fix-build.patch ]; jailbreak = true; meta = { homepage = "https://github.com/fpco/github"; diff --git a/pkgs/development/libraries/haskell/github/fix-build.patch b/pkgs/development/libraries/haskell/github/fix-build.patch new file mode 100644 index 000000000000..2d3483b38ec1 --- /dev/null +++ b/pkgs/development/libraries/haskell/github/fix-build.patch @@ -0,0 +1,13 @@ +diff -ubr github-0.7.2-orig/Github/Private.hs github-0.7.2/Github/Private.hs +--- github-0.7.2-orig/Github/Private.hs 2013-12-15 19:45:00.611789227 +0100 ++++ github-0.7.2/Github/Private.hs 2013-12-15 19:45:46.359954006 +0100 +@@ -104,9 +104,6 @@ + in Just (Data.List.takeWhile (/= '>') s') + else Nothing + +-doHttps :: Method -> String -> Maybe GithubAuth +- -> Maybe (RequestBody (ResourceT IO)) +- -> IO (Either E.SomeException (Response LBS.ByteString)) + doHttps reqMethod url auth body = do + let reqBody = fromMaybe (RequestBodyBS $ BS.pack "") body + reqHeaders = maybe [] getOAuth auth diff --git a/pkgs/development/libraries/haskell/gloss-accelerate/default.nix b/pkgs/development/libraries/haskell/gloss-accelerate/default.nix index c4a31d541b58..2c53925f975d 100644 --- a/pkgs/development/libraries/haskell/gloss-accelerate/default.nix +++ b/pkgs/development/libraries/haskell/gloss-accelerate/default.nix @@ -9,5 +9,6 @@ cabal.mkDerivation (self: { description = "Extras to interface Gloss and Accelerate"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix b/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix index 7ed70bc092cf..db5b62169c40 100644 --- a/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix +++ b/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix @@ -9,5 +9,6 @@ cabal.mkDerivation (self: { description = "Parallel rendering of raster images using Accelerate"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index 87d5181fa7de..89a6622cf1ce 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -1,20 +1,20 @@ -{ cabal, cmdargs, csv, filepath, HUnit, mtl, parsec, prettyShow -, regexCompat, regexpr, safe, split, testFramework +{ cabal, cmdargs, csv, dataPprint, filepath, HUnit, mtl, parsec +, prettyShow, regexCompatTdfa, regexpr, safe, split, testFramework , testFrameworkHunit, time, transformers, utf8String }: cabal.mkDerivation (self: { pname = "hledger-lib"; - version = "0.21.3"; - sha256 = "1vvki1dg98f8r9w6gmblazkbin7g2hzifwqd1frb0a3kp869i870"; + version = "0.22"; + sha256 = "059dbwmafwy25pbr9311lknhyjlycdhhal4ng9i56bgd334l2wx3"; buildDepends = [ - cmdargs csv filepath HUnit mtl parsec prettyShow regexCompat - regexpr safe split time transformers utf8String + cmdargs csv dataPprint filepath HUnit mtl parsec prettyShow + regexCompatTdfa regexpr safe split time transformers utf8String ]; testDepends = [ - cmdargs csv filepath HUnit mtl parsec prettyShow regexCompat - regexpr safe split testFramework testFrameworkHunit time - transformers + cmdargs csv dataPprint filepath HUnit mtl parsec prettyShow + regexCompatTdfa regexpr safe split testFramework testFrameworkHunit + time transformers ]; meta = { homepage = "http://hledger.org"; diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index e4dd6ef1faad..f846dba7fc87 100644 --- a/pkgs/development/libraries/haskell/hledger-web/default.nix +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -1,20 +1,20 @@ { cabal, blazeHtml, blazeMarkup, clientsession, cmdargs , dataDefault, filepath, hamlet, hjsmin, hledger, hledgerLib, hspec -, httpConduit, HUnit, json, networkConduit, parsec, regexpr, safe -, shakespeareText, text, time, transformers, wai, waiExtra -, waiHandlerLaunch, warp, yaml, yesod, yesodCore, yesodStatic -, yesodTest +, httpClient, httpConduit, HUnit, json, networkConduit, parsec +, regexpr, safe, shakespeareText, text, time, transformers, wai +, waiExtra, waiHandlerLaunch, warp, yaml, yesod, yesodCore +, yesodStatic, yesodTest }: cabal.mkDerivation (self: { pname = "hledger-web"; - version = "0.21.3"; - sha256 = "18gil6qwlzfk0y0f9q1la5np5phi0h3nqlb8rwn9qjjgvs134jgy"; + version = "0.22"; + sha256 = "0bd1cb6988ainkzi034a4g4xnslqc6djv74gbq58aaxjqn4m7m80"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml blazeMarkup clientsession cmdargs dataDefault filepath - hamlet hjsmin hledger hledgerLib httpConduit HUnit json + hamlet hjsmin hledger hledgerLib httpClient httpConduit HUnit json networkConduit parsec regexpr safe shakespeareText text time transformers wai waiExtra waiHandlerLaunch warp yaml yesod yesodCore yesodStatic diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index 36012251e077..47a5ed381f6b 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -1,23 +1,24 @@ -{ cabal, cmdargs, csv, filepath, haskeline, hledgerLib, HUnit, mtl -, parsec, prettyShow, regexCompat, regexpr, safe, shakespeareText -, split, testFramework, testFrameworkHunit, text, time -, transformers, utf8String +{ cabal, cmdargs, csv, dataPprint, filepath, haskeline, hledgerLib +, HUnit, mtl, parsec, prettyShow, regexCompatTdfa, regexpr, safe +, shakespeareText, split, tabular, testFramework +, testFrameworkHunit, text, time, transformers, utf8String }: cabal.mkDerivation (self: { pname = "hledger"; - version = "0.21.3"; - sha256 = "14j0axlq6xfaih7m6lqpis26ya0yl4v6g6xrqbihmjddvx7j32f2"; + version = "0.22"; + sha256 = "1fwi1a2nvhfjinif7gy7rv00gn7kazwzmhsskpim2a7bg99sfxb9"; isLibrary = true; isExecutable = true; buildDepends = [ - cmdargs filepath haskeline hledgerLib HUnit mtl parsec regexpr safe - shakespeareText split text time utf8String + cmdargs dataPprint filepath haskeline hledgerLib HUnit mtl parsec + regexpr safe shakespeareText split tabular text time utf8String ]; testDepends = [ - cmdargs csv filepath haskeline hledgerLib HUnit mtl parsec - prettyShow regexCompat regexpr safe shakespeareText split - testFramework testFrameworkHunit text time transformers + cmdargs csv dataPprint filepath haskeline hledgerLib HUnit mtl + parsec prettyShow regexCompatTdfa regexpr safe shakespeareText + split tabular testFramework testFrameworkHunit text time + transformers ]; meta = { homepage = "http://hledger.org"; diff --git a/pkgs/development/libraries/haskell/markdown-unlit/default.nix b/pkgs/development/libraries/haskell/markdown-unlit/default.nix index 06c1b9e2fcae..e09feb10d905 100644 --- a/pkgs/development/libraries/haskell/markdown-unlit/default.nix +++ b/pkgs/development/libraries/haskell/markdown-unlit/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; testDepends = [ hspec QuickCheck silently stringbuilder ]; + noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.4"; meta = { description = "Literate Haskell support for Markdown"; license = self.stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix index 691029ac5de2..4f7353dfdb6f 100644 --- a/pkgs/development/libraries/haskell/mime-mail/default.nix +++ b/pkgs/development/libraries/haskell/mime-mail/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "mime-mail"; - version = "0.4.2.1"; - sha256 = "1rpxx90k4dgz1b5ss6vqqgd9n1hjrv09q20myy16zzlj1gmn8k3g"; + version = "0.4.3"; + sha256 = "0xh6j4vdg2ispr9f41s8pvx5rb08zqapkqxyvykvjg2ibmczzg4f"; buildDepends = [ base64Bytestring blazeBuilder filepath random text ]; diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.5.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix index 58cbb522fa24..911d984a88c0 100644 --- a/pkgs/development/libraries/haskell/monad-par/0.3.4.5.nix +++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "monad-par"; - version = "0.3.4.5"; - sha256 = "0xwjx3l9ssyxaa49v8kz7ic54va1qy6dqa1z5gvww7a5gw1ll81p"; + version = "0.3.4.6"; + sha256 = "1k345fpq31jg0mvfk8ap03wscnx8dvlp65gr567vai9ym1ahk6zy"; buildDepends = [ abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom parallel diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 01ce4cc5bfb8..b42fc3633f09 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -26,6 +26,7 @@ cabal.mkDerivation (self: { testFrameworkQuickcheck2 text ]; buildTools = [ alex happy ]; + jailbreak = true; doCheck = false; meta = { homepage = "http://johnmacfarlane.net/pandoc"; diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix index 3f50ed381523..d72aed42852f 100644 --- a/pkgs/development/libraries/haskell/scotty/default.nix +++ b/pkgs/development/libraries/haskell/scotty/default.nix @@ -1,15 +1,15 @@ { cabal, aeson, blazeBuilder, caseInsensitive, conduit, dataDefault -, httpTypes, mtl, regexCompat, resourcet, text, transformers, wai -, waiExtra, warp +, httpTypes, mtl, regexCompat, text, transformers, wai, waiExtra +, warp }: cabal.mkDerivation (self: { pname = "scotty"; - version = "0.6.0"; - sha256 = "0h5m84kp3p2bc5q9vi9b8ky7k14d7hhhqgbl1mxrqkpw3m5z95xy"; + version = "0.6.1"; + sha256 = "1fcrd1fxlmgkm9d6xfyb76pmn68pgk0a367lpmyh77kp0zr3f7ib"; buildDepends = [ aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes - mtl regexCompat resourcet text transformers wai waiExtra warp + mtl regexCompat text transformers wai waiExtra warp ]; meta = { homepage = "https://github.com/scotty-web/scotty"; diff --git a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix index 838f45eccaad..8a9a594e45d7 100644 --- a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix +++ b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "snaplet-acid-state"; - version = "0.2.5"; - sha256 = "0qx6as1m0fwb5fkhvl0k71kx65njwq0dk183xi4gmdzhf83hkjbs"; + version = "0.2.6"; + sha256 = "005c4x7sh820iar69rany3hv4rlbzpsd4yqd2x2v3jql9z55k4s9"; buildDepends = [ acidState snap text ]; meta = { homepage = "https://github.com/mightybyte/snaplet-acid-state"; diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index 8153eb9f6a76..6ba25cdc99b2 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty"; - version = "0.5.1"; - sha256 = "0a59cwy3ks9jz7v27n9ws85qga38ksv1mg68p62birm1rw9xc3xd"; + version = "0.5.2.1"; + sha256 = "0dph1c0j2vjvzf5csp6hwlcx2zqa12yqrafk6pxs8bnd3r9a11ym"; buildDepends = [ ansiTerminal deepseq mtl optparseApplicative regexPosix stm tagged ]; diff --git a/pkgs/development/libraries/haskell/th-lift/default.nix b/pkgs/development/libraries/haskell/th-lift/default.nix index c479955db645..c10feac4ba68 100644 --- a/pkgs/development/libraries/haskell/th-lift/default.nix +++ b/pkgs/development/libraries/haskell/th-lift/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "th-lift"; - version = "0.5.6"; - sha256 = "128rbpqbm4fgn1glbv8bvlqnvn2wvca7wj08xri25w3bikmfy2z4"; + version = "0.6"; + sha256 = "0nsxrmilp2g0nx4s9iigj2llza6phphcfr4j9gvmqmx6kf2z9vns"; meta = { description = "Derive Template Haskell's Lift class for datatypes"; license = "unknown"; diff --git a/pkgs/development/libraries/haskell/th-orphans/default.nix b/pkgs/development/libraries/haskell/th-orphans/default.nix index 9196e9ef76b2..dd9fbc198bff 100644 --- a/pkgs/development/libraries/haskell/th-orphans/default.nix +++ b/pkgs/development/libraries/haskell/th-orphans/default.nix @@ -5,6 +5,7 @@ cabal.mkDerivation (self: { version = "0.8"; sha256 = "0kzzcicn6pggvvblhbrs3vh0bf71izlb99lb0f5qww7ymi4smldr"; buildDepends = [ thLift ]; + jailbreak = true; meta = { description = "Orphan instances for TH datatypes"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/vty-ui/default.nix b/pkgs/development/libraries/haskell/vty-ui/default.nix index 3b38db8c1de4..ad3ab7823c0e 100644 --- a/pkgs/development/libraries/haskell/vty-ui/default.nix +++ b/pkgs/development/libraries/haskell/vty-ui/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "vty-ui"; - version = "1.6"; - sha256 = "0chwgzzk2pl9kppd9r6h2azbqc668xpdrrk5y415yi8wcw61s0bc"; + version = "1.6.1"; + sha256 = "013a4wlhrhsbkh9wd8dxppn9aa0l7cfrgn3na6cifry34d96ql9d"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index a6b8eeb4058b..8f2c6ebb342c 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "2.0.0.1"; - sha256 = "0c02j61a62dpl9i736q8cv0b9kw17akkws7waqa4zcbad1wyiqps"; + version = "2.0.0.2"; + sha256 = "0d9afs50r08k9zgz7vvh7fvamcvhm8hf4qxca4w0xi7pcj1vql0r"; buildDepends = [ base64Bytestring blazeBuilder blazeHtml blazeMarkup cereal cryptoApi cryptoConduit cryptohashCryptoapi fileEmbed filepath diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index d3b835879650..c6f8752f8b00 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.0.1"; - sha256 = "16m6scz36yzvyhz098lv6ppxdyk6kmavzyzb42iq0bpyk9m0x2qx"; + version = "2.0.1"; + sha256 = "0asjd7v1zdbs1rixqanwwn4n5b417gj48nv2qva6pfj09hs5dzhh"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit caseInsensitive conduit dataDefault fastLogger httpTypes liftedBase diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index dbee52da8680..851d152eac56 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.5.1"; - sha256 = "1ybj89yvwrsw82jj92rf741jx8na8gp3z4ighyrpavfqhhl6576f"; + version = "1.2.5.2"; + sha256 = "00n957gbq03qrbwxa29hpqkmyfnbr7n4bah4185rpjdvnywq3l8x"; 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 86b2eec8945c..3a8bbb2cdf73 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.6.1"; - sha256 = "12w8lxkxdwf2pfanz33grciyh4ijn6nzrz4lm478w20y9frmf1nm"; + version = "1.2.6.2"; + sha256 = "11q70zc837d0sdwgh8c60pv1x4zki2klamcr5vw5zsjj0qsb9pby"; 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 c26d88b50807..936c4ab741b6 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.4"; - sha256 = "1ajdbr7lz6jxh5r0iapc7c70pmyrac8rw8qzv4vh8lbvmx0z4ck4"; + version = "1.3.4.1"; + sha256 = "01h9k7qwp26i57akbm9236r8gbil4mh2317caa4bcva7m1dclvpj"; 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 ee9cd3b1fd3b..e17ed799c0e1 100644 --- a/pkgs/development/libraries/haskell/yesod-platform/default.nix +++ b/pkgs/development/libraries/haskell/yesod-platform/default.nix @@ -31,8 +31,8 @@ cabal.mkDerivation (self: { pname = "yesod-platform"; - version = "1.2.5"; - sha256 = "1qd1r3ihnmzpc9jspvrygvxvp7si7j9rjrdp18jibsx3ijpkkif3"; + version = "1.2.5.2"; + sha256 = "0pvdaz860zlgizdrsjm4v1vsx0bvcmilz0si0skrx980gysxd0nn"; buildDepends = [ aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit authenticate base64Bytestring baseUnicodeSymbols blazeBuilder diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index d651e90a8a7f..87b4d059dc5b 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "yesod-routes"; - version = "1.2.0.2"; - sha256 = "0mjffsz9rk401a86l10vcjfhvfd8jknzml86jb5kpk6ssvnah0n7"; + version = "1.2.0.3"; + sha256 = "0p2640bbsx1lmxd0wq6qwicp6rbh1c54hjb6kiaczj63yahn04y3"; buildDepends = [ pathPieces text vector ]; testDepends = [ hspec HUnit pathPieces text ]; meta = { diff --git a/pkgs/development/libraries/haskell/zip-archive/default.nix b/pkgs/development/libraries/haskell/zip-archive/default.nix index bddf09bc405d..bfe648f449b0 100644 --- a/pkgs/development/libraries/haskell/zip-archive/default.nix +++ b/pkgs/development/libraries/haskell/zip-archive/default.nix @@ -1,14 +1,12 @@ -{ cabal, binary, digest, filepath, HUnit, mtl, time, utf8String -, zlib -}: +{ cabal, binary, digest, filepath, HUnit, mtl, text, time, zlib }: cabal.mkDerivation (self: { pname = "zip-archive"; - version = "0.1.4"; - sha256 = "0ipk8gwa2k8iqg2gg4lbawr8l9sjwhy2p7b8qxazpq0i88dyy3lb"; + version = "0.2"; + sha256 = "0d2n8mgfikyjzc4x7qm3vvpmhhf3mva9f0q6p9l1q9b7dlf8vmdv"; isLibrary = true; isExecutable = true; - buildDepends = [ binary digest filepath mtl time utf8String zlib ]; + buildDepends = [ binary digest filepath mtl text time zlib ]; testDepends = [ HUnit time ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index d77e2052f811..b1c154badd8e 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { name = "imlib2-1.4.5"; - + src = fetchurl { url = "mirror://sourceforge/enlightenment/${name}.tar.bz2"; sha256 = "0nllbhf8vfwdm40z35yj27n83k2mjf5vbd62khad4f0qjf9hsw14"; }; - + buildInputs = [ x11 libjpeg libtiff libungif libpng bzip2 ]; nativeBuildInputs = [ pkgconfig ]; meta = { - platforms = stdenv.lib.platforms.gnu; # random choice + hydraPlatforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix index 0263e98f587c..e6474abf11c1 100644 --- a/pkgs/development/libraries/incrtcl/default.nix +++ b/pkgs/development/libraries/incrtcl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "incrtcl-${version}"; - version = "3.4b1"; + version = "3.4.1"; src = fetchurl { - url = mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl3.4b1.tar.gz; - sha256 = "0226vf7vmb7qmk9bcic635d33rm3gr1wqk5rpx6pf00bq3vgr6fw"; + url = mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl3.4.1.tar.gz; + sha256 = "0s457j9mn3c1wjj43iwy3zwhyz980jlyqn3s9487da9dwwn86c2k"; }; buildInputs = [ tcl ]; diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix index 4908c737ece4..3d4e5f260dce 100644 --- a/pkgs/development/libraries/jansson/default.nix +++ b/pkgs/development/libraries/jansson/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "jansson-2.4"; + name = "jansson-2.5"; src = fetchurl { url = "http://www.digip.org/jansson/releases/${name}.tar.gz"; - sha256 = "1fcbd1ac3d8b610644acf86a5731d760bb228c9acbace20a2ad0f23baec79b41"; + sha256 = "1cdi1g4pyjwrw76z99ys8cr13iz9nz9i8sq6ivl1q0ymiarvz2yx"; }; meta = { diff --git a/pkgs/development/libraries/java/httpunit/default.nix b/pkgs/development/libraries/java/httpunit/default.nix index b70bbf56073e..73eb33df812d 100644 --- a/pkgs/development/libraries/java/httpunit/default.nix +++ b/pkgs/development/libraries/java/httpunit/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, unzip} : stdenv.mkDerivation { - name = "httpunit-1.6"; + name = "httpunit-1.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://sourceforge/httpunit/httpunit-1.6.zip; - md5 = "e94b53b9f4d7bdb706e4baac95b6e424"; + url = mirror://sourceforge/httpunit/httpunit-1.7.zip; + sha256 = "09gnayqgizd8cjqayvdpkxrc69ipyxawc96aznfrgdhdiwv8l5zf"; }; inherit unzip; diff --git a/pkgs/development/libraries/java/jflex/default.nix b/pkgs/development/libraries/java/jflex/default.nix index 4d0eda22c5bb..5e54e800f55b 100644 --- a/pkgs/development/libraries/java/jflex/default.nix +++ b/pkgs/development/libraries/java/jflex/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl} : stdenv.mkDerivation { - name = "jflex-1.4.1"; + name = "jflex-1.4.3"; builder = ./builder.sh; src = fetchurl { - url = http://jflex.de/jflex-1.4.1.tar.gz; - md5 = "9e4be6e826e6b344e84c0434d6fd4b46"; + url = http://jflex.de/jflex-1.4.3.tar.gz; + sha256 = "0sm74sgjvw01fsiqr5q9ipbm8rfyihf6yn00dqymhyc3wmbhr517"; }; } diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix index 7953b04183a9..78100521584b 100644 --- a/pkgs/development/libraries/json-c/default.nix +++ b/pkgs/development/libraries/json-c/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { and parse JSON formatted strings back into the C representation of JSON objects. ''; - platforms = platforms.linux; + hydraPlatforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 8ca1445b1f6d..005b9fac2e55 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, glib, pkgconfig }: +{ stdenv, fetchurl_gnome, glib, pkgconfig, gobjectIntrospection }: stdenv.mkDerivation rec { name = src.pkgname; @@ -9,8 +9,10 @@ stdenv.mkDerivation rec { sha256 = "19wlpsbdnm3mq2a6yjpzj0cwrmlkarp2m5x6g63b0r2n7vxaa5mq"; }; + configureflags= " --with-introspection " ; + propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gobjectIntrospection]; meta = { homepage = http://live.gnome.org/JsonGlib; diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix index 4a0066fccd49..8e4f8a36547a 100644 --- a/pkgs/development/libraries/libcddb/default.nix +++ b/pkgs/development/libraries/libcddb/default.nix @@ -1,11 +1,11 @@ {fetchurl, stdenv}: stdenv.mkDerivation rec { - name = "libcddb-1.3.0"; + name = "libcddb-1.3.2"; src = fetchurl { url = "mirror://sourceforge/libcddb/${name}.tar.bz2"; - sha256 = "1y8bfy12dwm41m1jahayn3v47dm34fmz7m9cjxyh7xcw6fp3lzaf"; + sha256 = "0fr21a7vprdyy1bq6s99m0x420c9jm5fipsd63pqv8qyfkhhxkim"; }; meta = { diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index fc26fb9aca11..00159e1de46b 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libcddb, pkgconfig, ncurses, help2man }: stdenv.mkDerivation rec { - name = "libcdio-0.82"; + name = "libcdio-0.90"; src = fetchurl { url = "mirror://gnu/libcdio/${name}.tar.gz"; - sha256 = "0fax1dzy84dzs20bmpq2gfw6hc1x2x9mhk53wynhcycjw3l3vjqs"; + sha256 = "0kpp6gr5sjr30pb9klncc37fhkw0wi6r41d2fmvmw17cbj176zmg"; }; buildInputs = [ libcddb pkgconfig ncurses help2man ]; diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix index 03b7b2cfb928..70a882ff15c1 100644 --- a/pkgs/development/libraries/libconfig/default.nix +++ b/pkgs/development/libraries/libconfig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libconfig-${version}"; - version = "1.4.8"; + version = "1.4.9"; src = fetchurl { url = "http://www.hyperrealm.com/libconfig/${name}.tar.gz"; - sha256 = "1v817hy9y416i64ly17xdmgrn62qwj225wqakdzqr2j3pygm1c8q"; + sha256 = "0h9h8xjd36lky2r8jyc6hw085xwpslf0x6wyjvi960g6aa99gj09"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix index f9666ccf4ddc..58c150a22d6e 100644 --- a/pkgs/development/libraries/libdaemon/default.nix +++ b/pkgs/development/libraries/libdaemon/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { license = "LGPLv2+"; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + hydraPlatforms = stdenv.lib.platforms.linux; maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix index 48a0423653d6..6b3a16d1c092 100644 --- a/pkgs/development/libraries/libeatmydata/default.nix +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libeatmydata-65"; + name = "libeatmydata-82"; src = fetchurl { url = "http://www.flamingspork.com/projects/libeatmydata/${name}.tar.gz"; - sha256 = "1hfmd24ps5661zbbw1qqgqs6hcwx6ll2fxz2j4cfvkmf0kzw25la"; + sha256 = "0aavq71bf0yxdgyf8gvyzq086shszzwpbsz5rqkjg4cz0rc5yrqb"; }; meta = { diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index cb60355ef558..997e9cfc5b88 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libgpgerror }: stdenv.mkDerivation (rec { - name = "libgcrypt-1.5.2"; + name = "libgcrypt-1.5.3"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "0gwnzqd64cpwdmk93nll54nidsr74jpimxzj4p4z7502ylwl66p4"; + sha256 = "1lar8y3lh61zl5flljpz540d78g99h4d5idfwrfw8lm3gm737xdw"; }; propagatedBuildInputs = [ libgpgerror ]; diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 9253468b8df5..0c79b20b5645 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -4,11 +4,11 @@ with { inherit (stdenv.lib) optionals; }; stdenv.mkDerivation rec { - name = "libgsf-1.14.26"; + name = "libgsf-1.14.28"; src = fetchurl { url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz"; - sha256 = "1md67l60li7rkma9m6mwchqz6b6q4xsfr38c6n056y6xm8jyf6c9"; + sha256 = "1r6bkwramb6qglmgbjmqvr5sahbfmql057ql97mx99fs3x7r357a"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index b592f458c6ce..b9ae43a7c8b9 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, glib, pkgconfig, perl, intltool }: stdenv.mkDerivation { - name = "libgtop-2.28.4"; + name = "libgtop-2.28.5"; src = fetchurl { - url = mirror://gnome/sources/libgtop/2.28/libgtop-2.28.4.tar.xz; - sha256 = "1n71mg82k8m7p6kh06vgb1hk4y9cqwk1lva53pl7w9j02pyrqqdn"; + url = mirror://gnome/sources/libgtop/2.28/libgtop-2.28.5.tar.xz; + sha256 = "0hik1aklcn79irgw1xf7d6cfkw8hzmy46r9jyfhp32aawisc24n8"; }; propagatedBuildInputs = [ glib ]; diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index 1bd8aaca9dca..da8a7d50b67e 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "libidn-1.25"; + name = "libidn-1.28"; src = fetchurl { url = "mirror://gnu/libidn/${name}.tar.gz"; - sha256 = "05j7qcj7gb791k6ya2pwr7cq9yxgi0bjqiiwf9yq6pbai8r2brkz"; + sha256 = "1yxbfdiwr3l91m79sksn6v5mgpl4lfj8i82zgryckas9hjb7ldfx"; }; doCheck = ! stdenv.isDarwin; diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix index fcaf95672e18..818789173844 100644 --- a/pkgs/development/libraries/libmng/default.nix +++ b/pkgs/development/libraries/libmng/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = http://www.libmng.com; license = "zlib/libpng"; maintainers = with stdenv.lib.maintainers; [ marcweber urkud ]; - platforms = stdenv.lib.platforms.linux; + hydraPlatforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libnova/default.nix b/pkgs/development/libraries/libnova/default.nix index 28decb9cfca0..b56697865a7a 100644 --- a/pkgs/development/libraries/libnova/default.nix +++ b/pkgs/development/libraries/libnova/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libnova-0.12.1"; + name = "libnova-0.12.3"; src = fetchurl { url = "mirror://sourceforge/libnova/${name}.tar.gz"; - sha256 = "0bs6c45q4qkrns36qndl8vns5gvhgpd90hi68bhah4r4hrg48lw0"; + sha256 = "18mkx79gyhccp5zqhf6k66sbhv97s7839sg15534ijajirkhw9dc"; }; meta = { diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index e8124c2643ab..754893894b6a 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libsodium-0.4.3"; + name = "libsodium-0.4.5"; src = fetchurl { url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz"; - sha256 = "0hk0zca1kpj6xlc2j2qx9qy7287pi0896frmxq5d7qmcwsdf372r"; + sha256 = "0cmcw479p866r6cjh20wzjr84pdn0mfswr5h57mw1siyylnj1mbs"; }; NIX_LDFLAGS = "-lssp"; diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index ad5783ae4f83..42fa2578062d 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libtasn1-2.13"; + name = "libtasn1-2.14"; src = fetchurl { url = "mirror://gnu/libtasn1/${name}.tar.gz"; - sha256 = "14asfhi35pwc67v7abbwim344h444237bjaqp92gwhhx7m44cvm5"; + sha256 = "0m1x2p04xpacl18dzv1hmsm2fk97gi167ra5h4kmjy16436kcadw"; }; doCheck = true; diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/development/libraries/libunibreak/default.nix index 5fb8622d1e0f..bf4d07c51cfd 100644 --- a/pkgs/development/libraries/libunibreak/default.nix +++ b/pkgs/development/libraries/libunibreak/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libunibreak-${version}"; - version = "1.0"; + version = "1.1"; src = fetchurl { url = "mirror://sourceforge/vimgadgets/libunibreak/${version}/${name}.tar.gz"; - sha256 = "0rsivyxnp9nfngf83fiy4v58s5mgdhcjz75nv5nyhxwxnjq35d25"; + sha256 = "02657l426bk5d8h42b9ixxy1clc50mx4bzwg02nkdhs09wqw32wn"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix index b292580e7052..f82581b10977 100644 --- a/pkgs/development/libraries/libviper/default.nix +++ b/pkgs/development/libraries/libviper/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, pkgconfig, glib, ncurses, gpm}: stdenv.mkDerivation rec { - name = "libviper-1.4.5"; + name = "libviper-1.4.6"; src = fetchurl { url = "mirror://sourceforge/libviper/${name}.tar.gz"; - sha256 = "1lryqv9xfsshx8x8c858h8fmsi2fkja0mhw415wa2bj9cqyb8byz"; + sha256 = "1jvm7wdgw6ixyhl0pcfr9lnr9g6sg6whyrs9ihjiz0agvqrgvxwc"; }; patchPhase = '' diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix index 3df58615aa6d..830890fad560 100644 --- a/pkgs/development/libraries/libwpd/default.nix +++ b/pkgs/development/libraries/libwpd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, pkgconfig, glib, libgsf, libxml2 }: stdenv.mkDerivation rec { - name = "libwpd-0.9.5"; + name = "libwpd-0.9.9"; src = fetchurl { url = "mirror://sourceforge/libwpd/${name}.tar.xz"; - sha256 = "1qvmnszql8c900py83wrxnj2pyyy4107scdhvmhapp4gpmccmg7f"; + sha256 = "1cn2z89yzsz8k6xjl02jdfhm0pkarw3yxj9ijnz5dx7h1v5g87dr"; }; buildInputs = [ glib libgsf libxml2 zlib ]; diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix index 18a8e49beea7..f71cc9654724 100644 --- a/pkgs/development/libraries/libwpg/default.nix +++ b/pkgs/development/libraries/libwpg/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libwpd, zlib }: stdenv.mkDerivation rec { - name = "libwpg-0.2.1"; + name = "libwpg-0.2.2"; src = fetchurl { url = "mirror://sourceforge/libwpg/${name}.tar.xz"; - sha256 = "0d83nx4rxkrq2sbfbbqpddni56h1328dzmraxyl6vh9p4f19rh5d"; + sha256 = "1kd6d583s9162z023gh5jqrhkjsdig2bsfylw3g38xa4p5vzv6xl"; }; buildInputs = [ libwpd zlib ]; diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 50bc4019df6e..cf687c972430 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "libyaml-0.1.3"; + name = "libyaml-0.1.4"; src = fetchurl { - url = http://pyyaml.org/download/libyaml/yaml-0.1.3.tar.gz; - sha256 = "a8bbad7e5250b3735126b7e3bd9f6fce9db19d6be7cc13abad17a24b59ec144a"; + url = http://pyyaml.org/download/libyaml/yaml-0.1.4.tar.gz; + sha256 = "0dvavrhxjrjfxgdgysxqfpdy08lpg3m9i8vxjyvdkcjsmra1by3v"; }; meta = { diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 48ef55892c8f..914157c7a0cd 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "libzip-0.10"; + name = "libzip-0.11.1"; src = fetchurl { url = "http://www.nih.at/libzip/${name}.tar.gz"; - sha256 = "1lnpxcl4z084bvx3jd0pqgr350ljnizpnlwh5vbzjp0iw9jakbxp"; + sha256 = "15fwscng2lk0ypg45awk4y2grjqm987frnjcsnbxznfgpckrq7yy"; }; propagatedBuildInputs = [ zlib ]; diff --git a/pkgs/development/libraries/log4cpp/default.nix b/pkgs/development/libraries/log4cpp/default.nix index 2b2553075580..32424d546b44 100644 --- a/pkgs/development/libraries/log4cpp/default.nix +++ b/pkgs/development/libraries/log4cpp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "log4cpp-1.1"; + name = "log4cpp-1.1.1"; src = fetchurl { url = "mirror://sourceforge/log4cpp/${name}.tar.gz"; - sha256 = "1d386ws9v6f9bxma4dh5m6nzr4k2rv5q96xl5bp5synlmghd2ny2"; + sha256 = "1l5yz5rfzzv6g3ynrj14mxfsk08cp5h1ssr7d74hjs0accrg7arm"; }; meta = { diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix index 743314d18154..d9369d59c7be 100644 --- a/pkgs/development/libraries/newt/default.nix +++ b/pkgs/development/libraries/newt/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, slang, popt }: stdenv.mkDerivation rec { - name = "newt-0.52.14"; + name = "newt-0.52.15"; src = fetchurl { url = "https://fedorahosted.org/releases/n/e/newt/${name}.tar.gz"; - sha256 = "13lp815zwldbw917wxmjy90gp608n3zlk4p3ybfqh0x6p9c4y3zp"; + sha256 = "0hg2l0siriq6qrz6mmzr6l7rpl40ay56c8cak87rb2ks7s952qbs"; }; patchPhase = '' diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix index 62a343d8efc7..5dfd87c4d84d 100644 --- a/pkgs/development/libraries/opendkim/default.nix +++ b/pkgs/development/libraries/opendkim/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, openssl, libmilter}: stdenv.mkDerivation rec { - name = "opendkim-2.4.2"; + name = "opendkim-2.4.3"; src = fetchurl { url = "mirror://sourceforge/opendkim/files/${name}.tar.gz"; - sha256 = "0gwgcrnl5c60sxb9z38ari2gl7vd626r3z3dcq8a6aw28pw9w2lk"; + sha256 = "01h97h012gcp8rimjbc9mrv4759cnw4flb42ddiady1bmb2p7vy3"; }; configureFlags="--with-openssl=${openssl} --with-milter=${libmilter}"; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index ca1db1372064..f57ee931fafa 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { license = "LGPLv2+"; maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/suitesparse/default.nix b/pkgs/development/libraries/suitesparse/default.nix index 017620839346..4d27701b135a 100644 --- a/pkgs/development/libraries/suitesparse/default.nix +++ b/pkgs/development/libraries/suitesparse/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, blas, liblapack, gfortran } : stdenv.mkDerivation rec { - version = "4.2.0"; + version = "4.2.1"; name = "suitesparse-${version}"; src = fetchurl { url = "http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-${version}.tar.gz" ; - sha256 = "0i0ivsc5sr3jdz6nqq4wz5lwxc8rpnkqgddyhqqgfhwzgrcqh9v6"; + sha256 = "1ga69637x7kdkiy3w3lq9dvva7220bdangv2lch2wx1hpi83h0p8"; }; buildInputs = [blas liblapack gfortran] ; patches = [./disable-metis.patch]; diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index 46aba67702df..8c08a342a903 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt }: stdenv.mkDerivation rec { - name = "telepathy-glib-0.20.1"; + name = "telepathy-glib-0.20.4"; src = fetchurl { url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz"; - sha256 = "1dk1s977zv8c935jsiv7ll51a52rlwd7a6f8v7z8klzvc4zk9801"; + sha256 = "0v5izjmgm1phy51l2y5whfrgzqx8510lqp16d2y5hb21bp40g8y9"; }; propagatedBuildInputs = [dbus_glib glib python]; diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix new file mode 100644 index 000000000000..2b555db32821 --- /dev/null +++ b/pkgs/development/libraries/thrift/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchgit, boost, zlib, libevent, openssl, python, automake, autoconf, +libtool, pkgconfig, bison, flex }: + +stdenv.mkDerivation { + name = "thrift-0.9.1"; + + # I take git, because the tarball is broken. + # http://stackoverflow.com/questions/18643642/libtool-error-building-thrift-0-9-1-on-ubuntu-13-04 + src = fetchgit { + url = "https://git-wip-us.apache.org/repos/asf/thrift.git"; + rev = "ff980c1432936c6bc897c60469ab05b5e0c6cb5e"; + md5 = "466aca9e43e43df868f4385af50e32f6"; + }; + + enableParallelBuilding = true; + buildInputs = [ boost zlib libevent openssl python automake autoconf libtool + pkgconfig bison flex ]; + + preConfigure = "sh bootstrap.sh; export PY_PREFIX=$out"; + + meta = { + homepage = http://thrift.apache.org/; + license = "ASL2.0"; + description = "Library for scalable cross-language services"; + }; +} diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix index e58c6dcba120..afcbcafab118 100644 --- a/pkgs/development/libraries/yajl/default.nix +++ b/pkgs/development/libraries/yajl/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, ruby }: stdenv.mkDerivation { - name = "yajl-2.0.1"; + name = "yajl-2.0.4"; src = fetchurl { - url = http://github.com/lloyd/yajl/tarball/2.0.1; + url = http://github.com/lloyd/yajl/tarball/2.0.4; name = "yajl-2.0.1.tar.gz"; - sha256 = "08a7bgmdpvi6w9f9bxx5f42njwmwzdf6jz3w6ila7jgbl5mhknf2"; + sha256 = "0661bfi4hfvwg3z2pf51wqbf5qd5kfn0dk83v5s2xwhmry8rd6y1"; }; buildInputs = [ cmake ruby ]; |