diff options
Diffstat (limited to 'pkgs/development/libraries')
19 files changed, 64 insertions, 25 deletions
diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 77ce77dee5ad..96259dc66948 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -26,6 +26,9 @@ stdenv.mkDerivation rec { # patch to fix python-test ./darwin.patch + + # facebook/zstd#1385 + ./zstd136.patch ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/arrow-cpp/zstd136.patch b/pkgs/development/libraries/arrow-cpp/zstd136.patch new file mode 100644 index 000000000000..1bdeecaef990 --- /dev/null +++ b/pkgs/development/libraries/arrow-cpp/zstd136.patch @@ -0,0 +1,17 @@ +--- 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/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 9afb03e0d0c6..a7c918ee01a2 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -15,13 +15,13 @@ let else throw "Unsupported system!"; in stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.5.17"; + version = "1.6.20"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "0mmzf3js6090kk9vdwrmib5cjny43mqf044iynkhkglzvwhadc8z"; + sha256 = "0b6ahy748i29jqzzrjh8vybk7dv8qda3ir277mqflg4a8xxg9bj1"; }; # FIXME: might be nice to put different APIs in different outputs diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix index 38e5ffcb4de0..fa27a80e22ed 100644 --- a/pkgs/development/libraries/libsigcxx/1.2.nix +++ b/pkgs/development/libraries/libsigcxx/1.2.nix @@ -11,10 +11,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ m4]; - meta = { + meta = with stdenv.lib; { homepage = https://libsigcplusplus.github.io/libsigcplusplus/; description = "A typesafe callback system for standard C++"; branch = "1.2"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.lgpl3; }; } diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index e608ea300d1a..68c35c49ef37 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/libuv/libuv; maintainers = with maintainers; [ cstrahan ]; platforms = with platforms; linux ++ darwin; + license = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ]; }; } diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix index eed0c77af804..bf685862adf1 100644 --- a/pkgs/development/libraries/libwmf/default.nix +++ b/pkgs/development/libraries/libwmf/default.nix @@ -22,8 +22,10 @@ stdenv.mkDerivation { }) ]; - meta = { + meta = with stdenv.lib; { description = "WMF library from wvWare"; - platforms = stdenv.lib.platforms.unix; + homepage = http://wvware.sourceforge.net/libwmf.html; + license = licenses.gpl2; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libwpd/0.8.nix b/pkgs/development/libraries/libwpd/0.8.nix index 49012f8bddf8..736b1a45fa20 100644 --- a/pkgs/development/libraries/libwpd/0.8.nix +++ b/pkgs/development/libraries/libwpd/0.8.nix @@ -2,19 +2,22 @@ stdenv.mkDerivation rec { name = "libwpd-0.8.14"; - + src = fetchurl { url = "mirror://sourceforge/libwpd/${name}.tar.gz"; sha256 = "1syli6i5ma10cwzpa61a18pyjmianjwsf6pvmvzsh5md6yk4yx01"; }; - + patches = [ ./gcc-0.8.patch ]; buildInputs = [ glib libgsf libxml2 ]; nativeBuildInputs = [ pkgconfig bzip2 ]; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Library for importing WordPerfect documents"; + homepage = http://libwpd.sourceforge.net; + license = with licenses; [ lgpl21 mpl20 ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix index 9d262910e14f..99808be2b216 100644 --- a/pkgs/development/libraries/libwpg/default.nix +++ b/pkgs/development/libraries/libwpg/default.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { buildInputs = [ libwpd zlib librevenge ]; nativeBuildInputs = [ pkgconfig ]; - meta = { + meta = with stdenv.lib; { homepage = http://libwpg.sourceforge.net; description = "C++ library to parse WPG"; - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + license = with licenses; [ lgpl21 mpl20 ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix index 7b672aebe445..b2fba7df509b 100644 --- a/pkgs/development/libraries/log4shib/default.nix +++ b/pkgs/development/libraries/log4shib/default.nix @@ -15,5 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A forked version of log4cpp that has been created for the Shibboleth project"; maintainers = [ maintainers.jammerful ]; + license = licenses.lgpl21; + homepage = http://log4cpp.sf.net; }; } diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index aecd75656dae..cad5d0d7ecad 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -18,11 +18,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - meta = { + meta = with stdenv.lib; { description = "A lightweight C library for the Jabber protocol"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; downloadPage = "http://mcabber.com/files/loudmouth/"; downloadURLRegexp = "loudmouth-[0-9.]+[.]tar[.]bz2$"; updateWalker = true; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix index 3b6102715391..064f04f220cd 100644 --- a/pkgs/development/libraries/martyr/default.nix +++ b/pkgs/development/libraries/martyr/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { meta = { description = "Martyr is a Java framework around the IRC protocol to allow application writers easy manipulation of the protocol and client state"; homepage = http://martyr.sourceforge.net/; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/mdds/0.12.1.nix b/pkgs/development/libraries/mdds/0.12.1.nix index 11bd437d377e..e1dd7586f921 100644 --- a/pkgs/development/libraries/mdds/0.12.1.nix +++ b/pkgs/development/libraries/mdds/0.12.1.nix @@ -9,9 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3"; }; - meta = { + meta = with stdenv.lib; { homepage = https://gitlab.com/mdds/mdds; description = "A collection of multi-dimensional data structure and indexing algorithm"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/mdds/0.7.1.nix b/pkgs/development/libraries/mdds/0.7.1.nix index 8ff1d6d5e9a2..2b61668d5c67 100644 --- a/pkgs/development/libraries/mdds/0.7.1.nix +++ b/pkgs/development/libraries/mdds/0.7.1.nix @@ -9,9 +9,10 @@ stdenv.mkDerivation rec { sha256 = "0zhrx7m04pknc8i2cialmbna1hmwa0fzs8qphan4rdxibf0c4yzy"; }; - meta = { + meta = with stdenv.lib; { homepage = https://gitlab.com/mdds/mdds/; description = "A collection of multi-dimensional data structure and indexing algorithm"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 43fee9ccead8..3b0a0441cc4e 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -16,10 +16,11 @@ stdenv.mkDerivation rec { checkInputs = [ boost ]; - meta = { + meta = with stdenv.lib; { inherit version; homepage = https://gitlab.com/mdds/mdds; description = "A collection of multi-dimensional data structure and indexing algorithm"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix index 345c6e51f0b7..ca72557242f1 100644 --- a/pkgs/development/libraries/mono-addins/default.nix +++ b/pkgs/development/libraries/mono-addins/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { and for creating libraries which extend those applications. ''; platforms = platforms.linux; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/mono-zeroconf/default.nix b/pkgs/development/libraries/mono-zeroconf/default.nix index d96f90b4bfd6..37195d385627 100644 --- a/pkgs/development/libraries/mono-zeroconf/default.nix +++ b/pkgs/development/libraries/mono-zeroconf/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "A cross platform Zero Configuration Networking library for Mono and .NET"; homepage = http://www.mono-project.com/archived/monozeroconf/; platforms = platforms.linux; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/msilbc/default.nix b/pkgs/development/libraries/msilbc/default.nix index cfb02ddbf9dd..601e70427a13 100644 --- a/pkgs/development/libraries/msilbc/default.nix +++ b/pkgs/development/libraries/msilbc/default.nix @@ -16,7 +16,9 @@ stdenv.mkDerivation rec { "MEDIASTREAMER_LIBS=mediastreamer" "MEDIASTREAMER_CFLAGS=-I${mediastreamer}/include" ]; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Mediastreamer plugin for the iLBC audio codec"; + platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/pkgs/development/libraries/mythes/default.nix b/pkgs/development/libraries/mythes/default.nix index dd40a3962449..28888e551ef6 100644 --- a/pkgs/development/libraries/mythes/default.nix +++ b/pkgs/development/libraries/mythes/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://hunspell.sourceforge.net/; description = "Thesaurus library from Hunspell project"; + license = stdenv.lib.licenses.bsd3; inherit (hunspell.meta) platforms; }; } diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index c903b041fd4d..f3cfc1e56e87 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "3.2.0"; + version = "3.2.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; - sha256 = "1yck1qjw5pw5i58x762vc0adg4g53lsan9xv92hbby5dxjpr1dnj"; + sha256 = "0238r1qnwqz13wcjzfsbcfi8rfnlxcjjmxq2vpf2qf5jgablvna7"; }; preConfigure = '' |