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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Orivej Desh
2020-05-22 09:13:23 +00:00
parent eae4f22176 5de1e307f2
commit 16d7f7edae
290 changed files with 7699 additions and 2328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/python-modules/awkward/default.nix
View File

@@ -3,7 +3,6 @@
, fetchPypi
, numpy
, pandas
, pyarrow
, pytestrunner
, pytest
, h5py
@@ -19,7 +18,7 @@ buildPythonPackage rec {
};
nativeBuildInputs = [ pytestrunner ];
checkInputs = [ pandas pyarrow pytest h5py ];
checkInputs = [ pandas pytest h5py ];
propagatedBuildInputs = [ numpy ];
checkPhase = ''

4
pkgs/development/python-modules/azure-mgmt-batch/default.nix
View File

@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-batch";
version = "7.0.0";
version = "8.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "18dwgbwk1kc0pdqa85hbsm9312l50rf8ymb60fia1c9rni9bdi8n";
sha256 = "228ea058361763a5a31273df7d813b9134d0ecff4567c533eb7e1afaf772fbc7";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-mgmt-core/default.nix
View File

@@ -7,13 +7,13 @@
}:
buildPythonPackage rec {
version = "1.0.0";
version = "1.1.0";
pname = "azure-mgmt-core";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "0pm565v05480f672l0n8z2sg6zk6iqyi91n0dhscibhdl54sy3si";
sha256 = "049dfb0bcc7961d0d988fee493d1ec4f4480e109e4661e360bad054cc297d43c";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
View File

@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-cosmosdb";
version = "0.13.0";
version = "0.14.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "e83d21462f9d5b02e90f5590c4247ab73e0ff85fc4ac1fba32be119a15b10c98";
sha256 = "692544dd2fa6276a7a4b4e094e2a5e0915d29b7829e266c6ade2b17a5fdcc2a9";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-mgmt-eventhub/default.nix
View File

@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-eventhub";
version = "3.0.0";
version = "3.1.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "05c6isg13dslds94kv28v6navxj4bp4c5lsd9df0g3ndsxvpdrxp";
sha256 = "c823a0ed879230a3ec9f15c32c9788610af1db56e6aeae6b2725476ddbe0d138";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-mgmt-iothub/default.nix
View File

@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-iothub";
version = "0.11.0";
version = "0.12.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "f6fbb87d9bf29ce325543c9a3a125fbe45f4797f3a7f260c6c21ca60dc3f0885";
sha256 = "da20ee2b9b9a2c2f89be9037c3ee5421152e7f6d718eafbf50a91dbf0a07ffa0";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-mgmt-network/default.nix
View File

@@ -7,13 +7,13 @@
}:
buildPythonPackage rec {
version = "10.1.0";
version = "10.2.0";
pname = "azure-mgmt-network";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "e5ac0ee14b71ab57035c45bef15d3698b0b6026ecafb8320a7c704eb3f6fba3a";
sha256 = "d50c74cdc1c9be6861ddef9adffd3b05afc5a5092baf0209eea30f4439cba2d9";
};
postInstall = if isPy3k then "" else ''

4
pkgs/development/python-modules/azure-mgmt-storage/default.nix
View File

@@ -7,13 +7,13 @@
}:
buildPythonPackage rec {
version = "9.0.0";
version = "10.0.0";
pname = "azure-mgmt-storage";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "198r51av2rd1mr3q9j8jibhd14w0v8k59ipc3czsm4g1n44adgkl";
sha256 = "d1edead1ad36e957c9f9b605f547ad1ff7152f8f785fa03d3c7891bb428a68ef";
};
propagatedBuildInputs = [ azure-mgmt-common ];

14
pkgs/development/python-modules/azure-multiapi-storage/default.nix
View File

@@ -1,20 +1,28 @@
{ lib, python, buildPythonPackage, fetchPypi, isPy27
, azure-common
, azure-core
, msrest
, msrestazure
, requests
}:
buildPythonPackage rec {
version = "0.2.4";
version = "0.3.2";
pname = "azure-multiapi-storage";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "0zqapc4dx6qd9bcim5fjykk3n1j84p85nwqyb876nb7qmqx9spig";
sha256 = "c403a47e40e4a80d9c42c854993f5c07f12c2a75bd9a85ba8225985493a9b792";
};
propagatedBuildInputs = [ azure-common msrest msrestazure ];
propagatedBuildInputs = [
azure-common
azure-core
msrest
msrestazure
requests
];
# fix namespace
pythonNamespaces = [ "azure.multiapi" ];

