Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1504357
This commit is contained in:
Vladimír Čunát
2019-02-09 10:15:17 +01:00
197 changed files with 5804 additions and 1612 deletions

View File

@@ -10,11 +10,11 @@
buildPythonPackage rec {
pname = "aws-sam-translator";
version = "1.8.0";
version = "1.9.0";
src = fetchPypi {
inherit pname version;
sha256 = "bdf9ba476a9a7726fe93746670ccae257955352d98b231f32e9529f01db7ef3b";
sha256 = "1334795a85077cd5741822149260f90104fb2a01699171c9e9567c0db76ed74d";
};
# Tests are not included in the PyPI package

View File

@@ -4,14 +4,14 @@
, pytest, requests }:
buildPythonPackage rec {
version = "2.2.0";
version = "2.2.1";
pname = "beancount";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "1j3fyyqnr5gq71rmkb9q3im8pqppa134zzhmmp4hk4b274g18w31";
sha256 = "0xrgmqv0wsc0makm5i6jwng99yp3rvm30v2xqmcah60fgjymkjzb";
};
# No tests in archive

View File

@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "braintree";
version = "3.50.0";
version = "3.51.0";
src = fetchPypi {
inherit pname version;
sha256 = "d1d7a6854b623f2c616451fa474113ac7fb8a2cbeb7dfad36dd3312113484030";
sha256 = "1aavalwxcpql416f0n6wxq2h5jpvbx5jq4y4nz2wsppgjbsxylcc";
};
propagatedBuildInputs = [ requests ];

View File

@@ -1,8 +1,8 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k,
python, twisted, jinja2, zope_interface, future, sqlalchemy,
sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, treq, txrequests,
txgithub, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial, isort, pylint,
flake8, buildbot-worker, buildbot-pkg, glibcLocales }:
sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq,
txrequests, txgithub, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial,
isort, pylint, flake8, buildbot-worker, buildbot-pkg, glibcLocales }:
let
withPlugins = plugins: buildPythonPackage {
@@ -24,11 +24,11 @@ let
package = buildPythonPackage rec {
pname = "buildbot";
version = "1.5.0";
version = "1.8.1";
src = fetchPypi {
inherit pname version;
sha256 = "d02a717222bcdc98205624c7d6b0b2ae24653170f2971946f26bf8cadea4fd52";
sha256 = "1zadmyrlk7p9h1akmbzwa7p90s7jwsxvdx4xn9i54dnda450m3a7";
};
propagatedBuildInputs = [
@@ -43,6 +43,7 @@ let
txaio
autobahn
pyjwt
pyyaml
# tls
twisted.extras.tls
@@ -71,13 +72,16 @@ let
./skip_test_linux_distro.patch
];
LC_ALL = "en_US.UTF-8";
postPatch = ''
substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)"
'';
# TimeoutErrors on slow machines -> aarch64
doCheck = !stdenv.isAarch64;
postPatch = ''
substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)"
preCheck = ''
export LC_ALL="en_US.UTF-8"
export PATH="$out/bin:$PATH"
'';
passthru = {

View File

@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "buildbot-pkg";
version = "1.4.0";
version = "1.8.1";
src = fetchPypi {
inherit pname version;
sha256 = "06f4jvczbg9km0gfmcd1ljplf5w8za27i9ap9jnyqgh3j77smd7a";
sha256 = "16gjdzkris6475bvsgvb0v6rkn4xb6f55s468q37n0l1r6n8snc3";
};
postPatch = ''

View File

@@ -10,7 +10,7 @@
src = fetchPypi {
inherit pname version format;
sha256 = "1m5dsp1gn9m5vfh5hnqp8g6hmhw1f1ydnassd33nhk521f2akz0v";
sha256 = "03cgjhwpgbm0qgis1cdy9g4vc11hsrya9grcx4j35784rny7lbfl";
};
meta = with lib; {
@@ -27,7 +27,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "0vblaxmihgb4w9aa5q0wcgvxs7qzajql8s22w0pl9qs494g05s9r";
sha256 = "0pfp2n4ys99jglshdrp2f6jm73c4ym3dfwl6qjvbc7y7nsi74824";
};
propagatedBuildInputs = [ buildbot-pkg ];
@@ -47,7 +47,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "18v1a6dapwjc2s9hi0cv3ry3s048w84md908zwaa3033gz3zwzy7";
sha256 = "0gnxq9niw64q36dm917lhhcl8zp0wjwaamjp07zidnrb5c3pjbsz";
};
propagatedBuildInputs = [ buildbot-pkg ];
@@ -67,7 +67,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "0iawsy892v6rn88hsgiiwaf689jqzhnb2wbxh6zkz3c0hvq4g0qd";
sha256 = "1b06aa8m1pzqq2d8imrq5mazc7llrlbgm7jzi8h6jjd2gahdjgz5";
};
propagatedBuildInputs = [ buildbot-pkg ];
@@ -87,7 +87,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "00cpjna3bffh1qbq6a3sqffd1g7qhbrmn9gpzxf9k38jam6jgfpz";
sha256 = "1v8411bw0cs206vwfnqx1na7dzg77h9aff4wlm11hkbdsy9ayv2d";
};
propagatedBuildInputs = [ buildbot-pkg ];

