nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-25 17:55:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
 pkgs/tools/networking/xh/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-22 18:19:10 -07:00
parent 563389a7fd 6543c61311
commit 11a9ac00fc
157 changed files with 1479 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "aiohomekit";
version = "0.2.61";
version = "0.2.62";
format = "pyproject";
disabled = pythonAtLeast "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "Jc2k";
repo = pname;
rev = version;
sha256 = "047ql5a4i4354jgr8xr2waim8j522z58vbfi7aa62jqc9l8jzxzk";
sha256 = "sha256-01IzeR0iukPTkz8I7h93wZkgjz6flRAJN8unEX6d+cs=";
};
nativeBuildInputs = [ poetry ];

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

@@ -14,14 +14,14 @@
}:
buildPythonPackage rec {
version = "1.13.0";
version = "1.14.0";
pname = "azure-core";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "624b46db407dbed9e03134ab65214efab5b5315949a1fbd6cd592c46fb272588";
sha256 = "f32bb64aabe61f496255c16dd6c555a027da628109460bf27311cee0caf78f96";
};
propagatedBuildInputs = [
@@ -45,8 +45,13 @@ buildPythonPackage rec {
pytestFlagsArray = [ "tests/" ];
# disable tests which touch network
disabledTests = [ "aiohttp" "multipart_send" "response" "request" "timeout" ];
# requires testing modules which aren't published, and likely to create cyclic dependencies
disabledTestPaths = [ "tests/test_connection_string_parsing.py" ];
disabledTestPaths = [
# requires testing modules which aren't published, and likely to create cyclic dependencies
"tests/test_connection_string_parsing.py"
# wants network
"tests/async_tests/test_streaming_async.py"
"tests/test_streaming.py"
];
meta = with lib; {
description = "Microsoft Azure Core Library for Python";

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

@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "azure-eventgrid";
version = "4.1.1";
version = "4.2.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "c3bd28ccf6c837b58b58fc61275dace5348a823660c3ca21166a88aa2a8377a4";
sha256 = "77af2c20abde7d8342da7993781605b440aeac0f95c4af13bb87465c3bd5fe35";
};
propagatedBuildInputs = [

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

@@ -17,12 +17,12 @@
buildPythonPackage rec {
pname = "azure-identity";
version = "1.5.0";
version = "1.6.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "872adfa760b2efdd62595659b283deba92d47b7a67557eb9ff48f0b5d04ee396";
sha256 = "2e70b00874e4f288e37804bc06bfaf216de8565c759594bf79cccfbf9ca2c78a";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/azure-mgmt-billing/default.nix
View File

@@ -3,6 +3,7 @@
, fetchPypi
, msrestazure
, azure-common
, azure-mgmt-core
, azure-mgmt-nspkg
, python
, isPy3k
@@ -10,17 +11,18 @@
buildPythonPackage rec {
pname = "azure-mgmt-billing";
version = "1.0.0"; #pypi's 0.2.0 doesn't build ootb
version = "6.0.0"; #pypi's 0.2.0 doesn't build ootb
src = fetchPypi {
inherit pname version;
sha256 = "8b55064546c8e94839d9f8c98e9ea4b021004b3804e192bf39fa65b603536ad0";
sha256 = "d4f5c5a4188a456fe1eb32b6c45f55ca2069c74be41eb76921840b39f2f5c07f";
extension = "zip";
};
propagatedBuildInputs = [
msrestazure
azure-common
azure-mgmt-core
azure-mgmt-nspkg
];

12
pkgs/development/python-modules/azure-mgmt-botservice/default.nix
View File

@@ -1,21 +1,27 @@
{ lib, buildPythonPackage, fetchPypi, isPy27
, azure-common
, azure-mgmt-core
, msrest
, msrestazure
}:
buildPythonPackage rec {
version = "0.3.0";
version = "1.0.0";
pname = "azure-mgmt-botservice";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "f8318878a66a0685a01bf27b7d1409c44eb90eb72b0a616c1a2455c72330f2f1";
sha256 = "9dae4d749a2a072e22703318ea36e379aec20876c553b2889037c7bdec4b9546";
extension = "zip";
};
propagatedBuildInputs = [ azure-common msrest msrestazure ];
propagatedBuildInputs = [
azure-common
azure-mgmt-core
msrest
msrestazure
];
# no tests included
doCheck = false;

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

@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-cosmosdb";
version = "6.2.0";
version = "6.3.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "116b5bf9433ad89078c743b617c5b1c51f9ce1a1f128fb2e4bbafb5efb2d2c74";
sha256 = "4135104da5b0f3f0a7249abcd8da55936603e50aaaf2868e5f739a717cf20b3d";
};
propagatedBuildInputs = [

12
pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix
View File

@@ -1,21 +1,27 @@
{ lib, buildPythonPackage, fetchPypi, isPy27
, azure-common
, azure-mgmt-core
, msrest
, msrestazure
}:
buildPythonPackage rec {
version = "0.2.0";
version = "1.0.0";
pname = "azure-mgmt-deploymentmanager";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "0c6pyr36n9snx879vas5r6l25db6nlp2z96xn759mz4kg4i45qs6";
sha256 = "9badb768617209149c33e68ca2e59c35b1d3d11427e2969872f2e236e14eee78";
extension = "zip";
};
propagatedBuildInputs = [ azure-common msrest msrestazure ];
propagatedBuildInputs = [
azure-common
azure-mgmt-core
msrest
msrestazure
];
# no tests included
doCheck = false;

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

@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-iothub";
version = "1.0.0";
version = "2.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "7acf24088395a299974dd26406db2686d8d59a3fffbe47c24617b36d445f2de8";
sha256 = "653a765f0beb6af0c9ecbd290b4101e1b5e0f6450405faf28ab8234c15d8b38b";
};
propagatedBuildInputs = [

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

@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-loganalytics";
version = "9.0.0";
version = "10.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "c0b702753c0774a25bcb49b967573b0ec2bef5262c24bc371c219a750ba3c4fd";
sha256 = "29330984d0f084dff26cea239d7b733c1a26844da85d33bf3bb53b515ce0bc23";
};
propagatedBuildInputs = [

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

@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-maps";
version = "1.0.0";
version = "2.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "dafbe23bdbe9c01f88ce91c5b8587eefc73ac2d637ebcdc59ded6d332932e3ab";
sha256 = "384e17f76a68b700a4f988478945c3a9721711c0400725afdfcb63cf84e85f0e";
};
propagatedBuildInputs = [

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

@@ -10,14 +10,14 @@
}:
buildPythonPackage rec {
version = "18.0.0";
version = "19.0.0";
pname = "azure-mgmt-network";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "85fdeb7a1a8d89be9b585396796b218b31b681590d57d82d3ea14cf1f2d20b4a";
sha256 = "5e39a26ae81fa58c13c02029700f8c7b22c3fd832a294c543e3156a91b9459e8";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix
View File

@@ -5,24 +5,26 @@
, msrest
, msrestazure
, azure-common
, azure-mgmt-core
, isPy27
}:
buildPythonPackage rec {
version = "0.1.0";
version = "1.0.0";
pname = "azure-mgmt-redhatopenshift";
disabled = isPy27; # don't feel like fixing namespace issues on python2
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "1g65lbia1i1jw6qkyjz2ldyl3p90rbr78l8kfryg70sj7z3gnnjn";
sha256 = "94cd41f1ebd82e40620fd3e6d88f666b5c19ac7cf8b4e8edadb9721bd7c80980";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
azure-mgmt-core
];
pythonNamespaces = "azure.mgmt";

6
pkgs/development/python-modules/azure-mgmt-reservations/default.nix
View File

@@ -4,24 +4,26 @@
, msrest
, msrestazure
, azure-common
, azure-mgmt-core
, azure-mgmt-nspkg
, isPy3k
}:
buildPythonPackage rec {
pname = "azure-mgmt-reservations";
version = "0.9.0";
version = "1.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "1dc97f48f3edb67116da8604ab76ef93233319f56455532be307f323e9ebf0e6";
sha256 = "880df54fdf3869ee6b142d4fc7a3fce518c850523c42cc895b7fb8359956554e";
};
propagatedBuildInputs = [
msrest
msrestazure
azure-common
azure-mgmt-core
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];

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

@@ -8,14 +8,14 @@
buildPythonPackage rec {
version = "16.1.0";
version = "18.0.0";
pname = "azure-mgmt-resource";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "b814ee27b37f030fe69461ef6f514661340dc8b1f28736362541e1c0d31d90ae";
sha256 = "551036e592f409ef477d30937ea7cc4dda5126576965d9c816fdb8401bbd774c";
};
propagatedBuildInputs = [

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

@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-sql";
version = "1.0.0";
version = "2.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "c7904f8798fbb285a2160c41c8bd7a416c6bd987f5d36a9b98c16f41e24e9f47";
sha256 = "191accd6e5b47f93a10cebb94e2ca5086f0b6f4afd0290b8596206cd4acb0d5c";
};
propagatedBuildInputs = [

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

@@ -8,14 +8,14 @@
}:
buildPythonPackage rec {
version = "17.1.0";
version = "18.0.0";
pname = "azure-mgmt-storage";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "01acb8e988c8082174fa952e1638d700146185644fbe4b126e65843e63d44600";
sha256 = "d17beb34273797fa89863632ff0e1eb9b6a55198abb8c7f05d84980762e5f71f";
};
propagatedBuildInputs = [

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

@@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-servicebus";
version = "7.1.1";
version = "7.2.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "58797defe666dd17ae11a8895395e7e844f11d2076ba4a9ce63682ac02f665d9";
sha256 = "919e81d6d9e6e098dbb7abf51d90282a73c0071846b104e70488417cd5d07863";
};
propagatedBuildInputs = [

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

@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "azure-synapse-artifacts";
version = "0.6.0";
version = "0.7.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "ec113d37386b8787862baaf9da0318364a008004a377d20fdfca31cfe8d16210";
sha256 = "2a538d617dc5d2d167716226d0a24e416324efb35ef22b223e0d9fb6b9889a72";
};
propagatedBuildInputs = [

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

@@ -94,7 +94,7 @@ buildPythonPackage rec {
description = "An implementation of the Debug Adapter Protocol for Python";
homepage = "https://github.com/microsoft/debugpy";
license = licenses.mit;
maintainers = with maintainers; [ metadark ];
maintainers = with maintainers; [ kira-bruneau ];
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "i686-darwin" ];
};
}

5
pkgs/development/python-modules/flufl/lock.nix
View File

@@ -14,6 +14,11 @@ buildPythonPackage rec {
propagatedBuildInputs = [ atpublic psutil ];
checkInputs = [ pytestCheckHook pytestcov sybil ];
# disable code coverage checks for all OS. Upstream does not enforce these
# checks on Darwin, and code coverage cannot be improved downstream nor is it
# relevant to the user.
pytestFlagsArray = [ "--no-cov" ];
meta = with lib; {
homepage = "https://flufllock.readthedocs.io/";
description = "NFS-safe file locking with timeouts for POSIX and Windows";

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

@@ -4,7 +4,7 @@
, numpy
, six
, scipy
, smart_open
, smart-open
, scikit-learn, testfixtures, unittest2
, isPy3k
}:
@@ -19,7 +19,7 @@ buildPythonPackage rec {
sha256 = "0rx37vnjspjl45v7bj123xwsjfgbwv91v8zpqpli8lgpf42xnskq";
};
propagatedBuildInputs = [ smart_open numpy six scipy ];
propagatedBuildInputs = [ smart-open numpy six scipy ];
checkInputs = [ scikit-learn testfixtures unittest2 ];

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

@@ -1,4 +1,5 @@
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, pythonOlder
@@ -71,6 +72,9 @@ buildPythonPackage rec {
"test_list_formats"
"test_base_url"
"test_culling"
] ++ lib.optionals stdenv.isDarwin [
# attempts to use trashcan, build env doesn't allow this
"test_delete"
];
meta = with lib; {

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

@@ -4,7 +4,7 @@
, pytestCheckHook
, typer
, dataclasses
, smart_open
, smart-open
, pytest
, mock
, google-cloud-storage
@@ -19,7 +19,7 @@ buildPythonPackage rec {
sha256 = "sha256-nb8my/5rkc7thuHnXZHe1Hg8j+sLBlYyJcLHWrrKZ5M=";
};
propagatedBuildInputs = [ smart_open typer google-cloud-storage ];
propagatedBuildInputs = [ smart-open typer google-cloud-storage ];
postPatch = ''
substituteInPlace requirements.txt \

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

@@ -25,6 +25,6 @@ buildPythonPackage rec {
description = "Pythonic generic implementation of the Language Server Protocol";
homepage = "https://github.com/openlawlibrary/pygls";
license = licenses.asl20;
maintainers = with maintainers; [ metadark ];
maintainers = with maintainers; [ kira-bruneau ];
};
}

27
pkgs/development/python-modules/pymumble/default.nix
View File

@@ -11,23 +11,15 @@
buildPythonPackage rec {
pname = "pymumble";
version = "1.6";
version = "1.6.1";
disabled = isPy27;
src = fetchFromGitHub {
owner = "azlux";
repo = "pymumble";
rev = version;
sha256 = "04nc66d554a98mbmdgzgsg6ncaz0jsn4zdr3mr14w6wnhrxpjkrs";
sha256 = "1qbsd2zvwd9ksclgiyrl1z79ms0zximm4527mnmhvq36lykgki7s";
};
patches = [
# Compatibility with pycryptodome (which is what our pycrypto really is)
# See https://github.com/azlux/pymumble/pull/99
(fetchpatch {
url = "https://github.com/azlux/pymumble/pull/99/commits/b85548a0e1deaac820954b1c0b308af214311a14.patch";
sha256 = "0w9dpc87rny6vmhi634pih1p97b67jm26qajscpa9wp6nphdlxlj";
})
];
postPatch = ''
# Changes all `library==x.y.z` statements to just `library`
@@ -35,11 +27,20 @@ buildPythonPackage rec {
sed -i 's/\(.*\)==.*/\1/' requirements.txt
'';
propagatedBuildInputs = [ opuslib protobuf ];
propagatedBuildInputs = [
opuslib
protobuf
];
checkInputs = [ pytestCheckHook pycrypto ];
checkInputs = [
pycrypto
pytestCheckHook
];
pythonImportsCheck = [ "pymumble_py3" ];
pythonImportsCheck = [
"pymumble_py3"
"pymumble_py3.constants"
];
meta = with lib; {
description = "Python 3 version of pymumble, Mumble library used for multiple uses like making mumble bot.";

2
pkgs/development/python-modules/pytest-datadir/default.nix
View File

@@ -27,6 +27,6 @@ buildPythonPackage rec {
homepage = "https://github.com/gabrielcnr/pytest-datadir";
description = "pytest plugin for manipulating test data directories and files";
license = licenses.mit;
maintainers = with maintainers; [ metadark ];
maintainers = with maintainers; [ kira-bruneau ];
};
}

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

@@ -18,6 +18,10 @@ buildPythonPackage rec {
sha256 = "sha256-cWQdrGKJyGieBow3TiMj/uB2crIF32Kvl5tVUKg/z+E=";
};
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace vex/Makefile-gcc --replace '/usr/bin/ar' 'ar'
'';
propagatedBuildInputs = [
archinfo
bitstring

8
pkgs/development/python-modules/smart_open/default.nix → pkgs/development/python-modules/smart-open/default.nix
View File

@@ -12,12 +12,13 @@
}:
buildPythonPackage rec {
pname = "smart_open";
pname = "smart-open";
version = "4.2.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
pname = "smart_open";
inherit version;
sha256 = "d9f5a0f173ccb9bbae528db5a3804f57145815774f77ef755b9b0f3b4b2a9dcb";
};
@@ -29,9 +30,10 @@ buildPythonPackage rec {
# upstream code requires both boto and boto3
propagatedBuildInputs = [ boto boto3 bz2file requests ];
meta = {
license = lib.licenses.mit;
description = "smart_open is a Python 2 & Python 3 library for efficient streaming of very large file";
description = "Library for efficient streaming of very large file";
maintainers = with lib.maintainers; [ jyp ];
};
}

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

@@ -0,0 +1,34 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestrunner
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "token-bucket";
version = "0.2.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "falconry";
repo = pname;
rev = version;
sha256 = "0kv8j2ab4knvzik2di66bgjwjxdslm2i0hjy35kn9z0dazni585s";
};
nativeBuildInputs = [
pytestrunner
];
checkInputs = [
pytestCheckHook
];
meta = with lib; {
description = "Token Bucket Implementation for Python Web Apps";
homepage = "https://github.com/falconry/token-bucket";
license = licenses.asl20;
maintainers = with maintainers; [ hexa ];
};
}

18
pkgs/development/python-modules/vdf/default.nix
View File

@@ -1,24 +1,28 @@
{ lib, buildPythonPackage, fetchFromGitHub
, pytest, pytestcov, mock }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, mock
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "vdf";
version = "3.3";
version = "3.4";
src = fetchFromGitHub {
owner = "ValvePython";
repo = pname;
rev = "v${version}";
sha256 = "0d9bhxdznry7kzyma00cxwjn6rqnd6vw8v5ym68k6qswgfzb569i";
hash = "sha256-6ozglzZZNKDtADkHwxX2Zsnkh6BE8WbcRcC9HkTTgPU=";
};
checkInputs = [ pytest pytestcov mock ];
checkPhase = "make test";
checkInputs = [ mock pytestCheckHook ];
pythonImportsCheck = [ "vdf" ];
meta = with lib; {
description = "Library for working with Valve's VDF text format";
homepage = "https://github.com/ValvePython/vdf";
license = licenses.mit;
maintainers = with maintainers; [ metadark ];
maintainers = with maintainers; [ kira-bruneau ];
};
}