4
pkgs/development/python-modules/azure-servicefabric/default.nix
View File

@@ -7,12 +7,12 @@
buildPythonPackage rec {
pname = "azure-servicefabric";
version = "7.0.0.0";
version = "7.1.0.45";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "27712658fed7f5db6965d1035bbc0f3b16964fc88d6f3ad3e86cf4fae2b01bb9";
sha256 = "8dd0eb419ca62f2436c31982f6d236868f15f65bb062c4e5a98e50b16298dcda";
};
propagatedBuildInputs = [

34
pkgs/development/python-modules/bleak/default.nix Normal file
View File

@@ -0,0 +1,34 @@
{ stdenv, buildPythonPackage, isPy3k, fetchPypi, bluez, txdbus, pytest, pytestcov }:
buildPythonPackage rec {
pname = "bleak";
version = "0.6.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "1kmq2z3dhq6dd20i5w71gshjrfvyw0pkpnld8iib9ai2rz6a8aj0";
};
postPatch = ''
# bleak checks BlueZ's version with a call to `bluetoothctl -v` twice
substituteInPlace bleak/__init__.py \
--replace \"bluetoothctl\" \"${bluez}/bin/bluetoothctl\"
substituteInPlace bleak/backends/bluezdbus/client.py \
--replace \"bluetoothctl\" \"${bluez}/bin/bluetoothctl\"
'';
propagatedBuildInputs = [ txdbus ];
checkInputs = [ pytest pytestcov ];
checkPhase = "AGENT_OS=linux py.test";
meta = with stdenv.lib; {
description = "Bluetooth Low Energy platform Agnostic Klient for Python";
homepage = "https://github.com/hbldh/bleak";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ geistesk ];
};
}

8
pkgs/development/python-modules/discordpy/default.nix
View File

@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "discord.py";
version = "1.2.5";
version = "1.3.3";
disabled = pythonOlder "3.5.3";
# only distributes wheels on pypi now
@@ -18,14 +18,14 @@ buildPythonPackage rec {
owner = "Rapptz";
repo = pname;
rev = "v${version}";
sha256 = "17l6mlfi9ikqndpmi4pwlvb53g132cycyfm9nzdyiqr96k8ly4ig";
sha256 = "0ld92vh7kjk3f02nbqyib68844yi4p2kmkyir6v9wi00y1l287l3";
};
propagatedBuildInputs = [ aiohttp websockets ];
patchPhase = ''
substituteInPlace "requirements.txt" \
--replace "aiohttp>=3.3.0,<3.6.0" "aiohttp~=3.3" \
--replace "websockets>=6.0,<7.0" "websockets>=6"
--replace "aiohttp>=3.6.0,<3.7.0" "aiohttp~=3.6.0" \
--replace "websockets>=6.0,!=7.0,!=8.0,!=8.0.1,<9.0" "websockets>=6"
'' + lib.optionalString withVoice ''
substituteInPlace "discord/opus.py" \
--replace "ctypes.util.find_library('opus')" "'${libopus}/lib/libopus.so.0'"

210
pkgs/development/python-modules/fluidasserts/default.nix
View File