View File

@@ -2,11 +2,11 @@
buildPythonPackage (rec {
pname = "buildbot-worker";
version = "1.4.0";
version = "1.8.1";
src = fetchPypi {
inherit pname version;
sha256 = "12zvf4c39b6s4g1f2w407q8kkw602m88rc1ggi4w9pkw3bwbxrgy";
sha256 = "1rh73jbyms4b9wgkkdzcn80xfd18p8rn89rw4rsi2002ydrc7n39";
};
propagatedBuildInputs = [ twisted future ];

View File

@@ -0,0 +1,25 @@
{ lib, buildPythonPackage, fetchPypi, six, pyyaml, click, pytestrunner }:
buildPythonPackage rec {
pname = "cfn-flip";
version = "1.1.0.post1";
src = fetchPypi {
pname = "cfn_flip";
inherit version;
sha256 = "16r01ijjwnq06ax5xrv6mq9l00f6sgzw776kr43zjai09xsbwwck";
};
propagatedBuildInputs = [ six pyyaml click ];
nativeBuildInputs = [ pytestrunner ];
# No tests in Pypi
doCheck = false;
meta = with lib; {
description = "Tool for converting AWS CloudFormation templates between JSON and YAML formats";
homepage = https://github.com/awslabs/aws-cfn-template-flip;
license = licenses.asl20;
maintainers = with maintainers; [ psyanticy ];
};
}

View File

@@ -4,7 +4,7 @@
}:
buildPythonPackage rec {
pname = "daphne";
version = "2.2.4";
version = "2.2.5";
disabled = !isPy3k;
@@ -12,7 +12,7 @@ buildPythonPackage rec {
owner = "django";
repo = pname;
rev = version;
sha256 = "0mpn2xbpx2r67bj5crfvxfwlznxlp7rcfbb2xly6ad3d0c7djkdi";
sha256 = "0ixgq1rr3s60bmrwx8qwvlvs3lag1c2nrmg4iy7wcmb8i1ddylqr";
};
nativeBuildInputs = [ pytestrunner ];

View File

@@ -19,27 +19,28 @@
, tornado
, zict
, pyyaml
, pythonOlder
, isPy3k
, futures
, singledispatch
, mpi4py
, bokeh
}:
buildPythonPackage rec {
pname = "distributed";
version = "1.25.2";
version = "1.25.3";
# get full repository need conftest.py to run tests
src = fetchPypi {
inherit pname version;
sha256 = "0rv5831xv5byx0f8ly3mlji207nb3bzq6qmdf7ishrgy9kpphc68";
sha256 = "0bvjlw74n0l4rgzhm876f66f7y6j09744i5h3iwlng2jwzyw97gs";
};
checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ];
propagatedBuildInputs = [
click cloudpickle dask msgpack psutil six
sortedcontainers tblib toolz tornado zict pyyaml
] ++ lib.optional (pythonOlder "3.2") [ futures ]
++ lib.optional (pythonOlder "3.4") [ singledispatch ];
sortedcontainers tblib toolz tornado zict pyyaml mpi4py bokeh
] ++ lib.optionals (!isPy3k) [ futures singledispatch ];
# tests take about 10-15 minutes
# ignore 5 cli tests out of 1000 total tests that fail due to subprocesses

View File

@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "django-reversion";
version = "3.0.2";
version = "3.0.3";
src = fetchPypi {
inherit pname version;
sha256 = "9b8a245917e1bae131d3210c9ca7efbc066e60f32efa436e391c9803c3f4b61b";
sha256 = "0xjs803r5fxaqpkjbpsb17j8racxa4q1nvjjaj1akkgkgw9dj343";
};
# tests assume the availability of a mysql/postgresql database

View File

