diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-10 11:17:52 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-10 11:17:52 +0200 |
commit | 30f14243c33f1b386273d08a4776aa679c42143d (patch) | |
tree | bd123d5c2ab4fef012ae7de6a225c092f8d611b8 /pkgs/development/libraries | |
parent | 50fccad5828fb459760fd7578951bb961a18c0fc (diff) | |
parent | 2463e0917318581da94e7ba92703b63128c40424 (diff) |
Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra: - 1255515 for nixos - 1255502 for nixpkgs
Diffstat (limited to 'pkgs/development/libraries')
30 files changed, 255 insertions, 290 deletions
diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix index 64b223d4ebb12..c477b4b1f39f5 100644 --- a/pkgs/development/libraries/cpp-netlib/default.nix +++ b/pkgs/development/libraries/cpp-netlib/default.nix @@ -2,21 +2,25 @@ stdenv.mkDerivation rec { name = "cpp-netlib-${version}"; - version = "0.11.2"; + version = "0.12.0"; src = fetchurl { url = "http://downloads.cpp-netlib.org/${version}/${name}-final.tar.bz2"; - sha256 = "0vwnp1jpvsdjaz7f7w55p7gw6hj7694nklmljcvphvkrhbw1g1q5"; + sha256 = "0h7gyrbr3madycnj8rl8k1jzk2hd8np2k5ad9mijlh0fizzzk3h8"; }; buildInputs = [ cmake boost openssl ]; - cmakeFlags = [ "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=RELEASE" ]; + cmakeFlags = [ + "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON" + "-DCMAKE_BUILD_TYPE=RELEASE" + ]; enableParallelBuilding = true; meta = with stdenv.lib; { - description = "A collection of open-source libraries for high level network programming"; + description = + "Collection of open-source libraries for high level network programming"; homepage = http://cpp-netlib.org; license = licenses.boost; platforms = platforms.all; diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/development/libraries/fastjson/default.nix new file mode 100644 index 0000000000000..4c32519854702 --- /dev/null +++ b/pkgs/development/libraries/fastjson/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, libtool, autoconf, automake }: + +stdenv.mkDerivation rec { + version = "v0.99.2"; + name = "fastjson-${version}"; + src = fetchFromGitHub { + repo = "libfastjson"; + owner = "rsyslog"; + rev = "eabae907c9d991143e17da278a239819f2e8ae1c"; + sha256 = "17fhaqdn0spc4p0848ahcy68swm6l5yd3bx6bdzxmmwj1jdrmvzk"; + }; + + buildInputs = [ autoconf automake libtool ]; + + preConfigure = '' + sh autogen.sh + ''; + + meta = with stdenv.lib; { + description = "A fast json library for C"; + homepage = "https://github.com/rsyslog/libfastjson"; + license = licenses.mit; + maintainers = with maintainers; [ nequissimus ]; + }; +} diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 223baaca61e76..d50c20331e4a9 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , libtheora, libva, libvorbis, libvpx, lzma, libpulseaudio, soxr -, x264, xvidcore, zlib, libopus +, x264, x265, xvidcore, zlib, libopus , openglSupport ? false, mesa ? null # Build options , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime @@ -133,6 +133,7 @@ stdenv.mkDerivation rec { "--enable-libxvid" "--enable-zlib" (ifMinVer "2.8" "--enable-libopus") + (ifMinVer "2.8" "--enable-libx265") # Developer flags (enableFeature debugDeveloper "debug") (enableFeature optimizationsDeveloper "optimizations") @@ -146,7 +147,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora - libvdpau libvorbis lzma SDL soxr x264 xvidcore zlib libopus + libvdpau libvorbis lzma SDL soxr x264 x265 xvidcore zlib libopus ] ++ optional openglSupport mesa ++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM ++ optional ((isLinux || isFreeBSD) && !isArm) libva @@ -192,6 +193,8 @@ stdenv.mkDerivation rec { ]; }; + installFlags = [ "install-man" ]; + passthru = { vaapiSupport = if reqMin "0.6" && ((isLinux || isFreeBSD) && !isArm) then true else false; inherit vdpauSupport; diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 3ff608a4ac330..8d79fcc50a8ec 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -1,21 +1,17 @@ { stdenv, fetchurl, xlibsWrapper, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig }: stdenv.mkDerivation rec { - name = "imlib2-1.4.6"; + name = "imlib2-1.4.8"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${name}.tar.bz2"; - sha256 = "0x1j0ylpclkp8cfpwfpkjywqz124bqskyxbw8pvwzkv2gmrbwldg"; + sha256 = "0xxhgkd1axlcmf3kp1d7naiygparpg8l3sg3d263rhl2z0gm7aw9"; }; buildInputs = [ xlibsWrapper libjpeg libtiff giflib libpng bzip2 ]; nativeBuildInputs = [ pkgconfig ]; - # From - # https://github.com/PhantomX/slackbuilds/blob/master/imlib2/patches/imlib2-giflib51.patch - patches = [ ./giflib51.patch ]; - preConfigure = '' substituteInPlace imlib2-config.in \ --replace "@my_libs@" "" diff --git a/pkgs/development/libraries/imlib2/giflib51.patch b/pkgs/development/libraries/imlib2/giflib51.patch deleted file mode 100644 index 97eaeb0b96e6d..0000000000000 --- a/pkgs/development/libraries/imlib2/giflib51.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -ruN imlib2-1.4.6.orig/src/modules/loaders/loader_gif.c imlib2-1.4.6/src/modules/loaders/loader_gif.c ---- imlib2-1.4.6.orig/src/modules/loaders/loader_gif.c 2013-12-21 10:16:10.000000000 +0000 -+++ imlib2-1.4.6/src/modules/loaders/loader_gif.c 2014-05-27 09:52:35.857291512 +0000 -@@ -36,7 +36,7 @@ - #endif - if (fd < 0) - return 0; -- gif = DGifOpenFileHandle(fd); -+ gif = DGifOpenFileHandle(fd, NULL); - if (!gif) - { - close(fd); -@@ -60,13 +60,13 @@ - h = gif->Image.Height; - if (!IMAGE_DIMENSIONS_OK(w, h)) - { -- DGifCloseFile(gif); -+ DGifCloseFile(gif, NULL); - return 0; - } - rows = malloc(h * sizeof(GifRowType *)); - if (!rows) - { -- DGifCloseFile(gif); -+ DGifCloseFile(gif, NULL); - return 0; - } - for (i = 0; i < h; i++) -@@ -78,7 +78,7 @@ - rows[i] = malloc(w * sizeof(GifPixelType)); - if (!rows[i]) - { -- DGifCloseFile(gif); -+ DGifCloseFile(gif, NULL); - for (i = 0; i < h; i++) - { - if (rows[i]) -@@ -150,7 +150,7 @@ - im->data = (DATA32 *) malloc(sizeof(DATA32) * w * h); - if (!im->data) - { -- DGifCloseFile(gif); -+ DGifCloseFile(gif, NULL); - free(rows); - return 0; - } -@@ -181,7 +181,7 @@ - last_per = (int)per; - if (!(progress(im, (int)per, 0, last_y, w, i))) - { -- DGifCloseFile(gif); -+ DGifCloseFile(gif, NULL); - for (i = 0; i < h; i++) - { - free(rows[i]); -@@ -198,7 +198,7 @@ - { - progress(im, 100, 0, last_y, w, h); - } -- DGifCloseFile(gif); -+ DGifCloseFile(gif, NULL); - for (i = 0; i < h; i++) - { - free(rows[i]); \ No newline at end of file diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix new file mode 100644 index 0000000000000..05ad908b3c361 --- /dev/null +++ b/pkgs/development/libraries/java/lombok/default.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "lombok-1.16.8"; + src = fetchurl { + url = "https://projectlombok.org/downloads/${name}.jar"; + sha256 = "0s7ak6gx1h04da2rdhvc0fk896cwqm2m7g3chqcjpsrkgfdv4cpy"; + }; + phases = [ "installPhase" ]; + installPhase = "mkdir -p $out/share/java; cp $src $out/share/java/lombok.jar"; + meta = { + description = "A library that can write a lot of boilerplate for your Java project"; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.mit; + homepage = https://projectlombok.org/; + maintainers = [ stdenv.lib.maintainers.CrystalGamma ]; + }; +} diff --git a/pkgs/development/libraries/libast/default.nix b/pkgs/development/libraries/libast/default.nix new file mode 100644 index 0000000000000..d392f9a38e1d2 --- /dev/null +++ b/pkgs/development/libraries/libast/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl +, pkgconfig }: + +stdenv.mkDerivation rec { + name = "libast-${version}"; + version = "0.7"; + + src = fetchurl { + url = "http://www.eterm.org/download/${name}.tar.gz"; + sha256 = "1w7bs46r4lykfd83kc3bg9i1rxzzlb4ydk23ikf8mx8avz05q1aj"; + }; + + buildInputs = [ pkgconfig ]; + + meta = with stdenv.lib; { + description = "Library of Assorted Spiffy Things"; + homepage = "http://www.eterm.org"; + license = licenses.bsd2; + maintainers = [ maintainers.AndersonTorres ]; + }; +} + diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 6d80bfdccf1ff..18dbd2de38bfa 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -15,11 +15,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "libinput-1.2.1"; + name = "libinput-1.2.2"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "1hy1h0a4zx5wj23sah4kms2z0285yl0kcn4fqlrrp1gqax9qrnz2"; + sha256 = "0rzkp37dnn4qnkx7v3hckx5ryv3lr0vl234pnk6z2vfq40v5pb08"; }; configureFlags = [ @@ -30,11 +30,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libevdev mtdev udev libwacom ] + buildInputs = [ libevdev mtdev libwacom ] ++ optionals eventGUISupport [ cairo glib gtk3 ] ++ optionals documentationSupport [ doxygen graphviz ] ++ optionals testsSupport [ check valgrind ]; + propagatedBuildInputs = [ udev ]; + meta = { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; homepage = http://www.freedesktop.org/wiki/Software/libinput; diff --git a/pkgs/development/libraries/libksi/default.nix b/pkgs/development/libraries/libksi/default.nix index 1f6bd05b5b3be..1dd7102468187 100644 --- a/pkgs/development/libraries/libksi/default.nix +++ b/pkgs/development/libraries/libksi/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { name = "libksi-2015-07-03"; src = fetchFromGitHub { - owner = "rgerhards"; + owner = "Guardtime"; repo = "libksi"; - rev = "b1ac0346395b4f52ec42a050bf33ac223f194443"; - sha256 = "0gg0fl56flwqmsph7j92lgybaa39i715w0nwgkcr58njm0c02wlw"; + rev = "b82dd65bd693722db92397cbe0920170e0d2ae1c"; + sha256 = "1sqd31l55kx6knl0sg26ail1k5rgmamq8760p6aj7bpb4jwb8r1n"; }; - + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ openssl curl ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = "https://github.com/rgerhards/libksi"; + homepage = "https://github.com/GuardTime/libksi"; description = "Keyless Signature Infrastructure API library"; license = licenses.asl20; platforms = platforms.all; diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index b3d76b1c931fb..8b8bf61a99b71 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "0.7.83"; + version = "0.7.84"; name = "libmediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "0kl5x07j3jp5mnmhpjvdq0a2nnlgvqnhwar0xalvg3b3msdf8417"; + sha256 = "0k657ynfxcw6lvakc8plz0pzfixlqbsiih2idimk9k1dd4xzhq3d"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 8a83462119417..a620826576cc1 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -3,10 +3,10 @@ let - listVersion = "2016-03-30"; + listVersion = "2016-04-05"; listSources = fetchFromGitHub { - sha256 = "0433ck6ykcq6pc48mvgif9f785q0ndprk77jsk58gb5289b87yns"; - rev = "6ec573d549e25fc89d930bb64939d947bae38f68"; + sha256 = "08ai0yyym0mvsn92fasfn5b5rdrjbavxxl1hhp60g1m0iamfzpa4"; + rev = "1e0c6b000874f98f28663870909e32ee6323fe1d"; repo = "list"; owner = "publicsuffix"; }; diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index a69dff20799ba..e8b3bc1cebc9b 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-1.0.8"; + name = "libsodium-1.0.10"; src = fetchurl { url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz"; - sha256 = "09hr604k9gdss2r321x5dv3wn11fdl87nswr18g68lkqab993wf0"; + sha256 = "1gn45g956lyz8l6iq187yc6l627vyivyp8qc5dkr6dnhdnlqddvi"; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 725b98cdae65e..e2809e9d483b8 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.0.6"; - sha256 = "1qypc5lx82vlqm9016knxx8khxpc9dy78a0q2x5jmxjk8v6g994r"; + version = "1.0.9"; + sha256 = "1kfydlvmx4pgi5lpbhqr4p3jr78p3f61ic32046mkp4yfyydrspl"; }) diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix index b2e13a1e9ab87..cae6e5c0a55e8 100644 --- a/pkgs/development/libraries/log4cxx/default.nix +++ b/pkgs/development/libraries/log4cxx/default.nix @@ -20,6 +20,9 @@ stdenv.mkDerivation rec { }' src/examples/cpp/console.cpp \ src/main/cpp/inputstreamreader.cpp \ src/main/cpp/socketoutputstream.cpp + '' + stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's/namespace std { class locale; }/#include <locale>/' src/main/include/log4cxx/helpers/simpledateformat.h + sed -i 's/\(#include <cctype>\)/\1\n#include <cstdlib>/' src/main/cpp/stringhelper.cpp ''; buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db expat]; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index f056933239176..cc5a26a557d5d 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -1,25 +1,13 @@ { stdenv, fetchurl, openssl, cyrus_sasl, db, groff }: stdenv.mkDerivation rec { - name = "openldap-2.4.42"; + name = "openldap-2.4.44"; src = fetchurl { url = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz"; - sha256 = "0qwfpb5ipp2l76v11arghq5mr0sjc6xhjfg8a0kgsaw5qpib1dzf"; + sha256 = "0044p20hx07fwgw2mbwj1fkx04615hhs1qyx4mawj2bhqvrnppnp"; }; - # Should be removed with >=2.4.43 - patches = [ - ./CVE-2015-6908.patch - ( - fetchurl { - sha256 = "5bcb3f9fb7186b380efa0a1c2d31ad755e190134b5c4dac07c65bbf7c0b6b3b3"; - url = "https://github.com/LMDB/lmdb/commit/3360cbad668f678fb23c064ca4efcc5c9ae95d10.patch"; - name = "openldap-clang-compilation.patch"; - } - ) - ]; - # TODO: separate "out" and "bin" outputs = [ "dev" "out" "man" "docdev" ]; diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 18dc2251013ef..c1333ff61714b 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -20,6 +20,12 @@ in stdenv.mkDerivation rec { sha256 = "14p4px9a3qzjc22lnl6braxrcrmd9rgmy7fh4qpanawn2pgfq6br"; }; + # Bug in openmpi implementation for zero sized messages + # Patch required to make mpi4py pass. Will NOT + # be required when openmpi >= 2.0.0 + # https://www.open-mpi.org/community/lists/users/2015/11/28030.php + patches = [ ./nbc_copy.patch ]; + buildInputs = [ gfortran libibverbs ]; nativeBuildInputs = [ perl ]; @@ -42,4 +48,3 @@ in stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.mornfall ]; }; } - diff --git a/pkgs/development/libraries/openmpi/nbc_copy.patch b/pkgs/development/libraries/openmpi/nbc_copy.patch new file mode 100644 index 0000000000000..d496c7cc2d763 --- /dev/null +++ b/pkgs/development/libraries/openmpi/nbc_copy.patch @@ -0,0 +1,30 @@ +commit 4ee20ba31dd64b8f899447cdad78ec2379acfce7 +Author: Gilles Gouaillardet <gilles@rist.or.jp> +Date: Tue Nov 10 08:59:03 2015 +0900 + + fix NBC_Copy for legitimate zero size messages + + (back ported from commit open-mpi/ompi@0bd765eddd33e3d4ac18ec644c60a5c160cb48dc) + (back ported from commit open-mpi/ompi@9a70765f27fdf17e70e1a115754fef7e5f16132a) + +diff --git a/ompi/mca/coll/libnbc/nbc_internal.h b/ompi/mca/coll/libnbc/nbc_internal.h +index bf2f1cb..81be8cc 100644 +--- a/ompi/mca/coll/libnbc/nbc_internal.h ++++ b/ompi/mca/coll/libnbc/nbc_internal.h +@@ -501,7 +501,14 @@ static inline int NBC_Copy(void *src, int srccount, MPI_Datatype srctype, void * + } else { + /* we have to pack and unpack */ + res = MPI_Pack_size(srccount, srctype, comm, &size); +- if (MPI_SUCCESS != res || 0 == size) { printf("MPI Error in MPI_Pack_size() (%i:%i)\n", res, size); return (MPI_SUCCESS == res) ? MPI_ERR_SIZE : res;} ++ if (MPI_SUCCESS != res) { ++ printf ("MPI Error in MPI_Pack_size() (%i:%i)", res, size); ++ return res; ++ } ++ ++ if (0 == size) { ++ return OMPI_SUCCESS; ++ } + packbuf = malloc(size); + if (NULL == packbuf) { printf("Error in malloc()\n"); return res; } + pos=0; + diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 46e2da18aa1e8..908d1ea856f5d 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchzip, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4 -, libusb1, libpcap, libXt +, libusb1, libpcap, libXt, libpng }: stdenv.mkDerivation rec { @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ cmake qhull flann boost vtk eigen pkgconfig qt4 libusb1 libpcap libXt ]; + buildInputs = [ cmake qhull flann boost eigen pkgconfig libusb1 libpcap + libpng vtk qt4 libXt ]; meta = { homepage = http://pointclouds.org/; diff --git a/pkgs/development/libraries/science/math/openblas/0.2.14.nix b/pkgs/development/libraries/science/math/openblas/0.2.14.nix deleted file mode 100644 index 2fac8a4db08b8..0000000000000 --- a/pkgs/development/libraries/science/math/openblas/0.2.14.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ stdenv, fetchurl, gfortran, perl, which, config, coreutils -# Most packages depending on openblas expect integer width to match pointer width, -# but some expect to use 32-bit integers always (for compatibility with reference BLAS). -, blas64 ? null -}: - -with stdenv.lib; - -let blas64_ = blas64; in - -let local = config.openblas.preferLocalBuild or false; - binary = - { i686-linux = "32"; - x86_64-linux = "64"; - x86_64-darwin = "64"; - }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); - genericFlags = - [ "DYNAMIC_ARCH=1" - "NUM_THREADS=64" - ]; - localFlags = config.openblas.flags or - optionals (hasAttr "target" config.openblas) [ "TARGET=${config.openblas.target}" ]; - blas64 = if blas64_ != null then blas64_ else hasPrefix "x86_64" stdenv.system; - - version = "0.2.14"; -in -stdenv.mkDerivation { - name = "openblas-${version}"; - src = fetchurl { - url = "https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz"; - sha256 = "2411c4f56f477b42dff54db2b7ffc0b7cf53bb9778d54982595c64cc69c40fc1"; - name = "openblas-${version}.tar.gz"; - }; - - inherit blas64; - - nativeBuildInputs = optionals stdenv.isDarwin [coreutils] ++ [gfortran perl which]; - - makeFlags = - (if local then localFlags else genericFlags) - ++ - optionals stdenv.isDarwin ["MACOSX_DEPLOYMENT_TARGET=10.9"] - ++ - [ - "FC=gfortran" - # Note that clang is available through the stdenv on OSX and - # thus is not an explicit dependency. - "CC=${if stdenv.isDarwin then "clang" else "gcc"}" - ''PREFIX="''$(out)"'' - "BINARY=${binary}" - "USE_OPENMP=${if stdenv.isDarwin then "0" else "1"}" - "INTERFACE64=${if blas64 then "1" else "0"}" - ]; - - doCheck = true; - checkTarget = "tests"; - - meta = with stdenv.lib; { - description = "Basic Linear Algebra Subprograms"; - license = licenses.bsd3; - homepage = "https://github.com/xianyi/OpenBLAS"; - platforms = platforms.unix; - maintainers = with maintainers; [ ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index e8b3403df405f..349e5582013f4 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -2,7 +2,7 @@ let - version = "2.3.7.0"; + version = "2.3.9.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/skalibs"; rev = "refs/tags/v${version}"; - sha256 = "11k84vckwvxphjswqxv677p6riyb2hgx1kh15f865hnk8n21fldx"; + sha256 = "1c5ap14f2yr3izz8s1blgp5g4r898kzppay7xrga2j216i51zfpw"; }; dontDisableStatic = true; @@ -23,7 +23,14 @@ in stdenv.mkDerivation rec { "--libdir=\${prefix}/lib" "--includedir=\${prefix}/include" "--sysdepdir=\${prefix}/lib/skalibs/sysdeps" - ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]); + ] + ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) + # On darwin, the target triplet from -dumpmachine includes version number, but + # skarnet.org software uses the triplet to test binary compatibility. + # Explicitly setting target ensures code can be compiled against a skalibs + # binary built on a different version of darwin. + # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph + ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); meta = { homepage = http://skarnet.org/software/skalibs/; diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix index 98cf160e8b51f..ba213dc98e76d 100644 --- a/pkgs/development/libraries/srtp/default.nix +++ b/pkgs/development/libraries/srtp/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libsrtp-${version}"; - version = "1.5.2"; + version = "1.5.4"; src = fetchFromGitHub { owner = "cisco"; repo = "libsrtp"; rev = "v${version}"; - sha256 = "0iy1il72gnjcwbi16wf4kzdqs1xx8is9qvs6m49pg37218s26gdw"; + sha256 = "0s029m4iw0nsvnsm2hlz8yajrasdvf315iv2dw8mfm7nhbshwsqa"; }; buildInputs = [ pkgconfig ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ] ++ optional (openssl != null) "--enable-openssl"; postInstall = '' - rmdir $out/bin + rm -rf $out/bin ''; meta = { diff --git a/pkgs/development/libraries/v8/3.14.nix b/pkgs/development/libraries/v8/3.14.nix new file mode 100644 index 0000000000000..fee0f868ea922 --- /dev/null +++ b/pkgs/development/libraries/v8/3.14.nix @@ -0,0 +1,28 @@ +{ stdenv, callPackage, fetchFromGitHub, python, ... } @ args: +with stdenv.lib; +let + version = "3.14.5.10"; + sha256 = "08vhl84166x13b3cbx8y0g99yqx772zd33gawsa1nxqkyrykql6k"; +in +(callPackage ./generic.nix (args // { + inherit version sha256; +})).overrideDerivation (oldAttrs:{ + patchPhase = [ + oldAttrs.patchPhase + "sed -i 's,#!/usr/bin/python,#!${python}/bin/python,' build/gyp_v8" + ]; + + # http://code.google.com/p/v8/issues/detail?id=2149 + NIX_CFLAGS_COMPILE = concatStringsSep " " [ + oldAttrs.NIX_CFLAGS_COMPILE + "-Wno-unused-local-typedefs" + "-Wno-aggressive-loop-optimizations" + ]; + + src = fetchFromGitHub { + owner = "v8"; + repo = "v8"; + rev = "${version}"; + inherit sha256; + }; +}) diff --git a/pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch b/pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch new file mode 100644 index 0000000000000..3bc0fff4d509b --- /dev/null +++ b/pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch @@ -0,0 +1,27 @@ +From dbe142c4eda0f15fad9fa85743dd11b81292fa8f Mon Sep 17 00:00:00 2001 +From: Timothy J Fontaine <tjfontaine@gmail.com> +Date: Thu, 23 May 2013 13:57:59 -0700 +Subject: [PATCH] v8: fix GetLocalizedMessage usage + +As is the backport of the abort on uncaught exception wouldn't compile +because we it was passing in `this` when it was unnecessary. +--- + deps/v8/src/isolate.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/isolate.cc b/src/isolate.cc +index 04a438b..5a5293e 100644 +--- a/src/isolate.cc ++++ b/src/isolate.cc +@@ -1161,7 +1161,7 @@ void Isolate::DoThrow(Object* exception, MessageLocation* location) { + (report_exception || can_be_caught_externally)) { + fatal_exception_depth++; + fprintf(stderr, "%s\n\nFROM\n", +- *MessageHandler::GetLocalizedMessage(this, message_obj)); ++ *MessageHandler::GetLocalizedMessage(message_obj)); + PrintCurrentStackTrace(stderr); + OS::Abort(); + } +-- +1.8.1.6 + diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 0510fde811c69..60e332de0c3d4 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkgconfig -, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto +, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto, libxml2 , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0) }: @@ -8,18 +8,18 @@ assert expat != null; stdenv.mkDerivation rec { name = "wayland-${version}"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1yhy62vkbq8j8c9zaa6yzvn75cd99kfa8n2zfdwl80x019r711ww"; + sha256 = "1p307ly1yyqjnzn9dbv78yffql2qszn84qk74lwanl3gma8fgxjb"; }; configureFlags = "--with-scanner --disable-documentation"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libffi /* docbook_xsl doxygen graphviz libxslt xmlto */ expat ]; + buildInputs = [ libffi /* docbook_xsl doxygen graphviz libxslt xmlto */ expat libxml2 ]; meta = { description = "Reference implementation of the wayland protocol"; diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix new file mode 100644 index 0000000000000..0ae9d9d59c8ac --- /dev/null +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchurl, pkgconfig +, wayland +}: + +stdenv.mkDerivation rec { + name = "wayland-protocols-${version}"; + version = "1.3"; + + src = fetchurl { + url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; + sha256 = "0byqvrsm6bkvylvzqy8wh5wpszwl5ra1z0yjqzqmw8przlrhdkbb"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ wayland ]; + + meta = { + description = "Wayland protocol extensions"; + homepage = http://wayland.freedesktop.org/; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ]; + }; + + passthru.version = version; +} diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix index b6ca281f05308..08258f677a400 100644 --- a/pkgs/development/libraries/wcslib/default.nix +++ b/pkgs/development/libraries/wcslib/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, flex }: stdenv.mkDerivation rec { - version = "5.14"; + version = "5.15"; name = "wcslib-${version}"; buildInputs = [ flex ]; src = fetchurl { url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${name}.tar.bz2"; - sha256 ="0zz3747m6gjzglgsqrrslwk2qkb6swsx8gmaxa459dvbcg914gsd"; + sha256 ="1s2nig327g4bimd9xshlk11ww09a7mrjmsbpdcd8smsmn2kl1glb"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/xapian/1.0.x.nix b/pkgs/development/libraries/xapian/1.0.x.nix deleted file mode 100644 index b89900d2b05ee..0000000000000 --- a/pkgs/development/libraries/xapian/1.0.x.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, zlib }: - -stdenv.mkDerivation { - name = "xapian-1.0.23"; - - src = fetchurl { - url = http://oligarchy.co.uk/xapian/1.0.23/xapian-core-1.0.23.tar.gz; - sha256 = "0aed7296bd56b4b49aba944cc744e1e76fff8cfb0a70fd5b1f49d4c62a97ecc6"; - }; - - buildInputs = [ zlib ]; - - meta = { - description = "Xapian Probabilistic Information Retrieval library"; - homepage = "http://xapian.org"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/libraries/xapian/bindings/1.0.x.nix b/pkgs/development/libraries/xapian/bindings/1.0.x.nix deleted file mode 100644 index 5d69f73d7973a..0000000000000 --- a/pkgs/development/libraries/xapian/bindings/1.0.x.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ stdenv, composableDerivation, fetchurl, xapian10, pkgconfig -, python ? null, php ? null, ruby ? null }: - -let inherit (composableDerivation) wwf; in - -composableDerivation.composableDerivation {} rec { - - name = "xapian-bindings-1.0.23"; - - src = fetchurl { - url = "http://oligarchy.co.uk/xapian/1.0.23/${name}.tar.gz"; - sha256 = "6028123c3cd9bfc380b672b89f5420f7d5c063fc3511dee4dd5d34033ccb6911"; - }; - - buildInputs = [ xapian10 pkgconfig ]; - - # most interpreters aren't tested yet.. (see python for example how to do it) - flags = - wwf { - name = "python"; - enable = { - buildInputs = [ python ]; - # export same env vars as in pythonNew - preConfigure = '' - export PYTHON_LIB=$out/lib/${python.libPrefix}/site-packages - mkdir -p $out/nix-support - echo "export NIX_PYTHON_SITES=\"$out:\$NIX_PYTHON_SITES\"" >> $out/nix-support/setup-hook - echo "export PYTHONPATH=\"$PYTHON_LIB:\$PYTHONPATH\"" >> $out/nix-support/setup-hook - ''; - }; - } - // wwf { - name = "php"; - enable = { - buildInputs = [ php ]; - preConfigure = '' - export PHP_EXTENSION_DIR=$out/lib/php # TODO use a sane directory. Its not used anywhere by now - ''; - }; - } - // wwf { - name = "ruby"; - enable = { - buildInputs = [ ruby ]; - preConfigure = '' - export RUBY_LIB=$out/${ruby.libPath} - export RUBY_LIB_ARCH=$RUBY_LIB - mkdir -p $out/nix-support - echo "export RUBYLIB=\"$RUBY_LIB:\$RUBYLIB\"" >> $out/nix-support/setup-hook - echo "export GEM_PATH=\"$out:\$GEM_PATH\"" >> $out/nix-support/setup-hook - ''; - }; - } - - # note: see configure --help to get see which env vars can be used - # // wwf { name = "tcl"; enable = { buildInputs = [ tcl ];};} - # // wwf { name = "csharp"; } - # // wwf { name = "java"; } - ; - - cfg = { - pythonSupport = true; - phpSupport = true; - rubySupport = true; - }; - - meta = { - description = "Bindings for the Xapian library"; - homepage = xapian10.meta.homepage; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/libraries/xapian/bindings/default.nix b/pkgs/development/libraries/xapian/bindings/default.nix index 740b71c59a7d7..ed7c1e046d559 100644 --- a/pkgs/development/libraries/xapian/bindings/default.nix +++ b/pkgs/development/libraries/xapian/bindings/default.nix @@ -5,11 +5,11 @@ let inherit (composableDerivation) wwf; in composableDerivation.composableDerivation {} rec { - name = "xapian-bindings-1.2.8"; + name = "xapian-bindings-1.2.23"; src = fetchurl { - url = "http://oligarchy.co.uk/xapian/1.2.8/${name}.tar.gz"; - sha256 = "eb740c619c75d288e65a1c2f86faecdca53d44d3f9896bcc080085839887b124"; + url = "http://oligarchy.co.uk/xapian/1.2.23/${name}.tar.xz"; + sha256 = "05929d9bq9df25kh2i6gk2w09w7p5qknf9cc7mrm2g46finbbd0r"; }; buildInputs = [ xapian pkgconfig zlib ]; @@ -24,8 +24,8 @@ composableDerivation.composableDerivation {} rec { preConfigure = '' export PYTHON_LIB=$out/lib/${python.libPrefix}/site-packages mkdir -p $out/nix-support - echo "export NIX_PYTHON_SITES=\"$out:\$NIX_PYTHON_SITES\"" >> $out/nix-support/setup-hook - echo "export PYTHONPATH=\"$PYTHON_LIB:\$PYTHONPATH\"" >> $out/nix-support/setup-hook + echo "export NIX_PYTHON_SITES=\"$out:\$NIX_PYTHON_SITES\"" >> $out/nix-support/setup-hook + echo "export PYTHONPATH=\"$PYTHON_LIB:\$PYTHONPATH\"" >> $out/nix-support/setup-hook ''; }; } @@ -46,8 +46,8 @@ composableDerivation.composableDerivation {} rec { export RUBY_LIB=$out/${ruby.libPath} export RUBY_LIB_ARCH=$RUBY_LIB mkdir -p $out/nix-support - echo "export RUBYLIB=\"$RUBY_LIB:\$RUBYLIB\"" >> $out/nix-support/setup-hook - echo "export GEM_PATH=\"$out:\$GEM_PATH\"" >> $out/nix-support/setup-hook + echo "export RUBYLIB=\"$RUBY_LIB:\$RUBYLIB\"" >> $out/nix-support/setup-hook + echo "export GEM_PATH=\"$out:\$GEM_PATH\"" >> $out/nix-support/setup-hook ''; }; } @@ -60,11 +60,11 @@ composableDerivation.composableDerivation {} rec { cfg = { pythonSupport = true; - phpSupport = true; + phpSupport = false; rubySupport = true; }; - meta = { + meta = { description = "Bindings for the Xapian library"; homepage = xapian.meta.homepage; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 89f97292d39d8..8a09d835f3da0 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "xapian-${version}"; - version = "1.2.21"; + version = "1.2.23"; src = fetchurl { url = "http://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz"; - sha256 = "0grd2s6gf8yzqwdaa50g57j9d81mxkrrpkyldm2shgyizdc8gx33"; + sha256 = "0z9lhvfaazzmd611bnii9a0d19sqnjs0s9vbcgjhcv8s9spax0wp"; }; outputs = [ "out" "doc" ]; |