@@ -1,210 +0,0 @@
{ buildPythonPackage
, fetchPypi
, isPy37
, lib
# pythonPackages
, aiohttp
, androguard
, azure-identity
, azure-keyvault
, azure-mgmt-compute
, azure-mgmt-keyvault
, azure-mgmt-network
, azure-mgmt-resource
, azure-mgmt-security
, azure-mgmt-storage
, azure-mgmt-sql
, azure-mgmt-web
, azure-storage
, bandit
, bcrypt
, beautifulsoup4
, boto3
, cfn-flip
, cython
, dnspython
, colorama
, configobj
, defusedxml
, GitPython
, google_api_python_client
, kubernetes
, ldap3
, mixpanel
, mysql-connector
, names
, ntplib
, oyaml
, paramiko
, pillow
, psycopg2
, pycrypto
, pygments
, pyhcl
, pyjks
, pynacl
, pyodbc
, pyopenssl
, pypdf2
, pysmb
, pytesseract
, python_magic
, pytz
, pywinrm
, requirements-detector
, selenium
, tlslite-ng
, viewstate
# pythonPackages to test the derivation
, pytest
, flask
, flask-httpauth
, docker
}:
buildPythonPackage rec {
pname = "fluidasserts";
version = "20.2.40218";
disabled = !isPy37;
src = fetchPypi {
inherit pname version;
sha256 = "b33ae7a14c57769b9da06c37bb19b6193291f12f159c42d7871ca22541ffa246";
};
patchPhase = ''
# Release packages from their hard pinned versions
sed -i -E "s/(.*)==.*/\1/g" requirements.txt
# Functionality that will be not present for the momment
# but that we'll work to add in the future
# Just a minimal portion of fluidasserts use this
substituteInPlace ./requirements.txt \
--replace "mitmproxy" "" \
'';
propagatedBuildInputs = [
# pythonPackages
aiohttp
androguard
azure-identity
azure-keyvault
azure-mgmt-compute
azure-mgmt-keyvault
azure-mgmt-network
azure-mgmt-resource
azure-mgmt-security
azure-mgmt-storage
azure-mgmt-sql
azure-mgmt-web
azure-storage
bandit
bcrypt
beautifulsoup4
boto3
cfn-flip
cython
dnspython
colorama
configobj
defusedxml
GitPython
google_api_python_client
kubernetes
ldap3
mixpanel
mysql-connector
names
ntplib
oyaml
paramiko
pillow
psycopg2
pycrypto
pygments
pyhcl
pyjks
pynacl
pyodbc
pyopenssl
pypdf2
pysmb
pytesseract
python_magic
pytz
pywinrm
requirements-detector
selenium
tlslite-ng
viewstate
];
configurePhase = ''
mkdir -p build/config
touch build/config/README.rst
'';
checkInputs = [
docker
flask
flask-httpauth
pytest
];
checkPhase = ''
# This tests require BWAPP Docker Container
sed -ie 's/test_a[0-9]//g' ./test/test_proto_http_open.py
sed -ie 's/test_a[0-9]//g' ./test/test_proto_http_close.py
# This tests require network connectivity
sed -ie 's/test_is_date_unsyncd//g' ./test/test_proto_http_open.py
sed -ie 's/test_is_date_unsyncd//g' ./test/test_proto_http_close.py
# Remove impurities
substituteInPlace ./test/conftest.py \
--replace "import wait" "" \
--replace "if not os.path.exists(name):" "if os.path.exists(name):" \
--replace "from test.mock import graphql_server" "" \
--replace "(graphql_server.start, 'MockGraphQLServer', ['proto_graphql'])," "" \
pytest --asserts-module 'iot' \
test/test_iot_phone.py
pytest --asserts-module 'ot' \
test/test_ot_powerlogic.py
pytest --asserts-module 'proto_http' \
test/test_proto_{http_close,http_open}.py
pytest --asserts-module 'proto_rest' \
test/test_proto_rest.py
# This file launches mock docker containers and servers
# let's remove it to create a custom test environment
rm test/conftest.py
pytest \
test/test_cloud_aws_terraform_{cloudfront,dynamodb,ebs,ec2,elb}.py \
test/test_cloud_aws_terraform_{fsx,iam,kms,rds,s3}.py \
test/test_cloud_aws_cloudformation_{cloudfront,dynamodb,ec2,elb,elb2}.py \
test/test_cloud_aws_cloudformation_{fsx,iam,kms,rds,s3,secretsmanager}.py \
test/test_format_{apk,jks,jwt,pdf,pkcs12,string}.py \
test/test_helper_{asynchronous,crypto}.py \
test/test_lang_{javascript,java}.py \
test/test_lang_{core,csharp,docker,dotnetconfig,html,php,python,rpgle}.py \
test/test_utils_generic.py
'';
meta = with lib; {
description = "Assertion Library for Security Assumptions";
homepage = "https://gitlab.com/fluidattacks/asserts";
license = licenses.mpl20;
maintainers = with maintainers; [
kamadorueda
];
broken = true; # dependency tree is too fragile for nixpkgs
};
}