@@ -1,20 +1,16 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchPypi
, python
}:
buildPythonPackage rec {
pname = "filetype";
version = "1.0.2";
version = "1.0.3";
# No tests in PyPI tarball
# See https://github.com/h2non/filetype.py/pull/33
src = fetchFromGitHub {
owner = "h2non";
repo = "filetype.py";
rev = "v${version}";
sha256 = "000gl3q2cadfnmqnbxg31ppc3ak8blzb4nfn75faxbp7b6r5qgr2";
src = fetchPypi {
inherit pname version;
sha256 = "74ccbd9ca5c95aad5665eee2f173fb1930226a12f05b0bc7380b1d456a86fcdf";
};
checkPhase = ''

View File

@@ -18,5 +18,6 @@ buildPythonPackage rec {
description = "A backport of fstrings to python<3.6";
license = licenses.mit;
maintainers = with maintainers; [ nyanloutre ];
broken = pythonOlder "3.6"; # dependency tokenize-rt not packaged
};
}

View File

@@ -0,0 +1,20 @@
{ stdenv, buildPythonPackage, fetchurl, libguestfs, qemu }:
buildPythonPackage rec {
pname = "guestfs";
version = "1.40.1";
src = fetchurl {
url = "http://download.libguestfs.org/python/guestfs-${version}.tar.gz";
sha256 = "06a4b5xf1rkhnzfvck91n0z9mlkrgy90s9na5a8da2g4p776lhkf";
};
propagatedBuildInputs = [ libguestfs qemu ];
meta = with stdenv.lib; {
homepage = "http://libguestfs.org/guestfs-python.3.html";
description = "Use libguestfs from Python";
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ grahamc ];
};
}

View File

@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "Keras_Applications";
version = "1.0.6";
version = "1.0.7";
src = fetchPypi {
inherit pname version;
sha256 = "a03af60ddc9c5afdae4d5c9a8dd4ca857550e0b793733a5072e0725829b87017";
sha256 = "1yk9brcvr96s1slpgj9vr6np7fk8limcrw9v2pjq72c6k0mpnq30";
};
# Cyclic dependency: keras-applications requires keras, which requires keras-applications

View File

@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "libtmux";
version = "0.8.0";
version = "0.8.1";
src = fetchPypi {
inherit pname version;
sha256 = "2b969b507c26d9db08b85be4808d75774b6418ecf5a0f61956f7a1da44519585";
sha256 = "0al5qcvzcl4v70vngbv39jg422jsy0m1b5q9pp54cc7m9b666jax";
};
checkInputs = [ pytest ];

View File

@@ -1,4 +1,5 @@
{ stdenv
, fetchpatch
, buildPythonPackage
, fetchPypi
, swig2
@@ -16,6 +17,14 @@ buildPythonPackage rec {
sha256 = "a1b2751cdadc6afac3df8a5799676b7b7c67a6ad144bb62d38563062e7cd3fc6";
};
patches = [
(fetchpatch {
url = "https://github.com/void-linux/void-packages/raw/7946d12eb3d815e5ecd4578f1a6133d948694370/srcpkgs/python-M2Crypto/patches/libressl.patch";
sha256 = "0z5qnkndg6ma5f5qqrid5m95i9kybsr000v3fdy1ab562kf65a27";
})
];
patchFlags = "-p0";
buildInputs = [ swig2 openssl ];
propagatedBuildInputs = [ typing ];
@@ -30,6 +39,7 @@ buildPythonPackage rec {
description = "A Python crypto and SSL toolkit";
homepage = http://chandlerproject.org/Projects/MeTooCrypto;
license = licenses.mit;
maintainers = with maintainers; [ andrew-d ];
};
}

View File

