diff options
Diffstat (limited to 'pkgs/development/libraries')
19 files changed, 115 insertions, 74 deletions
diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix index fb5431ff8d59..606058da8545 100644 --- a/pkgs/development/libraries/cwiid/default.nix +++ b/pkgs/development/libraries/cwiid/default.nix @@ -1,12 +1,14 @@ -{ stdenv, autoreconfHook, fetchgit, bison, flex, bluez, pkgconfig, gtk2 }: +{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, bluez, pkgconfig, gtk2 }: stdenv.mkDerivation rec { - name = "cwiid-2010-02-21-git"; - - src = fetchgit { - url = https://github.com/abstrakraft/cwiid; - sha256 = "0qdb0x757k76nfj32xc2nrrdqd9jlwgg63vfn02l2iznnzahxp0h"; - rev = "fadf11e89b579bcc0336a0692ac15c93785f3f82"; + name = "cwiid-${version}-git"; + version = "2010-02-21"; + + src = fetchFromGitHub { + owner = "abstrakraft"; + repo = "cwiid"; + rev = "fadf11e89b579bcc0336a0692ac15c93785f3f82"; + sha256 = "0qdb0x757k76nfj32xc2nrrdqd9jlwgg63vfn02l2iznnzahxp0h"; }; hardeningDisable = [ "format" ]; @@ -17,18 +19,20 @@ stdenv.mkDerivation rec { sed -i -e '/$(LDCONFIG)/d' common/include/lib.mak.in ''; - buildInputs = [ autoreconfHook bison flex bluez pkgconfig gtk2 ]; + buildInputs = [ bison flex bluez gtk2 ]; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; postInstall = '' # Some programs (for example, cabal-install) have problems with the double 0 sed -i -e "s/0.6.00/0.6.0/" $out/lib/pkgconfig/cwiid.pc ''; - meta = { + meta = with stdenv.lib; { description = "Linux Nintendo Wiimote interface"; - homepage = http://cwiid.org; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.bennofs ]; - platforms = stdenv.lib.platforms.linux; + homepage = http://cwiid.org; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ bennofs ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 984d3da81198..600e9314cd4c 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "--with-png=${libpng.dev}" # optional "--with-poppler=${poppler.dev}" # optional "--with-libz=${zlib.dev}" # optional - "--with-pg=${postgresql}/bin/pg_config" + "--with-pg=${postgresql.dev}/bin/pg_config" "--with-mysql=${mysql.lib.dev}/bin/mysql_config" "--with-geotiff=${libgeotiff}" "--with-sqlite3=${sqlite.dev}" diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 86d9bd649881..c6313dec90ce 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -25,6 +25,17 @@ stdenv.mkDerivation rec { ''; configureFlags = [ "--enable-libgdbm-compat" ]; + postInstall = '' + # create symlinks for compatibility + install -dm755 $out/include/gdbm + ( + cd $out/include/gdbm + ln -s ../gdbm.h gdbm.h + ln -s ../ndbm.h ndbm.h + ln -s ../dbm.h dbm.h + ) + ''; + meta = with lib; { description = "GNU dbm key/value database library"; diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index ee74836df81d..a35d2380eded 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -12,8 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "doc" "info" ]; - # FIXME stackprotector needs gcc 4.9 in bootstrap tools - hardeningDisable = [ "format" "stackprotector" ]; + hardeningDisable = [ "format" ]; LDFLAGS = if stdenv.isSunOS then "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec" else ""; diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index 548772ea6507..d6877e72a1f9 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -11,8 +11,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; - propagatedBuildInputs = [ glib zlib gpgme libidn ]; + buildInputs = [ gobjectIntrospection zlib gpgme libidn ]; + nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ glib ]; configureFlags = [ "--enable-introspection=yes" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 8c66dcec1613..8d26cabc9b54 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { configureFlags = optional stdenv.isDarwin "--enable-amd64=no" ++ optional (!x11Support) "--without-x"; - outputs = [ "out" "bin" "dev" ]; + outputs = [ "bin" "out" "dev" ]; postInstall = '' moveToOutput bin/imlib2-config "$dev" diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index f106bbe6ebca..c3e80fe87f48 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -2,7 +2,6 @@ let version = "1.7R2"; - options = "-Dbuild.compiler=gcj"; # FIXME: We assume GCJ here. xbeans = fetchurl { url = "http://archive.apache.org/dist/xmlbeans/binaries/xmlbeans-2.2.0.zip"; @@ -33,7 +32,7 @@ stdenv.mkDerivation { buildInputs = [ unzip ant javac jvm ]; - buildPhase = "ant ${options} jar"; + buildPhase = "ant jar"; doCheck = false; # FIXME: Install javadoc as well. diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix index 55d719e8d8c0..661e89e30782 100644 --- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix @@ -14,9 +14,6 @@ mkDerivation { propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; patches = [ ./kdoctools-no-find-docbook-xml.patch ]; - preConfigure = '' - outputBin=dev - ''; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook" diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/development/libraries/libnfs/default.nix new file mode 100644 index 000000000000..28069268022f --- /dev/null +++ b/pkgs/development/libraries/libnfs/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "libnfs-${version}"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "sahlberg"; + repo = "libnfs"; + rev = "libnfs-${version}"; + sha256 = "1xd1xb09jxwmx7hblv0f9gxv7i1glk3nbj2vyq50zpi158lnf2mb"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "NFS client library"; + homepage = https://github.com/sahlberg/libnfs; + license = with licenses; [ lgpl2 bsd gpl3]; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index c493dd678ad5..614890e929f7 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -1,28 +1,30 @@ { stdenv, lib, fetchFromGitHub, pkgconfig, cmake -, dbus, networkmanager, webkitgtk216x, pcre, python2 }: +, dbus, networkmanager, spidermonkey_38, pcre, python2, python3 }: stdenv.mkDerivation rec { name = "libproxy-${version}"; - version = "0.4.13"; + version = "0.4.15"; src = fetchFromGitHub { owner = "libproxy"; repo = "libproxy"; rev = version; - sha256 = "0yg4wr44ync6x3p107ic00m1l04xqhni9jn1vzvkw3nfjd0k6f92"; + sha256 = "10swd3x576pinx33iwsbd4h15fbh2snmfxzcmab4c56nb08qlbrs"; }; outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ dbus networkmanager webkitgtk216x pcre ]; + buildInputs = [ dbus networkmanager spidermonkey_38 pcre python2 python3 ]; - cmakeFlags = [ - "-DWITH_WEBKIT3=ON" - "-DWITH_MOZJS=OFF" - "-DPYTHON_SITEPKG_DIR=$(out)/${python2.sitePackages}" - ]; + preConfigure = '' + cmakeFlagsArray+=( + "-DWITH_MOZJS=ON" + "-DPYTHON2_SITEPKG_DIR=$out/${python2.sitePackages}" + "-DPYTHON3_SITEPKG_DIR=$out/${python3.sitePackages}" + ) + ''; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 4ce1b664725a..4818a720a30c 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -33,7 +33,7 @@ in { }; libressl_2_6 = generic { - version = "2.6.0"; - sha256 = "0lwapvfda4zj4r0kxn9ys43l5wyfgpljmhq0j1lr45spfis5b3g4"; + version = "2.6.2"; + sha256 = "0y64grb2zx98rjp2lbwihyhbml4z5ih3v7ydbxdvmabj5d4x4adh"; }; } diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index a625399cc63c..86e858e569cc 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -4,7 +4,7 @@ , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages -, curl, libiconv, gmp, xen, zfs, parted +, curl, libiconv, gmp, xen, zfs, parted, qemu }: with stdenv.lib; @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill rm $out/lib/systemd/system/{virtlockd,virtlogd}.* wrapProgram $out/sbin/libvirtd \ - --prefix PATH : ${makeBinPath [ iptables iproute pmutils numad numactl ]} + --prefix PATH : ${makeBinPath [ iptables iproute pmutils numad numactl qemu ]} ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 370572956726..28b6faa436aa 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -10,22 +10,13 @@ let in stdenv.mkDerivation rec { name = "libxml2-${version}"; - version = "2.9.4"; + version = "2.9.5"; src = fetchurl { url = "http://xmlsoft.org/sources/${name}.tar.gz"; - sha256 = "0g336cr0bw6dax1q48bblphmchgihx9p1pjmxdnrd6sh3qci3fgz"; + sha256 = "0f6d5nkvcfx8yqis2dwrnv6qaj0nhiifz49y657vmrwwxvnc2ca0"; }; - patches = [ - (fetchpatch { - # Contains fixes for CVE-2016-{4658,5131} and other bugs. - name = "misc.patch"; - url = "https://git.gnome.org/browse/libxml2/patch/?id=e905f081&id2=v2.9.4"; - sha256 = "14rnzilspmh92bcpwbd6kqikj36gx78al42ilgpqgl1609krb5m5"; - }) - ]; - outputs = [ "bin" "dev" "out" "man" "doc" ] ++ lib.optional pythonSupport "py"; propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py"; diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 7a7a6d9d23f1..34182cd5a847 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, libiconv -, libffi, libtasn1, gtk_doc, libxslt, docbook_xsl }: +, libffi, libtasn1 }: stdenv.mkDerivation rec { name = "p11-kit-${version}"; @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { sha256 = "1l8sg0g74k2mk0y6vz19hc103dzizxa0h579gdhvxifckglb01hy"; }; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev"]; outputBin = "dev"; - nativeBuildInputs = [ autoreconfHook which pkgconfig gtk_doc libxslt docbook_xsl ]; + nativeBuildInputs = [ autoreconfHook which pkgconfig ]; buildInputs = [ libffi libtasn1 libiconv ]; autoreconfPhase = '' @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" "--without-trust-paths" - "--enable-doc" ]; installFlags = [ "exampledir=\${out}/etc/pkcs11" ]; diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index e7c254359942..4455a9488c00 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, gfortran }: -let - version = "3.5.0"; -in + stdenv.mkDerivation rec { name = "blas-${version}"; + version = "3.7.1"; + src = fetchurl { url = "http://www.netlib.org/blas/${name}.tgz"; - sha256 = "096a3apnh899abjymjjg8m34hncagkzp9qxw08cms98g71fpfzgg"; + sha256 = "1hvmwp488hd6sdxdbmhjhmyrrd4s1ds1cjzh5d86l10b3wsm99n5"; }; - buildInputs = [gfortran]; + buildInputs = [ gfortran ]; configurePhase = '' echo >make.inc "SHELL = ${stdenv.shell}" diff --git a/pkgs/development/libraries/webkitgtk/2.16.nix b/pkgs/development/libraries/webkitgtk/2.16.nix index 7d7424d914de..094c3596d4b7 100644 --- a/pkgs/development/libraries/webkitgtk/2.16.nix +++ b/pkgs/development/libraries/webkitgtk/2.16.nix @@ -101,4 +101,6 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; + + outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/webkitgtk/2.17.nix b/pkgs/development/libraries/webkitgtk/2.17.nix index 53718f696cb4..fc0e13436bc0 100644 --- a/pkgs/development/libraries/webkitgtk/2.17.nix +++ b/pkgs/development/libraries/webkitgtk/2.17.nix @@ -103,4 +103,6 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; + + outputs = [ "out" "dev" ]; } diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index 832600fed874..936c88034aad 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -1,36 +1,37 @@ -{ lib, stdenv, fetchgit, cmake, pkgconfig -, glibc, wayland, pixman, libxkbcommon, libinput, libxcb, xcbutilwm, xcbutilimage, mesa, libdrm, udev, systemd, dbus_libs -, libpthreadstubs, libX11, libXau, libXdmcp, libXext, libXdamage, libxshmfence, libXxf86vm -, wayland-protocols +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, wayland, pixman, libxkbcommon, libinput, libxcb, xcbutilwm, xcbutilimage, mesa +, libdrm, udev, libX11, libXdamage, systemd, dbus_libs, wayland-protocols +, libpthreadstubs, libXau, libXdmcp, libXext, libXxf86vm }: stdenv.mkDerivation rec { name = "wlc-${version}"; - version = "0.0.9"; + version = "0.0.10"; - src = fetchgit { - url = "https://github.com/Cloudef/wlc"; - rev = "refs/tags/v${version}"; - sha256 = "1r6jf64gs7n9a8129wsc0mdwhcv44p8k87kg0714rhx3g2w22asg"; + src = fetchFromGitHub { + owner = "Cloudef"; + repo = "wlc"; + rev = "v${version}"; fetchSubmodules = true; - }; + sha256 = "09kvwhrpgkxlagn9lgqxc80jbg56djn29a6z0n6h0dsm90ysyb2k"; + }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - wayland pixman libxkbcommon libinput libxcb xcbutilwm xcbutilimage mesa libdrm udev - libX11 libXdamage systemd dbus_libs wayland-protocols + wayland pixman libxkbcommon libinput libxcb xcbutilwm xcbutilimage mesa + libdrm udev libX11 libXdamage systemd dbus_libs wayland-protocols + libpthreadstubs libXau libXdmcp libXext libXxf86vm ]; - doCheck = true; checkTarget = "test"; - meta = { + meta = with stdenv.lib; { description = "A library for making a simple Wayland compositor"; homepage = https://github.com/Cloudef/wlc; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ]; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; # Trying to keep it up-to-date. }; } diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index c64970f8f86e..c55a3020b442 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -12,7 +12,10 @@ stdenv.mkDerivation rec { sha256 = "1lpwj8dxwhha54sby0v5axjk79h56jnhjjiwiasbbk15vwzahz4n"; }; + outputs = [ "out" "dev" ]; + buildInputs = [ makeWrapper libxml2 gnutls libxslt pkgconfig libgcrypt libtool openssl nss ]; + enableParallelBuilding = true; doCheck = true; @@ -23,6 +26,11 @@ stdenv.mkDerivation rec { # otherwise libxmlsec1-gnutls.so won't find libgcrypt.so, after #909 NIX_LDFLAGS = [ "-lgcrypt" ]; + postInstall = '' + moveToOutput "bin/xmlsec1-config" "$dev" + moveToOutput "lib/xmlsec1Conf.sh" "$dev" + ''; + postFixup = '' wrapProgram "$out/bin/xmlsec1" --prefix LD_LIBRARY_PATH ":" "$out/lib" ''; |