nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-18 22:51:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-03-16 12:25:48 +00:00
committed by GitHub
parent f72d4dfbe1 f0b078ef9d
commit 974e83db9a
50 changed files with 317 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,11 @@
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, setuptools-scm
, pytestCheckHook
, pytest-asyncio
, pytest-tornado
, pytestcov
, sqlalchemy
, tornado
@@ -33,15 +36,16 @@ buildPythonPackage rec {
];
checkInputs = [
pytest-asyncio
pytest-tornado
pytestCheckHook
pytestcov
sqlalchemy
tornado
twisted
mock
trollius
gevent
];
] ++ lib.optionals (!isPy3k) [ trollius ];
propagatedBuildInputs = [
six
@@ -51,6 +55,11 @@ buildPythonPackage rec {
setuptools
] ++ lib.optional (!isPy3k) futures;
disabledTests = lib.optionals stdenv.isDarwin [
"test_submit_job"
"test_max_instances"
];
pythonImportsCheck = [ "apscheduler" ];
meta = with lib; {

28
pkgs/development/python-modules/devolo-home-control-api/default.nix
View File

@@ -2,28 +2,26 @@
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pytest-cov
, pytest-mock
, pytestCheckHook
, pythonOlder
, requests
, zeroconf
, websocket_client
, pytest-runner
, zeroconf
}:
buildPythonPackage rec {
pname = "devolo-home-control-api";
version = "0.16.0";
version = "0.17.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "2Fake";
repo = "devolo_home_control_api";
rev = "v${version}";
sha256 = "19zzdbx0dxlm8pq0yk00nn9gqqblgpp16fgl7z6a98hsa6459zzb";
sha256 = "sha256-g82YmlxlBdyNn7KPU+k+J3/P7ABWMMdLXUpXWnCkdpM=";
};
nativeBuildInputs = [ pytest-runner ];
propagatedBuildInputs = [
requests
zeroconf
@@ -32,12 +30,22 @@ buildPythonPackage rec {
checkInputs = [
pytestCheckHook
pytest-cov
pytest-mock
];
postPatch = ''
# setup.py is not able to detect the version with setuptools_scm
substituteInPlace setup.py \
--replace "setuptools_scm" "" \
--replace 'use_scm_version=True' 'use_scm_version="${version}"'
'';
# Disable test that requires network access
disabledTests = [ "test__on_pong" ];
disabledTests = [
"test__on_pong"
"TestMprm"
];
pythonImportsCheck = [ "devolo_home_control_api" ];
meta = with lib; {

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

@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "imap-tools";
version = "0.38.1";
version = "0.39.0";
disabled = isPy27;
@@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "ikvk";
repo = "imap_tools";
rev = "v${version}";
sha256 = "0b2gnym7p6cwgviwdq8pg2dy28pm5535f8kkc8rzc50knqdifl7g";
sha256 = "sha256-PyksCYVe7Ij/+bZpntHgY51I/ZVnC6L20TcKfTLr2CY=";
};
checkInputs = [

11
pkgs/development/python-modules/maestral/default.nix
View File

@@ -3,25 +3,23 @@
, fetchFromGitHub
, pythonOlder
, python
, alembic, click, desktop-notifier, dropbox, fasteners, keyring, keyrings-alt, packaging, pathspec, Pyro5, requests, setuptools, sdnotify, sqlalchemy, survey, watchdog
, click, desktop-notifier, dropbox, fasteners, keyring, keyrings-alt, packaging, pathspec, Pyro5, requests, setuptools, sdnotify, survey, watchdog
, importlib-metadata
, importlib-resources
}:
buildPythonPackage rec {
pname = "maestral";
version = "1.4.2";
version = "1.4.3";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "SamSchott";
repo = "maestral";
rev = "v${version}";
sha256 = "sha256-ibAYuaPSty275/aQ0DibyWe2LjPoEpdWgElTnR+MEs8=";
sha256 = "sha256-3GleQNkJrGIkFqOL2Dq0jTpgw7ts9ecpovKbyh3OrEI=";
};
propagatedBuildInputs = [
alembic
click
desktop-notifier
dropbox
@@ -34,13 +32,10 @@ buildPythonPackage rec {
requests
setuptools
sdnotify
sqlalchemy
survey
watchdog
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
] ++ lib.optionals (pythonOlder "3.9") [
importlib-resources
];
makeWrapperArgs = [

6
pkgs/development/python-modules/mpv/default.nix
View File

@@ -4,14 +4,14 @@
buildPythonPackage rec {
pname = "mpv";
version = "0.4.7";
version = "0.5.2";
disabled = isPy27;
src = fetchFromGitHub {
owner = "jaseg";
repo = "python-mpv";
rev = "v${version}";
sha256 = "1gq2ynzbpmc7bv066ddv2f4rnmvfsi7034vhf9ffp7yzbixf6ys8";
sha256 = "0ffskpynhl1252h6a05087lvpjgn1cn2z3caiv3i666dn1n79fjd";
};
buildInputs = [ mpv ];
@@ -28,6 +28,6 @@ buildPythonPackage rec {
meta = with lib; {
description = "A python interface to the mpv media player";
homepage = "https://github.com/jaseg/python-mpv";
license = licenses.agpl3;
license = licenses.agpl3Plus;
};
}

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

@@ -21,14 +21,14 @@
buildPythonPackage rec {
pname = "slack-sdk";
version = "3.4.0";
version = "3.4.2";
disabled = !isPy3k;
src = fetchFromGitHub {
owner = "slackapi";
repo = "python-slack-sdk";
rev = "v${version}";
sha256 = "sha256-WlHVorltN8Apq0MZUStPlJZKbBFSbnAoIBQUZYGdDiY=";
sha256 = "sha256-AbQqe6hCy6Ke5lwKHFWLJlXv7HdDApYYK++SPNQ2Nxg=";
};
propagatedBuildInputs = [

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

@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "vsure";
version = "1.7.2";
version = "1.7.3";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-EFat1sewh0Y9PHs08Grlk2RparA47GqkUv/WJ3J2494=";
sha256 = "sha256-tnUL9krKHqHR79EROsmVflCy9uO1n0iV6evQc/YpxnM=";
};
propagatedBuildInputs = [ requests ];

22
pkgs/development/python-modules/websocket_client/default.nix
View File

@@ -1,25 +1,33 @@
{ lib, buildPythonPackage, fetchPypi, isPy27
, six
{ lib
, backports_ssl_match_hostname
, buildPythonPackage
, fetchPypi
, isPy27
, pytestCheckHook
, six
}:
buildPythonPackage rec {
version = "0.57.0";
pname = "websocket_client";
version = "0.58.0";
src = fetchPypi {
inherit pname version;
sha256 = "d735b91d6d1692a6a181f2a8c9e0238e5f6373356f561bb9dc4c7af36f452010";
sha256 = "sha256-Y1CbQdFYrlt/Z+tK0g/su07umUNOc+FANU3D/44JcW8=";
};
propagatedBuildInputs = [
six
] ++ lib.optional isPy27 backports_ssl_match_hostname;
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "websocket" ];
meta = with lib; {
description = "Websocket client for python";
description = "Websocket client for Python";
homepage = "https://github.com/websocket-client/websocket-client";
license = licenses.bsd3;
maintainers = with maintainers; [ ];
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ fab ];
};
}