@@ -13,13 +13,13 @@ let
# Therefore we create a separate env for it.
scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]);
in buildPythonPackage rec {
version = "0.6.1";
version = "0.6.1.1";
pname = "Nuitka";
# Latest version is not yet on PyPi
src = fetchurl {
url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz";
sha256 = "0ncclbj9qdd88fs26mvgf217m7kgfcy1zgsyzi1j65b6z2wywl9a";
sha256 = "0dlhbgn90nj110kmylyrzxd301611g63ynbpm5dfsb09s9c569zm";
};
checkInputs = [ vmprof pyqt4 ];

View File

@@ -19,11 +19,11 @@
buildPythonPackage rec {
pname = "py3status";
version = "3.15";
version = "3.16";
src = fetchPypi {
inherit pname version;
sha256 = "78aa7fa0af707641e215ea93bfd4bb5fd47f18a7193d84ed60bb9e6cccb75b7f";
sha256 = "1xrfph277bgjln3jbpzpgkhxad04fjvj7s3xfil42q1sxi4s3q3g";
};
doCheck = false;

View File

@@ -3,11 +3,11 @@
buildPythonPackage rec {
pname = "PyContracts";
version = "1.8.7";
version = "1.8.8";
src = fetchPypi {
inherit pname version;
sha256 = "1b65jkbk9bcl10s49w9frsjcarfzi8gp22a40cz7zxry8b8yvcf0";
sha256 = "0njcssvjj2aisb52xp9jmfps43iqg3fw4grj524i911p34yln2va";
};
buildInputs = [ nose ];

View File

@@ -1,24 +0,0 @@
{ lib, buildPythonPackage, fetchFromGitHub, pynacl, six }:
buildPythonPackage rec {
pname = "pymacaroons-pynacl";
version = "0.9.3";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "pymacaroons";
rev = "v${version}";
sha256 = "0bykjk01zdndp6gjr30x46blsn0cvxa7j0zh5g8raxwaawchjhii";
};
propagatedBuildInputs = [ pynacl six ];
# Tests require an old version of hypothesis
doCheck = false;
meta = with lib; {
description = "Macaroon library for Python";
homepage = https://github.com/matrix-org/pymacaroons;
license = licenses.mit;
};
}

View File

@@ -0,0 +1,25 @@
{ lib, buildPythonPackage, fetchPypi, six, pynacl }:
buildPythonPackage rec {
pname = "pymacaroons";
version = "0.13.0";
src = fetchPypi {
inherit pname version;
sha256 = "1e6bba42a5f66c245adf38a5a4006a99dcc06a0703786ea636098667d42903b8";
};
propagatedBuildInputs = [
six
pynacl
];
# Tests require an old version of hypothesis
doCheck = false;
meta = with lib; {
description = "Macaroon library for Python";
homepage = https://github.com/ecordell/pymacaroons;
license = licenses.mit;
};
}

View File

@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "pynvim";
version = "0.3.1";
version = "0.3.2";
src = fetchPypi {
inherit pname version;
sha256 = "1yxh8zdigzs330m4gchxk6m323glz81x85q5fzgc4saq0naib26x";
sha256 = "01dybk4vs452pljn1q3il5z2sd313ki0lgiglc0xmjc6wp290r6g";
};
checkInputs = [ nose ];

View File

@@ -10,11 +10,11 @@
}:
buildPythonPackage rec {
pname = "pytest-django";
version = "3.4.5";
version = "3.4.6";
src = fetchPypi {
inherit pname version;
sha256 = "0dh7jm1d37p54pgc7cx4izz6khsd860a6hw64gx74c8fjfz36p8s";
sha256 = "0r190xb707817la5kw5i3m646ijmg025zqy55gz16py94wsnav5y";
};
nativeBuildInputs = [ pytest setuptools_scm ];

View File

@@ -1,4 +1,4 @@
{ stdenv
{ lib
, buildPythonPackage
, fetchPypi
, python
@@ -11,28 +11,33 @@
, testscenarios
, testrepository
, kerberos
, requests
, unittest2
, requests-mock
}:
buildPythonPackage rec {
pname = "python-jenkins";
version = "1.3.0";
version = "1.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "b44b3c8e0dabed371a1a8a301cc8833c635625faf003fd68c176800c71a6597c";
sha256 = "1h14hfcwichmppbgxf1k8njw29hchpav1kj574b4lly3j0n2vnag";
};
patchPhase = ''
sed -i 's@python@${python.interpreter}@' .testr.conf
buildInputs = [ mock ];
propagatedBuildInputs = [ pbr pyyaml six multi_key_dict requests ];
checkInputs = [ unittest2 testscenarios requests-mock ];
checkPhase = ''
unit2
'';
buildInputs = [ mock ];
propagatedBuildInputs = [ pbr pyyaml six multi_key_dict testtools testscenarios testrepository kerberos ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Python bindings for the remote Jenkins API";
homepage = https://pypi.python.org/pypi/python-jenkins;
license = licenses.bsd3;
maintainers = with maintainers; [ ma27 ];
};
}

View File

@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "QtAwesome";
version = "0.5.5";
version = "0.5.6";
src = fetchPypi {
inherit pname version;
sha256 = "0yb194c927g9nqknfb49nfqv32l74bb0m71wswijbbybb7syabbl";
sha256 = "0f6dvqmalzi4q4rrpl1xlrxanibam1nifzsgqb5z4jr4ap7kiyp3";
};
propagatedBuildInputs = [ qtpy six pyside ];

View File

@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "rpmfluff";
version = "0.5.5";
version = "0.5.6";
src = fetchurl {
url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz";
sha256 = "0m92ihii8fgdyma9vn3s6fhq0px8n930c27zs554la0mm4548ss3";
sha256 = "0bhh8mv2kddhv3fiswg3zdl91d7vh93b33jlh1dmyz63z94rm88l";
};
LC_ALL="en_US.utf-8";

View File

@@ -0,0 +1,35 @@
{ lib
, fetchPypi
, buildPythonPackage
, click-plugins
, colorama
, requests
, XlsxWriter
}:
buildPythonPackage rec {
pname = "shodan";
version = "1.10.4";
src = fetchPypi {
inherit pname version;
sha256 = "13966vqxww7v2b5hf2kjismdzvqyjvxlcdvpkzpbsrpxy9pvn2n4";
};
propagatedBuildInputs = [
click-plugins
colorama
requests
XlsxWriter
];
# The tests require a shodan api key, so skip them.
doCheck = false;
meta = with lib; {
description = "Python library and command-line utility for Shodan";
homepage = https://github.com/achillean/shodan-python;
license = licenses.mit;
maintainers = with maintainers; [ lihop ];
};
}

View File

@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "slixmpp";
version = "1.4.1";
version = "1.4.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "020acd4507fd00c38835b78b5f338db60d3df840187623e0d41ab2ca89d7ae57";
sha256 = "0rqpmscxjznxyz3dyxpc56gib319k01vl837r8g8w57dinz4y863";
};
patches = [

View File

@@ -0,0 +1,29 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytest
, pythonOlder
}:
buildPythonPackage rec {
pname = "sly";
version = "0.3";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "be6a3825b042a9e1b6f5730fc747e6d983c917f0f002d798d0b9f86ca5c05ad9";
};
checkInputs = [ pytest ];
# tests not included with pypi release
doCheck = false;
meta = with lib; {
description = "An improved PLY implementation of lex and yacc for Python 3";
homepage = https://github.com/dabeaz/sly;
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
};
}

