diff options
Diffstat (limited to 'pkgs/development/libraries')
100 files changed, 1110 insertions, 1251 deletions
diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index b8fd4af812ab..e4eb8d3ab2ec 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -1,25 +1,27 @@ -{ stdenv, fetchurl, cmake, boost, gmp, mpfr, mesa_glu }: +{ stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }: stdenv.mkDerivation rec { - version = "4.7"; + version = "4.9"; name = "cgal-" + version; - src = fetchurl { - url = "https://github.com/CGAL/releases/archive/CGAL-${version}.tar.gz"; - sha256 = "1hbp4qpfqvpggvv79yxr6z3w7y0nwd31zavb1s57y55yl9z3zfxy"; + src = fetchFromGitHub { + owner = "CGAL"; + repo = "releases"; + rev = "CGAL-${version}"; + sha256 = "044amgml1x5h17rpkck2azmxrmjvlzzykv71cjh5hlajsi88cid5"; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; # there are also libCGAL_Qt{3,4} omitted ATM - buildInputs = [ cmake boost gmp mpfr ]; - #propagatedBuildInputs = [ mesa_glu ]; + buildInputs = [ boost gmp mpfr ]; + nativeBuildInputs = [ cmake ]; doCheck = false; meta = with stdenv.lib; { description = "Computational Geometry Algorithms Library"; homepage = http://cgal.org; - license = licenses.gpl3Plus; # some parts are GPLv3+, some are LGPLv3+ + license = with licenses; [ gpl3Plus lgpl3Plus]; platforms = platforms.all; maintainers = [ maintainers.raskin ]; }; diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/development/libraries/CoinMP/default.nix index 079c0a5cf6f7..ea72bfb434b8 100644 --- a/pkgs/development/libraries/CoinMP/default.nix +++ b/pkgs/development/libraries/CoinMP/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "CoinMP-${version}"; - version = "1.7.6"; + version = "1.8.3"; src = fetchurl { url = "http://www.coin-or.org/download/source/CoinMP/${name}.tgz"; - sha256 = "0gqi2vqkg35gazzzv8asnhihchnbjcd6bzjfzqhmj7wy1dw9iiw6"; + sha256 = "1xr2iwbbhm6l9hwiry5c10pz46xfih8bvzrzwp0nkzf76vdnb9m1"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix index 1d26fed805eb..cee0a81ccfbd 100644 --- a/pkgs/development/libraries/SDL2_gfx/default.nix +++ b/pkgs/development/libraries/SDL2_gfx/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 ]; - configureFlags = [ "--enable-mmx" ]; + configureFlags = if stdenv.isi686 || stdenv.isx86_64 then "--enable-mmx" else "--disable-mmx"; meta = with stdenv.lib; { description = "SDL graphics drawing primitives and support functions"; diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index 0919970543c5..9fef76c799b9 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, SDL2, libogg, libvorbis, enableNativeMidi ? false }: +{ stdenv, lib, fetchurl, SDL2, libogg, libvorbis, smpeg, flac, enableNativeMidi ? false, fluidsynth ? null }: stdenv.mkDerivation rec { name = "SDL2_mixer-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0pv9jzjpcjlbiaybvwrb4avmv46qk7iqxlnqrd2dfj82c4mgc92s"; }; - propagatedBuildInputs = [ SDL2 libogg libvorbis ]; + propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg flac ]; configureFlags = [ "--disable-music-ogg-shared" ] ++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl"; @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { description = "SDL multi-channel audio mixer library"; platforms = platforms.linux; homepage = "https://www.libsdl.org/projects/SDL_mixer/"; + maintainers = with maintainers; [ MP2E ]; license = licenses.zlib; }; } diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index 10ba217175c3..9bc714c5538b 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, libtool, perl -}: +{ stdenv, fetchurl, pkgconfig, libtool, perl }: stdenv.mkDerivation rec { name = "ace-${version}"; - version = "6.3.3"; + version = "6.4.2"; + src = fetchurl { - url=http://download.dre.vanderbilt.edu/previous_versions/ACE-6.3.3.tar.bz2; - sha256 = "124qk205v8rx8p7rfigsargrpxjx3mh4nr99nlyk9csdc9gy8qpk"; + url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; + sha256 = "0dscvlgxy0fwma63azjkdbc85mh8k751ik67s88w6w75j0psld73"; }; enableParallelBuilding = true; - buildInputs = [ pkgconfig libtool perl ]; + nativeBuildInputs = [ pkgconfig libtool ]; + buildInputs = [ perl ]; patchPhase = ''substituteInPlace ./MPC/prj_install.pl \ --replace /usr/bin/perl "${perl}/bin/perl"''; @@ -25,12 +26,11 @@ stdenv.mkDerivation rec { > include/makeinclude/platform_macros.GNU ''; -meta = { + meta = with stdenv.lib; { description = "ADAPTIVE Communication Environment"; homepage = http://www.dre.vanderbilt.edu/~schmidt/ACE.html; - license = stdenv.lib.licenses.doc; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.nico202 ]; + license = licenses.doc; + platforms = platforms.linux; + maintainers = [ maintainers.nico202 ]; }; } - diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 302d63aa7596..d2b605c4f19c 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -1,24 +1,32 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gettext, intltool +{ stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, intltool , xmlto, docbook_xsl, docbook_xml_dtd_45 , glib, xapian, libxml2, libyaml, gobjectIntrospection +, pcre, itstool }: -stdenv.mkDerivation { - name = "appstream-0.9.5"; +stdenv.mkDerivation rec { + name = "appstream-${version}"; + version = "0.10.6"; - src = fetchurl { - url = "https://github.com/ximion/appstream/archive/APPSTREAM_0_8_0.tar.gz"; - sha256 = "16a3b38avrwyl1pp8jdgfjv6cd5mccbmk4asni92l40y5r0xfycr"; + src = fetchFromGitHub { + owner = "ximion"; + repo = "appstream"; + rev = "APPSTREAM_0_10_6"; + sha256 = "1fg7zxx2qhkyj7fmcpwbf80b72d16kyi8dadi111kf00sgzfbiyy"; }; nativeBuildInputs = [ cmake pkgconfig gettext intltool xmlto docbook_xsl docbook_xml_dtd_45 - gobjectIntrospection + gobjectIntrospection itstool ]; - buildInputs = [ glib xapian libxml2 libyaml ]; + buildInputs = [ pcre glib xapian libxml2 libyaml ]; + cmakeFlags = '' + -DSTEMMING=off + ''; + meta = with stdenv.lib; { description = "Software metadata handling library"; homepage = "http://www.freedesktop.org/wiki/Distributions/AppStream/Software/"; diff --git a/pkgs/development/libraries/aqbanking/sources.nix b/pkgs/development/libraries/aqbanking/sources.nix index f53d9a9e26f1..1638c72e95f5 100644 --- a/pkgs/development/libraries/aqbanking/sources.nix +++ b/pkgs/development/libraries/aqbanking/sources.nix @@ -1,12 +1,12 @@ # This file is autogenerated from update.sh in the same directory. { - gwenhywfar.version = "4.15.3"; - gwenhywfar.sha256 = "0fp67s932x66xfljb26zbrn8ambbc5y5c3hllr6l284nr63qf3ka"; - gwenhywfar.releaseId = "201"; + gwenhywfar.version = "4.17.0"; + gwenhywfar.sha256 = "1z9bm2r407x8vxk2nk6pndx0zhlk32j65z472ljkgjbh56mgzz8i"; + gwenhywfar.releaseId = "205"; libchipcard.version = "5.0.4"; libchipcard.sha256 = "0fj2h39ll4kiv28ch8qgzdbdbnzs8gl812qnm660bw89rynpjnnj"; libchipcard.releaseId = "200"; - aqbanking.version = "5.6.10"; - aqbanking.sha256 = "1x0isvpk43rq2zlyyb9p0kgjmqv7yq07vgkiprw3f5sjkykvxw6d"; - aqbanking.releaseId = "206"; + aqbanking.version = "5.6.12"; + aqbanking.sha256 = "08jbwmiv6f3v8iqdr44x4szna496fqcjfi6mlx04cnbx91m70lh6"; + aqbanking.releaseId = "208"; } diff --git a/pkgs/development/libraries/aqbanking/update.sh b/pkgs/development/libraries/aqbanking/update.sh index 2ba0192cbb64..8929e8bc6eb4 100755 --- a/pkgs/development/libraries/aqbanking/update.sh +++ b/pkgs/development/libraries/aqbanking/update.sh @@ -13,7 +13,7 @@ getCurrentVersions() { currentVersions="$(getCurrentVersions)" getLastestVersion() { - local baseurl="http://www.aquamaniac.de" + local baseurl="https://www.aquamaniac.de" local pkglist="sites/download/packages.php?package=$1&showall=1" local url="$baseurl/$pkglist" local reVersion='[0-9]+(\.[0-9]+)+' # Only release versions, no betas! diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 7f173b211565..d5a601f09ba0 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,24 +1,25 @@ { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { - version = "7.700.0"; + version = "7.800.1"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "152x274hd3f59xgd27k9d3ikwb3w62v1v5hpw4lp1yzdyy8980pr"; + sha256 = "1nxq2jp4jlvinynv0l04rpdzpnkzdsng0d5vi3hilc0hlsjnbnjs"; }; - buildInputs = [ cmake openblasCompat superlu hdf5 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ openblasCompat superlu hdf5 ]; cmakeFlags = [ "-DDETECT_HDF5=ON" ]; - patches = [ ./use-unix-config-on-OS-X.patch ]; - + patches = [ ./use-unix-config-on-OS-X.patch ]; + meta = with stdenv.lib; { description = "C++ linear algebra library"; homepage = http://arma.sourceforge.net; - license = licenses.mpl20; + license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ juliendehos knedlsepp ]; }; diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 5fbc45a7c08b..e342d8ab6c09 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -1,19 +1,17 @@ { stdenv, fetchFromGitHub, unzip, cmake, boost, zlib }: -let - version = "3.2"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "assimp-${version}"; + version = "3.3.1"; src = fetchFromGitHub{ owner = "assimp"; repo = "assimp"; rev = "v${version}"; - sha256 = "09fsksbq9a8gykwmw6gaicwh2ladrln1jc1xc5yk7w6x180cbb1x"; + sha256 = "13y44fymj13h6alig0nqab91j2qch0yh9gq8yql2zz744ch2s5vc"; }; - buildInputs = [ unzip cmake boost zlib ]; + buildInputs = [ cmake boost zlib ]; meta = with stdenv.lib; { description = "A library to import various 3D model formats"; diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index a14de67d7f39..3ea86b36a306 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -1,24 +1,23 @@ { stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate -, libsndfile, pkgconfig, python2 +, libsndfile, pkgconfig, python3 }: stdenv.mkDerivation rec { - name = "aubio-0.4.3"; + name = "aubio-0.4.4"; src = fetchurl { url = "http://aubio.org/pub/${name}.tar.bz2"; - sha256 = "1azarklqggch8kkz3gbqwi2vlb6ld4lidyhp34qawr0c7h3xnb5n"; + sha256 = "1y5zzwv9xjc649g4xrlqnim4q7pcwgzn0xrq3ijbmm5r4ckbkk9a"; }; - buildInputs = [ - alsaLib fftw libjack2 libsamplerate libsndfile pkgconfig python2 - ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ alsaLib fftw libjack2 libsamplerate libsndfile python3 ]; - configurePhase = "${python2.interpreter} waf configure --prefix=$out"; + configurePhase = "${python3.interpreter} waf configure --prefix=$out"; - buildPhase = "${python2.interpreter} waf"; + buildPhase = "${python3.interpreter} waf"; - installPhase = "${python2.interpreter} waf install"; + installPhase = "${python3.interpreter} waf install"; meta = with stdenv.lib; { description = "Library for audio labelling"; diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index 8864d710174a..f0dbdcc7daf6 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom +{ stdenv, lib, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom, gcc6 , withQt4 ? true, qt4 ? null , withQt5 ? false, qt5 ? null }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1kji3lhha26qr6xm9j8ic5c40zbrrb5qnwm2qxzmsfxgmrz29wkf"; }; - buildInputs = [ gtk2 lv2 pkgconfig python serd sord sratom ] + buildInputs = [ gtk2 lv2 pkgconfig python serd sord sratom gcc6 ] ++ (lib.optionals withQt4 [ qt4 ]) ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ])); diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 02b1af5ab521..545612d5c155 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babl-0.1.12"; + name = "babl-0.1.24"; src = fetchurl { url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "01x4an6zixrhn0vibkxpcb7gg348gadydq8gpw82rdqp39zjp01g"; + sha256 = "02wxyaa9kjfypmg31avp2dxh16sfx9701ww6dmp0ggz5vnng2as7"; }; - meta = { + meta = with stdenv.lib; { description = "Image pixel format conversion library"; homepage = http://gegl.org/babl/; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl3; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix index dcd35613d545..c5a6f55681ab 100644 --- a/pkgs/development/libraries/bobcat/default.nix +++ b/pkgs/development/libraries/bobcat/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchFromGitHub, icmake, libmilter, libX11, openssl, readline +{ stdenv, fetchFromGitHub, icmake +, libmilter, libX11, openssl, readline , utillinux, yodl }: stdenv.mkDerivation rec { name = "bobcat-${version}"; - version = "4.03.00"; + version = "4.07.00"; src = fetchFromGitHub { - sha256 = "0jkwq3f6g3vbim2jg5wfzhin89r4crnypqggp8cqimjmpkyfqnv0"; + sha256 = "0ja6rgdw4ng10acp2c0cv9k72i5sgng03i3xi2yshlm2811lgxcs"; rev = version; repo = "bobcat"; owner = "fbb-git"; diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 6adcce45d808..174e9fe47769 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -126,7 +126,7 @@ stdenv.mkDerivation { description = "Collection of C++ libraries"; license = stdenv.lib.licenses.boost; - platforms = platforms.unix; + platforms = (if versionOlder version "1.59" then remove "aarch64-linux" else id) platforms.unix; maintainers = with maintainers; [ peti wkennington ]; }; diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix new file mode 100644 index 000000000000..d3e655676e64 --- /dev/null +++ b/pkgs/development/libraries/caf/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + name = "actor-framework-${version}"; + version = "0.15.3"; + + src = fetchFromGitHub { + owner = "actor-framework"; + repo = "actor-framework"; + rev = "${version}"; + sha256 = "0202nsdriigdh6sxi1k3hddvmf1x54qpykbvf2ghfhzyh0m1q7j2"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "An open source implementation of the actor model in C++"; + homepage = http://actor-framework.org/; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ bobakker ]; + }; +} diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix index 614d57002cd2..a97ca5cc6980 100644 --- a/pkgs/development/libraries/cdk/default.nix +++ b/pkgs/development/libraries/cdk/default.nix @@ -1,11 +1,8 @@ { stdenv, fetchurl, ncurses }: -let - version = "5.0-20160131"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "cdk-${version}"; - inherit version; + version ="5.0-20161210"; buildInputs = [ ncurses @@ -13,13 +10,13 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://invisible-island.net/cdk/cdk-${version}.tgz"; - sha256 = "08ic2f5rmi8niaxwxwr6l6lhpan7690x52vpldnbjcf20rc0fbf3"; + sha256 = "1bazwcwz4qhxyc8jaahdd2nlm30f5dhy0f6cnix5rjjhi35mhxcy"; }; - meta = { + meta = with stdenv.lib; { description = "Curses development kit"; - license = stdenv.lib.licenses.bsdOriginal ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsdOriginal ; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 7cd848e602aa..673fb77f01aa 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -10,18 +10,17 @@ # google-gflags is required to run tests assert runTests -> google-gflags != null; -let - version = "1.10.0"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ceres-solver-${version}"; + version = "1.12.0"; src = fetchurl { url = "http://ceres-solver.org/ceres-solver-${version}.tar.gz"; - sha256 = "20bb5db05c3e3e14a4062e2cf2b0742d2653359549ecded3e0653104ef3deb17"; + sha256 = "15f8mwhcy9f5qggcc9dqwl5y687ykvmlidr686aqdq0ia7azwnvl"; }; - buildInputs = [ cmake glog ] + nativeBuildInputs = [ cmake ]; + buildInputs = [ glog ] ++ stdenv.lib.optional (google-gflags != null) google-gflags; inherit eigen; @@ -38,8 +37,7 @@ stdenv.mkDerivation { description = "C++ library for modeling and solving large, complicated optimization problems"; license = licenses.bsd3; homepage = "http://ceres-solver.org"; - maintainers = with stdenv.lib.maintainers; [ giogadi ]; - inherit version; - platforms = with stdenv.lib.platforms; unix; + maintainers = with maintainers; [ giogadi ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix index a3d1a46e818c..d49bd7eac1bc 100644 --- a/pkgs/development/libraries/cfitsio/default.nix +++ b/pkgs/development/libraries/cfitsio/default.nix @@ -1,24 +1,21 @@ { fetchurl, stdenv }: -stdenv.mkDerivation { - name = "cfitsio-3.21"; + stdenv.mkDerivation { + name = "cfitsio-3.41"; src = fetchurl { - url = ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3210.tar.gz; - sha256 = "1ffr3p5dy2b1vj9j4li5zf22naavi9wcxsvqy236fc0ykfyip96i"; + url = "ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3410.tar.gz"; + sha256 = "0k3knn5hz1vhzzvm46xa1y6fnpliwkwgw76lnkf4amcnl5zaqmm5"; }; # Shared-only build buildFlags = "shared"; - patchPhase = - '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in + patchPhase = '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in ''; - meta = { + meta = with stdenv.lib; { homepage = http://heasarc.gsfc.nasa.gov/fitsio/; - description = "Library for reading and writing FITS data files"; - longDescription = '' CFITSIO is a library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data @@ -28,9 +25,8 @@ stdenv.mkDerivation { advanced features for manipulating and filtering the information in FITS files. ''; - # Permissive BSD-style license. license = "permissive"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index 52990097a230..2c50d8138057 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -5,15 +5,16 @@ stdenv.mkDerivation rec { name = "chipmunk-${version}"; majorVersion = "7"; - version = "${majorVersion}.0.0"; + version = "${majorVersion}.0.1"; src = fetchurl { url = "https://chipmunk-physics.net/release/Chipmunk-${majorVersion}.x/Chipmunk-${version}.tgz"; - sha256 = "1kaii8wgvp0kgn2p22jm9smyqlws4p5dg8j23jaiasx9jq1kiaql"; + sha256 = "0q4jwv1icz8spcjkp0v3bnygi6hq2zmnsgcxkwm8i2bxfxjb8m7y"; }; + nativeBuildInputs = [ cmake ]; buildInputs = - [ cmake freeglut mesa glfw2 glew libX11 xproto inputproto libXi libXmu ]; + [ freeglut mesa glfw2 glew libX11 xproto inputproto libXi libXmu ]; postInstall = '' mkdir -p $out/bin diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 7c3c776e81b0..09c5eeb611ba 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 = "1.3.1"; + version = "1.3.2"; src = fetchurl { url = "http://bitbucket.org/acoustid/chromaprint/downloads/${name}.tar.gz"; - sha256 = "10dm9cfqb77g12pyjnqaw80860kzdcvskni02ll7afpywq8s15cg"; + sha256 = "0lln8dh33gslb9cbmd1hcv33pr6jxdwipd8m8gbsyhksiq6r1by3"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 722852f12700..a9470ee3f41b 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { name = "cimg-${version}"; - version = "1.7.0"; + version = "1.7.9"; src = fetchurl { url = "http://cimg.eu/files/CImg_${version}.zip"; - sha256 = "06j3n7gvgxzvprqwf56nnca195y38dcbdlszrxyn5p9w9al437zj"; + sha256 = "07g81jn25y2wksg9ycf9a7f5bfpcdl3xbrkp1xy3czl043a00y7s"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; builder = ./builder.sh; diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix index 1fa45992aeee..b26327dd7754 100644 --- a/pkgs/development/libraries/cl/default.nix +++ b/pkgs/development/libraries/cl/default.nix @@ -1,19 +1,19 @@ -{stdenv, fetchurl, SDL, mesa, rebar, erlang, opencl-headers, ocl-icd }: +{stdenv, fetchFromGitHub, SDL, mesa, rebar, erlang, opencl-headers, ocl-icd }: stdenv.mkDerivation rec { - version = "1.2.1"; + version = "1.2.3"; name = "cl-${version}"; - src = fetchurl { - url = "https://github.com/tonyrog/cl/archive/${name}.tar.gz"; - sha256 = "03jv280h9gqqqkm0mmkjr53srd2mzhvyy1biss77wpjrzq2z12c8"; + src = fetchFromGitHub { + owner = "tonyrog"; + repo = "cl"; + rev = "cl-${version}"; + sha256 = "1dk0k03z0ipxvrnn0kihph135hriw96jpnd31lbq44k6ckh6bm03"; }; buildInputs = [ erlang rebar opencl-headers ocl-icd ]; - #propagatedBuildInputs = [ SDL mesa ]; - + buildPhase = '' - sed 's/git/"${version}"/' -i src/cl.app.src rebar compile ''; @@ -25,10 +25,10 @@ stdenv.mkDerivation rec { cp -ruv c_src doc ebin include priv src $DIR ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/tonyrog/cl; description = "OpenCL binding for Erlang"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix index 3fad256e5728..29ce216cadf1 100644 --- a/pkgs/development/libraries/concurrencykit/default.nix +++ b/pkgs/development/libraries/concurrencykit/default.nix @@ -2,22 +2,23 @@ stdenv.mkDerivation rec { name = "concurrencykit-${version}"; - version = "0.4.5"; + version = "0.6.0"; src = fetchurl { url = "http://concurrencykit.org/releases/ck-${version}.tar.gz"; - sha256 = "0mh3z8ibiwidc6qvrv8bx9slgcycxwy06kfngfzfza6nihrymzl9"; + sha256 = "1pv21p7sjwwmbs2xblpy1lqk53r2i212yrqyjlr5dr3rlv87vqnp"; }; + + #Deleting this line causes "Unknown option --disable-static" + configurePhase = "./configure --prefix=$out"; enableParallelBuilding = true; - configurePhase = "./configure --prefix=$out"; - - meta = { + meta = with stdenv.lib; { description = "A library of safe, high-performance concurrent data structures"; - homepage = "http://concurrencykit.org"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + homepage = http://concurrencykit.org; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = [ maintainers.thoughtpolice ]; }; } diff --git a/pkgs/development/libraries/cre2/default.nix b/pkgs/development/libraries/cre2/default.nix new file mode 100644 index 000000000000..74619cbaaaed --- /dev/null +++ b/pkgs/development/libraries/cre2/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, + libtool, pkgconfig, re2, texinfo }: + +stdenv.mkDerivation rec { + name = "cre2-${version}"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "marcomaggi"; + repo = "cre2"; + rev = version; + sha256 = "12yrdad87jjqrhbqm02hzsayan2402vf61a9x1b2iabv6d1c1bnj"; + }; + + nativeBuildInputs = [ + autoreconfHook + libtool + pkgconfig + ]; + buildInputs = [ re2 texinfo ]; + + NIX_LDFLAGS="-lre2 -lpthread"; + + configureFlags = [ + "--enable-maintainer-mode" + ]; + + meta = with stdenv.lib; { + homepage = http://marcomaggi.github.io/docs/cre2.html; + description = "C Wrapper for RE2"; + license = licenses.bsd3; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/dbus/make-session-conf.xsl b/pkgs/development/libraries/dbus/make-session-conf.xsl index bc73369af944..9544aa13db56 100644 --- a/pkgs/development/libraries/dbus/make-session-conf.xsl +++ b/pkgs/development/libraries/dbus/make-session-conf.xsl @@ -18,7 +18,8 @@ <xsl:template match="/busconfig"> <busconfig> - <xsl:copy-of select="child::node()[name() != 'include' and name() != 'standard_session_servicedirs' and name() != 'servicedir' and name() != 'includedir']" /> + <!-- We leave <standard_session_servicedirs/> because it includes XDG dirs and therefore user Nix profile. --> + <xsl:copy-of select="child::node()[name() != 'include' and name() != 'servicedir' and name() != 'includedir']" /> <xsl:for-each select="str:tokenize($serviceDirectories)"> <servicedir><xsl:value-of select="." />/share/dbus-1/services</servicedir> diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 8a24445dcca7..fe4e7907c9fe 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -1,45 +1,25 @@ -{ stdenv, fetchurl, cmake, xlibsWrapper }: +{ stdenv, fetchFromGitHub, cmake, xlibsWrapper }: stdenv.mkDerivation rec { - version = "18.10"; + version = "19.4"; name = "dlib-${version}"; - src = fetchurl { - url = "mirror://sourceforge/dclib/dlib/${name}.tar.bz2"; - sha256 = "1g3v13azc29m5r7zqs3x0g731hny6spb66cxnra7f167z31ka3s7"; + src = fetchFromGitHub { + owner = "davisking"; + repo = "dlib"; + rev ="v${version}"; + sha256 = "0zqa36i4s5i7n6284sp22qrhm3k37n9vqmpz068nm02vj9h0a2j4"; }; - # The supplied CMakeLists.txt does not have any install targets. - sources_var = "\$\{sources\}"; - headers_var = "\$\{hearders\}"; - preConfigure = '' - cat << EOF > CMakeLists.txt - cmake_minimum_required(VERSION 2.6 FATAL_ERROR) - project(dlib) - - include_directories(./) - - file(GLOB sources ./dlib/all/*.cpp) - file(GLOB headers ./dlib/*.h) - - SET(LIBRARY_OUTPUT_PATH ".") - add_library(dlib "SHARED" dlib/all/source.cpp ${sources_var} ${headers_var}) - - install(TARGETS dlib DESTINATION lib) - install(DIRECTORY dlib/ DESTINATION include/dlib FILES_MATCHING PATTERN "*.h") - EOF - ''; - enableParallelBuilding = true; - buildInputs = [ cmake xlibsWrapper ]; - propagatedBuildInputs = [ xlibsWrapper ]; + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { description = "A general purpose cross-platform C++ machine learning library"; homepage = http://www.dlib.net; - license = stdenv.lib.licenses.boost; + license = licenses.boost; maintainers = with maintainers; [ christopherpoole ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index 809037bb5edf..7ec72afc2bff 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "drumstick-${version}"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { url = "mirror://sourceforge/drumstick/${version}/${name}.tar.bz2"; - sha256 = "0l47gy9yywrc860db5g3wdqg8yc8qdb2lqq6wvw1dfim5j0vbail"; + sha256 = "13pkfqrav30bbcddgf1imd7jk6lpqbxkz1qv31718pdl446jq7df"; }; outputs = [ "out" "dev" "man" ]; @@ -28,8 +28,14 @@ stdenv.mkDerivation rec { done ''; + #Temporarily remove drumstick-piano; Gives segment fault. Submitted ticket + postInstall = '' + rm $out/bin/drumstick-vpiano + ''; + + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - alsaLib cmake doxygen fluidsynth pkgconfig qt5.qtbase qt5.qtsvg + alsaLib doxygen fluidsynth qt5.qtbase qt5.qtsvg ]; meta = with stdenv.lib; { @@ -37,6 +43,6 @@ stdenv.mkDerivation rec { description = "MIDI libraries for Qt5/C++"; homepage = http://drumstick.sourceforge.net/; license = licenses.gpl2Plus; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index c38759e0c757..374f52c9cb06 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; postInstall = '' - sed -e '/Cflags:/s@''${prefix}@@' -i "$out"/share/pkgconfig/eigen3.pc + sed -e '/Cflags:/s@''${prefix}/@@' -i "$out"/share/pkgconfig/eigen3.pc ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/enginepkcs11/default.nix b/pkgs/development/libraries/enginepkcs11/default.nix deleted file mode 100644 index ff40a110a33e..000000000000 --- a/pkgs/development/libraries/enginepkcs11/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{stdenv, fetchurl, libp11, pkgconfig, openssl}: - -stdenv.mkDerivation rec { - name = "engine_pkcs11-0.1.8"; - - src = fetchurl { - urls = [ - "http://www.opensc-project.org/files/engine_pkcs11/${name}.tar.gz" - "http://www.openadk.org/distfiles/${name}.tar.gz" - ]; - sha256 = "1rd20rxy12rfx3kwwvk5sqvc1ll87z60rqak1ksfwbf4wx0pwzfy"; - }; - - buildInputs = [ libp11 pkgconfig openssl ]; - - meta = { - homepage = http://www.opensc-project.org/engine_pkcs11/; - license = stdenv.lib.licenses.bsdOriginal; - description = "Engine for OpenSSL to use smart cards in PKCS#11 format"; - }; -} diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix index e7a3bd495132..1453db8563f5 100644 --- a/pkgs/development/libraries/exempi/default.nix +++ b/pkgs/development/libraries/exempi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, expat, zlib, boost }: stdenv.mkDerivation rec { - name = "exempi-2.2.2"; + name = "exempi-2.4.2"; src = fetchurl { url = "http://libopenraw.freedesktop.org/download/${name}.tar.bz2"; - sha256 = "01vcd1mfn2s0iiq2cjyzgvnxx6kcq9cwra1iipijhs0vwvjx0yhf"; + sha256 = "1v665fc7x0yi7x6lzskvd8bd2anf7951svn2vd5384dblmgv43av"; }; configureFlags = [ diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix index 9cf49b3c2c09..a5dba0c94f12 100644 --- a/pkgs/development/libraries/exosip/default.nix +++ b/pkgs/development/libraries/exosip/default.nix @@ -1,18 +1,20 @@ {stdenv, fetchurl, libosip, openssl, pkgconfig }: stdenv.mkDerivation rec { - version = "4.0.0"; - src = fetchurl { + name = "libexosip2-${version}"; + version = "4.1.0"; + + src = fetchurl { url = "mirror://savannah/exosip/libeXosip2-${version}.tar.gz"; - sha256 = "1rdjr3x7s992w004cqf4xji1522an9rpzsr9wvyhp685khmahrsj"; + sha256 = "17cna8kpc8nk1si419vgr6r42k2lda0rdk50vlxrw8rzg0xp2xrw"; }; - name = "libexosip2-${version}"; - + + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libosip openssl pkgconfig ]; - meta = { - license = stdenv.lib.licenses.gpl2Plus; + meta = with stdenv.lib; { + license = licenses.gpl2Plus; description = "Library that hides the complexity of using the SIP protocol"; - platforms = stdenv.lib.platforms.linux; + platforms =platforms.linux; }; } diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix index ac785d65c4ee..c4332df5a3db 100644 --- a/pkgs/development/libraries/fcppt/default.nix +++ b/pkgs/development/libraries/fcppt/default.nix @@ -1,21 +1,24 @@ -{ stdenv, fetchgit, cmake, boost }: +{ stdenv, fetchFromGitHub, cmake, boost }: stdenv.mkDerivation rec { - name = "fcppt-1.3.0"; + name = "fcppt-${version}"; + version = "2.5.0"; - src = fetchgit { - url = https://github.com/freundlich/fcppt.git; - rev = "7787733afc7a6278c0de8c0435b3d312e0c0c851"; - sha256 = "1vy6nhk6nymbp4yihvw75qn67q9fgmfc518f8dn3h2pq2gfjqrpy"; + src = fetchFromGitHub { + owner = "freundlich"; + repo = "fcppt"; + rev = version; + sha256 = "0pjldwwxgnzjfd04cy29a9mn2szq4v2mjnw0367kxd141q2iglqi"; }; - buildInputs = [ cmake boost ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost ]; cmakeFlags = [ "-DENABLE_EXAMPLES=false" "-DENABLE_TEST=false" ]; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "Freundlich's C++ toolkit"; longDescription = '' Freundlich's C++ Toolkit (fcppt) is a collection of libraries focusing on @@ -25,8 +28,8 @@ stdenv.mkDerivation rec { C++11). ''; homepage = http://fcppt.org; - license = stdenv.lib.licenses.boost; - maintainers = with stdenv.lib.maintainers; [ pmiddend ]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.boost; + maintainers = with maintainers; [ pmiddend ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index df1c532f6330..c6167252866a 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -1,16 +1,19 @@ -{ pkgs, fetchurl, stdenv, ffmpeg, cmake, libpng, pkgconfig +{ pkgs, fetchFromGitHub, stdenv, ffmpeg, cmake, libpng, pkgconfig }: stdenv.mkDerivation rec { name = "ffmpegthumbnailer-${version}"; - version = "2.0.10"; + version = "2.2.0"; - src = fetchurl { - url = "https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/${version}/${name}.tar.bz2"; - sha256 = "0q7ws7ysw2rwr6ja8rhdjcc7x1hrlga7n514wi4lhw1yma32q0m3"; + src = fetchFromGitHub { + owner = "dirkvdb"; + repo = "ffmpegthumbnailer"; + rev = version; + sha256 = "0kl8aa547icy9b05njps02a8sw4yn4f8fzs228kig247sn09s4cp"; }; - buildInputs = [ ffmpeg cmake libpng pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ ffmpeg libpng ]; meta = with stdenv.lib; { homepage = https://github.com/dirkvdb/ffmpegthumbnailer; diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index 3fc3f37d2aad..5aa62a638fe8 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -1,23 +1,26 @@ -{ stdenv, fetchurl, zlib, ffmpeg, pkgconfig }: +{ stdenv, fetchFromGitHub, zlib, ffmpeg, pkgconfig }: stdenv.mkDerivation rec { - name = "ffms-2.21"; + name = "ffms-${version}"; + version = "2.22"; - src = fetchurl { - url = https://codeload.github.com/FFMS/ffms2/tar.gz/2.21; - name = "${name}.tar.gz"; - sha256 = "00h2a5yhvr1qzbrzwbjv1ybxrx25lchgral6yxv36aaf4pi3rhn2"; + src = fetchFromGitHub { + owner = "FFMS"; + repo = "ffms2"; + rev = version; + sha256 = "1ywcx1f3q533qfrbck5qhik3l617qhm062l8zixv02gnla7w6rkm"; }; NIX_CFLAGS_COMPILE = "-fPIC"; - buildInputs = [ zlib ffmpeg pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib ffmpeg ]; - meta = { - homepage = http://code.google.com/p/ffmpegsource/; + meta = with stdenv.lib; { + homepage = http://github.com/FFMS/ffms2/; description = "Libav/ffmpeg based source library for easy frame accurate access"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; - platforms = with stdenv.lib.platforms; unix; + license = licenses.mit; + maintainers = with maintainers; [ fuuzetsu ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/filter-audio/default.nix b/pkgs/development/libraries/filter-audio/default.nix index 989d9518a0eb..3faba45714a0 100644 --- a/pkgs/development/libraries/filter-audio/default.nix +++ b/pkgs/development/libraries/filter-audio/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "filter-audio-20150624"; + name = "filter-audio-${version}"; + version = "0.0.1"; - src = fetchgit { - url = "https://github.com/irungentoo/filter_audio.git"; - rev = "612c5a102550c614e4c8f859e753ea64c0b7250c"; - sha256 = "0bmf8dxnr4vb6y36lvlwqd5x68r4cbsd625kbw3pypm5yqp0n5na"; + src = fetchFromGitHub { + owner = "irungentoo"; + repo ="filter_audio"; + rev = "v${version}"; + sha256 = "1dv4pram317c1w97cjsv9f6r8cdxhgri7ib0v364z08pk7r2avfn"; }; doCheck = false; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 173e6411182d..9805bc17c443 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -6,12 +6,12 @@ }: composableDerivation.composableDerivation {} (fixed: rec { - version = "2.1.1"; + version = "2.1.3"; name = "gdal-${version}"; src = fetchurl { url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz"; - sha256 = "55fc6ffbe76e9d2e7e6cf637010e5d4bba6a966d065f40194ff798544198236b"; + sha256 = "0jh7filpf5dk5iz5acj7y3y49ihnzqypxckdlj0sjigbqq6hlsmf"; }; buildInputs = [ unzip libjpeg libtiff libpng proj openssl ] diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/development/libraries/gecode/default.nix index ee7b12de5027..5d683de404d9 100644 --- a/pkgs/development/libraries/gecode/default.nix +++ b/pkgs/development/libraries/gecode/default.nix @@ -2,13 +2,14 @@ stdenv.mkDerivation rec { name = "gecode-${version}"; - version = "4.4.0"; + version = "5.0.0"; src = fetchurl { url = "http://www.gecode.org/download/${name}.tar.gz"; - sha256 = "0akqjzy6pd229mn0lhpdbyc4wbazhprkd5ijqs99z68bj3b9h0s3"; + sha256 = "0yz7m4msp7g2jzsn216q74d9n7rv6qh8abcv0jdc1n7y2nhjzzzl"; }; + enableParallelBuilding = true; buildInputs = [ perl ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index e8f4001c1b59..5a7bff7459e3 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -16,11 +16,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "geis-${version}"; - version = "2.2.16"; + version = "2.2.17"; src = fetchurl { url = "https://launchpad.net/geis/trunk/${version}/+download/${name}.tar.xz"; - sha256 = "40a694092c79f325a2fbf8a9f301177bc91c364f4e637c2aa8963ad2a5aabbcf"; + sha256 = "1svhbjibm448ybq6gnjjzj0ak42srhihssafj0w402aj71lgaq4a"; }; NIX_CFLAGS_COMPILE = "-Wno-error=pedantic"; diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index 12460f4f2d29..9ce47ec2f1a2 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -8,27 +8,29 @@ assert zlibSupport -> zlib != null; assert sslSupport -> openssl != null; assert idnSupport -> libidn != null; +with stdenv.lib; + let - version = "1.0.14"; + version = "1.0.20"; in stdenv.mkDerivation rec { name = "gloox-${version}"; src = fetchurl { url = "http://camaya.net/download/gloox-${version}.tar.bz2"; - sha256 = "0h9r4382qv0vqc91x1qz1nivxw1r2l874s1kl0bskzm9dyk742sj"; + sha256 = "1a6yhs42wcdm8az3983m3lx4d9296bw0amz5v3b4012g1xn0hhq2"; }; buildInputs = [ ] - ++ stdenv.lib.optional zlibSupport zlib - ++ stdenv.lib.optional sslSupport openssl - ++ stdenv.lib.optional idnSupport libidn; + ++ optional zlibSupport zlib + ++ optional sslSupport openssl + ++ optional idnSupport libidn; meta = { description = "A portable high-level Jabber/XMPP library for C++"; - homepage = "http://camaya.net/gloox"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; - platforms = with stdenv.lib.platforms; unix; + homepage = http://camaya.net/gloox; + license = licenses.gpl3; + maintainers = with maintainers; [ fuuzetsu ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix index 47345e2a22c7..7f8a2276ef25 100644 --- a/pkgs/development/libraries/gmm/default.nix +++ b/pkgs/development/libraries/gmm/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchurl }: -stdenv.mkDerivation { - name = "gmm-4.3"; +stdenv.mkDerivation rec { + name = "gmm-${version}"; + version = "5.1"; src = fetchurl { - url = http://download.gna.org/getfem/stable/gmm-4.3.tar.gz; - sha256 = "0wpp3k73wd3rblsrwxl6djq6m11fx3q5wgw0pl41m9liswsw6din"; + url ="http://download.gna.org/getfem/stable/${name}.tar.gz"; + sha256 = "0di68vdn34kznf96rnwrpb3bbm3ahaczwxd306s9dx41kcqbzrlh"; }; - meta = { + meta = with stdenv.lib; { description = "Generic C++ template library for sparse, dense and skyline matrices"; homepage = http://home.gna.org/getfem/gmm_intro.html; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.unix; + license = licenses.lgpl21Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.5.nix index 8bb1a2d97f76..a1eab1a84c11 100644 --- a/pkgs/development/libraries/gnutls/3.5.nix +++ b/pkgs/development/libraries/gnutls/3.5.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl, libunistring, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.5.9"; + version = "3.5.10"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz"; - sha256 = "0l9971841jsfdcvcyhas17sk5rsby6x5vvwcmmj4x3zi9q60zcc2"; + sha256 = "17apwvdkkazh5w8z8mbanpj2yj8s2002qwy46wz4v3akpa33wi5g"; }; }) diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index cf298baf48a3..3aef10df33ed 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -1,6 +1,6 @@ { lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip , guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, unbound, libiconv -, tpmSupport ? false, trousers, nettools, libunistring +, tpmSupport ? false, trousers, which, nettools, libunistring # Version dependent args , version, src, patches ? [], postPatch ? "", nativeBuildInputs ? [] @@ -38,14 +38,14 @@ stdenv.mkDerivation { enableParallelBuilding = true; buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen libunistring ] - ++ lib.optional doCheck nettools ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv ++ lib.optional (tpmSupport && stdenv.isLinux) trousers ++ [ unbound ] ++ lib.optional guileBindings guile ++ buildInputs; - nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs; + nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs + ++ lib.optionals doCheck [ which nettools ]; propagatedBuildInputs = [ nettle ]; diff --git a/pkgs/development/libraries/google-gflags/default.nix b/pkgs/development/libraries/google-gflags/default.nix index 1423a5a9efcf..0f089d16eadd 100644 --- a/pkgs/development/libraries/google-gflags/default.nix +++ b/pkgs/development/libraries/google-gflags/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "google-gflags-${version}"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "gflags"; repo = "gflags"; rev = "v${version}"; - sha256 = "0qxvr9cyxq3px60jglkm94pq5bil8dkjjdb99l3ypqcds7iypx9w"; + sha256 = "1y5808ky8qhjwv1nf134czz0h2p2faqvjhxa9zxf8mg8hn4ns9wp"; }; nativeBuildInputs = [ cmake ]; @@ -21,17 +21,16 @@ stdenv.mkDerivation rec { doCheck = false; - meta = { + meta = with stdenv.lib; { description = "A C++ library that implements commandline flags processing"; longDescription = '' The gflags package contains a C++ library that implements commandline flags processing. As such it's a replacement for getopt(). It was owned by Google. google-gflags project has been renamed to gflags and maintained by new community. ''; - homepage = https://code.google.com/p/gflags/; - license = stdenv.lib.licenses.bsd3; - - maintainers = [ stdenv.lib.maintainers.linquize ]; - platforms = stdenv.lib.platforms.all; + homepage = https://gflags.github.io/gflags/; + license = licenses.bsd3; + maintainers = [ maintainers.linquize ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix index 4d011ddd4638..ee453963376f 100644 --- a/pkgs/development/libraries/granite/default.nix +++ b/pkgs/development/libraries/granite/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, perl, cmake, vala_0_23, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: +{ stdenv, fetchurl, perl, cmake, vala, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: stdenv.mkDerivation rec { - majorVersion = "0.3"; - minorVersion = "0"; + majorVersion = "0.4"; + minorVersion = "0.1"; name = "granite-${majorVersion}.${minorVersion}"; src = fetchurl { - url = "https://code.launchpad.net/granite/${majorVersion}/${majorVersion}/+download/${name}.tar.gz"; - sha256 = "1laa109dz7kbd8zxddqw2p1b67yzva7cc5h3smqkj8a9jzbhv5fz"; + url = "https://launchpad.net/granite/${majorVersion}/${majorVersion}.${minorVersion}/+download/${name}.tar.xz"; + sha256 = "1pf4jkz3xyn1sqv70063im80ayb5kdsqwqwx11dc7vgypsl458cm"; }; cmakeFlags = "-DINTROSPECTION_GIRDIR=share/gir-1.0/ -DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0"; - buildInputs = [perl cmake vala_0_23 pkgconfig gobjectIntrospection glib gtk3 gnome3.libgee gettext]; + buildInputs = [perl cmake vala pkgconfig gobjectIntrospection glib gtk3 gnome3.libgee gettext]; meta = { description = "An extension to GTK+ used by elementary OS"; longDescription = "An extension to GTK+ that provides several useful widgets and classes to ease application development. Designed for elementary OS."; diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 1a8cb233b77a..55e20065732c 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -1,21 +1,22 @@ { stdenv, fetchurl, pkgconfig, libsoup, glib }: -stdenv.mkDerivation { - name = "gssdp-0.14.11"; +stdenv.mkDerivation rec { + name = "gssdp-${version}"; + version = "1.0.1"; src = fetchurl { - url = mirror://gnome/sources/gssdp/0.14/gssdp-0.14.11.tar.xz; - sha256 = "0njkqr2y7c6linnw4wkc4y2vq5dfkpryqcinbzn0pzhr46psxxbv"; + url = "mirror://gnome/sources/gssdp/1.0/${name}.tar.xz"; + sha256 = "1qfj4gir1qf6v86z70ryzmjb75ns30q6zi5p89vhd3621gs6f7b0"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libsoup ]; propagatedBuildInputs = [ glib ]; - meta = { + meta = with stdenv.lib; { description = "GObject-based API for handling resource discovery and announcement over SSDP"; homepage = http://www.gupnp.org/; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.all; + license = licenses.lgpl2; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix index 1b28477f1e0c..c6cc51b1e1f8 100644 --- a/pkgs/development/libraries/gtkspell/3.nix +++ b/pkgs/development/libraries/gtkspell/3.nix @@ -2,21 +2,22 @@ stdenv.mkDerivation rec { name = "gtkspell-${version}"; - version = "3.0.8"; + version = "3.0.9"; src = fetchurl { - url = "mirror://sourceforge/gtkspell/gtkspell3-${version}.tar.gz"; - sha256 = "1zrz5pz4ryvcssk898liynmy2wyxgj95ak7mp2jv7x62yzihq6h1"; + url = "mirror://sourceforge/gtkspell/gtkspell3-${version}.tar.xz"; + sha256 = "09jdicmpipmj4v84gnkqwbmj4lh8v0i6pn967rb9jx4zg2ia9x54"; }; - buildInputs = [ aspell pkgconfig gtk3 enchant intltool ]; + nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ aspell gtk3 enchant ]; propagatedBuildInputs = [ enchant ]; - meta = { + meta = with stdenv.lib; { homepage = "http://gtkspell.sourceforge.net/"; description = "Word-processor-style highlighting GtkTextView widget"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ fuuzetsu ]; }; } diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix index 6557d8f80410..1537f9cc480b 100644 --- a/pkgs/development/libraries/htmlcxx/default.nix +++ b/pkgs/development/libraries/htmlcxx/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { name = "htmlcxx-${version}"; - version = "0.85"; + version = "0.86"; src = fetchurl { url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${name}.tar.gz"; - sha256 = "1rdsjrcjkf7mi3182lq4v5wn2wncw0ziczagaqnzi0nwmp2a00mb"; + sha256 = "1hgmyiad3qgbpf2dvv2jygzj6jpz4dl3n8ds4nql68a4l9g2nm07"; }; patches = [ ./ptrdiff.patch ]; - meta = { + meta = with stdenv.lib; { homepage = http://htmlcxx.sourceforge.net/; - description = "htmlcxx is a simple non-validating css1 and html parser for C++"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; + description = "A simple non-validating css1 and html parser for C++"; + license = licenses.lgpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 5d07cfe3a2bb..e1acacc328cc 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, pkgconfig, cairo, expat, ncurses, libX11 , pciutils, numactl }: +with stdenv.lib; + stdenv.mkDerivation rec { - name = "hwloc-1.11.2"; + name = "hwloc-1.11.6"; src = fetchurl { url = "http://www.open-mpi.org/software/hwloc/v1.11/downloads/${name}.tar.bz2"; - sha1 = "3d68de060808f04349538be4e63cde501cd53b0a"; + sha256 = "1yl7dm2qplwmnidd712zy12qfvxk28k8ccs694n42ybwdjwzg1bn"; }; # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo. @@ -16,17 +18,17 @@ stdenv.mkDerivation rec { # derivation and set optional dependencies to `null'. buildInputs = stdenv.lib.filter (x: x != null) ([ expat ncurses ] - ++ (stdenv.lib.optionals (!stdenv.isCygwin) [ cairo libX11 ]) - ++ (stdenv.lib.optionals stdenv.isLinux [ numactl ])); + ++ (optionals (!stdenv.isCygwin) [ cairo libX11 ]) + ++ (optionals stdenv.isLinux [ numactl ])); propagatedBuildInputs = # Since `libpci' appears in `hwloc.pc', it must be propagated. - stdenv.lib.optional stdenv.isLinux pciutils; + optional stdenv.isLinux pciutils; enableParallelBuilding = true; postInstall = - stdenv.lib.optionalString (stdenv.isLinux && numactl != null) + optionalString (stdenv.isLinux && numactl != null) '' if [ -d "${numactl}/lib64" ] then numalibdir="${numactl}/lib64" @@ -43,9 +45,8 @@ stdenv.mkDerivation rec { # fail on some build machines. doCheck = false; - meta = with stdenv.lib; { + meta = { description = "Portable abstraction of hierarchical architectures for high-performance computing"; - longDescription = '' hwloc provides a portable abstraction (across OS, versions, architectures, ...) of the hierarchical topology of @@ -64,9 +65,7 @@ stdenv.mkDerivation rec { # http://www.open-mpi.org/projects/hwloc/license.php license = licenses.bsd3; - homepage = http://www.open-mpi.org/projects/hwloc/; - maintainers = [ ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/icu/57.nix b/pkgs/development/libraries/icu/57.nix deleted file mode 100644 index fbd5f512aee7..000000000000 --- a/pkgs/development/libraries/icu/57.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }: - -let - pname = "icu4c"; - version = "57.1"; -in -stdenv.mkDerivation ({ - name = pname + "-" + version; - - src = fetchurl { - url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-" - + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz"; - sha256 = "10cmkqigxh9f73y7q3p991q6j8pph0mrydgj11w1x6wlcp5ng37z"; - }; - - outputs = [ "out" "dev" ]; - outputBin = "dev"; - - # FIXME: This fixes dylib references in the dylibs themselves, but - # not in the programs in $out/bin. - buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - - postUnpack = '' - sourceRoot=''${sourceRoot}/source - echo Source root reset to ''${sourceRoot} - ''; - - # This pre/postPatch shenanigans is to handle that the patches expect - # to be outside of `source`. - prePatch = '' - pushd .. - ''; - postPatch = '' - popd - ''; - - patches = [ - ]; - - preConfigure = '' - sed -i -e "s|/bin/sh|${stdenv.shell}|" configure - ''; - - configureFlags = "--disable-debug" + - stdenv.lib.optionalString (stdenv.isFreeBSD || stdenv.isDarwin) " --enable-rpath"; - - # remove dependency on bootstrap-tools in early stdenv build - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc - ''; - - postFixup = ''moveToOutput lib/icu "$dev" ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "Unicode and globalization support library"; - homepage = http://site.icu-project.org/; - maintainers = with maintainers; [ raskin urkud ]; - platforms = platforms.all; - }; -} // (if stdenv.isArm then { - patches = [ ./0001-Disable-LDFLAGSICUDT-for-Linux.patch ]; -} else {})) diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index 1508f05db8b6..ea0919caa31f 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -3,6 +3,14 @@ let pname = "icu4c"; version = "58.2"; + + # this patch should no longer be needed in 58.3 + # https://bugs.gentoo.org/show_bug.cgi?id=599142#c14 + keywordFix = fetchurl { + url = "http://bugs.icu-project.org/trac/changeset/39484?format=diff"; + name = "icu-changeset-39484.diff"; + sha256 = "0hxhpgydalyxacaaxlmaddc1sjwh65rsnpmg0j414mnblq74vmm8"; + }; in stdenv.mkDerivation ({ name = pname + "-" + version; @@ -32,6 +40,7 @@ stdenv.mkDerivation ({ ''; postPatch = '' popd + patch -p4 < ${keywordFix} ''; patches = [ diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index 9477aca59733..ed742888a0ef 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -1,24 +1,24 @@ -{stdenv, fetchurl, gettext, python, xz}: +{stdenv, fetchurl, gettext, python3, xz}: stdenv.mkDerivation rec { - name = "iso-codes-3.56"; + name = "iso-codes-3.74"; + src = fetchurl { url = "http://pkg-isocodes.alioth.debian.org/downloads/${name}.tar.xz"; - sha256 = "0vnfygd03jg21i7r238n450wy2hp354f3ank0v3k34zchbjydl2m"; + sha256 = "1vkaxkcx8h8lbg3z3jjfjs1x1rz1l01j6ll46ysza2gym37g7x11"; }; patchPhase = '' for i in `find . -name \*.py` do - sed -i -e "s|#!/usr/bin/env python|#!${python}/bin/python|" $i + sed -i -e "s|#!/usr/bin/env python|#!${python3}/bin/python|" $i done ''; - buildInputs = [ gettext ]; - nativeBuildInputs = [ xz ]; + buildInputs = [ gettext python3 ]; - meta = { + meta = with stdenv.lib; { homepage = http://pkg-isocodes.alioth.debian.org/; description = "Various ISO codes packaged as XML files"; - maintainers = [ stdenv.lib.maintainers.urkud ]; - platforms = stdenv.lib.platforms.all; + maintainers = [ maintainers.urkud ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index ae1f9996b78a..7e3220d8a37c 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, libX11, libuuid, xz}: +{ stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk }: stdenv.mkDerivation rec { name = "itk-4.10.0"; @@ -12,18 +12,21 @@ stdenv.mkDerivation rec { "-DBUILD_TESTING=OFF" "-DBUILD_EXAMPLES=OFF" "-DBUILD_SHARED_LIBS=ON" + "-DModule_ITKIOMINC=ON" + "-DModule_ITKVtkGlue=ON" + "-DModule_ITKReview=ON" ]; enableParallelBuilding = true; nativeBuildInputs = [ cmake xz ]; - buildInputs = [ libX11 libuuid ]; + buildInputs = [ libX11 libuuid vtk ]; meta = { description = "Insight Segmentation and Registration Toolkit"; homepage = http://www.itk.org/; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 84638bc01ea6..8c8c181409d4 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jemalloc-${version}"; - version = "4.3.1"; + version = "4.5.0"; src = fetchurl { url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${name}.tar.bz2"; - sha256 = "12r71i8nm3vwz21fc16rwbb0pwcg5s05n1qg3rwl2s85v0x1ifzp"; + sha256 = "9409d85664b4f135b77518b0b118c549009dc10f6cba14557d170476611f6780"; }; # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { # option should remove the prefix and give us a working jemalloc. configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix="; + doCheck = true; + + meta = with stdenv.lib; { homepage = http://jemalloc.net; description = "General purpose malloc(3) implementation"; diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index c35cc5883146..91eb7aecea90 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patchShebangs doc/doxyparse.pl ''; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "man" ]; nativeBuildInputs = [ perl ]; buildInputs = [ openssl ]; diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index c5bf7fd7f982..8b67d52b875e 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -19,13 +19,15 @@ assert withFonts -> freetype != null; stdenv.mkDerivation rec { name = "libbluray-${version}"; - version = "0.9.2"; + version = "1.0.0"; src = fetchurl { url = "http://get.videolan.org/libbluray/${version}/${name}.tar.bz2"; - sha256 = "1sp71j4agcsg17g6b85cqz78pn5vknl5pl39rvr6mkib5ps99jgg"; + sha256 = "1k3lag4lxi2jjd3zh4wcb5l3hadzm54j5kagh92yzfy76p9svqzp"; }; + patches = optional withJava ./BDJ-JARFILE-path.patch; + nativeBuildInputs = [ pkgconfig autoreconfHook ] ++ optionals withJava [ ant ] ; @@ -36,12 +38,15 @@ stdenv.mkDerivation rec { ++ optional withFonts freetype ; - propagatedBuildInputs = stdenv.lib.optional withAACS libaacs; + propagatedBuildInputs = optional withAACS libaacs; + + NIX_LDFLAGS = [ + (optionalString withAACS "-L${libaacs}/lib -laacs") + (optionalString withBDplus "-L${libbdplus}/lib -lbdplus") + ]; preConfigure = '' ${optionalString withJava ''export JDK_HOME="${jdk.home}"''} - ${optionalString withAACS ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${libaacs}/lib -laacs"''} - ${optionalString withBDplus ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${libbdplus}/lib -lbdplus"''} ''; configureFlags = with stdenv.lib; @@ -50,14 +55,11 @@ stdenv.mkDerivation rec { ++ optional (! withFonts) "--without-freetype" ; - # Fix search path for BDJ jarfile - patches = stdenv.lib.optional withJava ./BDJ-JARFILE-path.patch; - meta = with stdenv.lib; { - homepage = "http://www.videolan.org/developers/libbluray.html"; + homepage = http://www.videolan.org/developers/libbluray.html; description = "Library to access Blu-Ray disks for video playback"; license = licenses.lgpl21; - maintainers = [ maintainers.abbradar ]; + maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix index 6d64df88d3f1..02e4529b759e 100644 --- a/pkgs/development/libraries/libbson/default.nix +++ b/pkgs/development/libraries/libbson/default.nix @@ -1,18 +1,18 @@ -{ autoconf, automake114x, fetchzip, libtool, perl, stdenv, which }: - -let - version = "1.1.10"; -in +{ fetchFromGitHub, perl, stdenv, cmake }: stdenv.mkDerivation rec { name = "libbson-${version}"; + version = "1.6.1"; - src = fetchzip { - url = "https://github.com/mongodb/libbson/releases/download/${version}/libbson-${version}.tar.gz"; - sha256 = "0zzca7zqvxf89fq7ji9626q8nnqyyh0dnmbk4xijzr9sq485xz0s"; + src = fetchFromGitHub { + owner = "mongodb"; + repo = "libbson"; + rev = version; + sha256 = "1ilxbv4yjgf0vfzaa8lzn40hv5x1737ny2g2q1wmm8bl39m0viiw"; }; - buildInputs = [ autoconf automake114x libtool perl which ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ perl ]; meta = with stdenv.lib; { description = "A C Library for parsing, editing, and creating BSON documents"; diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 2784cd90a5c6..24ec3d74d36f 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -1,21 +1,28 @@ -{ stdenv, fetchurl, cmake, pkgconfig, libevent, openssl}: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, libevent, openssl}: -stdenv.mkDerivation { - name = "libcouchbase-2.5.2"; - src = fetchurl { - url = "https://github.com/couchbase/libcouchbase/archive/2.5.2.tar.gz"; - sha256 = "0ka1hix38a2kdhxz6n8frssyznf78ra0irga9d8lr5683y73xw24"; +stdenv.mkDerivation rec { + name = "libcouchbase-${version}"; + version = "2.7.2"; + + src = fetchFromGitHub { + owner = "couchbase"; + repo ="libcouchbase"; + rev = version; + sha256 = "1182r9z3cykkgx1vn36l0a50wvh5mr3yj89x0ynyjhfi3iwalrar"; }; cmakeFlags = "-DLCB_NO_MOCK=ON"; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libevent openssl]; + buildInputs = [ libevent openssl ]; + + doCheck = true; + checkPhase = "ctest"; - meta = { + meta = with stdenv.lib; { description = "C client library for Couchbase"; homepage = "https://github.com/couchbase/libcouchbase"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; + license = licenses.asl20; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix index 2e76c510bdda..e20b1c95a199 100644 --- a/pkgs/development/libraries/libdap/default.nix +++ b/pkgs/development/libraries/libdap/default.nix @@ -1,21 +1,22 @@ { stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }: stdenv.mkDerivation rec { - version = "3.15.1"; + version = "3.18.3"; name = "libdap-${version}"; - buildInputs = [ bison libuuid curl libxml2 flex ]; + nativeBuildInputs = [ bison flex ]; + buildInputs = [ libuuid curl libxml2 ]; src = fetchurl { url = "http://www.opendap.org/pub/source/${name}.tar.gz"; - sha256 = "6ee13cc69ae0b5e7552ddfd17013ebb385859bba66f42a2cfba3b3be7aa4ef0f"; + sha256 = "0azjf4gjqvp1fdf1wb3s98x52zfy4viq1m3j9lggaidldfinmv8c"; }; - meta = { + meta = with stdenv.lib; { description = "A C++ SDK which contains an implementation of DAP"; homepage = http://www.opendap.org/download/libdap; - license = stdenv.lib.licenses.lgpl2; - maintainers = [ stdenv.lib.maintainers.bzizou ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl2; + maintainers = [ maintainers.bzizou ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index c96a2b7f051a..c1d11ce87ee5 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchurl, libraw1394, libusb1 -, CoreServices -}: +{ stdenv, fetchurl, libraw1394, +libusb1, CoreServices }: stdenv.mkDerivation rec { - name = "libdc1394-2.2.3"; + name = "libdc1394-${version}"; + version = "2.2.5"; src = fetchurl { url = "mirror://sourceforge/libdc1394/${name}.tar.gz"; - sha256 = "1p9b4ciy97s04gmp7656cybr1zfd79hlw0ffhfb52m3zcn07h6aa"; + sha256 = "0drk4sqvaym9glaraia25mj60rmwqbhy4j9h3x7gqpzfib8ch31m"; }; buildInputs = [ libusb1 ] ++ stdenv.lib.optional stdenv.isLinux libraw1394 ++ stdenv.lib.optional stdenv.isDarwin CoreServices; - meta = { + meta = with stdenv.lib; { homepage = http://sourceforge.net/projects/libdc1394/; description = "Capture and control API for IIDC compliant cameras"; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.viric ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index d0122d0283c5..c5da3816c41c 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "libdiscid-0.6.1"; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake ]; + name = "libdiscid-${version}"; + version = "0.6.2"; + nativeBuildInputs = [ cmake pkgconfig ]; + src = fetchurl { url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${name}.tar.gz"; - sha256 = "1mbd5y9056638cffpfwc6772xwrsk18prv1djsr6jpfim38jpsxc"; + sha256 = "1f9irlj3dpb5gyfdnb1m4skbjvx4d4hwiz2152f83m0d9jn47r7r"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index 3ff40141b164..a91acb230525 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "libevdev-1.4.6"; + name = "libevdev-1.5.6"; src = fetchurl { - url = "http://www.freedesktop.org/software/libevdev/${name}.tar.xz"; - sha256 = "1lrja526iyg48yw6i0dxdhyj63q9gwbgvj6xk1hskxzrqyhf2akv"; + url = "https://www.freedesktop.org/software/libevdev/${name}.tar.xz"; + sha256 = "1256ypz93039n6km4macg158fpmjgylhmcmk20pnklxicsfpxv7c"; }; buildInputs = [ python ]; diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 6f1981d0ece7..0f21180f691c 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -7,11 +7,11 @@ assert gtkSupport -> glib != null && gtk3 != null; assert videoSupport -> ffmpeg != null && libmpeg2 != null; stdenv.mkDerivation rec { - name = "libextractor-1.2"; + name = "libextractor-1.3"; src = fetchurl { url = "mirror://gnu/libextractor/${name}.tar.gz"; - sha256 = "1n7z6s5ils6xmf6b0z1xda41maxj94c1n6wlyyxmacs5lrkh2a96"; + sha256 = "0zvv7wd011npcx7yphw9bpgivyxz6mlp87a57n96nv85k96dd2l6"; }; preConfigure = diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 4df326e278cc..d6c0c538a8fe 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libfilezilla-${version}"; - version = "0.9.0"; + version = "0.9.1"; src = fetchurl { url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2"; - sha256 = "0340v5xs48f28q2d16ldb9359dkzlhl4l449mgyv3qabnlz2pl21"; + sha256 = "06ivj40bk5b76a36zwhnwqvg564hgccncnn5nb5cqc7kf4bkkchq"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libfixposix/default.nix b/pkgs/development/libraries/libfixposix/default.nix index a0b03c4c0057..f56dc60771d6 100644 --- a/pkgs/development/libraries/libfixposix/default.nix +++ b/pkgs/development/libraries/libfixposix/default.nix @@ -1,28 +1,23 @@ -{ stdenv, fetchurl, fetchgit, autoreconfHook, libtool }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }: stdenv.mkDerivation rec { name="libfixposix-${version}"; - version="git-${src.rev}"; + version="0.4.1"; - src = fetchgit { - url = "https://github.com/sionescu/libfixposix"; - rev = "30b75609d858588ea00b427015940351896867e9"; - sha256 = "17spjz9vbgqllzlkws2abvqi0a71smhi4vgq3913aw0kq206mfxz"; + src = fetchFromGitHub { + owner = "sionescu"; + repo = "libfixposix"; + rev = "v${version}"; + sha256 = "19wjb43mn16f4lin5a2dfi3ym2hy7kqibs0z631d205b16vxas15"; }; - buildInputs = [ autoreconfHook libtool ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; meta = with stdenv.lib; { - description = "A set of workarounds for places in POSIX that get implemented differently"; - maintainers = with maintainers; - [ - raskin - ]; + homepage = https://github.com/sionescu/libfixposix; + description = "Thin wrapper over POSIX syscalls and some replacement functionality"; + license = licenses.boost; + maintainers = with maintainers; [ orivej raskin ]; platforms = platforms.linux; }; - passthru = { - updateInfo = { - downloadPage = "http://gitorious.org/libfixposix/libfixposix"; - }; - }; } diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index cf38f117bb8c..1e60a63fe06b 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { major = "0.2"; - minor = "3"; + minor = "10"; version = "${major}.${minor}"; name = "libhttpseverywhere-${version}"; src = fetchurl { url = "mirror://gnome/sources/libhttpseverywhere/${major}/libhttpseverywhere-${version}.tar.xz"; - sha256 = "0ndk6yyfcd7iwwkv4rkivhd08k0x8v03gnp9dk1ms4bxb1l2i8l1"; + sha256 = "235f5b7f96188d800470871774e31696fbde085b63f65bd71434af8e9e6ac8aa"; }; nativeBuildInputs = [ gnome3.vala valadoc gobjectIntrospection meson ninja pkgconfig ]; @@ -23,8 +23,7 @@ stdenv.mkDerivation rec { buildPhase = '' ninja - ninja devhelp - ''; + ''; installPhase = "ninja install"; diff --git a/pkgs/development/libraries/libibmad/default.nix b/pkgs/development/libraries/libibmad/default.nix index fad5c5d73f42..6a8af9ccac6d 100644 --- a/pkgs/development/libraries/libibmad/default.nix +++ b/pkgs/development/libraries/libibmad/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libibumad }: stdenv.mkDerivation rec { - name = "libibmad-1.3.12"; + name = "libibmad-1.3.13"; src = fetchurl { url = "https://www.openfabrics.org/downloads/management/${name}.tar.gz"; - sha256 = "0ywkz0rskci414r6h6jd4iz4qjbj37ga2k91z1mlj9xrnl9bbgzi"; + sha256 = "02sj8k2jpcbiq8s0l2lqk4vwji2dbb2lc730cv1yzv0zr0hxgk8p"; }; buildInputs = [ libibumad ]; diff --git a/pkgs/development/libraries/libircclient/default.nix b/pkgs/development/libraries/libircclient/default.nix index 14e41961e0a6..fef5e7278b81 100644 --- a/pkgs/development/libraries/libircclient/default.nix +++ b/pkgs/development/libraries/libircclient/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = http://www.ulduzsoft.com/libircclient/; license = licenses.lgpl3; maintainers = with maintainers; [ obadz ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libmsgpack/generic.nix b/pkgs/development/libraries/libmsgpack/generic.nix index 72943c098ba1..2da703da4cfd 100644 --- a/pkgs/development/libraries/libmsgpack/generic.nix +++ b/pkgs/development/libraries/libmsgpack/generic.nix @@ -8,7 +8,12 @@ stdenv.mkDerivation rec { inherit src patches; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; + + crossAttrs = { + } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "msvcrt") { + cmakeFlags = "-DMSGPACK_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=Windows"; + }; meta = with stdenv.lib; { description = "MessagePack implementation for C and C++"; diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix index 91195229d87a..26e754317df0 100644 --- a/pkgs/development/libraries/libp11/default.nix +++ b/pkgs/development/libraries/libp11/default.nix @@ -1,21 +1,25 @@ { stdenv, fetchFromGitHub, autoreconfHook, libtool, openssl, pkgconfig }: stdenv.mkDerivation rec { - name = "libp11-0.2.7"; + name = "libp11-${version}"; + version = "0.4.4"; src = fetchFromGitHub { owner = "OpenSC"; repo = "libp11"; rev = name; - sha256 = "0llw69kcb6nvz7zzkb9nyfyhc2s972q68sqciabqxwxljr09c411"; + sha256 = "1jnpnwipmw3skw112qff36w046nyz5amiil228rn5divpkvx4axa"; }; + makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + nativeBuildInputs = [ autoreconfHook pkgconfig libtool ]; buildInputs = [ openssl ]; - meta = { - homepage = http://www.opensc-project.org/libp11/; - license = "LGPL"; + meta = with stdenv.lib; { + homepage = https://github.com/OpenSC/libp11; + license = licenses.lgpl21Plus; description = "Small layer on top of PKCS#11 API to make PKCS#11 implementations easier"; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index a086ae890bd0..1575a60ec699 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -1,26 +1,30 @@ -{ stdenv, fetchurl, getopt }: - -let version = "2.3.1"; in +{ stdenv, fetchurl, getopt, makeWrapper }: stdenv.mkDerivation rec { name = "libseccomp-${version}"; + version = "2.3.2"; src = fetchurl { url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz"; - sha256 = "0asnlkzqms520r0dra08dzcz5hh6hs7lkajfw9wij3vrd0hxsnzz"; + sha256 = "3ddc8c037956c0a5ac19664ece4194743f59e1ccd4adde848f4f0dae7f77bca1"; }; - buildInputs = [ getopt ]; + buildInputs = [ getopt makeWrapper ]; patchPhase = '' patchShebangs . ''; + postInstall = '' + wrapProgram $out/bin/scmp_sys_resolver --prefix LD_LIBRARY_PATH ":" $out/lib + ''; + meta = with stdenv.lib; { description = "High level library for the Linux Kernel seccomp filter"; - homepage = "http://sourceforge.net/projects/libseccomp"; - license = licenses.lgpl2; + homepage = "https://github.com/seccomp/libseccomp"; + license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice wkennington ]; }; } + diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index e0ad21008046..bfe224d28cd6 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.11"; + name = "libsodium-1.0.12"; src = fetchurl { url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz"; - sha256 = "0rf7z6bgpnf8lyz8sph4h43fbb28pmj4dgybf0hsxxj97kdljid1"; + sha256 = "159givfh5jgli3cifxgssivkklfyfq6lzyjgrx8h4jx5ncdqyr5q"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index d1f2e633a0c5..9958a65d408b 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libzip-${version}"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { url = "http://www.nih.at/libzip/${name}.tar.gz"; - sha256 = "08b26qbfxq6z5xf36y1d8insm5valv83dhj933iag6man04prb2r"; + sha256 = "17vxj2ffsxwh8lkc6801ppmwj15jp8q58rin76znxfbx88789ybc"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix new file mode 100644 index 000000000000..391606d59e68 --- /dev/null +++ b/pkgs/development/libraries/liquid-dsp/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "liquid-dsp-${version}"; + version = "20170307"; + + src = fetchFromGitHub { + owner = "jgaeddert"; + repo = "liquid-dsp"; + rev = "8c1978fa4f5662b8849fe712be716958f29cec0e"; + sha256 = "0zpxvdsrw0vzzp3iaag3wh4z8ygl7fkswgjppp2fz2zhhqh93k2w"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = { + homepage = http://liquidsdr.org/; + description = "Digital signal processing library for software-defined radios"; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; + }; + +} diff --git a/pkgs/development/libraries/msilbc/default.nix b/pkgs/development/libraries/msilbc/default.nix index 1e868b79ce66..c7d65f156b8b 100644 --- a/pkgs/development/libraries/msilbc/default.nix +++ b/pkgs/development/libraries/msilbc/default.nix @@ -2,18 +2,19 @@ stdenv.mkDerivation rec { name = "msilbc-2.0.3"; - + src = fetchurl { url = "mirror://savannah/linphone/plugins/sources/${name}.tar.gz"; sha256 = "125yadpc0w1q84839dadin3ahs0gxxfas0zmc4c18mjmf58dmm7d"; }; -# patchPhase = "sed -i /MS_FILTER_SET_FMTP/d ilbc.c"; - - propagatedBuildInputs = [ilbc mediastreamer]; + propagatedBuildInputs = [ ilbc mediastreamer ]; + nativeBuildInputs = [ pkgconfig ]; - buildInputs = [pkgconfig]; - configureFlags = "ILBC_LIBS=ilbc ILBC_CFLAGS=-I${ilbc}/include"; + configureFlags = [ + "ILBC_LIBS=ilbc" "ILBC_CFLAGS=-I${ilbc}/include" + "MEDIASTREAMER_LIBS=mediastreamer" "MEDIASTREAMER_CFLAGS=-I${mediastreamer}/include" + ]; meta = { platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index aee0b3d7116c..5fb9cc36e962 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig # Optional Dependencies -, openssl ? null, libev ? null, zlib ? null, libcares ? null +, openssl ? null, libev ? null, zlib ? null, c-ares ? null , enableHpack ? false, jansson ? null , enableAsioLib ? false, boost ? null , enableGetAssets ? false, libxml2 ? null @@ -17,18 +17,18 @@ with { inherit (stdenv.lib) optional; }; stdenv.mkDerivation rec { name = "nghttp2-${version}"; - version = "1.19.0"; + version = "1.20.0"; # Don't use fetchFromGitHub since this needs a bootstrap curl src = fetchurl { url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2"; - sha256 = "477466eee27158d37b4478d9335dd091497cae4d7f2375fc6657beab67db9e7a"; + sha256 = "fb29d0500b194f11680203aed21aafab241063ec1397cc51ab5cc0957341141b"; }; outputs = [ "out" "dev" "lib" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl libev zlib libcares ] + buildInputs = [ openssl libev zlib c-ares ] ++ optional enableHpack jansson ++ optional enableAsioLib boost ++ optional enableGetAssets libxml2 @@ -36,8 +36,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + configureFlags = [ "--with-spdylay=no" "--disable-examples" "--disable-python-bindings" ] + ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib"; + + #doCheck = true; # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc + + meta = with stdenv.lib; { - homepage = http://nghttp2.org/; + homepage = https://nghttp2.org/; description = "A C implementation of HTTP/2"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 2591a43f1d47..947c0e30f993 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -19,6 +19,7 @@ let patches = (args.patches or []) + ++ [ ./nix-ssl-cert-file.patch ] ++ optional (versionOlder version "1.1.0") ./use-etc-ssl-certs.patch ++ optional stdenv.isCygwin ./1.0.1-cygwin64.patch ++ optional diff --git a/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch b/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch new file mode 100644 index 000000000000..b615f1482b7c --- /dev/null +++ b/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch @@ -0,0 +1,14 @@ +diff -ru -x '*~' openssl-1.0.2j-orig/crypto/x509/by_file.c openssl-1.0.2j/crypto/x509/by_file.c +--- openssl-1.0.2j-orig/crypto/x509/by_file.c 2016-09-26 11:49:07.000000000 +0200 ++++ openssl-1.0.2j/crypto/x509/by_file.c 2016-10-13 16:54:31.400288302 +0200 +@@ -97,7 +97,9 @@ + switch (cmd) { + case X509_L_FILE_LOAD: + if (argl == X509_FILETYPE_DEFAULT) { +- file = (char *)getenv(X509_get_default_cert_file_env()); ++ file = (char *)getenv("NIX_SSL_CERT_FILE"); ++ if (!file) ++ file = (char *)getenv(X509_get_default_cert_file_env()); + if (file) + ok = (X509_load_cert_crl_file(ctx, file, + X509_FILETYPE_PEM) != 0); diff --git a/pkgs/development/libraries/phonon/backends/gst-plugin-paths.patch b/pkgs/development/libraries/phonon/backends/gst-plugin-paths.patch new file mode 100644 index 000000000000..39c1b9c0d290 --- /dev/null +++ b/pkgs/development/libraries/phonon/backends/gst-plugin-paths.patch @@ -0,0 +1,13 @@ +Index: phonon-gstreamer-4.9.0/gstreamer/backend.cpp +=================================================================== +--- phonon-gstreamer-4.9.0.orig/gstreamer/backend.cpp ++++ phonon-gstreamer-4.9.0/gstreamer/backend.cpp +@@ -85,6 +85,8 @@ Backend::Backend(QObject *parent, const + "--gst-debug-no-color" + }; + ++ qputenv("GST_PLUGIN_PATH_1_0", GST_PLUGIN_PATH_1_0); ++ + int argc = sizeof(args) / sizeof(*args); + char **argv = const_cast<char**>(args); + GError *err = 0; diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index d8358757094d..e0f24fbc822a 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -29,15 +29,32 @@ stdenv.mkDerivation rec { sha256 = "1wc5p1rqglf0n1avp55s50k7fjdzdrhg0gind15k8796w7nfbhyf"; }; + # Hardcode paths to useful plugins so the backend doesn't depend + # on system paths being set. + patches = [ ./gst-plugin-paths.patch ]; + + NIX_CFLAGS_COMPILE = + let gstPluginPaths = + lib.makeSearchPathOutput "lib" "/lib/gstreamer-1.0" + (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gst-plugins-bad + gst-libav + ]); + in [ + # This flag should be picked up through pkgconfig, but it isn't. + "-I${gst_all_1.gstreamer.dev}/lib/gstreamer-1.0/include" + + ''-DGST_PLUGIN_PATH_1_0="${gstPluginPaths}"'' + ]; + buildInputs = with gst_all_1; [ gstreamer gst-plugins-base phonon ] ++ (if withQt5 then [ qtbase qtx11extras ] else [ qt4 ]); - NIX_CFLAGS_COMPILE = [ - # This flag should be picked up through pkgconfig, but it isn't. - "-I${gst_all_1.gstreamer.dev}/lib/gstreamer-1.0/include" - ]; - # cleanup: the build system creates (empty) $out/$out/share/icons (double prefix) # if DESTDIR is unset DESTDIR="/"; diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix index c4e7689efa29..ea04ca627284 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch - ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; + ++ lib.optionals mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; postPatch = '' diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 37b6eb7f3d3c..cc6475d31b64 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -114,9 +114,9 @@ let env = callPackage ../qt-env.nix {}; full = env "qt-${qtbase.version}" [ qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects - qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript - qtsensors qtserialport qtsvg qttools qttranslations qtwayland - qtwebchannel qtwebengine qtwebsockets qtx11extras qtxmlpatterns + qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 + qtscript qtsensors qtserialport qtsvg qttools qttranslations qtwayland + qtwebchannel qtwebengine qtwebkit qtwebsockets qtx11extras qtxmlpatterns ]; makeQtWrapper = diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix index 60a3896abafb..6f9ec5607122 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { copyPathsToStore (lib.readPathsFromFile ./. ./series) ++ [(if stdenv.isDarwin then ./cmake-paths-darwin.patch else ./cmake-paths.patch)] ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch - ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; + ++ lib.optionals mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; postPatch = '' diff --git a/pkgs/development/libraries/qt-5/5.7/default.nix b/pkgs/development/libraries/qt-5/5.7/default.nix index 85b38c6fc6ce..f387a242101b 100644 --- a/pkgs/development/libraries/qt-5/5.7/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/default.nix @@ -98,21 +98,22 @@ let env = callPackage ../qt-env.nix {}; full = env "qt-${qtbase.version}" [ - qtconnectivity qtdeclarative qtdoc qtgraphicaleffects - qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript + qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats + qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsensors qtserialport qtsvg qttools qttranslations qtwayland - qtwebsockets qtx11extras qtxmlpatterns + qtwebchannel qtwebengine qtwebkit qtwebsockets qtx11extras + qtxmlpatterns ]; makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } - ../make-qt-wrapper.sh; + (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh); qmakeHook = makeSetupHook { deps = [ self.qtbase.dev ]; } - ../qmake-hook.sh; + (if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh); }; diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths-darwin.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths-darwin.patch new file mode 100644 index 000000000000..2fda5ed8cf0c --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths-darwin.patch @@ -0,0 +1,384 @@ +Index: qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +=================================================================== +--- qtbase-opensource-src-5.7.1.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) + endif() + !!ENDIF + +-!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) +-!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +-!!ELSE +-get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH) +-# Use original install prefix when loaded through a +-# cross-prefix symbolic link such as /lib -> /usr/lib. +-get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH) +-get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH) +-if(_realCurr STREQUAL _realOrig) +- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE) +-else() +- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) +-endif() +-unset(_realOrig) +-unset(_realCurr) +-unset(_IMPORT_PREFIX) +-!!ENDIF +-!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +-get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) +-!!ELSE +-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +-!!ENDIF +- + !!IF !equals(TEMPLATE, aux) + # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. + set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)") +@@ -59,7 +35,10 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta + set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ if(NOT EXISTS \"${imported_location}\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ endif() + !!ELSE + set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ENDIF +@@ -74,45 +53,17 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta + \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" + ) + +-!!IF !isEmpty(CMAKE_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") +-!!ELSE +- set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") +-!!ENDIF +- _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) +- if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") +- set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES +- \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib} +- ) +- endif() +-!!ENDIF + endmacro() + !!ENDIF + + if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + + !!IF !no_module_headers +-!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) +- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\" +- ) +-!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) +- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" +- ) +-!!ELSE +- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") +-!!ENDIF +-!!ELSE + !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) +- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") ++ set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"@NIX_OUT@/lib\" \"@NIX_OUT@/lib/$${MODULE_INCNAME}.framework/Headers\") + !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" ++ \"\" + ) + !!ELSE + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") +@@ -128,7 +80,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") + !!ENDIF + !!ENDIF +-!!ENDIF ++ + !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) + include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) + !!ENDIF +@@ -253,28 +205,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME + + !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) + !!IF isEmpty(CMAKE_DEBUG_TYPE) +-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE +- if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE +- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) +-!!ELSE // CMAKE_STATIC_WINDOWS_BUILD + if (EXISTS + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" ++ \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" + !!ELSE + \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" + !!ENDIF + AND EXISTS + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) ++ \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) + !!ELSE + \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) + !!ENDIF + _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() + !!ENDIF // CMAKE_DEBUG_TYPE + !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD +@@ -282,36 +225,23 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME + !!ENDIF // CMAKE_RELEASE_TYPE + + !!IF !isEmpty(CMAKE_DEBUG_TYPE) +-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) +-!!ELSE + _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + + !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) + !!IF isEmpty(CMAKE_RELEASE_TYPE) +-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE +- if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE +- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" ) +-!!ELSE // CMAKE_STATIC_WINDOWS_BUILD + if (EXISTS + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" ++ \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" + !!ELSE + \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" + !!ENDIF + AND EXISTS + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) ++ \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) + !!ELSE + \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) + !!ENDIF + _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() + !!ENDIF // CMAKE_RELEASE_TYPE + !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD +@@ -328,11 +258,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME + macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) + set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + +-!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") +-!!ELSE +- set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") +-!!ENDIF ++ set(imported_location \"${PLUGIN_LOCATION}\") + _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) + set_target_properties(Qt5::${Plugin} PROPERTIES + \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} +Index: qtbase-opensource-src-5.7.1/src/gui/Qt5GuiConfigExtras.cmake.in +=================================================================== +--- qtbase-opensource-src-5.7.1.orig/src/gui/Qt5GuiConfigExtras.cmake.in ++++ qtbase-opensource-src-5.7.1/src/gui/Qt5GuiConfigExtras.cmake.in +@@ -2,7 +2,7 @@ + !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) + + !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) +-set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\") ++set(Qt5Gui_EGL_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR/QtANGLE\") + !!ELSE + set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") + !!ENDIF +@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_propert + set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ELSE + set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ENDIF + + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") ++ set(imported_implib \"@NIX_DEV@/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + !!ELSE + set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + !!ENDIF +Index: qtbase-opensource-src-5.7.1/src/widgets/Qt5WidgetsConfigExtras.cmake.in +=================================================================== +--- qtbase-opensource-src-5.7.1.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in ++++ qtbase-opensource-src-5.7.1/src/widgets/Qt5WidgetsConfigExtras.cmake.in +@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) + add_executable(Qt5::uic IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") + !!ENDIF +Index: qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtras.cmake.in +=================================================================== +--- qtbase-opensource-src-5.7.1.orig/src/corelib/Qt5CoreConfigExtras.cmake.in ++++ qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtras.cmake.in +@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) + add_executable(Qt5::qmake IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) + add_executable(Qt5::moc IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc) + add_executable(Qt5::rcc IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -131,7 +131,7 @@ if (NOT TARGET Qt5::WinMain) + !!IF !isEmpty(CMAKE_RELEASE_TYPE) + set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ENDIF +@@ -145,7 +145,7 @@ if (NOT TARGET Qt5::WinMain) + set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ENDIF +Index: qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +=================================================================== +--- qtbase-opensource-src-5.7.1.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in ++++ qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +@@ -1,6 +1,6 @@ + + !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) +-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") ++set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +Index: qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +=================================================================== +--- qtbase-opensource-src-5.7.1.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in ++++ qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +@@ -1,6 +1,6 @@ + + !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) +-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") ++set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +Index: qtbase-opensource-src-5.7.1/src/dbus/Qt5DBusConfigExtras.cmake.in +=================================================================== +--- qtbase-opensource-src-5.7.1.orig/src/dbus/Qt5DBusConfigExtras.cmake.in ++++ qtbase-opensource-src-5.7.1/src/dbus/Qt5DBusConfigExtras.cmake.in +@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) + add_executable(Qt5::qdbuscpp2xml IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp) + add_executable(Qt5::qdbusxml2cpp IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") + !!ENDIF +Index: qtbase-opensource-src-5.7.1/mkspecs/features/create_cmake.prf +=================================================================== +--- qtbase-opensource-src-5.7.1.orig/mkspecs/features/create_cmake.prf ++++ qtbase-opensource-src-5.7.1/mkspecs/features/create_cmake.prf +@@ -136,28 +136,28 @@ contains(CONFIG, plugin) { + + win32 { + isEmpty(CMAKE_STATIC_TYPE) { +- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.dll +- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.dll ++ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.dll ++ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.dll + } else:mingw { +- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}.a +- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}d.a ++ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}/$$PLUGIN_TYPE/lib$${TARGET}.a ++ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}d.a + } else { # MSVC static +- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.lib +- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.lib ++ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.lib ++ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.lib + } + } else { + mac { + isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib + else: CMAKE_PlUGIN_EXT = .a + +- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} +- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} ++ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} ++ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} + } else { + isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .so + else: CMAKE_PlUGIN_EXT = .a + +- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} +- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} ++ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} ++ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} + } + } + cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in +Index: qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +=================================================================== +--- qtbase-opensource-src-5.7.1.orig/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in ++++ qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +@@ -2,10 +2,10 @@ + add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED) + + !!IF !isEmpty(CMAKE_RELEASE_TYPE) +-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\") ++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_RELEASE}\") + !!ENDIF + !!IF !isEmpty(CMAKE_DEBUG_TYPE) +-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\") ++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\") + !!ENDIF + + list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix index 73df6726f4a7..4bf16004ce51 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix @@ -4,6 +4,7 @@ coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2, ruby, + darwin, libiconv, dbus, fontconfig, freetype, glib, gtk3, harfbuzz, icu, libX11, libXcomposite, libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff, @@ -15,7 +16,8 @@ cups ? null, mysql ? null, postgresql ? null, # options - mesaSupported, mesa, + mesaSupported ? (!stdenv.isDarwin), + mesa, buildExamples ? false, buildTests ? false, developerBuild ? false, @@ -35,8 +37,9 @@ stdenv.mkDerivation { patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) + ++ [(if stdenv.isDarwin then ./cmake-paths-darwin.patch else ./cmake-paths.patch)] ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch - ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; + ++ lib.optionals mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; postPatch = '' @@ -54,11 +57,11 @@ stdenv.mkDerivation { substituteInPlace src/network/kernel/qhostinfo_unix.cpp \ --replace "@glibc@" "${stdenv.cc.libc.out}" - substituteInPlace src/plugins/platforms/xcb/qxcbcursor.cpp \ - --replace "@libXcursor@" "${libXcursor.out}" - substituteInPlace src/network/ssl/qsslsocket_openssl_symbols.cpp \ --replace "@openssl@" "${openssl.out}" + '' + lib.optionalString stdenv.isLinux '' + substituteInPlace src/plugins/platforms/xcb/qxcbcursor.cpp \ + --replace "@libXcursor@" "${libXcursor.out}" substituteInPlace src/dbus/qdbus_symbols.cpp \ --replace "@dbus_libs@" "${dbus.lib}" @@ -74,8 +77,23 @@ stdenv.mkDerivation { substituteInPlace mkspecs/common/linux.conf \ --replace "@mesa_lib@" "${mesa.out}" \ --replace "@mesa_inc@" "${mesa.dev or mesa}" - ''; - + ''+ lib.optionalString stdenv.isDarwin '' + sed -i \ + -e 's|! /usr/bin/xcode-select --print-path >/dev/null 2>&1;|false;|' \ + -e 's|! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1;|false;|' \ + -e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot="${darwin.apple_sdk.sdk}"|' \ + -e 's|QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`|QMAKE_CXX="clang++"\nQMAKE_CONF_COMPILER="clang++"|' \ + -e 's|XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`|XCRUN="clang -v 2>&1"|' \ + -e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \ + -e 's#val=$(echo $sdk_val $(echo $val | cut -s -d \x27 \x27 -f 2-))##' \ + ./configure + sed -i '3,$d' ./mkspecs/features/mac/default_pre.prf + sed -i '26,$d' ./mkspecs/features/mac/default_post.prf + sed -i '1,$d' ./mkspecs/features/mac/sdk.prf + sed 's/QMAKE_LFLAGS_RPATH = -Wl,-rpath,/QMAKE_LFLAGS_RPATH =/' -i ./mkspecs/common/mac.conf + ''; + # Note on the above: \x27 is a way if including a single-quote + # character in the sed string arguments. setOutputFlags = false; preConfigure = '' @@ -103,7 +121,6 @@ stdenv.mkDerivation { ${lib.optionalString developerBuild "-developer-build"} -largefile -accessibility - -rpath -optimized-qmake -strip -no-reduce-relocations @@ -117,15 +134,6 @@ stdenv.mkDerivation { -iconv -icu -pch - -glib - -xcb - -qpa xcb - -${lib.optionalString (cups == null) "no-"}cups - - -no-eglfs - -no-directfb - -no-linuxfb - -no-kms ${lib.optionalString (!system-x86_64) "-no-sse2"} -no-sse3 @@ -141,13 +149,8 @@ stdenv.mkDerivation { -system-libpng -system-libjpeg -system-harfbuzz - -system-xcb - -system-xkbcommon -system-pcre -openssl-linked - -dbus-linked - -libinput - -gtk -system-sqlite -${if mysql != null then "plugin" else "no"}-sql-mysql @@ -158,7 +161,30 @@ stdenv.mkDerivation { -${lib.optionalString (buildExamples == false) "no"}make examples -${lib.optionalString (buildTests == false) "no"}make tests -v - ''; + '' + lib.optionalString (!stdenv.isDarwin) '' + -no-rpath + -glib + -xcb + -qpa xcb + + -${lib.optionalString (cups == null) "no-"}cups + + -no-eglfs + -no-directfb + -no-linuxfb + -no-kms + + -libinput + -gtk + -system-xcb + -system-xkbcommon + -dbus-linked + '' + lib.optionalString stdenv.isDarwin '' + -platform macx-clang + -no-use-gold-linker + -no-fontconfig + -qt-freetype + ''; # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag # if dependency paths contain the string "pq", which can occur in the hash. @@ -166,32 +192,44 @@ stdenv.mkDerivation { PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq"; propagatedBuildInputs = [ - dbus glib libxml2 libxslt openssl pcre16 sqlite udev zlib + libxml2 libxslt openssl pcre16 sqlite zlib + + # Text rendering + harfbuzz icu # Image formats libjpeg libpng libtiff + ] + ++ lib.optional mesaSupported mesa + ++ lib.optionals (!stdenv.isDarwin) [ + dbus glib udev # Text rendering - fontconfig freetype harfbuzz icu + fontconfig freetype # X11 libs libX11 libXcomposite libXext libXi libXrender libxcb libxkbcommon xcbutil xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm - ] - ++ lib.optional mesaSupported mesa; + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ApplicationServices CoreServices AppKit Carbon OpenGL AGL Cocoa + DiskArbitration darwin.cf-private libiconv darwin.apple_sdk.sdk + ]); - buildInputs = - [ gtk3 libinput ] + buildInputs = [ ] + ++ lib.optionals (!stdenv.isDarwin) [ gtk3 libinput ] ++ lib.optional developerBuild gdb ++ lib.optional (cups != null) cups ++ lib.optional (mysql != null) mysql.lib ++ lib.optional (postgresql != null) postgresql; - nativeBuildInputs = - [ bison flex gperf lndir patchelf perl pkgconfig python2 ]; + nativeBuildInputs = [ bison flex gperf lndir perl pkgconfig python2 ] ++ lib.optional (!stdenv.isDarwin) patchelf; # freetype-2.5.4 changed signedness of some struct fields - NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; + NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare" + + lib.optionalString stdenv.isDarwin " -D__MAC_OS_X_VERSION_MAX_ALLOWED=1090 -D__AVAILABILITY_INTERNAL__MAC_10_10=__attribute__((availability(macosx,introduced=10.10)))"; + # Note that nixpkgs's objc4 is from macOS 10.11 while the SDK is + # 10.9 which necessitates the above macro definition that mentions + # 10.10 postInstall = '' find "$out" -name "*.cmake" | while read file; do @@ -221,7 +259,7 @@ stdenv.mkDerivation { # Move libtool archives and qmake projects if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then pushd "''${!outputLib}" - find lib -name '*.a' -o -name '*.la' -o -name '*.prl' | \ + find lib -name '*.a' -o -name '*.la'${if stdenv.isDarwin then "" else "-o -name '*.prl'"} | \ while read -r file; do mkdir -p "''${!outputDev}/$(dirname "$file")" mv "''${!outputLib}/$file" "''${!outputDev}/$file" @@ -258,7 +296,9 @@ stdenv.mkDerivation { ''; inherit lndir; - setupHook = ../../qtbase-setup-hook.sh; + setupHook = if stdenv.isDarwin + then ../../qtbase-setup-hook-darwin.sh + else ../../qtbase-setup-hook.sh; enableParallelBuilding = true; @@ -267,7 +307,7 @@ stdenv.mkDerivation { description = "A cross-platform application framework for C++"; license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; maintainers = with maintainers; [ bbenoist qknight ttuegel ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/series b/pkgs/development/libraries/qt-5/5.7/qtbase/series index 44e2d9040807..2196d8383752 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/series +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/series @@ -7,4 +7,3 @@ xdg-config-dirs.patch nix-profiles-library-paths.patch compose-search-path.patch libressl.patch -cmake-paths.patch diff --git a/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix index 7c1cc5da07e3..a48dd38ae6d2 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix @@ -1,4 +1,4 @@ -{ qtSubmodule, qtbase, qtdeclarative, pkgconfig +{ stdenv, qtSubmodule, qtbase, qtdeclarative, pkgconfig , alsaLib, gstreamer, gst-plugins-base, libpulseaudio }: @@ -6,7 +6,7 @@ qtSubmodule { name = "qtmultimedia"; qtInputs = [ qtbase qtdeclarative ]; buildInputs = [ - pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio - ]; + pkgconfig gstreamer gst-plugins-base libpulseaudio + ] ++ stdenv.lib.optional stdenv.isLinux alsaLib; qmakeFlags = [ "GST_VERSION=1.0" ]; } diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix index a48c5dbb07a9..280d1f9c50b4 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch - ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; + ++ lib.optionals mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; postPatch = '' diff --git a/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh b/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh index 977c859e76d3..aa2d24a741ca 100644 --- a/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh +++ b/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh @@ -135,10 +135,14 @@ qt5LinkModuleDir() { qt5LinkDarwinModuleLibDir() { for fw in $(find "$1"/lib -maxdepth 1 -name '*.framework'); do + if [ ! -L "$fw" ]; then ln -s "$fw" "$NIX_QT5_TMP"/lib + fi done for file in $(find "$1"/lib -maxdepth 1 -type f); do + if [ ! -L "$file" ]; then ln -s "$file" "$NIX_QT5_TMP"/lib + fi done for dir in $(find "$1"/lib -maxdepth 1 -mindepth 1 -type d ! -name '*.framework'); do mkdir -p "$NIX_QT5_TMP"/lib/$(basename "$dir") @@ -178,4 +182,3 @@ _qtFixCMakePaths() { if [ -n "$NIX_QT_SUBMODULE" ]; then postInstallHooks+=(_qtFixCMakePaths) fi - diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix new file mode 100644 index 000000000000..529dee9376a9 --- /dev/null +++ b/pkgs/development/libraries/shapelib/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, proj }: + +stdenv.mkDerivation rec { + name = "shapelib-1.4.0"; + + src = fetchurl { + url = "https://download.osgeo.org/shapelib/${name}.tar.gz"; + sha256 = "18d7j5pn5srika7q3f90j0l2l4526xsjd64pin6z2b0gd7rdbp9y"; + }; + + buildInputs = [ proj ]; + + meta = with stdenv.lib; { + description = "C Library for reading, writing and updating ESRI Shapefiles"; + homepage = http://shapelib.maptools.org/; + license = licenses.gpl2; + maintainers = [ maintainers.ehmry ]; + }; +} diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 325d665aaf65..240de378afc7 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; let inherit (python2Packages) python pygtk; in stdenv.mkDerivation rec { - name = "spice-gtk-0.32"; + name = "spice-gtk-0.33"; src = fetchurl { url = "http://www.spice-space.org/download/gtk/${name}.tar.bz2"; - sha256 = "00pf94xh2xf0h1g13lnavxrysd0d0x22l5jl108cvq1mjc4z8j2c"; + sha256 = "0fdgx9k4vgmasp8i2n0swrkapq8f212igcg7wsgvr3mbhsvk7bvx"; }; buildInputs = [ diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix new file mode 100644 index 000000000000..fdf882ce817e --- /dev/null +++ b/pkgs/development/libraries/umockdev/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, autoreconfHook +, pkgconfig, glib, systemd, libgudev, vala }: + +stdenv.mkDerivation rec { + name = "umockdev"; + version = "0.8.13"; + + src = fetchFromGitHub { + owner = "martinpitt"; + repo = "umockdev"; + rev = version; + sha256 ="0bw2dpshlgbdwg5mhq4j22z474llpqix8pxii63r2bk5nhjc537k"; + }; + + buildInputs = [ glib systemd libgudev vala ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + ### docs/gtk-doc.make not found + prePatch = '' + sed -i 's|include $(top_srcdir)/docs/gtk-doc.make||g' docs/reference/Makefile.am + sed -i 's|+=|=|g' docs/reference/Makefile.am + ''; + + meta = with stdenv.lib; { + description = "Mock hardware devices for creating unit tests"; + license = licenses.lgpl2; + maintainers = [ maintainers.ndowens ]; + }; +} diff --git a/pkgs/development/libraries/urt/default.nix b/pkgs/development/libraries/urt/default.nix deleted file mode 100644 index 090ca28d7c45..000000000000 --- a/pkgs/development/libraries/urt/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{stdenv, fetchurl, ncompress}: - -stdenv.mkDerivation rec { - name = "urt-${version}"; - version = "3.1b"; - - src = fetchurl { - url = ftp://ftp.iastate.edu/pub/utah-raster/urt-3.1b.tar.Z; - sha256 = "0hbb3avgvkfb2cksqn6cmmgcr0278nb2qd1srayqx0876pq6g2vd"; - }; - - buildInputs = [ ncompress ]; - - unpackPhase = '' - mkdir urt - tar xvf "$src" -C urt - ''; - patchFlags = "-p0 -d urt"; - patches = [ ./urt-3.1b-build-fixes.patch ./urt-3.1b-compile-updates.patch - ./urt-3.1b-make.patch ./urt-3.1b-rle-fixes.patch ./urt-3.1b-tempfile.patch ]; - postPatch = '' - cd urt - - rm bin/README - rm man/man1/template.1 - - # stupid OS X declares a stack_t type already - sed -i -e 's:stack_t:_urt_stack:g' tools/clock/rleClock.c - - sed -i -e '/^CFLAGS/s: -O : :' makefile.hdr - - cp "${./gentoo-config}" config/gentoo - ''; - configurePhase = '' - ./Configure config/gentoo - ''; - postInstall = '' - mkdir -p $out/bin - cp bin/* $out/bin - - mkdir -p $out/lib - cp lib/librle.a $out/lib - - mkdir -p $out/include - cp include/rle*.h $out/include - - mkdir -p $out/share/man/man1 - cp man/man1/*.1 $out/share/man/man1 - - mkdir -p $out/share/man/man3 - cp man/man3/*.3 $out/share/man/man3 - - mkdir -p $out/share/man/man5 - cp man/man5/*.5 $out/share/man/man5 - ''; - - meta = { - homepage = http://www.cs.utah.edu/gdc/projects/urt/; - description = "A library for dealing with raster images"; - }; -} \ No newline at end of file diff --git a/pkgs/development/libraries/urt/gentoo-config b/pkgs/development/libraries/urt/gentoo-config deleted file mode 100644 index a2d9ec3faf2f..000000000000 --- a/pkgs/development/libraries/urt/gentoo-config +++ /dev/null @@ -1,52 +0,0 @@ -#define ABEKASA60 -#define ABEKASA62 -#define ALIAS -##define CGM -#define CUBICOMP -##define DVIRLE -#define GRAYFILES -#define MACPAINT -##define PBMPLUS -##define SUNRASTER -#define TARGA -#define VICAR -#define WASATCH -#define WAVEFRONT - -#define GCC - -#define CONST_DECL -#define NO_MAKE_MAKEFILE -#define USE_TIME_H -#define SYS_V_SETPGRP -#define USE_PROTOTYPES -#define USE_RANDOM -#define USE_STDARG -#define USE_STDLIB_H -#define USE_UNISTD_H -#define USE_STRING_H -#define VOID_STAR -#define USE_XLIBINT_H -#define X_SHARED_MEMORY - -#defpath DEST bin -#defpath RI include -#defpath RL lib - -ROFF = nroff -ROFFOPT = -man -ROFFPIPE = | lpr - -INCTIFF = -LIBTIFF = -ltiff -INCX11 = -LIBX11 = -lX11 - -# Most people have migrated X11 to /usr/lib, but just in case ... -check_x11=$(shell \ - echo 'int main(){}' > test.c ; \ - if ! $(CC) test.c -lX11 -o .urt-x11-test 2>/dev/null ; then \ - echo "-L/usr/X11R6/lib" ; \ - fi ; \ - rm -f .urt-x11-test test.c) -LIBX11 += $(call check_x11) diff --git a/pkgs/development/libraries/urt/urt-3.1b-build-fixes.patch b/pkgs/development/libraries/urt/urt-3.1b-build-fixes.patch deleted file mode 100644 index fc2bacddb30c..000000000000 --- a/pkgs/development/libraries/urt/urt-3.1b-build-fixes.patch +++ /dev/null @@ -1,151 +0,0 @@ -some hosts are more anal about ar usage than others -http://bugs.gentoo.org/107428 - -respect user LDFLAGS -http://bugs.gentoo.org/126872 - ---- lib/makefile.src -+++ lib/makefile.src -@@ -181,8 +181,7 @@ - # Rebuild the library from all the .o files. - buildlib: $(OBJS) - -rm -f $(LIBNAME) -- ar rc $(LIBNAME) -- ar q $(LIBNAME) $(OBJS) -+ ar rc $(LIBNAME) $(OBJS) - #ifndef NO_RANLIB - ranlib $(LIBNAME) - #endif ---- tools/clock/makefile.src -+++ tools/clock/makefile.src -@@ -6,7 +6,7 @@ install: rleClock - mv rleClock ../rleClock.out - - rleClock:rleClock.o font.o -- ${CC} ${CFLAGS} rleClock.o font.o -lm ${LIBS} -o rleClock -+ ${CC} ${CFLAGS} ${LDFLAGS} rleClock.o font.o ${LIBS} -o rleClock -lm - - font.c:font.src makeFont - chmod +x makeFont ---- tools/makefile.src -+++ tools/makefile.src -@@ -62,21 +62,21 @@ applymap.out rlebg.out: $(RI)/rle_raw.h - pyrlib.o: pyrlib.c $(RI)/pyramid.h $(RI)/rle.h $(RI)/rle_config.h - $(CC) $(CFLAGS) pyrlib.c -c - pyrmask.out: pyrlib.o pyrmask.c $(RI)/pyramid.h -- $(CC) $(CFLAGS) -I$(RI) pyrmask.c pyrlib.o $(LIBS) -lm -o pyrmask.new -+ $(CC) $(LDFLAGS) $(CFLAGS) -I$(RI) pyrmask.c pyrlib.o $(LIBS) -lm -o pyrmask.new - mv pyrmask.new pyrmask.out - - fant.out: fant.o mallocNd.o -- $(CC) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new -+ $(CC) $(LDFLAGS) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new - mv fant.new fant.out - - # rlebox and crop use some common code. - rle_box.o: $(RI)/rle.h $(RI)/rle_config.h $(RI)/rle_raw.h - - crop.out: crop.c rle_box.o -- ${CC} ${CFLAGS} crop.c rle_box.o ${LIBS} -o crop.new -+ ${CC} ${LDFLAGS} ${CFLAGS} crop.c rle_box.o ${LIBS} -o crop.new - mv crop.new crop.out - rlebox.out: rlebox.c rle_box.o -- ${CC} ${CFLAGS} rlebox.c rle_box.o ${LIBS} -o rlebox.new -+ ${CC} ${LDFLAGS} ${CFLAGS} rlebox.c rle_box.o ${LIBS} -o rlebox.new - mv rlebox.new rlebox.out - - # rleClock has it's own directory, must be built special -@@ -100,7 +100,7 @@ clean: clean-pgm - .SUFFIXES: - .SUFFIXES: .out .c .o - .c.out: -- $(CC) $(CFLAGS) $< $(LIBS) -lm -o $*.new -+ $(CC) $(LDFLAGS) $(CFLAGS) $< $(LIBS) -lm -o $*.new - mv $*.new $@ - - .c.o: ---- cnv/makefile.src -+++ cnv/makefile.src -@@ -76,13 +76,13 @@ PBMDIR = - # ppmtorle - ppm format to RLE - # rletoppm - RLE to ppm format - pgmtorle.out: pgmtorle.c -- $(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new - mv $*.new $@ - ppmtorle.out: ppmtorle.c -- $(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new - mv $*.new $@ - rletoppm.out: rletoppm.c -- $(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new - mv $*.new $@ - #endif - -@@ -95,10 +95,10 @@ rletoppm.out: rletoppm.c - # iristorle/rletoiris - Convert between RLE and SGI image format. - # - iristorle.out: iristorle.c -- $(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new - mv $*.new $@ - rletoiris.out: rletoiris.c -- $(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new - mv $*.new $@ - #endif - -@@ -108,10 +108,10 @@ TIFFDIR = - # tifftorle - Convert TIFF images to RLE - # rletotiff - Convert RLE images to TIFF - rletotiff.out: rletotiff.c -- $(CC) $(CFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new - mv $*.new $@ - tifftorle.out: tifftorle.c -- $(CC) $(CFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new - mv $*.new $@ - #endif - -@@ -125,7 +125,7 @@ tifftorle.out: tifftorle.c - # Will build with the default rule. - # rletorla - RLE to Wavefront RLA - rletorla.out: rletorla.c -- $(CC) $(CFLAGS) $*.c $(LIBS) $(LIBWAVEFRONT) -lm -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBS) $(LIBWAVEFRONT) -lm -o $*.new - mv $*.new $@ - #endif WAVEFRONT - -@@ -144,7 +144,7 @@ pristine: pristine-pgm - .SUFFIXES: - .SUFFIXES: .out .c - .c.out: -- $(CC) $(CFLAGS) $*.c $(LIBS) -lm -o $*.new -+ $(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBS) -lm -o $*.new - mv $*.new $@ - - # Dependency lines. Make sure to #ifdef them. ---- cnv/rletoabA62/makefile.src -+++ cnv/rletoabA62/makefile.src -@@ -15,7 +15,7 @@ all : $(PGMS) - # Executables. The .out will be stripped off in the install action. - - rletoabA62.out : rletoabA62.o rle.o -- $(CC) $(CFLAGS) -o rletoabA62.new \ -+ $(CC) $(CFLAGS) $(LDFLAGS) -o rletoabA62.new \ - rletoabA62.o rle.o $(LIBS) - mv rletoabA62.new rletoabA62.out - ---- cnv/rletogif/makefile.src -+++ cnv/rletogif/makefile.src -@@ -15,7 +15,7 @@ all: $(PGMS) - # The executable. The ".out" will be stripped off in the install action. - - rletogif.out: ${OBJ} -- ${CC} ${CFLAGS} ${OBJ} ${LIBS} -o rletogif.new -+ ${CC} ${CFLAGS} ${LDFLAGS} ${OBJ} ${LIBS} -o rletogif.new - mv rletogif.new rletogif.out - - # Incremental install, copies executable to DEST dir. diff --git a/pkgs/development/libraries/urt/urt-3.1b-compile-updates.patch b/pkgs/development/libraries/urt/urt-3.1b-compile-updates.patch deleted file mode 100644 index 105f7c41f6a7..000000000000 --- a/pkgs/development/libraries/urt/urt-3.1b-compile-updates.patch +++ /dev/null @@ -1,141 +0,0 @@ ---- get/getx11/XGetHClrs.c -+++ get/getx11/XGetHClrs.c -@@ -1,5 +1,4 @@ - #ifndef XLIBINT_H_NOT_AVAILABLE --#include <X11/copyright.h> - - /* $XConsortium: XGetHClrs.c,v 11.10 88/09/06 16:07:50 martin Exp $ */ - /* Copyright Massachusetts Institute of Technology 1986 */ ---- tools/mallocNd.c -+++ tools/mallocNd.c -@@ -67,7 +67,7 @@ - - /* Imports */ - #include <stdio.h> --extern char *malloc(); -+#include <string.h> - - /* Forward declarations */ - char *BuildIndirectionTable(); ---- tools/into.c -+++ tools/into.c -@@ -40,8 +40,8 @@ - static char buf[MAXPATHLEN+1]; - short forceflg; /* overwrite an unwritable file? */ - --extern int errno; --extern char *sys_errlist[]; -+#include <errno.h> -+#include <string.h> - - void - main(argc, argv) -@@ -103,7 +103,7 @@ - if (ferror(outf)) - { - fprintf(stderr, "into: %s, \"%s\" not modified\n", -- sys_errlist[errno], argv[1]); -+ strerror(errno), argv[1]); - unlink(buf); - exit(1); - } ---- cnv/tex/dvirle2.c -+++ cnv/tex/dvirle2.c -@@ -55,7 +55,6 @@ - void DumpTopOfBand(), MoveDown(), WriteBuf(), WriteBlanks(); - - char *ProgName; --extern int errno; - extern char *optarg; - extern int optind; - ---- cnv/wasatchrle.c -+++ cnv/wasatchrle.c -@@ -32,7 +32,6 @@ - #include <errno.h> - #include "rle.h" - --extern int errno; - - /* "short" in our world is 16 bits. Beware of swyte-bopping. */ - ---- get/getx11/x11_stuff.c -+++ get/getx11/x11_stuff.c -@@ -155,7 +155,6 @@ - IPC_CREAT|0777 ); - if ( img->shm_img.shmid < 0 ) - { -- extern int errno; - if ( errno == ENOSPC ) - { - if ( !no_shared_space ) -@@ -361,7 +360,6 @@ Boolean reallocate; - XDestroyImage( image ); - if ( img->shm_pix.shmid < 0 ) - { -- extern int errno; - if ( errno == ENOSPC ) - { - if ( !no_shared_space ) ---- get/qcr/qcr.h -+++ get/qcr/qcr.h -@@ -6,8 +6,6 @@ - #define GREEN 1 - #define BLUE 2 - --extern int errno; -- - /* Command defs for QCR-Z Film Recorder */ - - /* These are for 8 bit Look Up Tables */ ---- get/gettaac.c -+++ get/gettaac.c -@@ -24,6 +24,7 @@ - * Send bug fixes and improvements to: ksp@maxwell.nde.swri.edu - */ - -+#include <errno.h> - #include <stdio.h> - #include <strings.h> - #include <signal.h> -@@ -459,7 +460,6 @@ char *template; - char nonUnique; - char twiddleUserCompletion; - -- extern int errno; - struct direct *nameEntry; - DIR *dirChan; - struct passwd *pwdEntry; ---- tools/clock/rleClock.c -+++ tools/clock/rleClock.c -@@ -598,7 +598,7 @@ - { TRUE, "-tf", STRING, "Text area format string", (char *)&FormatString }, - { FALSE, "-Xm", BOOL, "Output the alpha channel on RGB", (char *)&DebugAlpha }, - { FALSE, "-D", BOOL, "Turn on debugging", (char *)&Debug }, -- NULL -+ { FALSE, NULL } - }; - - void ---- tools/to8.c -+++ tools/to8.c -@@ -175,7 +175,7 @@ - * Give it a background color of black, since the real background - * will be dithered anyway. - */ -- if ( in_hdr.background != NULL ) -+ if ( in_hdr.background != 0 ) - { - out_hdr.bg_color = (int *)malloc( sizeof( int ) ); - RLE_CHECK_ALLOC( cmd_name( argv ), out_hdr.bg_color, 0 ); ---- cnv/rletoabA62/rletoabA62.c -+++ cnv/rletoabA62/rletoabA62.c -@@ -157,7 +157,7 @@ - exit(1); - } - if (optind < argc) { -- if ((file = open(argv[optind], 0)) == NULL) { -+ if ((file = open(argv[optind], 0)) == -1) { - perror(argv[optind]); - exit(1); - } diff --git a/pkgs/development/libraries/urt/urt-3.1b-make.patch b/pkgs/development/libraries/urt/urt-3.1b-make.patch deleted file mode 100644 index 310675dd395d..000000000000 --- a/pkgs/development/libraries/urt/urt-3.1b-make.patch +++ /dev/null @@ -1,75 +0,0 @@ -Index: makefile.src -=================================================================== ---- makefile.src -+++ makefile.src -@@ -17,7 +17,7 @@ all: default - # clean deletes all but source, pristine (below) deletes installed stuff, too - default clean: doit - @for d in $(DIRS) ; do \ -- ( cd $$d ; echo make $@ on $$d ; make $(MFLAGS) $@ ) ; \ -+ ( cd $$d ; echo $(MAKE) $@ on $$d ; $(MAKE) $(MFLAGS) $@ ) ; \ - done - - # install puts library, binaries and documentation into global location -@@ -29,7 +29,7 @@ MAKE_TARGET = - - install $(MAKE_TARGET) pristine depend:: doit - @for d in $(ALLDIRS) ; do \ -- ( cd $$d ; echo make $@ on $$d ; make $(MFLAGS) $@ ) ; \ -+ ( cd $$d ; echo $(MAKE) $@ on $$d ; $(MAKE) $(MFLAGS) $@ ) ; \ - done - - -Index: tools/makefile.src -=================================================================== ---- tools/makefile.src -+++ tools/makefile.src -@@ -82,7 +82,7 @@ rlebox.out: rlebox.c rle_box.o - # rleClock has it's own directory, must be built special - - rleClock.out: clock/font.c clock/font.h clock/font.src clock/rleClock.c -- (cd clock ; make) -+ (cd clock ; $(MAKE)) - - # Incremental install, copies everything ("$?") since last install to DEST dir. - install: $(PGMS) install-pgm -Index: makefile.tlr -=================================================================== ---- makefile.tlr -+++ makefile.tlr -@@ -7,7 +7,7 @@ subdirs: - @sh -c "if test 'x$(DIRS)' != x ; then eval \ - 'set -e ; for dir in $(DIRS) ; do \ - (cd \$$dir ; echo Make ${HERE}\$$dir ; \ -- make $(MFLAGS) $(DIRMFLAGS) ) ; \ -+ $(MAKE) $(MFLAGS) $(DIRMFLAGS) ) ; \ - done' ; \ - else \ - true ; \ -@@ -46,7 +46,7 @@ install-subdirs: subdirs - @sh -c "if test 'x$(DIRS)' != x ; then eval \ - 'for dir in $(DIRS) ; do \ - (cd \$$dir ; echo Install ${HERE}\$$dir ; \ -- make $(MFLAGS) $(DIRMFLAGS) install) ; \ -+ $(MAKE) $(MFLAGS) $(DIRMFLAGS) install) ; \ - done' ; \ - else \ - true ; \ -@@ -105,7 +105,7 @@ pristine-pgm: clean-pgm - 'for dir in $(ALLDIRS); do \ - if test -d $$dir ; then \ - (cd $$dir; echo Make ${HERE}$$dir pristine ; \ -- make $(MFLAGS) pristine); \ -+ $(MAKE) $(MFLAGS) pristine); \ - else \ - true; \ - fi; \ -@@ -124,7 +124,7 @@ clean-pgm: - 'for dir in $(ALLDIRS); do \ - if test -d $$dir ; then \ - (cd $$dir; echo Clean ${HERE}$$dir ; \ -- make $(MFLAGS) clean); \ -+ $(MAKE) $(MFLAGS) clean); \ - else \ - true; \ - fi; \ diff --git a/pkgs/development/libraries/urt/urt-3.1b-rle-fixes.patch b/pkgs/development/libraries/urt/urt-3.1b-rle-fixes.patch deleted file mode 100644 index 3720806960fe..000000000000 --- a/pkgs/development/libraries/urt/urt-3.1b-rle-fixes.patch +++ /dev/null @@ -1,203 +0,0 @@ -Fixes taken from netpbm - ---- lib/rle_global.c -+++ lib/rle_global.c -@@ -76,7 +76,7 @@ rle_hdr rle_dflt_hdr = { - 8, /* cmaplen (log2 of length of color map) */ - NULL, /* pointer to color map */ - NULL, /* pointer to comment strings */ -- stdout, /* output file */ -+ NULL, /* output file -- must be set dynamically */ - { 7 }, /* RGB channels only */ - 0L, /* Can't free name and file fields. */ - "Urt", /* Default "program name". */ ---- lib/rle_hdr.c -+++ lib/rle_hdr.c -@@ -269,6 +273,9 @@ - { - rle_hdr *ret_hdr; - -+ rle_dflt_hdr.rle_file = stdout; -+ /* The rest of rle_dflt_hdr is set by the loader's data initialization */ -+ - if ( the_hdr == &rle_dflt_hdr ) - return the_hdr; - ---- lib/dither.c -+++ lib/dither.c -@@ -38,10 +38,10 @@ void make_square(); - #endif - - static int magic4x4[4][4] = { -- 0, 14, 3, 13, -- 11, 5, 8, 6, -- 12, 2, 15, 1, -- 7, 9, 4, 10 -+{ 0, 14, 3, 13}, -+{ 11, 5, 8, 6}, -+{ 12, 2, 15, 1}, -+{ 7, 9, 4, 10} - }; - - /* basic dithering macro */ ---- lib/rle_open_f.c -+++ lib/rle_open_f.c -@@ -9,7 +9,11 @@ - */ - - #include "rle_config.h" -+#define _XOPEN_SOURCE /* Make sure fdopen() is in stdio.h */ -+ - #include <stdio.h> -+#include <unistd.h> -+#include <fcntl.h> - - #ifndef NO_OPEN_PIPES - /* Need to have a SIGCLD signal catcher. */ -@@ -260,7 +260,6 @@ - int pipefd[2]; - int i; - char *argv[4]; -- extern int errno; - - /* Check args. */ - if ( *mode != 'r' && *mode != 'w' ) ---- lib/rle_getcom.c -+++ lib/rle_getcom.c -@@ -53,11 +53,12 @@ - { - for ( ; *n != '\0' && *n != '=' && *n == *v; n++, v++ ) - ; -- if (*n == '\0' || *n == '=') -+ if (*n == '\0' || *n == '=') { - if ( *v == '\0' ) - return v; - else if ( *v == '=' ) - return ++v; -+ } - - return NULL; - } ---- lib/scanargs.c -+++ lib/scanargs.c -@@ -128,10 +130,10 @@ - va_list argl; - { - -- register check; /* check counter to be sure all argvs -+ int check; /* check counter to be sure all argvs - are processed */ - register CONST_DECL char *cp; -- register cnt; -+ int cnt; - int optarg = 0; /* where optional args start */ - int nopt = 0; - char tmpflg, /* temp flag */ -@@ -375,11 +377,12 @@ - if ( optarg > 0 ) /* end optional args? */ - { - /* Eat the arg, too, if necessary */ -- if ( list_cnt == 0 ) -+ if ( list_cnt == 0 ) { - if ( typchr == 's' ) - (void)va_arg( argl, char * ); - else - (void)va_arg( argl, ptr ); -+ } - break; - } - else -@@ -567,7 +570,7 @@ - * Do conversion for n and N types - */ - tmpflg = typchr; -- if (typchr == 'n' || typchr == 'N' ) -+ if (typchr == 'n' || typchr == 'N' ) { - if (*argp != '0') - tmpflg = 'd'; - else if (*(argp+1) == 'x' || -@@ -578,6 +581,7 @@ - } - else - tmpflg = 'o'; -+ } - if (typchr == 'N') - tmpflg = toupper( tmpflg ); - ---- lib/inv_cmap.c -+++ lib/inv_cmap.c -@@ -42,7 +42,7 @@ - static long cbinc, cginc, crinc; - static unsigned long *gdp, *rdp, *cdp; - static unsigned char *grgbp, *rrgbp, *crgbp; --static gstride, rstride; -+static long gstride, rstride; - static long x, xsqr, colormax; - static int cindex; - #ifdef INSTRUMENT_IT ---- lib/rle_getrow.c -+++ lib/rle_getrow.c -@@ -351,7 +351,7 @@ - bzero( (char *)scanline[-1] + the_hdr->xmin, - the_hdr->xmax - the_hdr->xmin + 1 ); - for ( nc = 0; nc < the_hdr->ncolors; nc++ ) -- if ( RLE_BIT( *the_hdr, nc ) ) -+ if ( RLE_BIT( *the_hdr, nc ) ) { - /* Unless bg color given explicitly, use 0. */ - if ( the_hdr->background != 2 || the_hdr->bg_color[nc] == 0 ) - bzero( (char *)scanline[nc] + the_hdr->xmin, -@@ -360,6 +360,7 @@ - bfill( (char *)scanline[nc] + the_hdr->xmin, - the_hdr->xmax - the_hdr->xmin + 1, - the_hdr->bg_color[nc] ); -+ } - } - - /* If skipping, then just return */ -@@ -367,7 +368,7 @@ - { - the_hdr->priv.get.vert_skip--; - the_hdr->priv.get.scan_y++; -- if ( the_hdr->priv.get.vert_skip > 0 ) -+ if ( the_hdr->priv.get.vert_skip > 0 ) { - if ( the_hdr->priv.get.scan_y >= the_hdr->ymax ) - { - int y = the_hdr->priv.get.scan_y; -@@ -377,6 +378,7 @@ - } - else - return the_hdr->priv.get.scan_y; -+ } - } - - /* If EOF has been encountered, return also */ -@@ -457,11 +459,12 @@ - else - nc = DATUM(inst); - nc++; -- if ( debug_f ) -+ if ( debug_f ) { - if ( RLE_BIT( *the_hdr, channel ) ) - fprintf( stderr, "Pixel data %d (to %d):", nc, scan_x+nc ); - else - fprintf( stderr, "Pixel data %d (to %d)\n", nc, scan_x+nc); -+ } - if ( RLE_BIT( *the_hdr, channel ) ) - { - /* Don't fill past end of scanline! */ ---- lib/rle_putcom.c -+++ lib/rle_putcom.c -@@ -53,11 +53,12 @@ - { - for ( ; *n != '\0' && *n != '=' && *n == *v; n++, v++ ) - ; -- if (*n == '\0' || *n == '=') -+ if (*n == '\0' || *n == '=') { - if ( *v == '\0' ) - return v; - else if ( *v == '=' ) - return ++v; -+ } - - return NULL; - } diff --git a/pkgs/development/libraries/urt/urt-3.1b-tempfile.patch b/pkgs/development/libraries/urt/urt-3.1b-tempfile.patch deleted file mode 100644 index 12acce151b5d..000000000000 --- a/pkgs/development/libraries/urt/urt-3.1b-tempfile.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- tools/rlecat.c -+++ tools/rlecat.c -@@ -110,8 +110,14 @@ - nflag = 0; /* Not really repeating! */ - else - { -- mktemp( temp ); /* Make a temporary file name */ -- tmpfile = rle_open_f( cmd_name( argv ), temp, "w+" ); -+ /* we dont have to use rle_open_f() because all it does in -+ * this case is run fopen() ... we're creating a file so all -+ * the checks for opening an existing file aren't needed */ -+ int fd = mkstemp(temp); -+ if (fd == -1 || (tmpfile = fdopen(fd, "w+")) == NULL) { -+ perror("Unable to open tempfile"); -+ exit(-1); -+ } - } - } - |