diff options
Diffstat (limited to 'pkgs/development/libraries')
34 files changed, 254 insertions, 128 deletions
diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index b789d89c66b3..b006cb403879 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { - version = "9.200.6"; + version = "9.200.7"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "1gm8dysb29f3p96bzjgdb5r70dc6y5jq1avg18sdixz0hgnxqq14"; + sha256 = "1y3xrchykwddlrnzgf7xjdmbkf6c4gayz92vyrqdyvnlpi07sy72"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 811dfc47194a..cff960b29a73 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }: +{ stdenv, symlinkJoin, fetchurl, fetchFromGitHub, autoconf, boost, brotli, cmake, double-conversion, flatbuffers, gflags, glog, gtest, lz4, perl, python, rapidjson, snappy, thrift, which, zlib, zstd }: let parquet-testing = fetchFromGitHub { @@ -11,27 +11,21 @@ in stdenv.mkDerivation rec { name = "arrow-cpp-${version}"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - sha256 = "0pc5pqr0dbnx8s1ji102dhw9bbrsq3ml4ac3mmi2022yfyizlf0q"; + sha256 = "163s4i2cywq95jgrxbaq48qwmww0ibkq61k1aad4w9z9vpjfgnil"; }; sourceRoot = "apache-arrow-${version}/cpp"; patches = [ - # fix ARROW-3467 - ./double-conversion_cmake.patch - # patch to fix python-test ./darwin.patch - - # facebook/zstd#1385 - ./zstd136.patch ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake autoconf /* for vendored jemalloc */ ]; buildInputs = [ boost double-conversion glog python.pkgs.python python.pkgs.numpy ]; preConfigure = '' @@ -58,6 +52,7 @@ stdenv.mkDerivation rec { ZSTD_HOME = zstd; cmakeFlags = [ + "-DARROW_BUILD_TESTS=ON" "-DARROW_PYTHON=ON" "-DARROW_PARQUET=ON" ]; diff --git a/pkgs/development/libraries/arrow-cpp/double-conversion_cmake.patch b/pkgs/development/libraries/arrow-cpp/double-conversion_cmake.patch deleted file mode 100644 index 336fdde9e8fb..000000000000 --- a/pkgs/development/libraries/arrow-cpp/double-conversion_cmake.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/CMakeLists.txt b/cpp/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -615,7 +615,7 @@ endif(UNIX) - set(ARROW_LINK_LIBS) - - # Libraries to link statically with libarrow.so --set(ARROW_STATIC_LINK_LIBS double-conversion) -+set(ARROW_STATIC_LINK_LIBS ${DOUBLE_CONVERSION_TARGET}) - - if (ARROW_WITH_BROTLI) - SET(ARROW_STATIC_LINK_LIBS -@@ -694,7 +694,7 @@ else () - set(ARROW_MIN_TEST_LIBS - arrow_shared - ${ARROW_LINK_LIBS} -- double-conversion -+ ${DOUBLE_CONVERSION_TARGET} - ${BOOST_SYSTEM_LIBRARY} - ${BOOST_FILESYSTEM_LIBRARY} - ${BOOST_REGEX_LIBRARY} -diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake ---- a/cmake_modules/ThirdpartyToolchain.cmake -+++ b/cmake_modules/ThirdpartyToolchain.cmake -@@ -469,14 +469,16 @@ if("${DOUBLE_CONVERSION_HOME}" STREQUAL "") - set(DOUBLE_CONVERSION_VENDORED 1) - else() - find_package(double-conversion REQUIRED) -+ set(DOUBLE_CONVERSION_TARGET double-conversion::double-conversion) - set(DOUBLE_CONVERSION_VENDORED 0) - endif() - - include_directories(SYSTEM ${DOUBLE_CONVERSION_INCLUDE_DIR}) --ADD_THIRDPARTY_LIB(double-conversion -- STATIC_LIB ${DOUBLE_CONVERSION_STATIC_LIB}) - - if (DOUBLE_CONVERSION_VENDORED) -+ ADD_THIRDPARTY_LIB(double-conversion -+ STATIC_LIB ${DOUBLE_CONVERSION_STATIC_LIB}) -+ set(DOUBLE_CONVERSION_TARGET double-conversion) - add_dependencies(arrow_dependencies double-conversion_ep) - endif() - diff --git a/pkgs/development/libraries/arrow-cpp/zstd136.patch b/pkgs/development/libraries/arrow-cpp/zstd136.patch deleted file mode 100644 index 1bdeecaef990..000000000000 --- a/pkgs/development/libraries/arrow-cpp/zstd136.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/src/arrow/util/compression_zstd.cc -+++ b/src/arrow/util/compression_zstd.cc -@@ -35,8 +35,13 @@ namespace util { - - Status ZSTDCodec::Decompress(int64_t input_len, const uint8_t* input, int64_t output_len, - uint8_t* output_buffer) { -+ void *safe_output_buffer = static_cast<void*>(output_buffer); -+ int dummy {}; -+ if ((output_len == 0) && (output_buffer == NULL)) { -+ safe_output_buffer = static_cast<void*>(&dummy); -+ } - int64_t decompressed_size = -- ZSTD_decompress(output_buffer, static_cast<size_t>(output_len), input, -+ ZSTD_decompress(safe_output_buffer, static_cast<size_t>(output_len), input, - static_cast<size_t>(input_len)); - if (decompressed_size != output_len) { - return Status::IOError("Corrupt ZSTD compressed data."); diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index b8f105fdaf58..102e7bfcc12b 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "box2d-${version}"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { url = "https://github.com/erincatto/Box2D/archive/v${version}.tar.gz"; - sha256 = "1dmbswh4x2n5l3c9h0k72m0z4rdpzfy1xl8m8p3rf5rwkvk3bkg2"; + sha256 = "0llpcifl8zbjbpxdwz87drd01m3lwnv82xb4av6kca1xn4w2gmkm"; }; sourceRoot = "Box2D-${version}/Box2D"; diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index d9bf5bd2220c..c02633d880c4 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "capstone-${version}"; - version = "4.0"; + version = "4.0.1"; src = fetchurl { url = "https://github.com/aquynh/capstone/archive/${version}.tar.gz"; - sha256 = "0yp6y5m3v674i2pq6s804ikvz43gzgsjwq1maqhmj3b730b4dii6"; + sha256 = "1isxw2qwy1fi3m3w7igsr5klzczxc5cxndz0a78dfss6ps6ymfvr"; }; configurePhase = '' patchShebangs make.sh ''; diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 27a8b7b1119e..7b130d48928e 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -8,7 +8,10 @@ stdenv.mkDerivation rec { version = "2.1.27"; src = fetchurl { - url = "ftp://ftp.cyrusimap.org/cyrus-sasl/${name}.tar.gz"; + urls = + [ "http://www.cyrusimap.org/releases/${name}.tar.gz" + "http://www.cyrusimap.org/releases/old/${name}.tar.gz" + ]; sha256 = "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6"; }; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 2cfa4b1d3cd6..e0cd1227f7ea 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -95,6 +95,7 @@ , libxcbxfixesExtlib ? true # X11 grabbing mouse rendering , libxcbshapeExtlib ? true # X11 grabbing shape rendering , libXv ? null # Xlib support +, libXext ? null # Xlib support , lzma ? null # xz-utils , nvenc ? false, nvidia-video-sdk ? null, nv-codec-headers ? null # NVIDIA NVENC support , callPackage # needed for NVENC to access external ffmpeg nvidia headers @@ -139,7 +140,7 @@ * Darwin frameworks */ , Cocoa, CoreAudio, CoreServices, AVFoundation, MediaToolbox -, VideoDecodeAcceleration, CF +, VideoDecodeAcceleration, cf-private }: /* Maintainer notes: @@ -230,11 +231,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "4.0.2"; + version = "4.1"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "15rgzcmdccy4flajs63gkz4n3k24wkkg50r13l1r83lrxg4hqp59"; + sha256 = "150rrm549fy1x71c9whmyi5knyd9sliwvmcsm438bdgg4v8c93m3"; }; prePatch = '' @@ -355,7 +356,7 @@ stdenv.mkDerivation rec { (enableFeature (libvorbis != null) "libvorbis") (enableFeature (libvpx != null) "libvpx") (enableFeature (libwebp != null) "libwebp") - (enableFeature (libX11 != null && libXv != null) "xlib") + (enableFeature (libX11 != null && libXv != null && libXext != null) "xlib") (enableFeature (libxcb != null) "libxcb") (enableFeature libxcbshmExtlib "libxcb-shm") (enableFeature libxcbxfixesExtlib "libxcb-xfixes") @@ -408,7 +409,7 @@ stdenv.mkDerivation rec { bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11 - libxcb libXv lzma openal openjpeg libpulseaudio rtmpdump opencore-amr + libxcb libXv libXext lzma openal openjpeg libpulseaudio rtmpdump opencore-amr samba SDL2 soxr speex vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore zeromq4 zlib ] ++ optional openglExtlib libGLU_combined @@ -431,7 +432,7 @@ stdenv.mkDerivation rec { FILES+=($(ls $out/lib/*.dylib)) for f in ''${FILES[@]}; do if [ ! -h "$f" ]; then - install_name_tool -change ${CF}/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation "$f" + install_name_tool -change ${cf-private}/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation "$f" fi done ''; diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix index b99c7240daec..f8343e668a67 100644 --- a/pkgs/development/libraries/ffmpeg/3.4.nix +++ b/pkgs/development/libraries/ffmpeg/3.4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "3.4.4"; - sha256 = "0xmcijcpa7b59ws5ycmnp0a3pjmnpgly0zv8yff6if4p7pw7406f"; + branch = "3.4.5"; + sha256 = "0cbzysj9pskxh1kfdwmq2848fn6gi4pvh5y3insv10pdhpcjp8a3"; darwinFrameworks = [ Cocoa CoreMedia ]; }) diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index b470d45ba43f..9821357de3b9 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "4.0.2"; - sha256 = "0mnh41j3kzi3x3clai1yhqasr1kc8zvd5cz0283pxhs2bxrm2v1l"; + branch = "4.1"; + sha256 = "19d16dhb4gx3akhbqd8844awx1axxli91bsjwsm4qp2a4i1zp15n"; darwinFrameworks = [ Cocoa CoreMedia ]; }) diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 7ad5680c75cd..616394c6a084 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { name = "freetds-${version}"; - version = "1.00.109"; + version = "1.00.110"; src = fetchurl { url = "http://www.freetds.org/files/stable/${name}.tar.bz2"; - sha256 = "0d00ixf78jzkyhccxjsaspz7yvlwk0xvrfcqfca4cwnwvnyb54ry"; + sha256 = "1zxgvc9ikw34fsbkn9by7hwqz0p6m3f178zmj2s0qqpi84qq1vw2"; }; buildInputs = [ diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 642063220b2c..6b7a58fa30d9 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gdal-${version}"; - version = "2.3.2"; + version = "2.4.0"; src = fetchurl { url = "https://download.osgeo.org/gdal/${version}/${name}.tar.xz"; - sha256 = "191jknma0vricrgdcdmwh8588rwly6a77lmynypxdl87i3z7hv9z"; + sha256 = "09qgy36z0jc9w05373m4n0vm4j54almdzql6z9p9zr9pdp61syf3"; }; buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite @@ -51,6 +51,20 @@ stdenv.mkDerivation rec { #ifdef swap\ #undef swap\ #endif' ogr/ogrsf_frmts/mysql/ogr_mysql.h + + # poppler 0.73.0 support + patch -lp2 <${ + fetchpatch { + url = "https://github.com/OSGeo/gdal/commit/29f4dfbcac2de718043f862166cd639ab578b552.diff"; + sha256 = "1h2rsjjrgwqfgqzppmzv5jgjs1dbbg8pvfmay0j9y0618qp3r734"; + } + } || true + patch -p2 <${ + fetchpatch { + url = "https://github.com/OSGeo/gdal/commit/19967e682738977e11e1d0336e0178882c39cad2.diff"; + sha256 = "12yqd77226i6xvzgqmxiac5ghdinixh8k2crg1r2gnhc0xlc3arj"; + } + } ''; # - Unset CC and CXX as they confuse libtool. diff --git a/pkgs/development/libraries/gdl/default.nix b/pkgs/development/libraries/gdl/default.nix new file mode 100644 index 000000000000..45a29e15ede8 --- /dev/null +++ b/pkgs/development/libraries/gdl/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, gnome3, intltool }: + +stdenv.mkDerivation rec { + pname = "gdl"; + version = "3.28.0"; + + src = fetchurl { + url = "mirror://gnome/sources/gdl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1dipnzqpxl0yfwzl2lqdf6vb3174gb9f1d5jndkq8505q7n9ik2j"; + }; + + nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ libxml2 gtk3 ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gdl"; + }; + }; + + meta = with stdenv.lib; { + description = "Gnome docking library"; + homepage = https://developer.gnome.org/gdl/; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 37275489cc3d..024ccf2a4537 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -8,6 +8,7 @@ , doCheck ? stdenv.config.doCheckByDefault or false , coreutils, dbus, libxml2, tzdata , desktop-file-utils, shared-mime-info +, darwin }: with stdenv.lib; @@ -44,6 +45,7 @@ let ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true ''; + binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ]; version = "2.58.2"; in @@ -83,7 +85,12 @@ stdenv.mkDerivation rec { ] ++ optionals stdenv.isLinux [ libselinux utillinuxMinimal # for libmount - ]; + ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + AppKit Carbon Cocoa CoreFoundation CoreServices Foundation + # Needed for CFURLCreateFromFSRef, etc. which have deen deprecated + # since 10.9 and are not part of swift-corelibs CoreFoundation. + darwin.cf-private + ]); nativeBuildInputs = [ meson ninja pkgconfig perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 glibcLocales @@ -121,15 +128,17 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $bin/bin - for app in gapplication gdbus gio gsettings; do + for app in ${concatStringsSep " " binPrograms}; do mv "$dev/bin/$app" "$bin/bin" done + '' + optionalString (!stdenv.isDarwin) '' # Add gio-launch-desktop to $out so we can refer to it from $dev mkdir $out/bin mv "$dev/bin/gio-launch-desktop" "$out/bin/" ln -s "$out/bin/gio-launch-desktop" "$bin/bin/" + '' + '' moveToOutput "share/glib-2.0" "$dev" substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$dev" sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|" diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 10d5ee275006..054e6df0e4c9 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gnum4, glib, libsigcxx, gnome3 }: +{ stdenv, fetchurl, pkgconfig, gnum4, glib, libsigcxx, gnome3, darwin }: stdenv.mkDerivation rec { pname = "glibmm"; @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig gnum4 ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + Cocoa + ]); propagatedBuildInputs = [ glib libsigcxx ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 0e4ef72b8aae..fc98af8b2cae 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { name = "fix-key-expiry.patch"; - url = "https://files.gnupg.net/file/data/fehgbjmataj5tc2pnfhj/PHID-FILE-aqck6l4elhw53tjanrie/file"; - sha256 = "1h80m045gy7r0g7dzzlfpql6p065x88p274ij9jnf7d4lwwgrf1a"; + url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=66376f3e206a1aa791d712fb8577bb3490268f60"; + sha256 = "0i777dzcbv4r568l8623ar6y6j44bv46bbxi751qa5mdcihpya02"; }) ]; diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index 780b00f9d9a2..d1ba18739e93 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gtkd-${version}"; - version = "3.8.4"; + version = "3.8.5"; src = fetchzip { url = "https://gtkd.org/Downloads/sources/GtkD-${version}.zip"; - sha256 = "0q2kf1jwr89i8ajjzyf3b4bbla33djvnwrvljq17y206q7qknfyz"; + sha256 = "12n2njsaplra7x15nqwrj2hrf8a27pfjj2mck4mkzxv03qk6mqky"; stripRoot = false; }; diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix index 6e83b9637c16..487af4ae97a5 100644 --- a/pkgs/development/libraries/jemalloc/common.nix +++ b/pkgs/development/libraries/jemalloc/common.nix @@ -4,8 +4,8 @@ # then stops downstream builds (mariadb in particular) from detecting it. This # option should remove the prefix and give us a working jemalloc. # Causes segfaults with some software (ex. rustc), but defaults to true for backward -# compatibility. Ignored on non OSX. -, stripPrefix ? true +# compatibility. +, stripPrefix ? stdenv.hostPlatform.isDarwin , disableInitExecTls ? false }: @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { # see the comment on stripPrefix configureFlags = [] - ++ optional (stdenv.isDarwin && stripPrefix) [ "--with-jemalloc-prefix=" ] - ++ optional disableInitExecTls [ "--disable-initial-exec-tls" ] + ++ optional stripPrefix "--with-jemalloc-prefix=" + ++ optional disableInitExecTls "--disable-initial-exec-tls" ; doCheck = true; diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index d270e2f0678d..d3733ea5f720 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "kmsxx"; - version = "2018-09-10"; + version = "2018-10-23"; name = pname + "-" + version; src = fetchFromGitHub { owner = "tomba"; repo = "kmsxx"; fetchSubmodules = true; - rev = "524176c33ee2b79f78d454fa621e0d32e7e72488"; - sha256 = "0wyg0zv207h5a78cwmbg6fi8gr8blbbkwngjq8hayfbg45ww0jy8"; + rev = "c0093c91f0fa2fd6a5b9d1b206a6f44dcd55bfb5"; + sha256 = "03rv92r938nxb4k4gwcvxy76jnhxdx6x60b58jws83285hd9rgkf"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index f6ff7e758956..c7d7bfb1e824 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -2,22 +2,18 @@ stdenv.mkDerivation rec { name = "libaom-${version}"; - version = "1.0.0"; + version = "1.0.0-errata1"; src = fetchgit { url = "https://aomedia.googlesource.com/aom"; rev = "v${version}"; - sha256 = "07h2vhdiq7c3fqaz44rl4vja3dgryi6n7kwbwbj1rh485ski4j82"; + sha256 = "090phh4jl9z6m2pwpfpwcjh6iyw0byngb2n112qxkg6a3gsaa62f"; }; nativeBuildInputs = [ yasm perl cmake pkgconfig python3 ]; - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - ]; - preConfigure = '' # build uses `git describe` to set the build version cat > $NIX_BUILD_TOP/git << "EOF" diff --git a/pkgs/development/libraries/libdeflate/default.nix b/pkgs/development/libraries/libdeflate/default.nix index 0328a2215b48..db5448caa102 100644 --- a/pkgs/development/libraries/libdeflate/default.nix +++ b/pkgs/development/libraries/libdeflate/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libdeflate-${version}"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "ebiggers"; repo = "libdeflate"; rev = "v${version}"; - sha256 = "1wqxwza6rwmhrsy9sw86pdcd0w742gbzsy9qxnq6kk59m6h1dbsb"; + sha256 = "0kmp38s7vahvbgzzhs5v0bfyjgas1in7jn69gpyh70kl08279ly0"; }; postPatch = '' diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 1d07fe6ca268..1c50a28f0a4d 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -2,11 +2,12 @@ , gtk-doc, docbook_xsl, docbook_xml_dtd_43 , gtk3, gnome3 , dbus, xvfb_run, libxml2 +, hicolor-icon-theme }: let pname = "libhandy"; - version = "0.0.6"; + version = "0.0.7"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -18,7 +19,7 @@ in stdenv.mkDerivation rec { owner = "Librem5"; repo = pname; rev = "v${version}"; - sha256 = "0gmqsxkpi288qjfdczfrbvjqyy9sbn3gligqwgqj27ask95zl1q5"; + sha256 = "1k9v6q2dz9x8lfcyzmsksrkq6md7m9jdkjlfan7nqlcj3mqhd7m9"; }; nativeBuildInputs = [ @@ -26,10 +27,12 @@ in stdenv.mkDerivation rec { gtk-doc docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ gnome3.gnome-desktop gtk3 gnome3.glade libxml2 ]; - checkInputs = [ dbus xvfb_run ]; + checkInputs = [ dbus xvfb_run hicolor-icon-theme ]; mesonFlags = [ "-Dgtk_doc=true" + "-Dglade_catalog=enabled" + "-Dintrospection=enabled" ]; PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules"; diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index 58da13044523..0cc18d82720b 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/pkgs/development/libraries/liburcu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - version = "0.10.1"; + version = "0.10.2"; name = "liburcu-${version}"; src = fetchurl { url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - sha256 = "01pbg67qy5hcssy2yi0ckqapzfclgdq93li2rmzw4pa3wh5j42cw"; + sha256 = "1k31faqz9plx5dwxq8g1fnczxda1is4s1x4ph0gjrq3gmy6qixmk"; }; checkInputs = [ perl ]; diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix index 8af2a7aa3682..bb621a3eda6c 100644 --- a/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/pkgs/development/libraries/netcdf-fortran/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, netcdf, hdf5, curl, gfortran }: stdenv.mkDerivation rec { name = "netcdf-fortran-${version}"; - version = "4.4.4"; + version = "4.4.5"; src = fetchurl { url = "https://github.com/Unidata/netcdf-fortran/archive/v${version}.tar.gz"; - sha256 = "0rwybszj1jjb25cx8vfyrd77x5qsdjzwspcjz56n12br89n9ica4"; + sha256 = "00qwg4v250yg8kxp68srrnvfbfim241fnlm071p9ila2mihk8r01"; }; buildInputs = [ netcdf hdf5 curl gfortran ]; diff --git a/pkgs/development/libraries/physics/apfelgrid/default.nix b/pkgs/development/libraries/physics/apfelgrid/default.nix index 6509b04f0113..983523e1f2fb 100644 --- a/pkgs/development/libraries/physics/apfelgrid/default.nix +++ b/pkgs/development/libraries/physics/apfelgrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root }: +{ stdenv, fetchFromGitHub, autoreconfHook, apfel, applgrid, lhapdf, root5 }: stdenv.mkDerivation rec { name = "apfelgrid-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ apfel applgrid lhapdf root ]; + buildInputs = [ apfel applgrid lhapdf root5 ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/pkgs/development/libraries/physics/qcdnum/default.nix index 1a3334562641..620f227250dd 100644 --- a/pkgs/development/libraries/physics/qcdnum/default.nix +++ b/pkgs/development/libraries/physics/qcdnum/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "QCDNUM-${version}"; - version = "17-01-14"; + version = "17-01-13"; src = fetchurl { url = "http://www.nikhef.nl/user/h24/qcdnum-files/download/qcdnum${builtins.replaceStrings ["-"] [""] version}.tar.gz"; - sha256 = "199s6kgmszxgjzd9214mpx3kyplq2q6987sii67s5xkg10ynyv31"; + sha256 = "0568rjviwvjkfihq2ka7g91vmialr31ryn7c69iqf13rcv5vzcw7"; }; nativeBuildInputs = [ gfortran ]; diff --git a/pkgs/development/libraries/psqlodbc/default.nix b/pkgs/development/libraries/psqlodbc/default.nix new file mode 100644 index 000000000000..2364e0913bc8 --- /dev/null +++ b/pkgs/development/libraries/psqlodbc/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, libiodbc, postgresql, openssl }: + +stdenv.mkDerivation rec { + name = "psqlodbc-09.01.0200"; + + src = fetchurl { + url = "https://ftp.postgresql.org/pub/odbc/versions/src/${name}.tar.gz"; + sha256 = "0b4w1ahfpp34jpscfk2kv9050lh3xl9pvcysqvaigkcd0vsk1hl9"; + }; + + buildInputs = [ libiodbc postgresql openssl ]; + + configureFlags = [ "--with-iodbc=${libiodbc}" ]; + + meta = with stdenv.lib; { + homepage = http://psqlodbc.projects.postgresql.org/; + description = "ODBC driver for PostgreSQL"; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/pyotherside/default.nix b/pkgs/development/libraries/pyotherside/default.nix new file mode 100644 index 000000000000..0c2d4fa2b28b --- /dev/null +++ b/pkgs/development/libraries/pyotherside/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub +, python3, qmake, qtbase, qtquickcontrols, qtsvg, ncurses }: + +stdenv.mkDerivation rec { + pname = "pyotherside"; + version = "1.5.3"; + + src = fetchFromGitHub { + owner = "thp"; + repo = "pyotherside"; + rev = version; + sha256 = "1xaw1aarj8gpgpm4z3lk8klbssadrsf3xdyzqx10zcwy16amka7k"; + }; + + nativeBuildInputs = [ qmake ]; + buildInputs = [ + python3 qtbase qtquickcontrols qtsvg ncurses + ]; + + patches = [ ./qml-path.patch ]; + installTargets = [ "sub-src-install_subtargets" ]; + + meta = with stdenv.lib; { + description = "Asynchronous Python 3 Bindings for Qt 5"; + homepage = https://thp.io/2011/pyotherside/; + license = licenses.isc; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/development/libraries/pyotherside/qml-path.patch b/pkgs/development/libraries/pyotherside/qml-path.patch new file mode 100644 index 000000000000..9f7208909970 --- /dev/null +++ b/pkgs/development/libraries/pyotherside/qml-path.patch @@ -0,0 +1,12 @@ +diff -Naur --strip-trailing-cr source.org/src/src.pro source/src/src.pro +--- source.org/src/src.pro 1970-01-01 01:00:01.000000000 +0100 ++++ source/src/src.pro 2019-01-17 19:14:46.256821852 +0000 +@@ -10,7 +10,7 @@ + CONFIG += qt plugin + QT += qml quick svg + +-target.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH ++target.path = $$NIX_OUTPUT_QML/$$PLUGIN_IMPORT_PATH + INSTALLS += target + + qmldir.files += $$_PRO_FILE_PWD_/qmldir $$_PRO_FILE_PWD_/pyotherside.qmltypes diff --git a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix index f9b8cdc8cf02..7c1fa449ebba 100644 --- a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix +++ b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix @@ -1,10 +1,10 @@ -{ qtModule, lib, python2, qtbase, qtsvg, qtxmlpatterns }: +{ qtModule, lib, python2, qtbase, qtsvg }: with lib; qtModule { name = "qtdeclarative"; - qtInputs = [ qtbase qtsvg qtxmlpatterns ]; + qtInputs = [ qtbase qtsvg ]; nativeBuildInputs = [ python2 ]; outputs = [ "out" "dev" "bin" ]; preConfigure = '' diff --git a/pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix index ee8ef617fc8d..7ac922421f08 100644 --- a/pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix +++ b/pkgs/development/libraries/qt-5/modules/qtxmlpatterns.nix @@ -1,7 +1,7 @@ -{ qtModule, qtbase }: +{ qtModule, qtbase, qtdeclarative }: qtModule { name = "qtxmlpatterns"; - qtInputs = [ qtbase ]; + qtInputs = [ qtbase qtdeclarative ]; devTools = [ "bin/xmlpatterns" "bin/xmlpatternsvalidator" ]; } diff --git a/pkgs/development/libraries/readline/8.0.nix b/pkgs/development/libraries/readline/8.0.nix new file mode 100644 index 000000000000..eefef9727663 --- /dev/null +++ b/pkgs/development/libraries/readline/8.0.nix @@ -0,0 +1,66 @@ +{ fetchurl, stdenv, ncurses +}: + +stdenv.mkDerivation rec { + name = "readline-${version}"; + version = "8.0p${toString (builtins.length upstreamPatches)}"; + + src = fetchurl { + url = "mirror://gnu/readline/readline-${meta.branch}.tar.gz"; + sha256 = "0qg4924hf4hg0r0wbx2chswsr08734536fh5iagkd3a7f4czafg3"; + }; + + outputs = [ "out" "dev" "man" "doc" "info" ]; + + propagatedBuildInputs = [ncurses]; + + patchFlags = "-p0"; + + upstreamPatches = + (let + patch = nr: sha256: + fetchurl { + url = "mirror://gnu/readline/readline-${meta.branch}-patches/readline80-${nr}"; + inherit sha256; + }; + in + import ./readline-8.0-patches.nix patch); + + patches = + [ ./link-against-ncurses.patch + ./no-arch_only-6.3.patch + ] + ++ upstreamPatches; + + # Don't run the native `strip' when cross-compiling. + dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; + bash_cv_func_sigsetjmp = if stdenv.isCygwin then "missing" else null; + + meta = with stdenv.lib; { + description = "Library for interactive line editing"; + + longDescription = '' + The GNU Readline library provides a set of functions for use by + applications that allow users to edit command lines as they are + typed in. Both Emacs and vi editing modes are available. The + Readline library includes additional functions to maintain a + list of previously-entered command lines, to recall and perhaps + reedit those lines, and perform csh-like history expansion on + previous commands. + + The history facilities are also placed into a separate library, + the History library, as part of the build process. The History + library may be used without Readline in applications which + desire its capabilities. + ''; + + homepage = https://savannah.gnu.org/projects/readline/; + + license = licenses.gpl3Plus; + + maintainers = with maintainers; [ vanschelven dtzWill ]; + + platforms = platforms.unix; + branch = "8.0"; + }; +} diff --git a/pkgs/development/libraries/readline/readline-8.0-patches.nix b/pkgs/development/libraries/readline/readline-8.0-patches.nix new file mode 100644 index 000000000000..b8019fb33502 --- /dev/null +++ b/pkgs/development/libraries/readline/readline-8.0-patches.nix @@ -0,0 +1,4 @@ +# Automatically generated by `update-patch-set.sh'; do not edit. + +patch: [ +] diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 7119f76c55fd..35d5075a949a 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { --prefix PKG_CONFIG_PATH ":" "${SDL.dev}/lib/pkgconfig" ''; + NIX_LDFLAGS = [ "-lX11" ]; + meta = { homepage = http://icculus.org/smpeg/; description = "MPEG decoding library"; |