Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2019-05-14 10:23:13 +02:00
307 changed files with 3534 additions and 1507 deletions

View File

@@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "ansible-runner";
version = "1.3.3";
version = "1.3.4";
src = fetchPypi {
inherit pname version;
sha256 = "2a2b83e63b830de3ff01c2992342cfe09f96e410953c85904ee7e301b21fa513";
sha256 = "087jk00kv0qsqqspyn015nicvbl627wck3fgx2qhqawvrgqk3xb0";
};
checkInputs = [ pytest mock ];

View File

@@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchPypi
, nose
, numpy
, ffmpeg_4
, libav
@@ -10,14 +9,14 @@
buildPythonPackage rec {
pname = "av";
version = "6.1.2";
version = "6.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "eebbb56eeae650b1fc551f94d51aee39b487bf4df73c39daea186c5d2950650f";
sha256 = "1wm33qajxcpl9rn7zfb2pwwqn87idb7ic7h5zwy2hgbpjnh3vc2g";
};
checkInputs = [ nose numpy ];
checkInputs = [ numpy ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ffmpeg_4 ];

View File

@@ -15,11 +15,11 @@
buildPythonPackage rec {
pname = "holoviews";
version = "1.11.3";
version = "1.12.2";
src = fetchPypi {
inherit pname version;
sha256 = "cb03053bfcb96ccef181405b6d3482a5b868f0c7fbaa68b52d25e0071dafd1bc";
sha256 = "0i4lfnajz685hlp9m0bjn7s279bv6mm5118b1qmldzqdnvw4s032";
};
propagatedBuildInputs = [

View File

@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "latexcodec";
version = "1.0.6";
version = "1.0.7";
src = fetchPypi {
inherit pname version;
sha256 = "0s4wdbg0w2l8pj3i0y4510i0s04p8nhxcsa2z41bjsv0k66npb81";
sha256 = "0wnp3yqcgx0rpy8dz51vh75lbp2qif67da19zi7m3ca98n887hgb";
};
propagatedBuildInputs = [ six ];

View File

@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "phonenumbers";
version = "8.10.10";
version = "8.10.11";
src = fetchPypi {
inherit pname version;
sha256 = "dabc8cfcff96446b0787ea337739ea286ec3949ec27a4790a9b4587817da5c5f";
sha256 = "1rd46dryxkwlha9lfqqwywazlh908ngh6076zz3myhzf8h3dmxnz";
};
meta = {

View File

@@ -0,0 +1,28 @@
{ stdenv
, buildPythonPackage
, fetchFromGitHub
, coverage
, nose
}:
buildPythonPackage rec {
pname = "py-radix";
version = "0.10.0";
src = fetchFromGitHub {
owner = "mjschultz";
repo = "py-radix";
rev = "v${version}";
sha256 = "01xyn9lg6laavnzczf5bck1l1c2718ihxx0hvdkclnnxjqhbrqis";
};
doCheck = true;
checkInputs = [ coverage nose ];
meta = with stdenv.lib; {
description = "Python radix tree for IPv4 and IPv6 prefix matching";
homepage = https://github.com/mjschultz/py-radix;
license = with licenses; [ isc bsdOriginal ];
maintainers = with maintainers; [ mkg ];
};
}

View File

@@ -32,12 +32,25 @@ let
"test_set_notBefore"
];
# these tests are extremely tightly wed to the exact output of the openssl cli tool,
# including exact punctuation.
failingOpenSSL_1_1Tests = [
"test_dump_certificate"
"test_dump_privatekey_text"
"test_dump_certificate_request"
"test_export_text"
];
disabledTests = [
# https://github.com/pyca/pyopenssl/issues/692
# These tests, we disable always.
"test_set_default_verify_paths"
"test_fallback_default_verify_paths"
] ++ (optionals (hasPrefix "libressl" openssl.meta.name) failingLibresslTests);
] ++ (
optionals (hasPrefix "libressl" openssl.meta.name) failingLibresslTests
) ++ (
optionals (versionAtLeast (getVersion openssl.name) "1.1") failingOpenSSL_1_1Tests
);
# Compose the final string expression, including the "-k" and the single quotes.
testExpression = optionalString (disabledTests != [])

View File

@@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchPypi, gnupg1 }:
{ stdenv, buildPythonPackage, fetchPypi, gnupg }:
buildPythonPackage rec {
pname = "python-gnupg";
@@ -12,9 +12,9 @@ buildPythonPackage rec {
# Let's make the library default to our gpg binary
patchPhase = ''
substituteInPlace gnupg.py \
--replace "gpgbinary='gpg'" "gpgbinary='${gnupg1}/bin/gpg'"
--replace "gpgbinary='gpg'" "gpgbinary='${gnupg}/bin/gpg'"
substituteInPlace test_gnupg.py \
--replace "gpgbinary=GPGBINARY" "gpgbinary='${gnupg1}/bin/gpg'" \
--replace "gpgbinary=GPGBINARY" "gpgbinary='${gnupg}/bin/gpg'" \
--replace "test_search_keys" "disabled__test_search_keys"
'';

View File

@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "qdarkstyle";
version = "2.6.6";
version = "2.6.8";
src = fetchPypi {
inherit version;
pname = "QDarkStyle";
sha256 = "1jbvvg36fnbvpzvg4ns7zx5jj8h1xsqdr05v5m98a0a9r8awdx3m";
sha256 = "18l2ynq2x8jd380nr47xy947c3qdmhv8nnxnan03y5d51azm8yh3";
};
# No tests available

View File

@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "qtconsole";
version = "4.4.3";
version = "4.4.4";
src = fetchPypi {
inherit pname version;
sha256 = "1b03n1ixzscm0jw97l4dq5iy4fslnqxq5bb8287xb7n2a1gs26xw";
sha256 = "1qqyk5wlaps1m2hb5n2q1gynw2ayqn31dvxwwni4450ygf65arx6";
};
checkInputs = [ nose ] ++ lib.optionals isPy27 [mock];

View File

@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "QtPy";
version = "1.7.0";
version = "1.7.1";
src = fetchPypi {
inherit pname version;
sha256 = "0gjg7farw6mkmrwqcg6ms7j74g8py2msvawddji4wy8yfvql1ifl";
sha256 = "17pdn4d77gjjrsq7m1i6dz9px0dfi6wgaqz2v3sa3crl15spawp9";
};
# no concrete propagatedBuildInputs as multiple backends are supposed

View File

@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "shodan";
version = "1.12.1";
version = "1.13.0";
src = fetchPypi {
inherit pname version;
sha256 = "0fd68yaqhpay7jxhyc6xkdrak88wdblxs0phgdkngbakx2yaw2y3";
sha256 = "06z9h5vxrvqns3yr4jfrxifw0iqdn6ijlnznpmyi8nc18h8yma2a";
};
propagatedBuildInputs = [

View File

@@ -12,11 +12,11 @@
buildPythonPackage rec {
pname = "smart_open";
version = "1.8.2";
version = "1.8.3";
src = fetchPypi {
inherit pname version;
sha256 = "d3c16477ad7e8f94ab033630ea31993670ad21153172367db1acb143077d501c";
sha256 = "029b0ns6q9vl4pyk1w7jp4dvif1mfgr53a58z1p8zipwnhkfwnih";
};
# nixpkgs version of moto is >=1.2.0, remove version pin to fix build

View File

@@ -1,10 +1,10 @@
{ buildPythonPackage, fetchPypi, lib, pythonOlder }:
buildPythonPackage rec {
pname = "typed-ast";
version = "1.3.4";
version = "1.3.5";
src = fetchPypi{
inherit pname version;
sha256 = "68c362848d9fb71d3c3e5f43c09974a0ae319144634e7a47db62f0f2a54a7fa7";
sha256 = "1m7pr6qpana3cvqwiw7mlvrgvmw27ch5mx1592572xhlki8g85ak";
};
# Only works with Python 3.3 and newer;
disabled = pythonOlder "3.3";