4
pkgs/development/python-modules/grpcio-tools/default.nix
View File

@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "grpcio-tools";
version = "1.28.1";
version = "1.29.0";
src = fetchPypi {
inherit pname version;
sha256 = "adf089aaf6e21358b12e39d9fa7c28611340d8399a918c0b72ff122ce9b7e0af";
sha256 = "0f681c1ebd5472b804baa391b16dc59d92b065903999566f4776bfbd010bcec9";
};
enableParallelBuilding = true;

4
pkgs/development/python-modules/jc/default.nix
View File

@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "jc";
version = "1.10.10";
version = "1.10.12";
disabled = isPy27;
src = fetchFromGitHub {
owner = "kellyjonbrazil";
repo = "jc";
rev = "v${version}";
sha256 = "1rkgk1d1gijic6l6rsvz5mpfhdj8l7qc60aqafj27s4yi5bbqrc7";
sha256 = "04gggx47acckyd96cginrw7ldw7fqgkiggk9fxdij2hwi03mk4n4";
};
propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ];

4
pkgs/development/python-modules/pre-commit/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, fetchPypi, buildPythonApplication, pythonOlder
{ lib, fetchPypi, buildPythonPackage, pythonOlder
, aspy-yaml
, cached-property
, cfgv
@@ -13,7 +13,7 @@
, virtualenv
}:
buildPythonApplication rec {
buildPythonPackage rec {
pname = "pre-commit";
version = "1.21.0";

17
pkgs/development/python-modules/pyarrow/default.nix
View File

@@ -1,28 +1,19 @@
{ lib, fetchpatch, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkgconfig, setuptools_scm, six }:
{ lib, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkgconfig, setuptools_scm, six }:
let
_arrow-cpp = arrow-cpp.override { inherit python; };
_arrow-cpp = arrow-cpp.override { python3 = python; };
in
buildPythonPackage rec {
pname = "pyarrow";
disabled = !isPy3k;
inherit (_arrow-cpp) version src;
patches = [
# Remove when updating pkgs.arrow-cpp to 0.17
(fetchpatch {
name = "ARROW-8106-fix-conversion-test";
url = "https://github.com/apache/arrow/commit/af20bbff30adc560d7e57dd921345d00cc8b870c.patch";
sha256 = "0ihpw589vh35va31ajzy5zpx3bqd9gdn3342rghi03r245kch9zd";
stripLen = 1;
})
];
sourceRoot = "apache-arrow-${version}/python";
nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ];
propagatedBuildInputs = [ numpy six ] ++ lib.optionals (!isPy3k) [ futures ];
propagatedBuildInputs = [ numpy six ];
checkInputs = [ hypothesis pandas pytestCheckHook pytest-lazy-fixture ];
PYARROW_BUILD_TYPE = "release";

5
pkgs/development/python-modules/tensorflow/1/default.nix
View File

@@ -430,7 +430,10 @@ in buildPythonPackage {
EOF
'';
passthru.libtensorflow = bazel-build.out;
passthru = {
deps = bazel-build.deps;
libtensorflow = bazel-build.out;
};
inherit (bazel-build) meta;
}

5
pkgs/development/python-modules/tensorflow/2/default.nix
View File

@@ -421,7 +421,10 @@ in buildPythonPackage {
'';
# Regression test for #77626 removed because not more `tensorflow.contrib`.
passthru.libtensorflow = bazel-build.out;
passthru = {
deps = bazel-build.deps;
libtensorflow = bazel-build.out;
};
inherit (bazel-build) meta;
}

22
pkgs/development/python-modules/txdbus/default.nix Normal file
View File

@@ -0,0 +1,22 @@
{ stdenv, buildPythonPackage, fetchPypi, six, twisted }:
buildPythonPackage rec {
pname = "txdbus";
version = "1.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "0z41n1ikpdvk0nm8dbyh6g9bg781q4j6hg2b09b5k4wdqm17zxbg";
};
propagatedBuildInputs = [ six twisted ];
pythonImportsCheck = [ "txdbus" ];
meta = with stdenv.lib; {
description = "Native Python implementation of DBus for Twisted";
homepage = "https://github.com/cocagne/txdbus";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ geistesk ];
};
}