View File

@@ -5,11 +5,11 @@
}:
buildPythonPackage rec {
pname = "sqlalchemy-migrate";
version = "0.11.0";
version = "0.12.0";
src = fetchPypi {
inherit pname version;
sha256 = "0ld2bihp9kmf57ykgzrfgxs4j9kxlw79sgdj9sfn47snw3izb2p6";
sha256 = "1bngmbcry97kwhrxwm0d74zg9qg7gmiws6rd78xshyfgpcqdmylc";
};
# See: https://review.openstack.org/#/c/608382/

View File

@@ -1,9 +1,11 @@
{ lib, buildPythonPackage, fetchPypi, sqlalchemy, telethon }:
{ lib, buildPythonPackage, fetchPypi, isPy3k, sqlalchemy }:
buildPythonPackage rec {
pname = "telethon-session-sqlalchemy";
version = "0.2.5";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "b392096b14e5cdc4040d3900cc2be7847b160ed77e5c861a6bd07d75d8e17a85";

View File

@@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "xarray";
version = "0.11.2";
version = "0.11.3";
src = fetchPypi {
inherit pname version;
sha256 = "1cnghx1xcgdq675abmrys311vspmzgjgiji4wh8iyw194qalfwdg";
sha256 = "1pc4p7yxvmhn3x121wgslwclaqnjlx51wxs6ihb4cxynh2vcwgfc";
};
checkInputs = [ pytest ];

View File

@@ -0,0 +1,24 @@
{ lib, buildPythonPackage, fetchPypi
, requests }:
buildPythonPackage rec {
pname = "yubico-client";
version = "1.10.0";
src = fetchPypi {
inherit pname version;
sha256 = "0skkmrpvpb1pwyqjf3lh9vq46xagvwdx9kagpdbba2v5dgrk34d1";
};
propagatedBuildInputs = [ requests ];
# pypi package missing test_utils and github releases is behind
doCheck = false;
meta = with lib; {
description = "Verifying Yubico OTPs based on the validation protocol version 2.0";
homepage = https://github.com/Kami/python-yubico-client/;
maintainers= with maintainers; [ peterromfeldhk ];
license = licenses.bsd3;
};
}