public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-next' (PR #62209)

Browse Source
This commit is contained in:
Vladimír Čunát
2019-06-07 08:07:10 +02:00
parent 276dc23b61 326148ec9b
commit 8f5edef47e
50 changed files with 282 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/libraries/boost/generic.nix
View File

@@ -97,9 +97,9 @@ let
in
stdenv.mkDerivation {
name = "boost-${version}";
pname = "boost";
inherit src;
inherit src version;
patchFlags = "";
@@ -112,11 +112,10 @@ stdenv.mkDerivation {
meta = {
homepage = http://boost.org/;
description = "Collection of C++ libraries";
license = stdenv.lib.licenses.boost;
license = licenses.boost;
platforms = platforms.unix ++ platforms.windows;
badPlatforms = stdenv.lib.optional (versionOlder version "1.59") "aarch64-linux"
++ stdenv.lib.optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin";
badPlatforms = optional (versionOlder version "1.59") "aarch64-linux"
++ optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin";
maintainers = with maintainers; [ peti ];
};
@@ -158,16 +157,22 @@ stdenv.mkDerivation {
++ optional (toolset != null) "--with-toolset=${toolset}";
buildPhase = ''
runHook preBuild
./b2 ${b2Args}
runHook postBuild
'';
installPhase = ''
runHook preInstall
# boostbook is needed by some applications
mkdir -p $dev/share/boostbook
cp -a tools/boostbook/{xsl,dtd} $dev/share/boostbook/
# Let boost install everything else
./b2 ${b2Args} install
runHook postInstall
'';
postFixup = ''

40
pkgs/development/libraries/gdbm/default.nix
View File

@@ -1,12 +1,14 @@
{ stdenv, lib, fetchurl }:
stdenv.mkDerivation rec {
name = "gdbm-1.18.1";
pname = "gdbm";
version = "1.18.1";
# FIXME: remove on update to > 1.18.1
NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-Wno-error=return-type" else null;
src = fetchurl {
url = "mirror://gnu/gdbm/${name}.tar.gz";
url = "mirror://gnu/gdbm/${pname}-${version}.tar.gz";
sha256 = "1p4ibds6z3ccy65lkmd6lm7js0kwifvl53r0fd759fjxgr917rl6";
};
@@ -25,10 +27,12 @@ stdenv.mkDerivation rec {
substituteInPlace tests/testsuite.at --replace \
'm4_include([dbmfetch03.at])' ""
'';
enableParallelBuilding = true;
configureFlags = [ "--enable-libgdbm-compat" ];
# create symlinks for compatibility
postInstall = ''
# create symlinks for compatibility
install -dm755 $out/include/gdbm
(
cd $out/include/gdbm
@@ -40,26 +44,24 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "GNU dbm key/value database library";
longDescription = ''
GNU dbm (or GDBM, for short) is a library of database functions that
use extensible hashing and work similar to the standard UNIX dbm.
These routines are provided to a programmer needing to create and
manipulate a hashed database.
longDescription =
'' GNU dbm (or GDBM, for short) is a library of database functions that
use extensible hashing and work similar to the standard UNIX dbm.
These routines are provided to a programmer needing to create and
manipulate a hashed database.
The basic use of GDBM is to store key/data pairs in a data file.
Each key must be unique and each key is paired with only one data
item.
The basic use of GDBM is to store key/data pairs in a data file.
Each key must be unique and each key is paired with only one data
item.
The library provides primitives for storing key/data pairs,
searching and retrieving the data by its key and deleting a key
along with its data. It also support sequential iteration over all
key/data pairs in a database.
The library provides primitives for storing key/data pairs,
searching and retrieving the data by its key and deleting a key
along with its data. It also support sequential iteration over all
key/data pairs in a database.
For compatibility with programs using old UNIX dbm function, the
package also provides traditional dbm and ndbm interfaces.
For compatibility with programs using old UNIX dbm function, the
package also provides traditional dbm and ndbm interfaces.
'';
homepage = https://www.gnu.org/software/gdbm/;
license = licenses.gpl3Plus;
platforms = platforms.all;

9
pkgs/development/libraries/gnutls/default.nix
View File

@@ -1,6 +1,6 @@
{ config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
, perl, gmp, autoconf, autogen, automake, libidn, p11-kit, libiconv
, unbound, dns-root-data, gettext
, unbound, dns-root-data, gettext, cacert
, guileBindings ? config.gnutls.guile or false, guile
, tpmSupport ? false, trousers, which, nettools, libunistring
, withSecurity ? false, Security # darwin Security.framework
@@ -8,7 +8,7 @@
assert guileBindings -> guile != null;
let
version = "3.6.7";
version = "3.6.8";
# XXX: Gnulib's `test-select' fails on FreeBSD:
# http://hydra.nixos.org/build/2962084/nixlog/1/raw .
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz";
sha256 = "1ql8l6l5bxks2pgpwb1602zc0j6ivhpy27hdfc49h8xgbanhjd2v";
sha256 = "10ry71sy8zbksa905bjryphafcg25gkmfa3pf48ripimar7990da";
};
outputs = [ "bin" "dev" "out" "man" "devdoc" ];
@@ -72,6 +72,9 @@ stdenv.mkDerivation {
propagatedBuildInputs = [ nettle ];
inherit doCheck;
# stdenv's `NIX_SSL_CERT_FILE=/no-cert-file.crt` broke tests with:
# Error setting the x509 trust file: Error while reading file.
checkInputs = [ cacert ];
# Fixup broken libtool and pkgconfig files
preFixup = lib.optionalString (!isDarwin) ''

4
pkgs/development/libraries/icu/64.nix Normal file
View File

@@ -0,0 +1,4 @@
import ./base.nix {
version = "64.2";
sha256 = "0v0xsf14xwlj125y9fd8lrhsaych4d8liv8gr746zng6g225szb2";
}

3
pkgs/development/libraries/languagemachines/libfolia.nix
View File

@@ -16,6 +16,9 @@ stdenv.mkDerivation {
buildInputs = [ automake autoconf bzip2 libtool autoconf-archive libtar libxml2 icu languageMachines.ticcutils ];
preConfigure = "sh bootstrap.sh";
# compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554
CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ];
meta = with stdenv.lib; {
description = "A C++ API for FoLiA documents; an XML-based linguistic annotation format.";
homepage = https://proycon.github.io/folia/;

8
pkgs/development/libraries/libbytesize/default.nix
View File

@@ -1,10 +1,10 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gettext
, gtk-doc, libxslt, docbook_xml_dtd_43, docbook_xsl
, python3, pcre, gmp, mpfr
, python3, pcre2, gmp, mpfr
}:
let
version = "1.4";
version = "2.0";
in stdenv.mkDerivation rec {
name = "libbytesize-${version}";
@@ -12,14 +12,14 @@ in stdenv.mkDerivation rec {
owner = "storaged-project";
repo = "libbytesize";
rev = version;
sha256 = "1yxlc0f960rhqmh3fs3p0hvw0y2cikplgc27zsz6rn4h5dlrfmi2";
sha256 = "0m950idlyv6mbkhr8ngnda5l5wwb5lzs4wn4kxl73cvdlcvklmwj";
};
outputs = [ "out" "dev" "devdoc" ];
nativeBuildInputs = [ autoreconfHook pkgconfig gettext gtk-doc libxslt docbook_xml_dtd_43 docbook_xsl python3 ];
buildInputs = [ pcre gmp mpfr ];
buildInputs = [ pcre2 gmp mpfr ];
meta = with stdenv.lib; {
description = "A tiny library providing a C “class” for working with arbitrary big sizes in bytes";

53
pkgs/development/libraries/libpsl/default.nix
View File

@@ -1,34 +1,22 @@
{ stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, docbook_xml_dtd_43, gtk-doc, icu
, libxslt, pkgconfig, python3 }:
{ stdenv, fetchurl, autoreconfHook, docbook_xsl, docbook_xml_dtd_43, gtk-doc, lzip
, libidn2, libunistring, libxslt, pkgconfig, python3, valgrind
, publicsuffix-list
}:
let
stdenv.mkDerivation rec {
pname = "libpsl";
version = "0.21.0";
listVersion = "2017-02-03";
listSources = fetchFromGitHub {
sha256 = "0fhc86pjv50hxj3xf9r4mh0zzvdzqp5lac20caaxq1hlvdzavaa3";
rev = "37e30d13801eaad3383b122c11d8091c7ac21040";
repo = "list";
owner = "publicsuffix";
src = fetchurl {
url = "https://github.com/rockdaboot/${pname}/releases/download/${pname}-${version}/${pname}-${version}.tar.lz";
sha256 = "183hadbira0d2zvv8272lspy31dgm9x26z35c61s5axcd5wd9g9i";
};
libVersion = "0.20.2";
in stdenv.mkDerivation rec {
name = "libpsl-${version}";
version = "${libVersion}-list-${listVersion}";
src = fetchFromGitHub {
sha256 = "0ijingxpnvl5xnna32j93ijagvjsvw2lhj71q39hz9xhzjzrda9b";
rev = "libpsl-${libVersion}";
repo = "libpsl";
owner = "rockdaboot";
};
buildInputs = [ icu libxslt ];
nativeBuildInputs = [ autoreconfHook docbook_xsl docbook_xml_dtd_43 gtk-doc pkgconfig python3 ];
nativeBuildInputs = [ autoreconfHook docbook_xsl docbook_xml_dtd_43 gtk-doc lzip pkgconfig python3 valgrind ];
buildInputs = [ libidn2 libunistring libxslt ];
propagatedBuildInputs = [ publicsuffix-list ];
postPatch = ''
substituteInPlace src/psl.c --replace bits/stat.h sys/stat.h
patchShebangs src/psl-make-dafsa
'';
@@ -36,15 +24,14 @@ in stdenv.mkDerivation rec {
gtkdocize
'';
preConfigure = ''
# The libpsl check phase requires the list's test scripts (tests/) as well
cp -Rv "${listSources}"/* list
'';
configureFlags = [
"--disable-builtin"
"--disable-static"
"--enable-gtk-doc"
"--enable-man"
"--enable-valgrind-tests"
"--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"
"--with-psl-file=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"
"--with-psl-testfile=${publicsuffix-list}/share/publicsuffix/test_psl.txt"
];
enableParallelBuilding = true;
@@ -60,8 +47,10 @@ in stdenv.mkDerivation rec {
"supercookies" and "super domain" certificates, for highlighting parts of
the domain in a user interface or sorting domain lists by site.
'';
homepage = http://rockdaboot.github.io/libpsl/;
homepage = "https://rockdaboot.github.io/libpsl/";
changelog = "https://raw.githubusercontent.com/rockdaboot/${pname}/${pname}-${version}/NEWS";
license = licenses.mit;
platforms = with platforms; linux ++ darwin;
platforms = platforms.unix;
maintainers = [ maintainers.c0bw3b ];
};
}

4
pkgs/development/libraries/librsvg/default.nix
View File

@@ -5,14 +5,14 @@
let
pname = "librsvg";
version = "2.44.13";
version = "2.44.14";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "13ybdfx1agp0is81hy699nqvzb4zg1msjyvsmqcx0hb41jzn1mnj";
sha256 = "00z3qimpk909pcqq0jlsis5sskc6kn7cqia20smd9k9rhs3ag1ba";
};
outputs = [ "out" "dev" "installedTests" ];

4
pkgs/development/libraries/libsoup/default.nix
View File

@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "libsoup";
version = "2.66.1";
version = "2.66.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1zs3bhspwg7fggxd7x1rrggpkcf2j9ch6dhncq9syh252z0vcb2a";
sha256 = "0amfw1yvy1kjrg41rfh2vvrw5gkwnyckqbw1fab50hm6xc1acbmx";
};
postPatch = ''

5
pkgs/development/libraries/openssl/default.nix
View File

@@ -136,6 +136,11 @@ in {
sha256 = "0jza8cmznnyiia43056dij1jdmz62dx17wsn0zxksh9h6817nmaw";
patches = [
./1.1/nix-ssl-cert-file.patch
(fetchurl {
name = "long-chacha-nonce.patch";
url = "https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=f426625b6ae9a7831010750490a5f0ad689c5ba3";
sha256= "02ghqg3vzmzx3s1dwwwbm1p1l4asaiampyg4k9vfrjwficvgpdgp";
})
(if stdenv.hostPlatform.isDarwin
then ./1.1/use-etc-ssl-certs-darwin.patch

3
pkgs/development/libraries/sqlite/default.nix
View File

@@ -9,7 +9,7 @@ let
in
stdenv.mkDerivation rec {
name = "sqlite-${version}";
pname = "sqlite";
version = "3.28.0";
# NB! Make sure to update analyzer.nix src (in the same directory).
@@ -71,6 +71,7 @@ stdenv.mkDerivation rec {
sed -i $out/lib/libsqlite3.la -e "s/dependency_libs=.*/dependency_libs='''/"
'';
enableParallelBuilding = true;
doCheck = false; # fails to link against tcl
meta = {

7
pkgs/development/libraries/sword/default.nix
View File

@@ -24,7 +24,12 @@ stdenv.mkDerivation rec {
})
];
configureFlags = [ "--without-conf" "--enable-tests=no CXXFLAGS=-Wno-unused-but-set-variable" ];
configureFlags = [ "--without-conf" "--enable-tests=no" ];
CXXFLAGS = [
"-Wno-unused-but-set-variable"
# compat with icu61+ https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554
"-DU_USING_ICU_NAMESPACE=1"
];
meta = with stdenv.lib; {
description = "A software framework that allows research manipulation of Biblical texts";

4
pkgs/development/libraries/webkitgtk/default.nix
View File

@@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
with stdenv.lib;
stdenv.mkDerivation rec {
name = "webkitgtk-${version}";
version = "2.24.1";
version = "2.24.2";
meta = {
description = "Web content rendering engine, GTK+ port";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://webkitgtk.org/releases/${name}.tar.xz";
sha256 = "0v9riwrmwi9wxbb8hlvcbyyxa9zxhcdk6s1xcspalk6asam8xjsk";
sha256 = "071jnjvjq6wsxx1jh4ql3j53h1nhphs5ga67fa5i9xjvs3qb3701";
};
patches = optionals stdenv.isDarwin [

17
pkgs/development/libraries/x265/default.nix
View File

@@ -1,4 +1,5 @@
{ stdenv, fetchurl, fetchpatch, cmake, yasm
{ stdenv, fetchurl, fetchpatch, cmake, nasm, numactl
, numaSupport ? stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64) # Enabled by default on NUMA platforms
, debugSupport ? false # Run-time sanity checks (debugging)
, highbitdepthSupport ? false # false=8bits per channel, true=10/12bits per channel
, werrorSupport ? false # Warnings as errors
@@ -16,26 +17,20 @@ in
stdenv.mkDerivation rec {
name = "x265-${version}";
version = "2.9";
version = "3.0";
src = fetchurl {
urls = [
"https://get.videolan.org/x265/x265_${version}.tar.gz"
"ftp://ftp.videolan.org/pub/videolan/x265/x265_${version}.tar.gz"
];
sha256 = "090hp4216isis8q5gb7bwzia8rfyzni54z21jnwm97x3hiy6ibpb";
sha256 = "0qh65wdpasrspkm1y0dlfa123myax568yi0sas0lmg5b1hkgrff5";
};
enableParallelBuilding = true;
patches = [
# Fix issue #442 (linking issue on non-x86 platforms)
# Applies on v2.9 only, this should be removed at next update
(fetchpatch {
url = "https://bitbucket.org/multicoreware/x265/commits/471726d3a0462739ff8e3518eb1a1e8a01de4e8d/raw";
sha256 = "0mj8lb8ng8lrhzjavap06vjhqf6j0r3sn76c6rhs3012f86lv928";
})
# Fix build on ARM (#406)
# Fix build on ARM (#406)
(fetchpatch {
url = "https://bitbucket.org/multicoreware/x265/issues/attachments/406/multicoreware/x265/1527562952.26/406/X265-2.8-asm-primitives.patch";
sha256 = "1vf8bpl37gbd9dcbassgkq9i0rp24qm3bl6hx9zv325174bn402v";
@@ -67,7 +62,7 @@ stdenv.mkDerivation rec {
rm $out/lib/*.a
'';
nativeBuildInputs = [ cmake yasm ];
nativeBuildInputs = [ cmake nasm ] ++ stdenv.lib.optional numaSupport numactl;
meta = with stdenv.lib; {
description = "Library for encoding h.265/HEVC video streams";