From 36be6c5d026b7ac00825abd18f2d323b8af6d3d8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 05:41:47 +0000 Subject: [PATCH 01/61] headscale: 0.3.3 -> 0.3.4 --- pkgs/servers/headscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix index 8b9380c6baf2..bece609fc4e0 100644 --- a/pkgs/servers/headscale/default.nix +++ b/pkgs/servers/headscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "headscale"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - sha256 = "0nf2l8l23wzn3l3x4698rfr3g6lkx5qfzsbfl0rv25q1pqgybdzj"; + sha256 = "sha256-O8PJrowP9iDK4sQXHNi1eo44X/tRc7nyKZgJUB6fKC4="; }; vendorSha256 = "sha256-0Lqr/tWk31S01vi21sG2gtlGouOhecL4u8ScKG0nWLo="; From 278909b507200db2a9245368f21d10eec1a5a232 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 05:49:23 +0000 Subject: [PATCH 02/61] hostctl: 1.0.14 -> 1.1.0 --- pkgs/tools/system/hostctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/hostctl/default.nix b/pkgs/tools/system/hostctl/default.nix index 6f557e05cd12..54bc72144ea3 100644 --- a/pkgs/tools/system/hostctl/default.nix +++ b/pkgs/tools/system/hostctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hostctl"; - version = "1.0.14"; + version = "1.1.0"; src = fetchFromGitHub { owner = "guumaster"; repo = pname; rev = "v${version}"; - sha256 = "02bjii97l4fy43v2rb93m9b0ad8y6mjvbvp4sz6a5n0w9dm1z1q9"; + sha256 = "sha256-X07JvXN1mwOQE2XBfaYbqQnQ92fBSg/Erj0yUygAqmM="; }; - vendorSha256 = "1lqk3cda0frqp2vwkqa4b3xkdw814wgkbr7g9r2mwxn85fpdcq5c"; + vendorSha256 = "sha256-rGDWrivIdl5FTu/kNR8nAfE2+1hE4cm3uDg7oBobE9M="; buildFlagsArray = [ "-ldflags=-s -w -X github.com/guumaster/hostctl/cmd/hostctl/actions.version=${version}" ]; From dc1afb4a49ad707a4384c2e100ad7f64f0e8619d Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 20 Jul 2021 15:44:02 +0200 Subject: [PATCH 03/61] electrum: 4.1.3 -> 4.1.5 --- pkgs/applications/misc/electrum/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 4197c1af040b..28c965a72b5c 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -20,7 +20,7 @@ }: let - version = "4.1.3"; + version = "4.1.5"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -36,7 +36,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "1nkcybalkfna9zn33dxm13ic3brj50cfzwspjl349rgyar07j781"; + sha256 = "1ps8yaps5kfd7yv7bpdvssbwm6f5qivxcvhwn17cpddc2760a7nk"; extraPostFetch = '' mv $out ./all @@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "1mlwpmgfm3n45agx65jzsi4dr8nxf95x7nl01jnwa3qk5krrv4cf"; + sha256 = "188r4zji985z8pm9b942xhmvv174yndk6jxagxl7ljk03wl2wiwi"; }; postUnpack = '' @@ -154,6 +154,8 @@ python3.pkgs.buildPythonApplication { of the blockchain. ''; homepage = "https://electrum.org/"; + downloadPage = "https://electrum.org/#download"; + changelog = "https://github.com/spesmilo/electrum/blob/master/RELEASE-NOTES"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ joachifm np prusnak ]; From 2047bf6e784ab16fe00b971396690054e5d657b7 Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Tue, 20 Jul 2021 16:01:55 +0700 Subject: [PATCH 04/61] coreterminal: init at 4.2.0 --- .../coreterminal/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/applications/terminal-emulators/coreterminal/default.nix diff --git a/pkgs/applications/terminal-emulators/coreterminal/default.nix b/pkgs/applications/terminal-emulators/coreterminal/default.nix new file mode 100644 index 000000000000..e358fae0716f --- /dev/null +++ b/pkgs/applications/terminal-emulators/coreterminal/default.nix @@ -0,0 +1,42 @@ +{ mkDerivation +, lib +, fetchFromGitLab +, cmake +, ninja +, qtbase +, qtserialport +, qtermwidget +, libcprime +}: + +mkDerivation rec { + pname = "coreterminal"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-YXs6VTem3AaK4n1DYwKP/jqNuf09Srn2THHyJJnArlc="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + qtserialport + qtermwidget + libcprime + ]; + + meta = with lib; { + description = "A terminal emulator from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coreterminal"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58ccafd7cada..9c95ff91ab57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -931,6 +931,10 @@ in cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; + coreterminal = libsForQt5.callPackage ../applications/terminal-emulators/coreterminal { + inherit (lxqt) qtermwidget; + }; + eterm = callPackage ../applications/terminal-emulators/eterm { }; evilvte = callPackage ../applications/terminal-emulators/evilvte (config.evilvte or {}); From ced49e422559437d33f3cf2ef4354410e5de5c1a Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Tue, 20 Jul 2021 22:45:46 +0700 Subject: [PATCH 05/61] libcprime: init at 4.2.2 --- .../libraries/libcprime/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/libraries/libcprime/default.nix diff --git a/pkgs/development/libraries/libcprime/default.nix b/pkgs/development/libraries/libcprime/default.nix new file mode 100644 index 000000000000..4db6ac1b46b8 --- /dev/null +++ b/pkgs/development/libraries/libcprime/default.nix @@ -0,0 +1,40 @@ +{ mkDerivation +, lib +, fetchFromGitLab +, libnotify +, cmake +, ninja +, qtbase +, qtconnectivity +}: + +mkDerivation rec { + pname = "libcprime"; + version = "4.2.2"; + + src = fetchFromGitLab { + owner = "cubocore"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-RywvFATA/+fDP/TR5QRWaJlDgy3EID//iVmrJcj3GXI="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + qtconnectivity + libnotify + ]; + + meta = with lib; { + description = "A library for bookmarking, saving recent activites, managing settings of C-Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/libcprime"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c95ff91ab57..2e1a024f5ec5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6363,6 +6363,8 @@ in libscrypt = callPackage ../development/libraries/libscrypt { }; + libcprime = libsForQt5.callPackage ../development/libraries/libcprime { }; + libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; libcoap = callPackage ../applications/networking/libcoap { From 960fffcbf935deb3bac245128a50d5afd4e5031b Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Tue, 20 Jul 2021 23:19:03 +0700 Subject: [PATCH 06/61] coreimage: init at 4.2.0 --- .../graphics/coreimage/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/graphics/coreimage/default.nix diff --git a/pkgs/applications/graphics/coreimage/default.nix b/pkgs/applications/graphics/coreimage/default.nix new file mode 100644 index 000000000000..1dcff1f6e8f2 --- /dev/null +++ b/pkgs/applications/graphics/coreimage/default.nix @@ -0,0 +1,31 @@ +{ mkDerivation, lib, fetchFromGitLab, libcprime, qtbase, cmake, ninja }: + +mkDerivation rec { + pname = "coreimage"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-dxRHzSG5ea1MhpTjgZbFztV9mElEaeOK4NsmieSgf5Q"; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + ]; + + meta = with lib; { + description = "An image viewer from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coreimage"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index acda472dbbd6..706455ce0397 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23455,6 +23455,8 @@ in corrscope = libsForQt5.callPackage ../applications/video/corrscope { }; + coreimage = libsForQt5.callPackage ../applications/graphics/coreimage { }; + csa = callPackage ../applications/audio/csa { }; csound = callPackage ../applications/audio/csound { From b9c4bdb4f7741a95738b68ebd3bfa191adad8f29 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 Jul 2021 21:57:04 +0200 Subject: [PATCH 07/61] python3Packages.asyncio-mqtt: 0.9.1 -> 0.10.0 --- pkgs/development/python-modules/asyncio_mqtt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncio_mqtt/default.nix b/pkgs/development/python-modules/asyncio_mqtt/default.nix index 522f406da423..d8a378b082fc 100644 --- a/pkgs/development/python-modules/asyncio_mqtt/default.nix +++ b/pkgs/development/python-modules/asyncio_mqtt/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "asyncio_mqtt"; - version = "0.9.1"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "0550229cecde6ff1751c49dd5ea26b02bf52b7e9bbe9bf763da765f35bb281de"; + sha256 = "0s94dvgh1fazycppki5m6f9d60hc4ykhqfznlzpwl4dzknxplpsz"; }; propagatedBuildInputs = [ From 3082d4c45a33489dccb510faba067a4a18bf2b42 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 Jul 2021 22:19:11 +0200 Subject: [PATCH 08/61] python3Packages.adb-shell: 0.3.4 -> 0.4.0 --- pkgs/development/python-modules/adb-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix index 22e4a67ff2ab..47a70940e927 100644 --- a/pkgs/development/python-modules/adb-shell/default.nix +++ b/pkgs/development/python-modules/adb-shell/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "adb-shell"; - version = "0.3.4"; + version = "0.4.0"; disabled = !isPy3k; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "JeffLIrion"; repo = "adb_shell"; rev = "v${version}"; - sha256 = "sha256-H1GVbMeaVUZh8T1jgZP2o+emEkK4fOi5k4aL9ayVesA="; + sha256 = "1dzpgpvjvss4mk2kp1s9g1gg0d008pbmfdsi9b98q9fax9syk725"; }; propagatedBuildInputs = [ From cca25fe1e0ee7ee3e597d8671f800a2cd6b86fa2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 21:59:12 +0000 Subject: [PATCH 09/61] gmic: 2.9.7 -> 2.9.8 --- pkgs/tools/graphics/gmic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 37b398ef1c62..d12a213a31e5 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "gmic"; - version = "2.9.7"; + version = "2.9.8"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "sha256-lCU3SH6nIhQSMFeds81DMTaEKcDjPLOP7hsXqulVfxY="; + sha256 = "sha256-GNa7xzGuO02oplasGJR2eTsRGp3Rn3LbIxLwdN983II="; }; nativeBuildInputs = [ From 0e80580b98d069c78861aadd372484f160f256b5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 21 Jul 2021 09:24:47 +0000 Subject: [PATCH 10/61] cherrytree: 0.99.38 -> 0.99.39 --- pkgs/applications/misc/cherrytree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index ef307ce3460b..daef73a56796 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "cherrytree"; - version = "0.99.38"; + version = "0.99.39"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = version; - sha256 = "sha256-04MRw6pMtJGxTMKwOzPNGg1T85SfVY5bMkF3gt2V0e0="; + sha256 = "sha256-QSRYtnZxLAaq42PvPd5+LxSzq/Hd/Cz5bquBTiGWnAE="; }; nativeBuildInputs = [ From 0c98dd91ffde756bf4e77c8c70e9545c82fe2a50 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 21 Jul 2021 10:33:09 +0000 Subject: [PATCH 11/61] dnsproxy: 0.38.2 -> 0.38.3 --- pkgs/tools/networking/dnsproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 96528a78d4cb..ffa2138ffa82 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.38.2"; + version = "0.38.3"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-v2uVIFPc8h58W03Jo2vsbLT5f7F8bJw4uMtSErrBYdo="; + sha256 = "sha256-VfEfxcewKo8D8kNsMuCvrLOZNl632ZIFyD+RG8qzjQ4="; }; vendorSha256 = null; From 4209fed914e4362f952f4fa6d88c1808aa3df7b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 22:42:24 +0200 Subject: [PATCH 12/61] pythonPackages: deprecate pytestcov alias --- pkgs/applications/graphics/cq-editor/default.nix | 2 +- pkgs/applications/misc/buku/default.nix | 2 +- .../networking/instant-messengers/zulip-term/default.nix | 2 +- pkgs/applications/office/todoman/default.nix | 2 +- pkgs/development/compilers/vyper/default.nix | 2 +- pkgs/development/libraries/galario/default.nix | 2 +- pkgs/development/python-modules/APScheduler/default.nix | 4 ++-- pkgs/development/python-modules/aioftp/default.nix | 4 ++-- pkgs/development/python-modules/aiohttp-jinja2/default.nix | 4 ++-- pkgs/development/python-modules/aiohttp-remotes/default.nix | 4 ++-- pkgs/development/python-modules/aiostream/default.nix | 4 ++-- pkgs/development/python-modules/alembic/default.nix | 4 ++-- pkgs/development/python-modules/apprise/default.nix | 4 ++-- pkgs/development/python-modules/aria2p/default.nix | 4 ++-- pkgs/development/python-modules/arrow/2.nix | 4 ++-- pkgs/development/python-modules/atpublic/default.nix | 4 ++-- .../python-modules/backports_functools_lru_cache/default.nix | 4 ++-- pkgs/development/python-modules/capturer/default.nix | 2 +- pkgs/development/python-modules/cfn-flip/default.nix | 4 ++-- pkgs/development/python-modules/cftime/default.nix | 4 ++-- pkgs/development/python-modules/cheroot/default.nix | 4 ++-- pkgs/development/python-modules/cherrypy/17.nix | 4 ++-- pkgs/development/python-modules/cherrypy/default.nix | 4 ++-- pkgs/development/python-modules/clickclick/default.nix | 4 ++-- pkgs/development/python-modules/cookiecutter/default.nix | 4 ++-- pkgs/development/python-modules/cssselect2/default.nix | 4 ++-- pkgs/development/python-modules/dbus-next/default.nix | 4 ++-- pkgs/development/python-modules/diskcache/default.nix | 4 ++-- pkgs/development/python-modules/django-extensions/default.nix | 4 ++-- pkgs/development/python-modules/dockerfile-parse/default.nix | 4 ++-- pkgs/development/python-modules/dogpile.cache/default.nix | 4 ++-- pkgs/development/python-modules/dyn/default.nix | 4 ++-- pkgs/development/python-modules/easysnmp/default.nix | 4 ++-- pkgs/development/python-modules/flask-caching/default.nix | 4 ++-- pkgs/development/python-modules/flickrapi/default.nix | 4 ++-- pkgs/development/python-modules/flufl/lock.nix | 4 ++-- pkgs/development/python-modules/graspologic/default.nix | 4 ++-- pkgs/development/python-modules/gunicorn/19.nix | 4 ++-- pkgs/development/python-modules/gunicorn/default.nix | 4 ++-- pkgs/development/python-modules/hickle/default.nix | 4 ++-- pkgs/development/python-modules/httpcore/default.nix | 4 ++-- pkgs/development/python-modules/httpx/default.nix | 4 ++-- pkgs/development/python-modules/hyppo/default.nix | 4 ++-- .../development/python-modules/ibm-cloud-sdk-core/default.nix | 4 ++-- pkgs/development/python-modules/inquirer/default.nix | 4 ++-- pkgs/development/python-modules/iocapture/default.nix | 4 ++-- pkgs/development/python-modules/ipydatawidgets/default.nix | 4 ++-- pkgs/development/python-modules/jedi/default.nix | 4 ++-- pkgs/development/python-modules/jira/default.nix | 4 ++-- pkgs/development/python-modules/jsonlines/default.nix | 4 ++-- pkgs/development/python-modules/jupyterlab_server/default.nix | 2 +- pkgs/development/python-modules/keras/default.nix | 4 ++-- pkgs/development/python-modules/libais/default.nix | 4 ++-- pkgs/development/python-modules/m3u8/default.nix | 4 ++-- .../python-modules/markdownsuperscript/default.nix | 4 ++-- .../python-modules/marshmallow-polyfield/default.nix | 4 ++-- pkgs/development/python-modules/mne-python/default.nix | 4 ++-- pkgs/development/python-modules/multidict/default.nix | 4 ++-- pkgs/development/python-modules/mwclient/default.nix | 4 ++-- pkgs/development/python-modules/natsort/default.nix | 4 ++-- pkgs/development/python-modules/nbdime/default.nix | 4 ++-- pkgs/development/python-modules/nbval/default.nix | 4 ++-- pkgs/development/python-modules/nipype/default.nix | 4 ++-- .../python-modules/nix-prefetch-github/default.nix | 4 ++-- pkgs/development/python-modules/nplusone/default.nix | 4 ++-- .../python-modules/openapi-schema-validator/default.nix | 4 ++-- .../python-modules/openapi-spec-validator/default.nix | 4 ++-- pkgs/development/python-modules/orm/default.nix | 4 ++-- pkgs/development/python-modules/papermill/default.nix | 4 ++-- pkgs/development/python-modules/papis/default.nix | 4 ++-- pkgs/development/python-modules/periodictable/default.nix | 4 ++-- pkgs/development/python-modules/pglast/default.nix | 4 ++-- pkgs/development/python-modules/phonemizer/default.nix | 4 ++-- .../python-modules/plaster-pastedeploy/default.nix | 4 ++-- pkgs/development/python-modules/plaster/default.nix | 4 ++-- pkgs/development/python-modules/poetry/default.nix | 4 ++-- pkgs/development/python-modules/portalocker/default.nix | 2 +- pkgs/development/python-modules/portend/default.nix | 4 ++-- pkgs/development/python-modules/prance/default.nix | 4 ++-- pkgs/development/python-modules/property-manager/default.nix | 4 ++-- pkgs/development/python-modules/psautohint/default.nix | 4 ++-- .../python-modules/py-air-control-exporter/default.nix | 4 ++-- pkgs/development/python-modules/pycategories/default.nix | 4 ++-- pkgs/development/python-modules/pyls-mypy/default.nix | 4 ++-- pkgs/development/python-modules/pylti/default.nix | 4 ++-- .../python-modules/pytest-astropy-header/default.nix | 4 ++-- pkgs/development/python-modules/pytest-factoryboy/default.nix | 4 ++-- .../python-modules/pytest-filter-subpackage/default.nix | 4 ++-- pkgs/development/python-modules/pytest-shutil/default.nix | 4 ++-- pkgs/development/python-modules/pytest-timeout/default.nix | 4 ++-- pkgs/development/python-modules/pytest-virtualenv/default.nix | 4 ++-- pkgs/development/python-modules/python-hosts/default.nix | 4 ++-- .../python-modules/python-jsonrpc-server/default.nix | 4 ++-- .../python-modules/python-language-server/default.nix | 4 ++-- pkgs/development/python-modules/python-lz4/default.nix | 4 ++-- pkgs/development/python-modules/python-multipart/default.nix | 4 ++-- pkgs/development/python-modules/qcelemental/default.nix | 4 ++-- pkgs/development/python-modules/qcengine/default.nix | 4 ++-- pkgs/development/python-modules/rasterio/default.nix | 4 ++-- pkgs/development/python-modules/readchar/default.nix | 4 ++-- pkgs/development/python-modules/reikna/default.nix | 4 ++-- pkgs/development/python-modules/resampy/default.nix | 4 ++-- pkgs/development/python-modules/rising/default.nix | 4 ++-- pkgs/development/python-modules/runway-python/default.nix | 4 ++-- pkgs/development/python-modules/rxv/default.nix | 4 ++-- pkgs/development/python-modules/scikit-build/default.nix | 4 ++-- .../python-modules/scrapy-fake-useragent/default.nix | 4 ++-- pkgs/development/python-modules/skorch/default.nix | 4 ++-- pkgs/development/python-modules/softlayer/default.nix | 4 ++-- pkgs/development/python-modules/stripe/default.nix | 4 ++-- pkgs/development/python-modules/stups-cli-support/default.nix | 4 ++-- pkgs/development/python-modules/stups-fullstop/default.nix | 4 ++-- pkgs/development/python-modules/stups-pierone/default.nix | 4 ++-- pkgs/development/python-modules/stups-tokens/default.nix | 4 ++-- pkgs/development/python-modules/stups-zign/default.nix | 4 ++-- pkgs/development/python-modules/subliminal/default.nix | 4 ++-- pkgs/development/python-modules/sunpy/default.nix | 4 ++-- pkgs/development/python-modules/tablib/default.nix | 4 ++-- pkgs/development/python-modules/tempora/default.nix | 4 ++-- pkgs/development/python-modules/textwrap3/default.nix | 4 ++-- pkgs/development/python-modules/threadpoolctl/default.nix | 4 ++-- pkgs/development/python-modules/timezonefinder/default.nix | 4 ++-- pkgs/development/python-modules/tinycss2/default.nix | 4 ++-- pkgs/development/python-modules/toggl-cli/default.nix | 4 ++-- pkgs/development/python-modules/typer/default.nix | 4 ++-- pkgs/development/python-modules/typesentry/default.nix | 4 ++-- pkgs/development/python-modules/typesystem/default.nix | 4 ++-- pkgs/development/python-modules/uarray/default.nix | 4 ++-- pkgs/development/python-modules/venusian/default.nix | 4 ++-- pkgs/development/python-modules/weasyprint/default.nix | 4 ++-- pkgs/development/python-modules/word2vec/default.nix | 4 ++-- pkgs/development/python-modules/wordcloud/default.nix | 4 ++-- pkgs/development/tools/sourcetrail/jedi.nix | 4 ++-- pkgs/development/tools/vim-vint/default.nix | 2 +- pkgs/servers/dns/doh-proxy/default.nix | 2 +- pkgs/tools/admin/lexicon/default.nix | 2 +- pkgs/tools/admin/salt/pepper/default.nix | 2 +- pkgs/tools/backup/zfs-replicate/default.nix | 4 ++-- pkgs/tools/filesystems/gitfs/default.nix | 2 +- pkgs/tools/misc/bonfire/default.nix | 2 +- pkgs/tools/security/vulnix/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 3 +-- 143 files changed, 268 insertions(+), 268 deletions(-) diff --git a/pkgs/applications/graphics/cq-editor/default.nix b/pkgs/applications/graphics/cq-editor/default.nix index b9b2eb368735..33bae268c8a6 100644 --- a/pkgs/applications/graphics/cq-editor/default.nix +++ b/pkgs/applications/graphics/cq-editor/default.nix @@ -41,7 +41,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pytest pytest-xvfb pytest-mock - pytestcov + pytest-cov pytest-repeat pytest-qt ]; diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 68b4f7b3e560..c559e239c09e 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -12,7 +12,7 @@ with python3.pkgs; buildPythonApplication rec { }; checkInputs = [ - pytestcov + pytest-cov hypothesis pytest pylint diff --git a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix index e97ea7bb65f5..b2f80c70d240 100644 --- a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec { glibcLocales ] ++ (with python3.pkgs; [ pytestCheckHook - pytestcov + pytest-cov pytest-mock ]); diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 5894c6c3e141..83bbc6cf53f9 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -45,7 +45,7 @@ buildPythonApplication rec { hypothesis pytest pytestrunner - pytestcov + pytest-cov glibcLocales ]; diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index d0bfa5b0b962..4bdad5f7c61c 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, writeText, asttokens -, pycryptodome, pytest_xdist, pytestcov, recommonmark, semantic-version, sphinx +, pycryptodome, pytest_xdist, pytest-cov, recommonmark, semantic-version, sphinx , sphinx_rtd_theme, pytestrunner }: let diff --git a/pkgs/development/libraries/galario/default.nix b/pkgs/development/libraries/galario/default.nix index 4e28f84bacdb..7fb93a61a0fe 100644 --- a/pkgs/development/libraries/galario/default.nix +++ b/pkgs/development/libraries/galario/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { pythonPackages.pytest ]; - checkInputs = lib.optional enablePython [ pythonPackages.scipy pythonPackages.pytestcov ]; + checkInputs = lib.optional enablePython [ pythonPackages.scipy pythonPackages.pytest-cov ]; preConfigure = '' mkdir -p build/external/src diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix index 1a27c8c1f0fc..a4083707a072 100644 --- a/pkgs/development/python-modules/APScheduler/default.nix +++ b/pkgs/development/python-modules/APScheduler/default.nix @@ -6,7 +6,7 @@ , pytestCheckHook , pytest-asyncio , pytest-tornado -, pytestcov +, pytest-cov , sqlalchemy , tornado , twisted @@ -38,7 +38,7 @@ buildPythonPackage rec { pytest-asyncio pytest-tornado pytestCheckHook - pytestcov + pytest-cov sqlalchemy tornado twisted diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix index e3ca13859acc..a610dba76614 100644 --- a/pkgs/development/python-modules/aioftp/default.nix +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -4,7 +4,7 @@ , isPy27 , pytest , pytest-asyncio -, pytestcov +, pytest-cov , trustme , async-timeout }: @@ -22,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytest-asyncio - pytestcov + pytest-cov trustme async-timeout ]; diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 0a939dfb0097..589aa14509e2 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp, pytestcov }: +{ lib, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp, pytest-cov }: buildPythonPackage rec { pname = "aiohttp-jinja2"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp jinja2 ]; - checkInputs = [ pytest pytest-aiohttp pytestcov ]; + checkInputs = [ pytest pytest-aiohttp pytest-cov ]; checkPhase = '' pytest -W ignore::DeprecationWarning diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/pkgs/development/python-modules/aiohttp-remotes/default.nix index 8a8f7c4b3132..f3abbddfd957 100644 --- a/pkgs/development/python-modules/aiohttp-remotes/default.nix +++ b/pkgs/development/python-modules/aiohttp-remotes/default.nix @@ -1,5 +1,5 @@ { lib, fetchpatch, buildPythonPackage, fetchPypi -, aiohttp, pytest, pytestcov, pytest-aiohttp +, aiohttp, pytest, pytest-cov, pytest-aiohttp }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp ]; - checkInputs = [ pytest pytestcov pytest-aiohttp ]; + checkInputs = [ pytest pytest-cov pytest-aiohttp ]; checkPhase = '' python -m pytest ''; diff --git a/pkgs/development/python-modules/aiostream/default.nix b/pkgs/development/python-modules/aiostream/default.nix index 0bdab3bb2833..e15271bafdbc 100644 --- a/pkgs/development/python-modules/aiostream/default.nix +++ b/pkgs/development/python-modules/aiostream/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , pythonOlder , pytestCheckHook -, pytestcov +, pytest-cov , pytest-asyncio }: @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1r3x9qwl08yscmzvhafc6gsmq84lr17s6p7a1qxr49cmdvjzsc13"; }; - checkInputs = [ pytestCheckHook pytestcov pytest-asyncio ]; + checkInputs = [ pytestCheckHook pytest-cov pytest-asyncio ]; meta = with lib; { description = "Generator-based operators for asynchronous iteration"; diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 81502a470a68..9c7244b3c066 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytest, pytestcov, mock, coverage, setuptools +, pytest, pytest-cov, mock, coverage, setuptools , Mako, sqlalchemy, python-editor, python-dateutil }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "a21fedebb3fb8f6bbbba51a11114f08c78709377051384c9c5ead5705ee93a51"; }; - buildInputs = [ pytest pytestcov mock coverage ]; + buildInputs = [ pytest pytest-cov mock coverage ]; propagatedBuildInputs = [ Mako sqlalchemy python-editor python-dateutil setuptools ]; # no traditional test suite diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 61cfed3dbb9e..1bf5a93130dd 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, installShellFiles , Babel, requests, requests_oauthlib, six, click, markdown, pyyaml, cryptography -, pytestrunner, coverage, flake8, mock, pytestCheckHook, pytestcov, tox, gntp, sleekxmpp +, pytestrunner, coverage, flake8, mock, pytestCheckHook, pytest-cov, tox, gntp, sleekxmpp }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { ]; checkInputs = [ - pytestrunner coverage flake8 mock pytestCheckHook pytestcov tox gntp sleekxmpp + pytestrunner coverage flake8 mock pytestCheckHook pytest-cov tox gntp sleekxmpp ]; disabledTests = [ "test_apprise_cli_nux_env" ]; diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix index 9ea4fdf64b5b..4755c80e707c 100644 --- a/pkgs/development/python-modules/aria2p/default.nix +++ b/pkgs/development/python-modules/aria2p/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, aria2, poetry, pytest, pytestcov, pytest_xdist, responses +, aria2, poetry, pytest, pytest-cov, pytest_xdist, responses , asciimatics, loguru, requests, setuptools, websocket-client }: @@ -22,7 +22,7 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - checkInputs = [ aria2 responses pytest pytestcov pytest_xdist ]; + checkInputs = [ aria2 responses pytest pytest-cov pytest_xdist ]; # Tests are not all stable/deterministic, # they rely on actually running an aria2c daemon and communicating with it, diff --git a/pkgs/development/python-modules/arrow/2.nix b/pkgs/development/python-modules/arrow/2.nix index d87f1ede3ccd..88864ec78b77 100644 --- a/pkgs/development/python-modules/arrow/2.nix +++ b/pkgs/development/python-modules/arrow/2.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , nose, chai, simplejson, backports_functools_lru_cache -, python-dateutil, pytz, pytest-mock, sphinx, dateparser, pytestcov +, python-dateutil, pytz, pytest-mock, sphinx, dateparser, pytest-cov , pytestCheckHook }: @@ -19,7 +19,7 @@ buildPythonPackage rec { checkInputs = [ dateparser pytestCheckHook - pytestcov + pytest-cov pytest-mock pytz simplejson diff --git a/pkgs/development/python-modules/atpublic/default.nix b/pkgs/development/python-modules/atpublic/default.nix index 5f00955eef92..4d96bcbe26b5 100644 --- a/pkgs/development/python-modules/atpublic/default.nix +++ b/pkgs/development/python-modules/atpublic/default.nix @@ -1,6 +1,6 @@ { lib, isPy3k, pythonOlder, fetchPypi, buildPythonPackage , pytest -, pytestcov +, pytest-cov , sybil , typing-extensions }: @@ -20,7 +20,7 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest pytestcov sybil + pytest pytest-cov sybil ]; checkPhase = '' diff --git a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix index 586176300b7d..cb5665363f9c 100644 --- a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -6,7 +6,7 @@ , pytest , pytest-black , pytest-flake8 -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytest pytest-flake8 pytest-black pytestcov ]; + checkInputs = [ pytest pytest-flake8 pytest-black pytest-cov ]; # ironically, they fail a linting test, and pytest.ini forces that test suite checkPhase = '' rm backports/functools_lru_cache.py diff --git a/pkgs/development/python-modules/capturer/default.nix b/pkgs/development/python-modules/capturer/default.nix index 0e8732f69a8f..02bdd0fc72ed 100644 --- a/pkgs/development/python-modules/capturer/default.nix +++ b/pkgs/development/python-modules/capturer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub, humanfriendly, pytestCheckHook, pytestcov }: +{ stdenv, lib, buildPythonPackage, fetchFromGitHub, humanfriendly, pytestCheckHook, pytest-cov }: buildPythonPackage rec { pname = "capturer"; diff --git a/pkgs/development/python-modules/cfn-flip/default.nix b/pkgs/development/python-modules/cfn-flip/default.nix index da04ecf68897..98d428cdbeba 100644 --- a/pkgs/development/python-modules/cfn-flip/default.nix +++ b/pkgs/development/python-modules/cfn-flip/default.nix @@ -5,7 +5,7 @@ # pythonPackages , click , pytest -, pytestcov +, pytest-cov , pytestrunner , pyyaml , six @@ -30,7 +30,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov pytestrunner ]; diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index bec5f03cd88b..46fad656cabe 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -2,7 +2,7 @@ , fetchPypi , pytestCheckHook , coveralls -, pytestcov +, pytest-cov , cython , numpy , python @@ -20,7 +20,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook coveralls - pytestcov + pytest-cov ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 50f6d33791de..6e9256ffacfe 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -9,7 +9,7 @@ , portend , pyopenssl , pytestCheckHook -, pytestcov +, pytest-cov , pytest-mock , requests , requests-toolbelt @@ -46,7 +46,7 @@ buildPythonPackage rec { portend pyopenssl pytestCheckHook - pytestcov + pytest-cov pytest-mock requests requests-toolbelt diff --git a/pkgs/development/python-modules/cherrypy/17.nix b/pkgs/development/python-modules/cherrypy/17.nix index df50219fb170..82e878c83042 100644 --- a/pkgs/development/python-modules/cherrypy/17.nix +++ b/pkgs/development/python-modules/cherrypy/17.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildPythonPackage, fetchPypi , setuptools-scm , cheroot, contextlib2, portend, routes, six, zc_lockfile -, backports_unittest-mock, objgraph, pathpy, pytest, pytestcov, backports_functools_lru_cache, requests_toolbelt +, backports_unittest-mock, objgraph, pathpy, pytest, pytest-cov, backports_functools_lru_cache, requests_toolbelt }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ - backports_unittest-mock objgraph pathpy pytest pytestcov backports_functools_lru_cache requests_toolbelt + backports_unittest-mock objgraph pathpy pytest pytest-cov backports_functools_lru_cache requests_toolbelt ]; checkPhase = '' diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 0b574e9114cf..b4fa2b8aeb45 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -2,7 +2,7 @@ , setuptools-scm , cheroot, portend, more-itertools, zc_lockfile, routes , jaraco_collections -, objgraph, pytest, pytestcov, pathpy, requests_toolbelt, pytest-services +, objgraph, pytest, pytest-cov, pathpy, requests_toolbelt, pytest-services , fetchpatch }: @@ -47,7 +47,7 @@ buildPythonPackage rec { ]; checkInputs = [ - objgraph pytest pytestcov pathpy requests_toolbelt pytest-services + objgraph pytest pytest-cov pathpy requests_toolbelt pytest-services ]; # Keyboard interrupt ends test suite run diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix index d829f43dc0d1..8aeb73bb25b2 100644 --- a/pkgs/development/python-modules/clickclick/default.nix +++ b/pkgs/development/python-modules/clickclick/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy36, flake8, click, pyyaml, six, pytestCheckHook, pytestcov }: +{ lib, buildPythonPackage, fetchFromGitHub, isPy36, flake8, click, pyyaml, six, pytestCheckHook, pytest-cov }: buildPythonPackage rec { pname = "clickclick"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1rij9ws9nhsmagiy1vclzliiqfkxi006rf65qvrw1k3sm2s8p5g0"; }; - checkInputs = [ pytestCheckHook pytestcov ]; + checkInputs = [ pytestCheckHook pytest-cov ]; propagatedBuildInputs = [ flake8 click pyyaml six ]; # test_cli asserts on exact quoting style of output diff --git a/pkgs/development/python-modules/cookiecutter/default.nix b/pkgs/development/python-modules/cookiecutter/default.nix index b2a13cdbb654..de42f7284112 100644 --- a/pkgs/development/python-modules/cookiecutter/default.nix +++ b/pkgs/development/python-modules/cookiecutter/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPyPy -, pytest, pytestcov, pytest-mock, freezegun +, pytest, pytest-cov, pytest-mock, freezegun , jinja2, future, binaryornot, click, whichcraft, poyo, jinja2_time, requests , python-slugify }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-a5pNcoguJDvgd6c5fQ8fdv5mzz35HzEV27UzDiFPpFc="; }; - checkInputs = [ pytest pytestcov pytest-mock freezegun ]; + checkInputs = [ pytest pytest-cov pytest-mock freezegun ]; propagatedBuildInputs = [ jinja2 future binaryornot click whichcraft poyo jinja2_time requests python-slugify ]; diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix index eadc3eb32b1f..28e524a265ba 100644 --- a/pkgs/development/python-modules/cssselect2/default.nix +++ b/pkgs/development/python-modules/cssselect2/default.nix @@ -5,7 +5,7 @@ , tinycss2 , pytest , pytestrunner -, pytestcov +, pytest-cov , pytest-flake8 , pytest-isort }: @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ tinycss2 ]; - checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ]; + checkInputs = [ pytest pytestrunner pytest-cov pytest-flake8 pytest-isort ]; meta = with lib; { description = "CSS selectors for Python ElementTree"; diff --git a/pkgs/development/python-modules/dbus-next/default.nix b/pkgs/development/python-modules/dbus-next/default.nix index d7cf79f9d07c..ba27b633fefd 100644 --- a/pkgs/development/python-modules/dbus-next/default.nix +++ b/pkgs/development/python-modules/dbus-next/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , python -, dbus, dbus-python, pytest, pytestcov, pytest-asyncio, pytest-timeout +, dbus, dbus-python, pytest, pytest-cov, pytest-asyncio, pytest-timeout }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { dbus dbus-python pytest - pytestcov + pytest-cov pytest-asyncio pytest-timeout ]; diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix index ed6007f87ed2..50b1a94c7795 100644 --- a/pkgs/development/python-modules/diskcache/default.nix +++ b/pkgs/development/python-modules/diskcache/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook -, pytestcov +, pytest-cov , pytest_xdist , pytest-django , mock @@ -22,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestcov + pytest-cov pytest_xdist pytest-django mock diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index 8ee903bedc2a..cbe5dfbaa70b 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -5,7 +5,7 @@ , mock , pygments , pytest -, pytestcov +, pytest-cov , pytest-django , python-dateutil , shortuuid @@ -40,7 +40,7 @@ buildPythonPackage rec { mock pygments # not explicitly declared in setup.py, but some tests require it pytest - pytestcov + pytest-cov pytest-django python-dateutil shortuuid diff --git a/pkgs/development/python-modules/dockerfile-parse/default.nix b/pkgs/development/python-modules/dockerfile-parse/default.nix index 7afe92b4337b..e9a31b461fd6 100644 --- a/pkgs/development/python-modules/dockerfile-parse/default.nix +++ b/pkgs/development/python-modules/dockerfile-parse/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, six, pytestcov, pytest }: +{ lib, buildPythonPackage, fetchPypi, six, pytest-cov, pytest }: buildPythonPackage rec { version = "1.2.0"; @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytestcov pytest ]; + checkInputs = [ pytest-cov pytest ]; meta = with lib; { description = "Python library for parsing Dockerfile files"; diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index 6e14355c2934..05eb173c5599 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pythonOlder , pytest -, pytestcov +, pytest-cov , mock , Mako , decorator @@ -33,7 +33,7 @@ buildPythonPackage rec { pytest ''; - checkInputs = [ pytest pytestcov mock Mako ]; + checkInputs = [ pytest pytest-cov mock Mako ]; propagatedBuildInputs = [ decorator stevedore ]; diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix index 7cddb324f3a1..72986e7bda1e 100644 --- a/pkgs/development/python-modules/dyn/default.nix +++ b/pkgs/development/python-modules/dyn/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, pytestcov, mock +{ lib, buildPythonPackage, fetchPypi, pytest, pytest-cov, mock , pytest_xdist, covCore, glibcLocales }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov mock pytest_xdist covCore diff --git a/pkgs/development/python-modules/easysnmp/default.nix b/pkgs/development/python-modules/easysnmp/default.nix index 11b13d8325a0..c55bf52a6643 100644 --- a/pkgs/development/python-modules/easysnmp/default.nix +++ b/pkgs/development/python-modules/easysnmp/default.nix @@ -5,7 +5,7 @@ , net-snmp , openssl , pytest -, pytestcov +, pytest-cov , pytest-flake8 , pytest-sugar , termcolor @@ -27,7 +27,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov pytest-flake8 pytest-sugar termcolor diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/pkgs/development/python-modules/flask-caching/default.nix index 708c5c351ea0..9fd80ac6d677 100644 --- a/pkgs/development/python-modules/flask-caching/default.nix +++ b/pkgs/development/python-modules/flask-caching/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, flask, pytestCheckHook, pytestcov, pytest-xprocess, pytestcache }: +{ lib, buildPythonPackage, fetchPypi, isPy27, flask, pytestCheckHook, pytest-cov, pytest-xprocess, pytestcache }: buildPythonPackage rec { pname = "Flask-Caching"; @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask ]; - checkInputs = [ pytestCheckHook pytestcov pytest-xprocess pytestcache ]; + checkInputs = [ pytestCheckHook pytest-cov pytest-xprocess pytestcache ]; disabledTests = [ # backend_cache relies on pytest-cache, which is a stale package from 2013 diff --git a/pkgs/development/python-modules/flickrapi/default.nix b/pkgs/development/python-modules/flickrapi/default.nix index cfcc4d362997..73b7eea6e63a 100644 --- a/pkgs/development/python-modules/flickrapi/default.nix +++ b/pkgs/development/python-modules/flickrapi/default.nix @@ -6,7 +6,7 @@ , requests_oauthlib , pytest , pytestrunner -, pytestcov +, pytest-cov , responses }: @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests requests_toolbelt requests_oauthlib ]; - checkInputs = [ pytest pytestrunner pytestcov responses ]; + checkInputs = [ pytest pytestrunner pytest-cov responses ]; doCheck = false; # Otherwise: # ========================= no tests ran in 0.01 seconds ========================= # builder for '/nix/store/c8a58v6aa18zci08q2l53s12ywn8jqhq-python3.6-flickrapi-2.4.0.drv' failed with exit code 5 diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix index ce2ead246f95..40ce524c6675 100644 --- a/pkgs/development/python-modules/flufl/lock.nix +++ b/pkgs/development/python-modules/flufl/lock.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pytestCheckHook -, atpublic, psutil, pytestcov, sybil +, atpublic, psutil, pytest-cov, sybil }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ atpublic psutil ]; - checkInputs = [ pytestCheckHook pytestcov sybil ]; + checkInputs = [ pytestCheckHook pytest-cov 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 diff --git a/pkgs/development/python-modules/graspologic/default.nix b/pkgs/development/python-modules/graspologic/default.nix index 758f988a2395..37ff849a3cb9 100644 --- a/pkgs/development/python-modules/graspologic/default.nix +++ b/pkgs/development/python-modules/graspologic/default.nix @@ -3,7 +3,7 @@ , isPy27 , fetchFromGitHub , pytestCheckHook -, pytestcov +, pytest-cov , hyppo , matplotlib , networkx @@ -36,7 +36,7 @@ buildPythonPackage rec { seaborn ]; - checkInputs = [ pytestCheckHook pytestcov ]; + checkInputs = [ pytestCheckHook pytest-cov ]; pytestFlagsArray = [ "tests" "--ignore=docs" "--ignore=tests/test_sklearn.py" ]; disabledTests = [ "gridplot_outputs" ]; diff --git a/pkgs/development/python-modules/gunicorn/19.nix b/pkgs/development/python-modules/gunicorn/19.nix index 7d43ce95a7e3..a7a418afa18c 100644 --- a/pkgs/development/python-modules/gunicorn/19.nix +++ b/pkgs/development/python-modules/gunicorn/19.nix @@ -2,7 +2,7 @@ , coverage , mock , pytest -, pytestcov +, pytest-cov , setuptools }: @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; - checkInputs = [ pytest mock pytestcov coverage ]; + checkInputs = [ pytest mock pytest-cov coverage ]; prePatch = '' substituteInPlace requirements_test.txt --replace "==" ">=" \ diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index c1f36c20566f..ba948a68915a 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -2,7 +2,7 @@ , coverage , mock , pytest -, pytestcov +, pytest-cov , setuptools }: @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; - checkInputs = [ pytest mock pytestcov coverage ]; + checkInputs = [ pytest mock pytest-cov coverage ]; prePatch = '' substituteInPlace requirements_test.txt --replace "==" ">=" \ diff --git a/pkgs/development/python-modules/hickle/default.nix b/pkgs/development/python-modules/hickle/default.nix index 1d6d6b39d043..0852ce4d4430 100644 --- a/pkgs/development/python-modules/hickle/default.nix +++ b/pkgs/development/python-modules/hickle/default.nix @@ -9,7 +9,7 @@ , pandas , codecov , pytest -, pytestcov +, pytest-cov , pytestrunner , coveralls , twine @@ -36,7 +36,7 @@ buildPythonPackage rec { doCheck = false; # incompatible with latest astropy checkInputs = [ - pytest pytestcov pytestrunner coveralls scipy pandas astropy twine check-manifest codecov + pytest pytest-cov pytestrunner coveralls scipy pandas astropy twine check-manifest codecov ]; pythonImportsCheck = [ "hickle" ]; diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index de2f9b00f538..c6c7b3372140 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -8,7 +8,7 @@ , pproxy , pytest-asyncio , pytestCheckHook -, pytestcov +, pytest-cov , sniffio , trio , trustme @@ -38,7 +38,7 @@ buildPythonPackage rec { pproxy pytest-asyncio pytestCheckHook - pytestcov + pytest-cov trio trustme uvicorn diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index b45c3e85f502..e5db065defcd 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -11,7 +11,7 @@ , pytestCheckHook , pytest-asyncio , pytest-trio -, pytestcov +, pytest-cov , trustme , uvicorn }: @@ -41,7 +41,7 @@ buildPythonPackage rec { pytestCheckHook pytest-asyncio pytest-trio - pytestcov + pytest-cov trustme uvicorn ]; diff --git a/pkgs/development/python-modules/hyppo/default.nix b/pkgs/development/python-modules/hyppo/default.nix index 9fdeca082b2f..8dcca1983ba3 100644 --- a/pkgs/development/python-modules/hyppo/default.nix +++ b/pkgs/development/python-modules/hyppo/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , isPy27 , fetchFromGitHub -, pytestCheckHook , pytestcov , numba +, pytestCheckHook , pytest-cov , numba , numpy , scikit-learn , scipy @@ -30,7 +30,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ pytestCheckHook pytestcov matplotlib seaborn ]; + checkInputs = [ pytestCheckHook pytest-cov matplotlib seaborn ]; disabledTestPaths = [ "docs" "benchmarks" diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index a63617ba2a2a..8e7f4832c254 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -5,7 +5,7 @@ , pyjwt , pylint , pytestCheckHook -, pytestcov +, pytest-cov , python-dateutil , requests , responses @@ -25,7 +25,7 @@ buildPythonPackage rec { codecov pylint pytestCheckHook - pytestcov + pytest-cov responses tox ]; diff --git a/pkgs/development/python-modules/inquirer/default.nix b/pkgs/development/python-modules/inquirer/default.nix index e55fd8f39d55..84e381f0b8c8 100644 --- a/pkgs/development/python-modules/inquirer/default.nix +++ b/pkgs/development/python-modules/inquirer/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, python-editor, readchar, blessed, pytest, pytestcov, pexpect, pytest-mock }: +{ lib, buildPythonPackage, fetchFromGitHub, python-editor, readchar, blessed, pytest, pytest-cov, pexpect, pytest-mock }: buildPythonPackage rec { pname = "inquirer"; @@ -20,7 +20,7 @@ buildPythonPackage rec { --replace "readchar==2.0.1" "readchar>=2.0.0" ''; - checkInputs = [ pytest pytestcov pexpect pytest-mock ]; + checkInputs = [ pytest pytest-cov pexpect pytest-mock ]; checkPhase = '' pytest --cov-report=term-missing --cov inquirer --no-cov-on-fail tests/unit tests/integration diff --git a/pkgs/development/python-modules/iocapture/default.nix b/pkgs/development/python-modules/iocapture/default.nix index 0f0466c8b3eb..cc56f8d0bdea 100644 --- a/pkgs/development/python-modules/iocapture/default.nix +++ b/pkgs/development/python-modules/iocapture/default.nix @@ -3,7 +3,7 @@ , fetchPypi , flexmock , pytest -, pytestcov +, pytest-cov , six }: @@ -19,7 +19,7 @@ buildPythonPackage rec { checkInputs = [ flexmock pytest - pytestcov + pytest-cov six ]; diff --git a/pkgs/development/python-modules/ipydatawidgets/default.nix b/pkgs/development/python-modules/ipydatawidgets/default.nix index a0efa9b575db..3f8811f4f3b4 100644 --- a/pkgs/development/python-modules/ipydatawidgets/default.nix +++ b/pkgs/development/python-modules/ipydatawidgets/default.nix @@ -3,7 +3,7 @@ , fetchPypi , isPy27 , pytest -, pytestcov +, pytest-cov , nbval , ipywidgets , numpy @@ -29,7 +29,7 @@ buildPythonPackage rec { traittypes ]; - checkInputs = [ pytest pytestcov nbval ]; + checkInputs = [ pytest pytest-cov nbval ]; checkPhase = "pytest ipydatawidgets/tests"; diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 305b9f6c6b6b..0dba5e8f192c 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: +{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, pytest, glibcLocales, tox, pytest-cov, parso }: buildPythonPackage rec { pname = "jedi"; @@ -14,7 +14,7 @@ buildPythonPackage rec { fetchSubmodules = true; }; - checkInputs = [ pytest glibcLocales tox pytestcov ]; + checkInputs = [ pytest glibcLocales tox pytest-cov ]; propagatedBuildInputs = [ parso ]; diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index 78aaadf690e2..7507789fd533 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy3k -, pytest, pytestrunner, pbr, glibcLocales , pytestcov +, pytest, pytestrunner, pbr, glibcLocales , pytest-cov , requests, requests_oauthlib, requests_toolbelt, defusedxml , ipython }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "e2a94adff98e45b29ded030adc76103eab34fa7d4d57303f211f572bedba0e93"; }; - buildInputs = [ glibcLocales pytest pytestcov pytestrunner pbr ]; + buildInputs = [ glibcLocales pytest pytest-cov pytestrunner pbr ]; propagatedBuildInputs = [ requests requests_oauthlib requests_toolbelt defusedxml pbr ipython ]; # impure tests because of connectivity attempts to jira servers diff --git a/pkgs/development/python-modules/jsonlines/default.nix b/pkgs/development/python-modules/jsonlines/default.nix index 82ddb3bf23a7..d16fa89a97c4 100644 --- a/pkgs/development/python-modules/jsonlines/default.nix +++ b/pkgs/development/python-modules/jsonlines/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildPythonPackage, six -, flake8, pep8-naming, pytest, pytestcov }: +, flake8, pep8-naming, pytest, pytest-cov }: buildPythonPackage rec { pname = "jsonlines"; @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ flake8 pep8-naming pytest pytestcov ]; + checkInputs = [ flake8 pep8-naming pytest pytest-cov ]; checkPhase = '' pytest ''; diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index 7f1a729b5b1a..f3f2b9dc32c1 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -10,7 +10,7 @@ , jupyter_server , openapi-core , pytest-tornasync -, pytestcov +, pytest-cov , ruamel-yaml , strict-rfc3339 }: diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index e90dd1a806aa..b6ac0a1fa132 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytest, pytestcov, pytest_xdist +, pytest, pytest-cov, pytest_xdist , six, numpy, scipy, pyyaml, h5py , keras-applications, keras-preprocessing }: @@ -15,7 +15,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov pytest_xdist ]; diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix index 33710c6682dc..36918a484c3e 100644 --- a/pkgs/development/python-modules/libais/default.nix +++ b/pkgs/development/python-modules/libais/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, - six, pytest, pytestrunner, pytestcov, coverage + six, pytest, pytestrunner, pytest-cov, coverage }: buildPythonPackage rec { pname = "libais"; @@ -13,7 +13,7 @@ buildPythonPackage rec { # data files missing doCheck = false; - checkInputs = [ pytest pytestrunner pytestcov coverage ]; + checkInputs = [ pytest pytestrunner pytest-cov coverage ]; propagatedBuildInputs = [ six ]; meta = with lib; { diff --git a/pkgs/development/python-modules/m3u8/default.nix b/pkgs/development/python-modules/m3u8/default.nix index 01ff1458c0fa..decad482bef1 100644 --- a/pkgs/development/python-modules/m3u8/default.nix +++ b/pkgs/development/python-modules/m3u8/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, python, fetchFromGitHub, requests, iso8601, bottle, pytest, pytestcov }: +{ lib, buildPythonPackage, python, fetchFromGitHub, requests, iso8601, bottle, pytest, pytest-cov }: buildPythonPackage rec { pname = "m3u8"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0cmg993icpsa1b19kljxvjwhs167bsqrs0ad4wnwsi8qq6na5d4p"; }; - checkInputs = [ bottle pytest pytestcov ]; + checkInputs = [ bottle pytest pytest-cov ]; checkPhase = '' pytest tests/test_{parser,model,variant_m3u8}.py diff --git a/pkgs/development/python-modules/markdownsuperscript/default.nix b/pkgs/development/python-modules/markdownsuperscript/default.nix index 94cfb637a15e..a7876a75e495 100644 --- a/pkgs/development/python-modules/markdownsuperscript/default.nix +++ b/pkgs/development/python-modules/markdownsuperscript/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, markdown, - pytest, pytestrunner, pytestcov, coverage }: + pytest, pytestrunner, pytest-cov, coverage }: buildPythonPackage rec { pname = "MarkdownSuperscript"; @@ -20,7 +20,7 @@ buildPythonPackage rec { sed 's/=.*//' -i requirements/*.txt ''; - checkInputs = [ pytest pytestrunner pytestcov coverage ]; + checkInputs = [ pytest pytestrunner pytest-cov coverage ]; meta = with lib; { description = "An extension to the Python Markdown package enabling superscript text"; diff --git a/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/pkgs/development/python-modules/marshmallow-polyfield/default.nix index e3b629b3034e..aa2784cd1dbb 100644 --- a/pkgs/development/python-modules/marshmallow-polyfield/default.nix +++ b/pkgs/development/python-modules/marshmallow-polyfield/default.nix @@ -4,7 +4,7 @@ , marshmallow # Check Inputs , pytestCheckHook -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -23,7 +23,7 @@ buildPythonPackage rec { ]; # setuptools check can run, but won't find tests - checkInputs = [ pytestCheckHook pytestcov ]; + checkInputs = [ pytestCheckHook pytest-cov ]; meta = with lib; { description = "An unofficial extension to Marshmallow to allow for polymorphic fields"; diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index 77e6f9c24685..2dfe06d51770 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -5,7 +5,7 @@ , numpy , scipy , pytestCheckHook -, pytestcov +, pytest-cov , pytest-timeout , h5py , matplotlib @@ -34,7 +34,7 @@ buildPythonPackage rec { doCheck = false; checkInputs = [ pytestCheckHook - pytestcov + pytest-cov pytest-timeout h5py matplotlib diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 555011a314d9..10cbc58eb8d8 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -1,7 +1,7 @@ { lib , fetchPypi , buildPythonPackage -, pytestCheckHook, pytestrunner, pytestcov +, pytestCheckHook, pytestrunner, pytest-cov , isPy3k }: @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "25b4e5f22d3a37ddf3effc0710ba692cfc792c2b9edfb9c05aefe823256e84d5"; }; - checkInputs = [ pytestCheckHook pytestrunner pytestcov ]; + checkInputs = [ pytestCheckHook pytestrunner pytest-cov ]; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix index 2eed1eefeec8..bffc4247632d 100644 --- a/pkgs/development/python-modules/mwclient/default.nix +++ b/pkgs/development/python-modules/mwclient/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub , requests, requests_oauthlib, six -, pytest, pytestcache, pytestcov, responses, mock +, pytest, pytestcache, pytest-cov, responses, mock }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "120snnsh9n5svfwkyj1w9jrxf99jnqm0jk282yypd3lpyca1l9hj"; }; - checkInputs = [ pytest pytestcache pytestcov responses mock ]; + checkInputs = [ pytest pytestcache pytest-cov responses mock ]; propagatedBuildInputs = [ requests requests_oauthlib six ]; diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index d475f21fcb51..e7a2a6808a8a 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -3,7 +3,7 @@ , pythonOlder , fetchPypi , pytest -, pytestcov +, pytest-cov , pytest-mock , hypothesis , glibcLocales @@ -17,7 +17,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov pytest-mock hypothesis glibcLocales diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index 221915efca03..96fc94d43e85 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -5,7 +5,7 @@ , attrs , py , setuptools -, pytestcov +, pytest-cov , pytest-timeout , pytest-tornado , mock @@ -34,7 +34,7 @@ buildPythonPackage rec { checkInputs = [ hypothesis - pytestcov + pytest-cov pytest-timeout pytest-tornado jsonschema diff --git a/pkgs/development/python-modules/nbval/default.nix b/pkgs/development/python-modules/nbval/default.nix index b9a336f7fbe9..176986492555 100644 --- a/pkgs/development/python-modules/nbval/default.nix +++ b/pkgs/development/python-modules/nbval/default.nix @@ -11,7 +11,7 @@ , glibcLocales , matplotlib , sympy -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -27,7 +27,7 @@ buildPythonPackage rec { pytestCheckHook matplotlib sympy - pytestcov + pytest-cov ]; buildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 078c455a6373..7ecba3b7d3b1 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -26,7 +26,7 @@ , simplejson , traits , xvfbwrapper -, pytestcov +, pytest-cov , codecov , sphinx # other dependencies @@ -94,7 +94,7 @@ buildPythonPackage rec { pytest pytest-forked pytest_xdist - pytestcov + pytest-cov which ]; diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index 597b6814281f..0821e0b763d0 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -6,7 +6,7 @@ , effect , git , pytestCheckHook -, pytestcov +, pytest-cov , pythonOlder }: @@ -29,7 +29,7 @@ buildPythonPackage rec { effect ]; - checkInputs = [ pytestCheckHook pytestcov git ]; + checkInputs = [ pytestCheckHook pytest-cov git ]; # ignore tests which are impure disabledTests = [ "network" "requires_nix_build" ]; diff --git a/pkgs/development/python-modules/nplusone/default.nix b/pkgs/development/python-modules/nplusone/default.nix index c2f484cb3a92..7d29428d93e6 100644 --- a/pkgs/development/python-modules/nplusone/default.nix +++ b/pkgs/development/python-modules/nplusone/default.nix @@ -1,5 +1,5 @@ { blinker, buildPythonPackage, fetchFromGitHub, lib, isPy27, six, mock, pytest -, webtest, pytestcov, pytest-django, pytest-pythonpath, flake8, sqlalchemy +, webtest, pytest-cov, pytest-django, pytest-pythonpath, flake8, sqlalchemy , flask_sqlalchemy, peewee }: buildPythonPackage rec { @@ -31,7 +31,7 @@ buildPythonPackage rec { mock pytest webtest - pytestcov + pytest-cov pytest-django pytest-pythonpath flake8 diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix index f09a42ddd69b..18e357c1f2d2 100644 --- a/pkgs/development/python-modules/openapi-schema-validator/default.nix +++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -5,7 +5,7 @@ , isodate , jsonschema , pytest-flake8 -, pytestcov +, pytest-cov , rfc3339-validator , six , strict-rfc3339 @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ isodate jsonschema six strict-rfc3339 rfc3339-validator ]; - checkInputs = [ pytestCheckHook pytestcov pytest-flake8 ]; + checkInputs = [ pytestCheckHook pytest-cov pytest-flake8 ]; pythonImportsCheck = [ "openapi_schema_validator" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index b431ef507525..4e61a86a5013 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, isPy27, fetchPypi , jsonschema, openapi-schema-validator, pyyaml, six, pathlib -, mock, pytest, pytestcov, pytest-flake8, tox, setuptools }: +, mock, pytest, pytest-cov, pytest-flake8, tox, setuptools }: buildPythonPackage rec { pname = "openapi-spec-validator"; @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jsonschema openapi-schema-validator pyyaml six setuptools ] ++ (lib.optionals (isPy27) [ pathlib ]); - checkInputs = [ mock pytest pytestcov pytest-flake8 tox ]; + checkInputs = [ mock pytest pytest-cov pytest-flake8 tox ]; meta = with lib; { homepage = "https://github.com/p1c2u/openapi-spec-validator"; diff --git a/pkgs/development/python-modules/orm/default.nix b/pkgs/development/python-modules/orm/default.nix index 872a54076125..f2dd196be942 100644 --- a/pkgs/development/python-modules/orm/default.nix +++ b/pkgs/development/python-modules/orm/default.nix @@ -5,7 +5,7 @@ , typesystem , aiosqlite , pytestCheckHook -, pytestcov +, pytest-cov , typing-extensions }: @@ -28,7 +28,7 @@ buildPythonPackage rec { checkInputs = [ aiosqlite pytestCheckHook - pytestcov + pytest-cov typing-extensions ]; diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index 9af09d569466..5b9a6d8e968b 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -19,7 +19,7 @@ , backports_tempfile , isPy27 , pytest -, pytestcov +, pytest-cov , pytest-mock }: @@ -54,7 +54,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov pytest-mock ]; diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index 3e7c6ae00116..72eb9a185d7a 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -3,7 +3,7 @@ , pyyaml, chardet, beautifulsoup4, colorama, bibtexparser , click, python-slugify, habanero, isbnlib, typing-extensions , prompt_toolkit, pygments, stevedore, tqdm, lxml -, python-doi, isPy3k, pytestcov +, python-doi, isPy3k, pytest-cov #, optional, dependencies , whoosh, pytest , stdenv @@ -43,7 +43,7 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; checkInputs = ([ - pytest pytestcov + pytest pytest-cov ]) ++ [ xdg-utils ]; diff --git a/pkgs/development/python-modules/periodictable/default.nix b/pkgs/development/python-modules/periodictable/default.nix index 783d85b6c08c..7c08468c03f4 100644 --- a/pkgs/development/python-modules/periodictable/default.nix +++ b/pkgs/development/python-modules/periodictable/default.nix @@ -1,4 +1,4 @@ -{lib, fetchPypi, buildPythonPackage, numpy, pyparsing, pytestcov, pytestCheckHook }: +{lib, fetchPypi, buildPythonPackage, numpy, pyparsing, pytest-cov, pytestCheckHook }: buildPythonPackage rec { pname = "periodictable"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "52e925220005c20e97601e7b04ad6cebc271680947ab9adcbb1a796ddbaa0f23"; }; - checkInputs = [ pytestcov pytestCheckHook ]; + checkInputs = [ pytest-cov pytestCheckHook ]; meta = { homepage = "https://www.reflectometry.org/danse/software.html"; diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index 6a0f8940788c..8184c6d0d18a 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , isPy3k , setuptools -, pytestcov +, pytest-cov , pytest }: @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; pythonImportsCheck = [ "pglast" ]; diff --git a/pkgs/development/python-modules/phonemizer/default.nix b/pkgs/development/python-modules/phonemizer/default.nix index 8eab09046dc2..54a816643818 100644 --- a/pkgs/development/python-modules/phonemizer/default.nix +++ b/pkgs/development/python-modules/phonemizer/default.nix @@ -7,7 +7,7 @@ , attrs , espeak-ng , pytestCheckHook -, pytestcov +, pytest-cov }: buildPythonApplication rec { @@ -45,7 +45,7 @@ buildPythonApplication rec { checkInputs = [ pytestCheckHook - pytestcov + pytest-cov ]; # We tried to package festvial, but were unable to get the backend running, diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix index 262bdceb5db7..75bc033807f6 100644 --- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix +++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage, fetchPypi, fetchpatch , plaster, PasteDeploy -, pytest, pytestcov +, pytest, pytest-cov }: buildPythonPackage rec { @@ -26,5 +26,5 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ plaster PasteDeploy ]; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; } diff --git a/pkgs/development/python-modules/plaster/default.nix b/pkgs/development/python-modules/plaster/default.nix index 82aaebb10039..749ffdb7f321 100644 --- a/pkgs/development/python-modules/plaster/default.nix +++ b/pkgs/development/python-modules/plaster/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchPypi -, pytest, pytestcov +, pytest, pytest-cov }: buildPythonPackage rec { @@ -15,5 +15,5 @@ buildPythonPackage rec { py.test ''; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; } diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index c37c428805eb..7287797ef331 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -13,7 +13,7 @@ , pkginfo , poetry-core , pytestCheckHook -, pytestcov +, pytest-cov , pytest-mock , requests , requests-toolbelt @@ -71,7 +71,7 @@ buildPythonPackage rec { "$out/bin/poetry" completions fish > "$out/share/fish/vendor_completions.d/poetry.fish" ''; - checkInputs = [ pytestCheckHook httpretty pytest-mock pytestcov ]; + checkInputs = [ pytestCheckHook httpretty pytest-mock pytest-cov ]; preCheck = "export HOME=$TMPDIR"; disabledTests = [ # touches network diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix index 7b4fc177bc11..8b642240f9cb 100644 --- a/pkgs/development/python-modules/portalocker/default.nix +++ b/pkgs/development/python-modules/portalocker/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , pytestCheckHook -, pytestcov +, pytest-cov , pytest-flake8 , pytest-mypy , redis diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index da27dd3cd922..d48f387400e4 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytest, setuptools-scm, tempora, pytest-black, pytestcov }: +, pytest, setuptools-scm, tempora, pytest-black, pytest-cov }: buildPythonPackage rec { pname = "portend"; @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ tempora ]; - checkInputs = [ pytest pytest-black pytestcov ]; + checkInputs = [ pytest pytest-black pytest-cov ]; checkPhase = '' py.test --deselect=test_portend.py::TestChecker::test_check_port_listening diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index b13808f1a9db..783c936cf2d1 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -7,7 +7,7 @@ , six , semver , pytestCheckHook -, pytestcov +, pytest-cov , pytestrunner , openapi-spec-validator }: @@ -35,7 +35,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestcov + pytest-cov openapi-spec-validator ]; diff --git a/pkgs/development/python-modules/property-manager/default.nix b/pkgs/development/python-modules/property-manager/default.nix index ad47163e4842..f50f9625fd96 100644 --- a/pkgs/development/python-modules/property-manager/default.nix +++ b/pkgs/development/python-modules/property-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, humanfriendly, verboselogs, coloredlogs, pytest, pytestcov }: +{ lib, buildPythonPackage, fetchFromGitHub, humanfriendly, verboselogs, coloredlogs, pytest, pytest-cov }: buildPythonPackage rec { pname = "property-manager"; @@ -12,7 +12,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ coloredlogs humanfriendly verboselogs ]; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; meta = with lib; { description = "Useful property variants for Python programming"; diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix index 01b249e1c77f..3a720bf328f3 100644 --- a/pkgs/development/python-modules/psautohint/default.nix +++ b/pkgs/development/python-modules/psautohint/default.nix @@ -2,7 +2,7 @@ , fonttools , lxml, fs # for fonttools extras , setuptools-scm -, pytestCheckHook, pytestcov, pytest_xdist +, pytestCheckHook, pytest-cov, pytest_xdist }: buildPythonPackage rec { @@ -31,7 +31,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestcov + pytest-cov pytest_xdist ]; disabledTests = [ diff --git a/pkgs/development/python-modules/py-air-control-exporter/default.nix b/pkgs/development/python-modules/py-air-control-exporter/default.nix index 2f494dcb7002..c333c3ea4fd1 100644 --- a/pkgs/development/python-modules/py-air-control-exporter/default.nix +++ b/pkgs/development/python-modules/py-air-control-exporter/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchPypi, flask, isPy27, lib, nixosTests -, prometheus_client, py-air-control, pytestCheckHook, pytestcov, pytestrunner +, prometheus_client, py-air-control, pytestCheckHook, pytest-cov, pytestrunner , setuptools-scm }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytestCheckHook pytestcov pytestrunner ]; + checkInputs = [ pytestCheckHook pytest-cov pytestrunner ]; propagatedBuildInputs = [ flask prometheus_client py-air-control ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) py-air-control; }; diff --git a/pkgs/development/python-modules/pycategories/default.nix b/pkgs/development/python-modules/pycategories/default.nix index 55f30f9e55a9..48686225e1ef 100644 --- a/pkgs/development/python-modules/pycategories/default.nix +++ b/pkgs/development/python-modules/pycategories/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage , callPackage -, pytestcov +, pytest-cov , fetchPypi , lib , pytest @@ -24,7 +24,7 @@ buildPythonPackage rec { # and shouldn't be used in production code propagatedBuildInputs = [ (callPackage ./infix.nix { }) ]; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; meta = with lib; { homepage = "https://gitlab.com/danielhones/pycategories"; diff --git a/pkgs/development/python-modules/pyls-mypy/default.nix b/pkgs/development/python-modules/pyls-mypy/default.nix index f919ac21cb7b..acce4469eed4 100644 --- a/pkgs/development/python-modules/pyls-mypy/default.nix +++ b/pkgs/development/python-modules/pyls-mypy/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 , future, python-language-server, mypy, configparser -, pytestCheckHook, mock, pytestcov, coverage +, pytestCheckHook, mock, pytest-cov, coverage , fetchpatch }: @@ -34,7 +34,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ mock pytestcov coverage pytestCheckHook ]; + checkInputs = [ mock pytest-cov coverage pytestCheckHook ]; propagatedBuildInputs = [ mypy python-language-server configparser diff --git a/pkgs/development/python-modules/pylti/default.nix b/pkgs/development/python-modules/pylti/default.nix index a6778a4aa7e8..80fa5bff3200 100644 --- a/pkgs/development/python-modules/pylti/default.nix +++ b/pkgs/development/python-modules/pylti/default.nix @@ -11,7 +11,7 @@ , pyflakes , pytest , pytestcache -, pytestcov +, pytest-cov , covCore , pytest-flakes , sphinx @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ httplib2 oauth oauth2 semantic-version ]; checkInputs = [ - flask httpretty oauthlib pyflakes pytest pytestcache pytestcov covCore + flask httpretty oauthlib pyflakes pytest pytestcache pytest-cov covCore pytest-flakes sphinx mock chalice ]; diff --git a/pkgs/development/python-modules/pytest-astropy-header/default.nix b/pkgs/development/python-modules/pytest-astropy-header/default.nix index 963e621986cf..acc555035822 100644 --- a/pkgs/development/python-modules/pytest-astropy-header/default.nix +++ b/pkgs/development/python-modules/pytest-astropy-header/default.nix @@ -3,7 +3,7 @@ , fetchPypi , fetchpatch , pytest -, pytestcov +, pytest-cov , pytestCheckHook , numpy , astropy @@ -37,7 +37,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestcov + pytest-cov numpy scipy h5py diff --git a/pkgs/development/python-modules/pytest-factoryboy/default.nix b/pkgs/development/python-modules/pytest-factoryboy/default.nix index 39d6bc127e6b..eea6c61a7274 100644 --- a/pkgs/development/python-modules/pytest-factoryboy/default.nix +++ b/pkgs/development/python-modules/pytest-factoryboy/default.nix @@ -7,7 +7,7 @@ , pytest , pytestcache , pytestCheckHook -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -32,7 +32,7 @@ buildPythonPackage rec { mock pytestCheckHook pytestcache - pytestcov + pytest-cov ]; pytestFlagsArray = [ "--ignore=docs" ]; diff --git a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix index 148b2c7185fb..df152eaa5eca 100644 --- a/pkgs/development/python-modules/pytest-filter-subpackage/default.nix +++ b/pkgs/development/python-modules/pytest-filter-subpackage/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytest -, pytestcov +, pytest-cov , pytest-doctestplus , pytestCheckHook , setuptools-scm @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytest-doctestplus - pytestcov + pytest-cov pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix index 0483063c53bc..e43a837d6aa4 100644 --- a/pkgs/development/python-modules/pytest-shutil/default.nix +++ b/pkgs/development/python-modules/pytest-shutil/default.nix @@ -1,5 +1,5 @@ { lib, isPyPy, buildPythonPackage, fetchPypi -, pytest, cmdline, pytestcov, coverage, setuptools-git, mock, pathpy, execnet +, pytest, cmdline, pytest-cov, coverage, setuptools-git, mock, pathpy, execnet , contextlib2, termcolor }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; checkInputs = [ cmdline pytest ]; - propagatedBuildInputs = [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 termcolor ]; + propagatedBuildInputs = [ pytest-cov coverage setuptools-git mock pathpy execnet contextlib2 termcolor ]; checkPhase = '' py.test ${lib.optionalString isPyPy "-k'not (test_run or test_run_integration)'"} diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index 8c59b6ee2c9c..40f67eb0b0ba 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -4,7 +4,7 @@ , pytest , pytestCheckHook , pexpect -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - checkInputs = [ pytestCheckHook pexpect pytestcov ]; + checkInputs = [ pytestCheckHook pexpect pytest-cov ]; disabledTests = [ "test_suppresses_timeout_when_pdb_is_entered" diff --git a/pkgs/development/python-modules/pytest-virtualenv/default.nix b/pkgs/development/python-modules/pytest-virtualenv/default.nix index 8ea981ba2e7a..c4a66cc48e5d 100644 --- a/pkgs/development/python-modules/pytest-virtualenv/default.nix +++ b/pkgs/development/python-modules/pytest-virtualenv/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytest, pytestcov, mock, cmdline, pytest-fixture-config, pytest-shutil, virtualenv }: +, pytest, pytest-cov, mock, cmdline, pytest-fixture-config, pytest-shutil, virtualenv }: buildPythonPackage rec { pname = "pytest-virtualenv"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "03w2zz3crblj1p6i8nq17946hbn3zqp9z7cfnifw47hi4a4fww12"; }; - checkInputs = [ pytest pytestcov mock cmdline ]; + checkInputs = [ pytest pytest-cov mock cmdline ]; propagatedBuildInputs = [ pytest-fixture-config pytest-shutil virtualenv ]; checkPhase = "py.test tests/unit "; diff --git a/pkgs/development/python-modules/python-hosts/default.nix b/pkgs/development/python-modules/python-hosts/default.nix index c8f1179bc66b..861addf81eef 100644 --- a/pkgs/development/python-modules/python-hosts/default.nix +++ b/pkgs/development/python-modules/python-hosts/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pyyaml, pytest, pytestcov }: +{ lib, buildPythonPackage, fetchPypi, pyyaml, pytest, pytest-cov }: buildPythonPackage rec { pname = "python-hosts"; @@ -15,7 +15,7 @@ buildPythonPackage rec { substituteInPlace python_hosts/utils.py --replace "import win_inet_pton" "" ''; - checkInputs = [ pyyaml pytest pytestcov ]; + checkInputs = [ pyyaml pytest pytest-cov ]; # Removing 1 test file (it requires internet connection) and keeping the other two checkPhase = '' diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index e641a943f865..a6d0bf800ea6 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, pytestCheckHook, mock, pytestcov, coverage +, pytestCheckHook, mock, pytest-cov, coverage , future, futures ? null, ujson, isPy38 }: @@ -19,7 +19,7 @@ buildPythonPackage rec { ''; checkInputs = [ - pytestCheckHook mock pytestcov coverage + pytestCheckHook mock pytest-cov coverage ]; propagatedBuildInputs = [ future ujson ] diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index 3ed9b75ef91f..f022eba58571 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonAtLeast, pythonOlder, isPy27 , backports_functools_lru_cache ? null, configparser ? null, futures ? null, future, jedi, pluggy, python-jsonrpc-server, flake8 -, pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson, flaky +, pytestCheckHook, mock, pytest-cov, coverage, setuptools, ujson, flaky , # Allow building a limited set of providers, e.g. ["pycodestyle"]. providers ? ["*"] # The following packages are optional and @@ -55,7 +55,7 @@ buildPythonPackage rec { doCheck = providers == ["*"]; checkInputs = [ - pytestCheckHook mock pytestcov coverage flaky + pytestCheckHook mock pytest-cov coverage flaky # Do not propagate flake8 or it will enable pyflakes implicitly flake8 # rope is technically a dependency, but we don't add it by default since we diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix index 95208c7b94b6..901a368d5d85 100644 --- a/pkgs/development/python-modules/python-lz4/default.nix +++ b/pkgs/development/python-modules/python-lz4/default.nix @@ -6,7 +6,7 @@ , pkgconfig , psutil , pytest -, pytestcov +, pytest-cov , pytestrunner , setuptools-scm }: @@ -24,7 +24,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools-scm pkgconfig pytestrunner ]; - checkInputs = [ pytest pytestcov psutil ]; + checkInputs = [ pytest pytest-cov psutil ]; propagatedBuildInputs = lib.optionals (!isPy3k) [ future ]; # give a hint to setuptools-scm on package version diff --git a/pkgs/development/python-modules/python-multipart/default.nix b/pkgs/development/python-modules/python-multipart/default.nix index c27923424872..ccac3e8b3cb2 100644 --- a/pkgs/development/python-modules/python-multipart/default.nix +++ b/pkgs/development/python-modules/python-multipart/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytest -, pytestcov +, pytest-cov , mock , pyyaml , six @@ -19,7 +19,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov mock pyyaml ]; diff --git a/pkgs/development/python-modules/qcelemental/default.nix b/pkgs/development/python-modules/qcelemental/default.nix index 3a3e9bced050..e06afb02165b 100644 --- a/pkgs/development/python-modules/qcelemental/default.nix +++ b/pkgs/development/python-modules/qcelemental/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, lib, fetchPypi, numpy -, pydantic, pint, networkx, pytestrunner, pytestcov, pytest +, pydantic, pint, networkx, pytestrunner, pytest-cov, pytest } : buildPythonPackage rec { pname = "qcelemental"; version = "0.21.0"; - checkInputs = [ pytestrunner pytestcov pytest ]; + checkInputs = [ pytestrunner pytest-cov pytest ]; propagatedBuildInputs = [ numpy pydantic pint networkx ]; src = fetchPypi { diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix index 847eeb23c9a1..793e1ada739e 100644 --- a/pkgs/development/python-modules/qcengine/default.nix +++ b/pkgs/development/python-modules/qcengine/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, lib, fetchPypi, pyyaml, qcelemental, pydantic -, py-cpuinfo, psutil, pytestrunner, pytest, pytestcov +, py-cpuinfo, psutil, pytestrunner, pytest, pytest-cov } : buildPythonPackage rec { @@ -8,7 +8,7 @@ buildPythonPackage rec { checkInputs = [ pytestrunner - pytestcov + pytest-cov pytest ]; diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 85d5d5d0b7d8..1ec6448d74c1 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage, lib, fetchFromGitHub, isPy3k , cython, setuptools , numpy, affine, attrs, cligj, click-plugins, snuggs, gdal -, pytest, pytestcov, packaging, hypothesis, boto3, mock +, pytest, pytest-cov, packaging, hypothesis, boto3, mock , certifi, shapely }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "sha256-rf2qdUhbS4Z2+mvlN1RzZvlgTgjqiBoQzry4z5QLSUc="; }; - checkInputs = [ boto3 pytest pytestcov packaging hypothesis shapely ] ++ lib.optional (!isPy3k) mock; + checkInputs = [ boto3 pytest pytest-cov packaging hypothesis shapely ] ++ lib.optional (!isPy3k) mock; nativeBuildInputs = [ cython gdal ]; propagatedBuildInputs = [ certifi gdal numpy attrs affine cligj click-plugins snuggs setuptools ]; diff --git a/pkgs/development/python-modules/readchar/default.nix b/pkgs/development/python-modules/readchar/default.nix index ea13c7083fe7..c83a2bba1cd6 100644 --- a/pkgs/development/python-modules/readchar/default.nix +++ b/pkgs/development/python-modules/readchar/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, flake8, pytest, pytestcov, pexpect }: +{ lib, buildPythonPackage, fetchFromGitHub, flake8, pytest, pytest-cov, pexpect }: buildPythonPackage rec { pname = "readchar"; @@ -13,7 +13,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ flake8 ]; - checkInputs = [ pytest pytestcov pexpect ]; + checkInputs = [ pytest pytest-cov pexpect ]; meta = with lib; { homepage = "https://github.com/magmax/python-readchar"; diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix index 896bc8e02f09..873a39244fe3 100644 --- a/pkgs/development/python-modules/reikna/default.nix +++ b/pkgs/development/python-modules/reikna/default.nix @@ -2,7 +2,7 @@ , fetchPypi , buildPythonPackage , sphinx -, pytestcov +, pytest-cov , pytest , Mako , numpy @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "d01f4264c8379ef2962a93aacb002d491b92ef9b5b22b45f77e7821dfa87bef7"; }; - checkInputs = [ sphinx pytestcov pytest ]; + checkInputs = [ sphinx pytest-cov pytest ]; propagatedBuildInputs = [ Mako numpy funcsigs ] ++ lib.optional withCuda pycuda diff --git a/pkgs/development/python-modules/resampy/default.nix b/pkgs/development/python-modules/resampy/default.nix index 551c7f5b93e6..e7e7ed5a7381 100644 --- a/pkgs/development/python-modules/resampy/default.nix +++ b/pkgs/development/python-modules/resampy/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pytest -, pytestcov +, pytest-cov , numpy , scipy , cython @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "0qmkxl5sbgh0j73n667vyi7ywzh09iaync91yp1j5rrcmwsn0qfs"; }; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; propagatedBuildInputs = [ numpy scipy cython numba six ]; checkPhase = '' diff --git a/pkgs/development/python-modules/rising/default.nix b/pkgs/development/python-modules/rising/default.nix index eb9afc8353c7..03aed296aa63 100644 --- a/pkgs/development/python-modules/rising/default.nix +++ b/pkgs/development/python-modules/rising/default.nix @@ -3,7 +3,7 @@ , isPy27 , fetchFromGitHub , pytestCheckHook -, pytestcov +, pytest-cov , dill , numpy , pytorch @@ -25,7 +25,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ numpy pytorch threadpoolctl tqdm ]; - checkInputs = [ dill pytestcov pytestCheckHook ]; + checkInputs = [ dill pytest-cov pytestCheckHook ]; disabledTests = [ "test_affine" ]; # deprecated division operator '/' diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix index c47054632c6f..4e062d9928ec 100644 --- a/pkgs/development/python-modules/runway-python/default.nix +++ b/pkgs/development/python-modules/runway-python/default.nix @@ -20,7 +20,7 @@ , wget , deepdiff , pytestCheckHook -, pytestcov +, pytest-cov , websocket-client }: @@ -61,7 +61,7 @@ buildPythonPackage rec { checkInputs = [ deepdiff pytestCheckHook - pytestcov + pytest-cov websocket-client ]; diff --git a/pkgs/development/python-modules/rxv/default.nix b/pkgs/development/python-modules/rxv/default.nix index 7f3e6527d060..5f0653236acf 100644 --- a/pkgs/development/python-modules/rxv/default.nix +++ b/pkgs/development/python-modules/rxv/default.nix @@ -6,7 +6,7 @@ , pytest , requests-mock , mock -, pytestcov +, pytest-cov , pytest-timeout , testtools }: @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ defusedxml requests ]; - checkInputs = [ pytest requests-mock mock pytestcov pytest-timeout testtools ]; + checkInputs = [ pytest requests-mock mock pytest-cov pytest-timeout testtools ]; checkPhase = '' pytest ''; diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 6694c3abe4df..3a3feaa14edc 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -15,7 +15,7 @@ , ninja , pathpy , pytest -, pytestcov +, pytest-cov , pytest-mock , pytestrunner , pytest-virtualenv @@ -48,7 +48,7 @@ buildPythonPackage rec { ninja pathpy pytest - pytestcov + pytest-cov pytest-mock pytestrunner pytest-virtualenv diff --git a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix index f9f896a563b7..643afd6dc8bf 100644 --- a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix +++ b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildPythonPackage, pytestCheckHook, pytestcov, pytest-mock, fake-useragent, faker, scrapy }: +{ lib, fetchFromGitHub, buildPythonPackage, pytestCheckHook, pytest-cov, pytest-mock, fake-useragent, faker, scrapy }: buildPythonPackage rec { pname = "scrapy-fake-useragent"; @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ fake-useragent faker ]; - checkInputs = [ pytestCheckHook scrapy pytestcov pytest-mock ]; + checkInputs = [ pytestCheckHook scrapy pytest-cov pytest-mock ]; meta = with lib; { description = "Random User-Agent middleware based on fake-useragent"; diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index db3b8ed4312c..3bbf28d2884e 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pytestCheckHook , pytest -, pytestcov +, pytest-cov , flaky , numpy , pandas @@ -24,7 +24,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ numpy pytorch scikit-learn scipy tabulate tqdm ]; - checkInputs = [ pytest pytestcov flaky pandas pytestCheckHook ]; + checkInputs = [ pytest pytest-cov flaky pandas pytestCheckHook ]; disabledTests = [ # on CPU, these expect artifacts from previous GPU run diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index 3c2a5e2a356d..78ecb3face30 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -9,7 +9,7 @@ , pygments , urllib3 , pytest -, pytestcov +, pytest-cov , mock , sphinx , testtools @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ptable click requests prompt_toolkit pygments urllib3 ]; - checkInputs = [ pytest pytestcov mock sphinx testtools ptable click requests prompt_toolkit pygments urllib3 ]; + checkInputs = [ pytest pytest-cov mock sphinx testtools ptable click requests prompt_toolkit pygments urllib3 ]; checkPhase = '' pytest diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index cfdc173995c3..a0b5c9799254 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, requests, pytest, pytestcov, pytest-mock, pytest_xdist }: +{ lib, buildPythonPackage, fetchPypi, requests, pytest, pytest-cov, pytest-mock, pytest_xdist }: buildPythonPackage rec { pname = "stripe"; @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ pytest pytestcov pytest-mock pytest_xdist ]; + checkInputs = [ pytest pytest-cov pytest-mock pytest_xdist ]; meta = with lib; { description = "Stripe Python bindings"; diff --git a/pkgs/development/python-modules/stups-cli-support/default.nix b/pkgs/development/python-modules/stups-cli-support/default.nix index 35aaf45ed1a2..97a7d6ebbdda 100644 --- a/pkgs/development/python-modules/stups-cli-support/default.nix +++ b/pkgs/development/python-modules/stups-cli-support/default.nix @@ -5,7 +5,7 @@ , dnspython , requests , pytest -, pytestcov +, pytest-cov , isPy3k }: @@ -31,7 +31,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov ]; meta = with lib; { diff --git a/pkgs/development/python-modules/stups-fullstop/default.nix b/pkgs/development/python-modules/stups-fullstop/default.nix index 5f51112324aa..8628c83334ba 100644 --- a/pkgs/development/python-modules/stups-fullstop/default.nix +++ b/pkgs/development/python-modules/stups-fullstop/default.nix @@ -5,7 +5,7 @@ , stups-cli-support , stups-zign , pytest -, pytestcov +, pytest-cov , isPy3k }: @@ -33,7 +33,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov ]; meta = with lib; { diff --git a/pkgs/development/python-modules/stups-pierone/default.nix b/pkgs/development/python-modules/stups-pierone/default.nix index aaa049916411..92cd344edb6d 100644 --- a/pkgs/development/python-modules/stups-pierone/default.nix +++ b/pkgs/development/python-modules/stups-pierone/default.nix @@ -5,7 +5,7 @@ , stups-cli-support , stups-zign , pytest -, pytestcov +, pytest-cov , hypothesis , isPy3k }: @@ -34,7 +34,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov hypothesis ]; diff --git a/pkgs/development/python-modules/stups-tokens/default.nix b/pkgs/development/python-modules/stups-tokens/default.nix index 3e785d8febbe..62dec6f348e8 100644 --- a/pkgs/development/python-modules/stups-tokens/default.nix +++ b/pkgs/development/python-modules/stups-tokens/default.nix @@ -4,7 +4,7 @@ , requests , mock , pytest -, pytestcov +, pytest-cov , isPy3k }: @@ -27,7 +27,7 @@ buildPythonPackage rec { checkInputs = [ mock pytest - pytestcov + pytest-cov ]; meta = with lib; { diff --git a/pkgs/development/python-modules/stups-zign/default.nix b/pkgs/development/python-modules/stups-zign/default.nix index 6b80f55636a9..e7f6c2805de5 100644 --- a/pkgs/development/python-modules/stups-zign/default.nix +++ b/pkgs/development/python-modules/stups-zign/default.nix @@ -5,7 +5,7 @@ , stups-tokens , stups-cli-support , pytest -, pytestcov +, pytest-cov , isPy3k }: @@ -40,7 +40,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov + pytest-cov ]; meta = with lib; { diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix index cedbb7bcf786..fe92b71f3f52 100644 --- a/pkgs/development/python-modules/subliminal/default.nix +++ b/pkgs/development/python-modules/subliminal/default.nix @@ -19,7 +19,7 @@ , vcrpy , pytest , pytest-flakes -, pytestcov +, pytest-cov , pytestrunner }: @@ -40,7 +40,7 @@ buildPythonPackage rec { checkInputs = [ sympy vcrpy pytest pytest-flakes - pytestcov pytestrunner + pytest-cov pytestrunner ]; # https://github.com/Diaoul/subliminal/pull/963 diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index c8fd82043a81..0079b44cfd35 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -19,7 +19,7 @@ , parfive , pytest-astropy , pytest-mock -, pytestcov +, pytest-cov , python-dateutil , scikitimage , scipy @@ -68,7 +68,7 @@ buildPythonPackage rec { checkInputs = [ hypothesis pytest-astropy - pytestcov + pytest-cov pytest-mock ]; diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix index b6754e15ad5d..404edac7e59b 100644 --- a/pkgs/development/python-modules/tablib/default.nix +++ b/pkgs/development/python-modules/tablib/default.nix @@ -4,7 +4,7 @@ , pandas , setuptools-scm , pytest -, pytestcov +, pytest-cov , pyyaml , unicodecsv , xlrd @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ xlwt openpyxl pyyaml xlrd odfpy ]; - checkInputs = [ pytest pytestcov unicodecsv pandas ]; + checkInputs = [ pytest pytest-cov unicodecsv pandas ]; # test_tablib needs MarkupPy, which isn't packaged yet checkPhase = '' diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index b06a53cb333c..8da8d622a7b3 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi , setuptools-scm, pytest, pytest-freezegun, freezegun, backports_unittest-mock , six, pytz, jaraco_functools, pythonOlder -, pytest-flake8, pytestcov, pytest-black, pytest-mypy +, pytest-flake8, pytest-cov, pytest-black, pytest-mypy }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { checkInputs = [ pytest-freezegun pytest freezegun backports_unittest-mock - pytest-flake8 pytestcov pytest-black pytest-mypy + pytest-flake8 pytest-cov pytest-black pytest-mypy ]; checkPhase = '' diff --git a/pkgs/development/python-modules/textwrap3/default.nix b/pkgs/development/python-modules/textwrap3/default.nix index 791479b69e14..995a62230b22 100644 --- a/pkgs/development/python-modules/textwrap3/default.nix +++ b/pkgs/development/python-modules/textwrap3/default.nix @@ -4,7 +4,7 @@ , tox , pytest , coverage -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { tox pytest coverage - pytestcov + pytest-cov ]; checkPhase = '' diff --git a/pkgs/development/python-modules/threadpoolctl/default.nix b/pkgs/development/python-modules/threadpoolctl/default.nix index fb2c6094b37c..20fad7c18a0a 100644 --- a/pkgs/development/python-modules/threadpoolctl/default.nix +++ b/pkgs/development/python-modules/threadpoolctl/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , flit , pytestCheckHook -, pytestcov +, pytest-cov , numpy , scipy }: @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "0sl6mp3b2gb0dvqkhnkmrp2g3r5c7clyyyxzq44xih6sw1pgx9df"; }; - checkInputs = [ pytestCheckHook pytestcov numpy scipy ]; + checkInputs = [ pytestCheckHook pytest-cov numpy scipy ]; meta = with lib; { homepage = "https://github.com/joblib/threadpoolctl"; diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix index 48aff396aaad..1cd055588c28 100644 --- a/pkgs/development/python-modules/timezonefinder/default.nix +++ b/pkgs/development/python-modules/timezonefinder/default.nix @@ -5,7 +5,7 @@ , numba , numpy , pytestCheckHook -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -23,7 +23,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ numba pytestCheckHook pytestcov ]; + checkInputs = [ numba pytestCheckHook pytest-cov ]; meta = with lib; { description = "fast python package for finding the timezone of any point on earth (coordinates) offline"; diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 35c0f76b0843..7a025577dbb0 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -7,7 +7,7 @@ # Check inputs , pytest , pytestrunner -, pytestcov +, pytest-cov , pytest-flake8 , pytest-isort }: @@ -34,7 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ webencodings ]; - checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ]; + checkInputs = [ pytest pytestrunner pytest-cov pytest-flake8 pytest-isort ]; # https://github.com/PyCQA/pycodestyle/issues/598 preCheck = '' diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index d8225e7031ea..fb39831a0d18 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, pythonAtLeast, pythonOlder, click , click-completion, factory_boy, faker, inquirer, notify-py, pbr, pendulum -, ptable, pytestCheckHook, pytestcov, pytest-mock, requests, twine +, ptable, pytestCheckHook, pytest-cov, pytest-mock, requests, twine , validate-email }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ pbr twine ]; - checkInputs = [ pbr pytestCheckHook pytestcov pytest-mock faker factory_boy ]; + checkInputs = [ pbr pytestCheckHook pytest-cov pytest-mock faker factory_boy ]; preCheck = '' export TOGGL_API_TOKEN=your_api_token diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index 61adcf9254ff..13d037515c3f 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -4,7 +4,7 @@ , click , pytestCheckHook , shellingham -, pytestcov +, pytest-cov , pytest_xdist , pytest-sugar , coverage @@ -26,7 +26,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestcov + pytest-cov pytest_xdist pytest-sugar shellingham diff --git a/pkgs/development/python-modules/typesentry/default.nix b/pkgs/development/python-modules/typesentry/default.nix index ef3b1c78c399..a4d8125b5d61 100644 --- a/pkgs/development/python-modules/typesentry/default.nix +++ b/pkgs/development/python-modules/typesentry/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , colorama , pytest -, pytestcov +, pytest-cov }: buildPythonPackage { @@ -19,7 +19,7 @@ buildPythonPackage { }; propagatedBuildInputs = [ colorama ]; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; checkPhase = '' pytest ''; diff --git a/pkgs/development/python-modules/typesystem/default.nix b/pkgs/development/python-modules/typesystem/default.nix index c278680404ba..f7dcf33ea7fd 100644 --- a/pkgs/development/python-modules/typesystem/default.nix +++ b/pkgs/development/python-modules/typesystem/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , isPy27 , pytestCheckHook -, pytestcov +, pytest-cov , jinja2 , pyyaml }: @@ -27,7 +27,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestcov + pytest-cov ]; disabledTests = [ diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix index 32a877582342..4d7fe6b034b4 100644 --- a/pkgs/development/python-modules/uarray/default.nix +++ b/pkgs/development/python-modules/uarray/default.nix @@ -7,7 +7,7 @@ , astunparse , typing-extensions , pytestCheckHook -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -30,7 +30,7 @@ buildPythonPackage rec { } )]; - checkInputs = [ pytestCheckHook pytestcov ]; + checkInputs = [ pytestCheckHook pytest-cov ]; propagatedBuildInputs = [ matchpy numpy astunparse typing-extensions ]; # Tests must be run from outside the source directory diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix index 82e291ae4623..f13bd4cbdc43 100644 --- a/pkgs/development/python-modules/venusian/default.nix +++ b/pkgs/development/python-modules/venusian/default.nix @@ -3,7 +3,7 @@ , fetchPypi , isPy27 , pytest -, pytestcov +, pytest-cov }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "f6842b7242b1039c0c28f6feef29016e7e7dd3caaeb476a193acf737db31ee38"; }; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; checkPhase = '' pytest diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index 8f946c47786d..c578b7c7c8c0 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -16,7 +16,7 @@ pytestrunner, pytest-isort, pytest-flake8, - pytestcov, + pytest-cov, isPy3k, substituteAll }: @@ -39,7 +39,7 @@ buildPythonPackage rec { --replace '[tool:pytest]' '[tool:pytest]\nflake8-ignore = E501' ''; - checkInputs = [ pytest pytestrunner pytest-isort pytest-flake8 pytestcov ]; + checkInputs = [ pytest pytestrunner pytest-isort pytest-flake8 pytest-cov ]; FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; diff --git a/pkgs/development/python-modules/word2vec/default.nix b/pkgs/development/python-modules/word2vec/default.nix index b078231c9429..1272916d41f7 100644 --- a/pkgs/development/python-modules/word2vec/default.nix +++ b/pkgs/development/python-modules/word2vec/default.nix @@ -9,7 +9,7 @@ , setuptools-scm , gcc , pytest -, pytestcov +, pytest-cov , isPy27 }: let @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cython numpy scikit-learn six ]; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; # Checks require test data downloaded separately # See project source Makefile:test-data rule for reference diff --git a/pkgs/development/python-modules/wordcloud/default.nix b/pkgs/development/python-modules/wordcloud/default.nix index 80f22efbda85..e04f17c214df 100644 --- a/pkgs/development/python-modules/wordcloud/default.nix +++ b/pkgs/development/python-modules/wordcloud/default.nix @@ -4,7 +4,7 @@ , numpy , pillow , cython -, pytestcov +, pytest-cov , pytest , fetchpatch }: @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ matplotlib numpy pillow ]; # Tests require extra dependencies - checkInputs = [ mock pytest pytestcov ]; + checkInputs = [ mock pytest pytest-cov ]; checkPhase = '' PATH=$out/bin:$PATH pytest test diff --git a/pkgs/development/tools/sourcetrail/jedi.nix b/pkgs/development/tools/sourcetrail/jedi.nix index 2e1ca55dad3f..93650c9027a4 100644 --- a/pkgs/development/tools/sourcetrail/jedi.nix +++ b/pkgs/development/tools/sourcetrail/jedi.nix @@ -1,6 +1,6 @@ # Taken from a past commit of nixpkgs -{ lib, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }: +{ lib, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytest-cov, parso }: buildPythonPackage rec { pname = "jedi"; @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "86ed7d9b750603e4ba582ea8edc678657fb4007894a12bcf6f4bb97892f31d20"; }; - checkInputs = [ pytest glibcLocales tox pytestcov ]; + checkInputs = [ pytest glibcLocales tox pytest-cov ]; propagatedBuildInputs = [ parso ]; diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix index fcab1f952f2b..a6d28b36bffd 100644 --- a/pkgs/development/tools/vim-vint/default.nix +++ b/pkgs/development/tools/vim-vint/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { # For python 3.5 > version > 2.7 , a nested dependency (pythonPackages.hypothesis) fails. disabled = ! pythonAtLeast "3.5"; - checkInputs = [ pytest pytestcov ]; + checkInputs = [ pytest pytest-cov ]; propagatedBuildInputs = [ ansicolor chardet pyyaml setuptools ]; # Unpin test dependency versions. This is fixed in master but not yet released. diff --git a/pkgs/servers/dns/doh-proxy/default.nix b/pkgs/servers/dns/doh-proxy/default.nix index e65021599ad4..8774715bb1d8 100644 --- a/pkgs/servers/dns/doh-proxy/default.nix +++ b/pkgs/servers/dns/doh-proxy/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { asynctest unittest-data-provider pytest - pytestcov + pytest-cov pytest-aiohttp ]; diff --git a/pkgs/tools/admin/lexicon/default.nix b/pkgs/tools/admin/lexicon/default.nix index 6c105cf9b335..7737205ce02d 100644 --- a/pkgs/tools/admin/lexicon/default.nix +++ b/pkgs/tools/admin/lexicon/default.nix @@ -65,7 +65,7 @@ buildPythonApplication rec { checkInputs = [ mock pytest - pytestcov + pytest-cov pytest_xdist vcrpy ]; diff --git a/pkgs/tools/admin/salt/pepper/default.nix b/pkgs/tools/admin/salt/pepper/default.nix index 25d3eaa15fc8..31cb2861f39f 100644 --- a/pkgs/tools/admin/salt/pepper/default.nix +++ b/pkgs/tools/admin/salt/pepper/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { buildInputs = with python3Packages; [ setuptools setuptools-scm salt ]; checkInputs = with python3Packages; [ - pytest mock pyzmq pytest-rerunfailures pytestcov cherrypy tornado + pytest mock pyzmq pytest-rerunfailures pytest-cov cherrypy tornado ]; meta = with lib; { diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/tools/backup/zfs-replicate/default.nix index c167ad1fa018..aae6ce329f68 100644 --- a/pkgs/tools/backup/zfs-replicate/default.nix +++ b/pkgs/tools/backup/zfs-replicate/default.nix @@ -1,5 +1,5 @@ { buildPythonApplication, click, fetchPypi, hypothesis, mypy, pytest -, pytestcov, pytestrunner, lib, stringcase +, pytest-cov, pytestrunner, lib, stringcase }: buildPythonApplication rec { @@ -15,7 +15,7 @@ buildPythonApplication rec { hypothesis mypy pytest - pytestcov + pytest-cov ]; buildInputs = [ diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix index 03e76e5fb275..b5b1256a9b5e 100644 --- a/pkgs/tools/filesystems/gitfs/default.nix +++ b/pkgs/tools/filesystems/gitfs/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { 'from pygit2 import RemoteCallbacks' ''; - checkInputs = with python3Packages; [ pytest pytestcov mock ]; + checkInputs = with python3Packages; [ pytest pytest-cov mock ]; propagatedBuildInputs = with python3Packages; [ atomiclong fusepy pygit2 six ]; checkPhase = "py.test"; diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix index a3f1608c3ad1..f71d8a8b8ef3 100644 --- a/pkgs/tools/misc/bonfire/default.nix +++ b/pkgs/tools/misc/bonfire/default.nix @@ -29,7 +29,7 @@ buildPythonApplication rec { --replace "data_files = *.rst, *.txt" "" ''; - buildInputs = [ httpretty pytest pytestcov ]; + buildInputs = [ httpretty pytest pytest-cov ]; preCheck = '' # fix compatibility with pytest 4 diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index d49c1e925dc1..037adda92eb6 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { checkInputs = with python3Packages; [ freezegun pytest - pytestcov + pytest-cov pytest-flake8 ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 017d27a8a208..f42713fee3db 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -52,6 +52,7 @@ mapAliases ({ privacyidea = throw "renamed to pkgs.privacyidea"; # added 2021-06-20 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 + pytestcov = pytest-cov; # added 2021-01-04 pytest-pep8 = pytestpep8; # added 2021-01-04 pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c4654534e6c9..f689a562a49d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6786,8 +6786,7 @@ in { pytest-console-scripts = callPackage ../development/python-modules/pytest-console-scripts { }; - pytest-cov = self.pytestcov; # self 2021-01-04 - pytestcov = callPackage ../development/python-modules/pytest-cov { }; + pytest-cov = callPackage ../development/python-modules/pytest-cov { }; pytest-cram = callPackage ../development/python-modules/pytest-cram { }; From 9bfdf57e139e7e3b253979da828285bb8284a217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:07:53 +0200 Subject: [PATCH 13/61] pythonPackages: deprecate pytestrunner alias --- pkgs/applications/misc/pyditz/cerberus.nix | 4 ++-- pkgs/applications/networking/dyndns/dyndnsc/default.nix | 2 +- .../networking/instant-messengers/matrixcli/default.nix | 4 ++-- pkgs/applications/office/todoman/default.nix | 2 +- pkgs/applications/terminal-emulators/terminator/default.nix | 2 +- pkgs/applications/version-management/nbstripout/default.nix | 2 +- pkgs/development/compilers/vyper/default.nix | 4 ++-- pkgs/development/python-modules/aiocontextvars/default.nix | 4 ++-- pkgs/development/python-modules/apprise/default.nix | 4 ++-- pkgs/development/python-modules/arpeggio/default.nix | 4 ++-- pkgs/development/python-modules/awkward0/default.nix | 4 ++-- pkgs/development/python-modules/bacpypes/default.nix | 4 ++-- pkgs/development/python-modules/bleach/default.nix | 4 ++-- pkgs/development/python-modules/cairocffi/0_9.nix | 2 +- pkgs/development/python-modules/cairocffi/default.nix | 2 +- pkgs/development/python-modules/cairocffi/generic.nix | 2 +- pkgs/development/python-modules/cfn-flip/default.nix | 4 ++-- pkgs/development/python-modules/chardet/2.nix | 4 ++-- pkgs/development/python-modules/ci-py/default.nix | 4 ++-- pkgs/development/python-modules/coveralls/default.nix | 4 ++-- pkgs/development/python-modules/cssselect2/default.nix | 4 ++-- pkgs/development/python-modules/daphne/default.nix | 4 ++-- pkgs/development/python-modules/defcon/default.nix | 4 ++-- pkgs/development/python-modules/diceware/default.nix | 4 ++-- pkgs/development/python-modules/django_guardian/default.nix | 4 ++-- pkgs/development/python-modules/dropbox/default.nix | 4 ++-- pkgs/development/python-modules/fastpair/default.nix | 4 ++-- pkgs/development/python-modules/fastparquet/default.nix | 4 ++-- pkgs/development/python-modules/favicon/default.nix | 4 ++-- pkgs/development/python-modules/ffmpeg-python/default.nix | 4 ++-- pkgs/development/python-modules/flake8/default.nix | 4 ++-- pkgs/development/python-modules/flickrapi/default.nix | 4 ++-- pkgs/development/python-modules/fontmath/default.nix | 4 ++-- pkgs/development/python-modules/genanki/default.nix | 4 ++-- pkgs/development/python-modules/gidgethub/default.nix | 4 ++-- pkgs/development/python-modules/grandalf/default.nix | 4 ++-- pkgs/development/python-modules/guessit/default.nix | 4 ++-- pkgs/development/python-modules/hickle/default.nix | 4 ++-- pkgs/development/python-modules/image-match/default.nix | 4 ++-- pkgs/development/python-modules/inform/default.nix | 4 ++-- pkgs/development/python-modules/jira/default.nix | 4 ++-- pkgs/development/python-modules/keyutils/default.nix | 4 ++-- pkgs/development/python-modules/libais/default.nix | 4 ++-- pkgs/development/python-modules/libcloud/2.nix | 4 ++-- pkgs/development/python-modules/libcloud/default.nix | 4 ++-- pkgs/development/python-modules/lomond/default.nix | 4 ++-- pkgs/development/python-modules/lyricwikia/default.nix | 4 ++-- pkgs/development/python-modules/marisa-trie/default.nix | 4 ++-- .../python-modules/markdownsuperscript/default.nix | 4 ++-- pkgs/development/python-modules/matchpy/default.nix | 4 ++-- pkgs/development/python-modules/matrix-client/default.nix | 4 ++-- pkgs/development/python-modules/mccabe/default.nix | 4 ++-- pkgs/development/python-modules/measurement/default.nix | 4 ++-- pkgs/development/python-modules/multidict/default.nix | 4 ++-- pkgs/development/python-modules/multiset/default.nix | 4 ++-- .../development/python-modules/mwparserfromhell/default.nix | 4 ++-- pkgs/development/python-modules/ndjson/default.nix | 4 ++-- pkgs/development/python-modules/numpy-stl/default.nix | 4 ++-- pkgs/development/python-modules/omegaconf/default.nix | 4 ++-- pkgs/development/python-modules/packet-python/default.nix | 6 +++--- pkgs/development/python-modules/paho-mqtt/default.nix | 4 ++-- pkgs/development/python-modules/parse-type/default.nix | 4 ++-- pkgs/development/python-modules/parsedatetime/default.nix | 4 ++-- pkgs/development/python-modules/paste/default.nix | 4 ++-- pkgs/development/python-modules/pastedeploy/default.nix | 4 ++-- pkgs/development/python-modules/prance/default.nix | 4 ++-- pkgs/development/python-modules/praw/6.3.nix | 4 ++-- .../python-modules/py-air-control-exporter/default.nix | 4 ++-- pkgs/development/python-modules/py-multibase/default.nix | 4 ++-- pkgs/development/python-modules/pycategories/default.nix | 4 ++-- pkgs/development/python-modules/pydicom/default.nix | 4 ++-- pkgs/development/python-modules/pyee/default.nix | 4 ++-- pkgs/development/python-modules/pygal/default.nix | 4 ++-- pkgs/development/python-modules/pylint/1.9.nix | 4 ++-- pkgs/development/python-modules/pymatgen-lammps/default.nix | 4 ++-- pkgs/development/python-modules/pynvim/default.nix | 4 ++-- pkgs/development/python-modules/pyosf/default.nix | 4 ++-- pkgs/development/python-modules/pysrim/default.nix | 4 ++-- pkgs/development/python-modules/pytest-pylint/default.nix | 4 ++-- .../python-modules/{pytestrunner => pytest-runner}/2.nix | 0 .../{pytestrunner => pytest-runner}/default.nix | 0 pkgs/development/python-modules/python-lz4/default.nix | 4 ++-- pkgs/development/python-modules/python-twitter/default.nix | 4 ++-- pkgs/development/python-modules/pythran/default.nix | 4 ++-- pkgs/development/python-modules/pyvips/default.nix | 4 ++-- pkgs/development/python-modules/qcelemental/default.nix | 4 ++-- pkgs/development/python-modules/qcengine/default.nix | 4 ++-- pkgs/development/python-modules/rebulk/default.nix | 4 ++-- pkgs/development/python-modules/reflink/default.nix | 4 ++-- pkgs/development/python-modules/scikit-build/default.nix | 4 ++-- pkgs/development/python-modules/secp256k1/default.nix | 4 ++-- pkgs/development/python-modules/setuptoolstrial/default.nix | 4 ++-- pkgs/development/python-modules/slackclient/default.nix | 4 ++-- pkgs/development/python-modules/sqlite-utils/default.nix | 4 ++-- pkgs/development/python-modules/srptools/default.nix | 4 ++-- pkgs/development/python-modules/ssdeep/default.nix | 4 ++-- pkgs/development/python-modules/sseclient/default.nix | 4 ++-- pkgs/development/python-modules/stone/default.nix | 4 ++-- pkgs/development/python-modules/subliminal/default.nix | 4 ++-- pkgs/development/python-modules/tatsu/default.nix | 4 ++-- pkgs/development/python-modules/tinycss2/default.nix | 4 ++-- pkgs/development/python-modules/token-bucket/default.nix | 4 ++-- pkgs/development/python-modules/torchgpipe/default.nix | 4 ++-- pkgs/development/python-modules/variants/default.nix | 4 ++-- pkgs/development/python-modules/weasyprint/default.nix | 4 ++-- pkgs/development/python-modules/yarl/default.nix | 4 ++-- pkgs/development/tools/analysis/cpplint/default.nix | 2 +- pkgs/development/tools/asn2quickder/default.nix | 4 ++-- pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix | 4 +--- pkgs/misc/flashfocus/default.nix | 2 +- pkgs/servers/dns/doh-proxy/default.nix | 2 +- pkgs/servers/radicale/2.x.nix | 2 +- pkgs/tools/backup/duplicity/default.nix | 2 +- pkgs/tools/backup/zfs-replicate/default.nix | 4 ++-- pkgs/tools/misc/yle-dl/default.nix | 2 +- pkgs/tools/security/sequoia/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 3 +-- pkgs/top-level/python2-packages.nix | 2 +- 120 files changed, 218 insertions(+), 220 deletions(-) rename pkgs/development/python-modules/{pytestrunner => pytest-runner}/2.nix (100%) rename pkgs/development/python-modules/{pytestrunner => pytest-runner}/default.nix (100%) diff --git a/pkgs/applications/misc/pyditz/cerberus.nix b/pkgs/applications/misc/pyditz/cerberus.nix index 5eb43c0e3575..0e473c6a1ba1 100644 --- a/pkgs/applications/misc/pyditz/cerberus.nix +++ b/pkgs/applications/misc/pyditz/cerberus.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pytestrunner, pytest }: +{ lib, buildPythonPackage, fetchPypi, pytest-runner, pytest }: buildPythonPackage rec { pname = "Cerberus"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1pxzr8sfm2hc5s96m9k044i44nwkva70n0ypr6a35v73zn891cx5"; }; - checkInputs = [ pytestrunner pytest ]; + checkInputs = [ pytest-runner pytest ]; meta = with lib; { homepage = "http://python-cerberus.org/"; diff --git a/pkgs/applications/networking/dyndns/dyndnsc/default.nix b/pkgs/applications/networking/dyndns/dyndnsc/default.nix index 66b1d2639d68..07854f48fcc6 100644 --- a/pkgs/applications/networking/dyndns/dyndnsc/default.nix +++ b/pkgs/applications/networking/dyndns/dyndnsc/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { substituteInPlace setup.py --replace "bottle==" "bottle>=" ''; - nativeBuildInputs = with python3Packages; [ pytestrunner ]; + nativeBuildInputs = with python3Packages; [ pytest-runner ]; propagatedBuildInputs = with python3Packages; [ daemonocle dnspython diff --git a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix index aadb18606e11..7e88a77193b6 100644 --- a/pkgs/applications/networking/instant-messengers/matrixcli/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrixcli/default.nix @@ -1,6 +1,6 @@ { lib, fetchgit , buildPythonApplication, buildPythonPackage - , pygobject3, pytestrunner, requests, responses, pytest, python-olm + , pygobject3, pytest-runner, requests, responses, pytest, python-olm , canonicaljson, olm }: let @@ -20,7 +20,7 @@ let propagatedBuildInputs = [ requests responses olm python-olm canonicaljson - pytestrunner pytest + pytest-runner pytest ]; doCheck = false; diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 83bbc6cf53f9..fc9f70094da1 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -44,7 +44,7 @@ buildPythonApplication rec { freezegun hypothesis pytest - pytestrunner + pytest-runner pytest-cov glibcLocales ]; diff --git a/pkgs/applications/terminal-emulators/terminator/default.nix b/pkgs/applications/terminal-emulators/terminator/default.nix index 6ddeffe68eb8..e922a34423c0 100644 --- a/pkgs/applications/terminal-emulators/terminator/default.nix +++ b/pkgs/applications/terminal-emulators/terminator/default.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { intltool gobject-introspection wrapGAppsHook - python3.pkgs.pytestrunner + python3.pkgs.pytest-runner ]; buildInputs = [ diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index 06a4b2c98a69..5e556b40a890 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { # application, it would mess up the Python environment. Thus, don't add it # here, instead add it to PATH when running unit tests checkInputs = [ pytest pytest-flake8 git ]; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ ipython nbformat ]; src = fetchPypi { diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index 4bdad5f7c61c..7df426177483 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, writeText, asttokens , pycryptodome, pytest_xdist, pytest-cov, recommonmark, semantic-version, sphinx -, sphinx_rtd_theme, pytestrunner }: +, sphinx_rtd_theme, pytest-runner }: let sample-contract = writeText "example.vy" '' @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "e763561a161c35c03b92a0c176096dd9b4c78ab003c2f08324d443f459b3de84"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; postPatch = '' substituteInPlace setup.py \ diff --git a/pkgs/development/python-modules/aiocontextvars/default.nix b/pkgs/development/python-modules/aiocontextvars/default.nix index 728f2b5fa61a..dc70baab9e5c 100644 --- a/pkgs/development/python-modules/aiocontextvars/default.nix +++ b/pkgs/development/python-modules/aiocontextvars/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytestrunner +, pytest-runner , pytest , pytest-asyncio , contextvars @@ -23,7 +23,7 @@ buildPythonPackage rec { }; buildInputs = [ - pytestrunner + pytest-runner ]; checkInputs = [ diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 1bf5a93130dd..04a3e11be3ef 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, installShellFiles , Babel, requests, requests_oauthlib, six, click, markdown, pyyaml, cryptography -, pytestrunner, coverage, flake8, mock, pytestCheckHook, pytest-cov, tox, gntp, sleekxmpp +, pytest-runner, coverage, flake8, mock, pytestCheckHook, pytest-cov, tox, gntp, sleekxmpp }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { ]; checkInputs = [ - pytestrunner coverage flake8 mock pytestCheckHook pytest-cov tox gntp sleekxmpp + pytest-runner coverage flake8 mock pytestCheckHook pytest-cov tox gntp sleekxmpp ]; disabledTests = [ "test_apprise_cli_nux_env" ]; diff --git a/pkgs/development/python-modules/arpeggio/default.nix b/pkgs/development/python-modules/arpeggio/default.nix index 97718a300693..5ad433413ce7 100644 --- a/pkgs/development/python-modules/arpeggio/default.nix +++ b/pkgs/development/python-modules/arpeggio/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , glibcLocales -, pytestrunner +, pytest-runner , pytestCheckHook }: @@ -19,7 +19,7 @@ buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; buildInputs = [ glibcLocales ]; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/awkward0/default.nix b/pkgs/development/python-modules/awkward0/default.nix index 3783f9776cd1..ce9f1eabc77a 100644 --- a/pkgs/development/python-modules/awkward0/default.nix +++ b/pkgs/development/python-modules/awkward0/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , numpy -, pytestrunner +, pytest-runner , pytestCheckHook }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "039pxzgll2yz8xpr6bw788ymvgvqgna5kgl9m6d9mzi4yhbjsjpx"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/bacpypes/default.nix b/pkgs/development/python-modules/bacpypes/default.nix index e07b02a08e74..8a1e6771b114 100644 --- a/pkgs/development/python-modules/bacpypes/default.nix +++ b/pkgs/development/python-modules/bacpypes/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, fetchFromGitHub -, wheel, pytestCheckHook, pytestrunner, pythonAtLeast }: +, wheel, pytestCheckHook, pytest-runner, pythonAtLeast }: buildPythonPackage rec { version = "0.18.4"; @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ wheel ]; # Using pytes instead of setuptools check hook allows disabling specific tests - checkInputs = [ pytestCheckHook pytestrunner ]; + checkInputs = [ pytestCheckHook pytest-runner ]; dontUseSetuptoolsCheck = true; disabledTests = [ # Test fails with a an error: AssertionError: assert 30 == 31 diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 53319466d3a5..d68318355d88 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytest -, pytestrunner +, pytest-runner , six , html5lib , setuptools @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "sha256-mLMXBznl6D3Z3BljPwdHJ62EjL7bYCZwjIrC07aXpDM="; }; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ packaging six html5lib setuptools ]; # Disable network tests diff --git a/pkgs/development/python-modules/cairocffi/0_9.nix b/pkgs/development/python-modules/cairocffi/0_9.nix index bd7bde42901e..84c1767bc29f 100644 --- a/pkgs/development/python-modules/cairocffi/0_9.nix +++ b/pkgs/development/python-modules/cairocffi/0_9.nix @@ -8,7 +8,7 @@ , makeFontsConf , freefont_ttf , pytest -, pytestrunner +, pytest-runner , glibcLocales , cairo , cffi diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix index 5c561af2f172..9b64dbeb66c1 100644 --- a/pkgs/development/python-modules/cairocffi/default.nix +++ b/pkgs/development/python-modules/cairocffi/default.nix @@ -8,7 +8,7 @@ , makeFontsConf , freefont_ttf , pytest -, pytestrunner +, pytest-runner , glibcLocales , cairo , cffi diff --git a/pkgs/development/python-modules/cairocffi/generic.nix b/pkgs/development/python-modules/cairocffi/generic.nix index 8b674f3baaa8..cdcdbad3395d 100644 --- a/pkgs/development/python-modules/cairocffi/generic.nix +++ b/pkgs/development/python-modules/cairocffi/generic.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { fontDirectories = [ freefont_ttf ]; }; - checkInputs = [ numpy pytest pytestrunner glibcLocales ]; + checkInputs = [ numpy pytest pytest-runner glibcLocales ]; propagatedBuildInputs = [ cairo cffi ] ++ lib.optional withXcffib xcffib; checkPhase = '' diff --git a/pkgs/development/python-modules/cfn-flip/default.nix b/pkgs/development/python-modules/cfn-flip/default.nix index 98d428cdbeba..bf3eab19d4fa 100644 --- a/pkgs/development/python-modules/cfn-flip/default.nix +++ b/pkgs/development/python-modules/cfn-flip/default.nix @@ -6,7 +6,7 @@ , click , pytest , pytest-cov -, pytestrunner +, pytest-runner , pyyaml , six }: @@ -31,7 +31,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytest-cov - pytestrunner + pytest-runner ]; checkPhase = '' diff --git a/pkgs/development/python-modules/chardet/2.nix b/pkgs/development/python-modules/chardet/2.nix index 65381d40268f..5f6fe0a672a7 100644 --- a/pkgs/development/python-modules/chardet/2.nix +++ b/pkgs/development/python-modules/chardet/2.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, fetchpatch -, pytest, pytestrunner, hypothesis }: +, pytest, pytest-runner, hypothesis }: buildPythonPackage rec { pname = "chardet"; @@ -18,7 +18,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ pytest pytestrunner hypothesis ]; + checkInputs = [ pytest pytest-runner hypothesis ]; meta = with lib; { homepage = "https://github.com/chardet/chardet"; diff --git a/pkgs/development/python-modules/ci-py/default.nix b/pkgs/development/python-modules/ci-py/default.nix index 30220b48b72d..61e1760f3727 100644 --- a/pkgs/development/python-modules/ci-py/default.nix +++ b/pkgs/development/python-modules/ci-py/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy27 -, pytest, pytestrunner, pytestCheckHook }: +, pytest, pytest-runner, pytestCheckHook }: buildPythonPackage rec { version = "1.0.0"; @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "12ax07n81vxbyayhwzi1q6x7gfmwmvrvwm1n4ii6qa6fqlp9pzj7"; }; - nativeBuildInputs = [ pytestrunner ]; # pytest-runner included in setup-requires + nativeBuildInputs = [ pytest-runner ]; # pytest-runner included in setup-requires checkInputs = [ pytest pytestCheckHook ]; pythonImportsCheck = [ "ci" ]; diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix index 5d5b07ffd05e..109667582188 100644 --- a/pkgs/development/python-modules/coveralls/default.nix +++ b/pkgs/development/python-modules/coveralls/default.nix @@ -4,7 +4,7 @@ , isPy27 , mock , pytest -, pytestrunner +, pytest-runner , sh , coverage , docopt @@ -33,7 +33,7 @@ buildPythonPackage rec { ]; buildInputs = [ - pytestrunner + pytest-runner ]; postPatch = '' diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix index 28e524a265ba..25bb35eab2d8 100644 --- a/pkgs/development/python-modules/cssselect2/default.nix +++ b/pkgs/development/python-modules/cssselect2/default.nix @@ -4,7 +4,7 @@ , fetchPypi , tinycss2 , pytest -, pytestrunner +, pytest-runner , pytest-cov , pytest-flake8 , pytest-isort @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ tinycss2 ]; - checkInputs = [ pytest pytestrunner pytest-cov pytest-flake8 pytest-isort ]; + checkInputs = [ pytest pytest-runner pytest-cov pytest-flake8 pytest-isort ]; meta = with lib; { description = "CSS selectors for Python ElementTree"; diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index f6d7fcac62a5..90b108e3bc74 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub -, asgiref, autobahn, twisted, pytestrunner +, asgiref, autobahn, twisted, pytest-runner , hypothesis, pytest, pytest-asyncio, service-identity, pyopenssl }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-KWkMV4L7bA2Eo/u4GGif6lmDNrZAzvYyDiyzyWt9LeI="; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ asgiref autobahn twisted service-identity pyopenssl ]; diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix index 100c7ee6fc1f..30853aa41a64 100644 --- a/pkgs/development/python-modules/defcon/default.nix +++ b/pkgs/development/python-modules/defcon/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder , fonttools, setuptools-scm -, pytest, pytestrunner, lxml, fs, unicodedata2, fontpens +, pytest, pytest-runner, lxml, fs, unicodedata2, fontpens }: buildPythonPackage rec { @@ -25,7 +25,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestrunner + pytest-runner lxml fs unicodedata2 diff --git a/pkgs/development/python-modules/diceware/default.nix b/pkgs/development/python-modules/diceware/default.nix index 8e35eabfb0d7..d519aa76c8b1 100644 --- a/pkgs/development/python-modules/diceware/default.nix +++ b/pkgs/development/python-modules/diceware/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytestrunner +, pytest-runner , setuptools , coverage, pytest }: @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "0klb0ysybzlh2wihvir82hgq62v0jjmlcqklwajyms7c0p529yby"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix index 0e3eaff6cb57..9685e55bb1c3 100644 --- a/pkgs/development/python-modules/django_guardian/default.nix +++ b/pkgs/development/python-modules/django_guardian/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , django_environ, mock, django -, pytest, pytestrunner, pytest-django +, pytest, pytest-runner, pytest-django }: buildPythonPackage rec { pname = "django-guardian"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "c58a68ae76922d33e6bdc0e69af1892097838de56e93e78a8361090bcd9f89a0"; }; - checkInputs = [ pytest pytestrunner pytest-django django_environ mock ]; + checkInputs = [ pytest pytest-runner pytest-django django_environ mock ]; propagatedBuildInputs = [ django ]; meta = with lib; { diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index c6751eede2fe..f5a9274a0d18 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytestrunner, requests, urllib3, mock, setuptools, stone }: +, pytest-runner, requests, urllib3, mock, setuptools, stone }: buildPythonPackage rec { pname = "dropbox"; @@ -18,7 +18,7 @@ buildPythonPackage rec { # Set DROPBOX_TOKEN environment variable to a valid token. doCheck = false; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ requests urllib3 mock setuptools stone ]; meta = with lib; { diff --git a/pkgs/development/python-modules/fastpair/default.nix b/pkgs/development/python-modules/fastpair/default.nix index eaf1a78520a2..45d9976896ec 100644 --- a/pkgs/development/python-modules/fastpair/default.nix +++ b/pkgs/development/python-modules/fastpair/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytestrunner, pytest, scipy, pytestCheckHook }: +{ lib, buildPythonPackage, fetchFromGitHub, pytest-runner, pytest, scipy, pytestCheckHook }: buildPythonPackage { pname = "fastpair"; @@ -11,7 +11,7 @@ buildPythonPackage { sha256 = "1l8zgr8awg27lhlkpa2dsvghrb7b12jl1bkgpzg5q7pg8nizl9mx"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; checkInputs = [ pytest pytestCheckHook ]; diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index c0694a58cb71..155f3b6e8290 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -5,7 +5,7 @@ , numba , numpy , pandas -, pytestrunner +, pytest-runner , cramjam , fsspec , thrift @@ -23,7 +23,7 @@ buildPythonPackage rec { hash = "sha256-wSJ6PqW7c8DJCsGuPhXaVGM2s/1dZhLjG4C0JWPcjhY="; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ cramjam fsspec numba numpy pandas thrift ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/favicon/default.nix b/pkgs/development/python-modules/favicon/default.nix index 5af3be420b02..1a3917fbdb7a 100644 --- a/pkgs/development/python-modules/favicon/default.nix +++ b/pkgs/development/python-modules/favicon/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, requests, beautifulsoup4, pytest, requests-mock, - pytestrunner }: + pytest-runner }: buildPythonPackage rec { pname = "favicon"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "6d6b5a78de2a0d0084589f687f384b2ecd6a6527093fec564403b1a30605d7a8"; }; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; checkInputs = [ pytest requests-mock ]; propagatedBuildInputs = [ requests beautifulsoup4 ]; diff --git a/pkgs/development/python-modules/ffmpeg-python/default.nix b/pkgs/development/python-modules/ffmpeg-python/default.nix index f845ca6a5d36..1f8c6983cbd8 100644 --- a/pkgs/development/python-modules/ffmpeg-python/default.nix +++ b/pkgs/development/python-modules/ffmpeg-python/default.nix @@ -5,7 +5,7 @@ , pytestCheckHook , ffmpeg , future -, pytestrunner +, pytest-runner , pytest-mock }: @@ -27,7 +27,7 @@ buildPythonPackage rec { }) ]; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; propagatedBuildInputs = [ future ]; checkInputs = [ pytestCheckHook pytest-mock ]; diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index b6f287669c58..0110db18c4c3 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder -, mock, pytest, pytestrunner +, mock, pytest, pytest-runner , configparser, enum34, mccabe, pycodestyle, pyflakes, functools32, typing ? null, importlib-metadata }: @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b"; }; - checkInputs = [ pytest mock pytestrunner ]; + checkInputs = [ pytest mock pytest-runner ]; propagatedBuildInputs = [ pyflakes pycodestyle mccabe ] ++ lib.optionals (pythonOlder "3.2") [ configparser functools32 ] ++ lib.optionals (pythonOlder "3.4") [ enum34 ] diff --git a/pkgs/development/python-modules/flickrapi/default.nix b/pkgs/development/python-modules/flickrapi/default.nix index 73b7eea6e63a..c989cfbb56d5 100644 --- a/pkgs/development/python-modules/flickrapi/default.nix +++ b/pkgs/development/python-modules/flickrapi/default.nix @@ -5,7 +5,7 @@ , requests_toolbelt , requests_oauthlib , pytest -, pytestrunner +, pytest-runner , pytest-cov , responses }: @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests requests_toolbelt requests_oauthlib ]; - checkInputs = [ pytest pytestrunner pytest-cov responses ]; + checkInputs = [ pytest pytest-runner pytest-cov responses ]; doCheck = false; # Otherwise: # ========================= no tests ran in 0.01 seconds ========================= # builder for '/nix/store/c8a58v6aa18zci08q2l53s12ywn8jqhq-python3.6-flickrapi-2.4.0.drv' failed with exit code 5 diff --git a/pkgs/development/python-modules/fontmath/default.nix b/pkgs/development/python-modules/fontmath/default.nix index a6982037c1eb..d9516ceb88b4 100644 --- a/pkgs/development/python-modules/fontmath/default.nix +++ b/pkgs/development/python-modules/fontmath/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , fonttools, setuptools-scm -, pytest, pytestrunner +, pytest, pytest-runner }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ fonttools ]; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; meta = with lib; { description = "A collection of objects that implement fast font, glyph, etc. math"; diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix index f755bb8cf8f5..2c54bc4910b5 100644 --- a/pkgs/development/python-modules/genanki/default.nix +++ b/pkgs/development/python-modules/genanki/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy3k -, cached-property, frozendict, pystache, pyyaml, pytest, pytestrunner +, cached-property, frozendict, pystache, pyyaml, pytest, pytest-runner }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - pytestrunner + pytest-runner cached-property frozendict pystache diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index a65de61b6dbe..691af2eda849 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pythonOlder , setuptools -, pytestrunner +, pytest-runner , pytest , pytest-asyncio , twisted @@ -25,7 +25,7 @@ buildPythonPackage rec { sha256 = "3efbd6998600254ec7a2869318bd3ffde38edc3a0d37be0c14bc46b45947b682"; }; - nativeBuildInputs = [ setuptools pytestrunner ]; + nativeBuildInputs = [ setuptools pytest-runner ]; checkInputs = [ pytest pytest-asyncio twisted treq tornado aiohttp ]; propagatedBuildInputs = [ uritemplate diff --git a/pkgs/development/python-modules/grandalf/default.nix b/pkgs/development/python-modules/grandalf/default.nix index 2d2658e00f84..6056d215d227 100644 --- a/pkgs/development/python-modules/grandalf/default.nix +++ b/pkgs/development/python-modules/grandalf/default.nix @@ -4,7 +4,7 @@ , pyparsing , future , pytest -, pytestrunner +, pytest-runner }: buildPythonPackage rec { @@ -24,7 +24,7 @@ buildPythonPackage rec { future ]; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; patches = [ ./no-setup-requires-pytestrunner.patch ]; diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix index adb131868c7c..0e8d07465989 100644 --- a/pkgs/development/python-modules/guessit/default.nix +++ b/pkgs/development/python-modules/guessit/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, pytestrunner +, pytest-runner , python-dateutil , babelfish , rebulk @@ -18,7 +18,7 @@ buildPythonPackage rec { # Tests require more packages. doCheck = false; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; propagatedBuildInputs = [ python-dateutil babelfish rebulk ]; diff --git a/pkgs/development/python-modules/hickle/default.nix b/pkgs/development/python-modules/hickle/default.nix index 0852ce4d4430..21af8addaac0 100644 --- a/pkgs/development/python-modules/hickle/default.nix +++ b/pkgs/development/python-modules/hickle/default.nix @@ -10,7 +10,7 @@ , codecov , pytest , pytest-cov -, pytestrunner +, pytest-runner , coveralls , twine , check-manifest @@ -36,7 +36,7 @@ buildPythonPackage rec { doCheck = false; # incompatible with latest astropy checkInputs = [ - pytest pytest-cov pytestrunner coveralls scipy pandas astropy twine check-manifest codecov + pytest pytest-cov pytest-runner coveralls scipy pandas astropy twine check-manifest codecov ]; pythonImportsCheck = [ "hickle" ]; diff --git a/pkgs/development/python-modules/image-match/default.nix b/pkgs/development/python-modules/image-match/default.nix index ed5179d6db5f..a59f7e08b988 100644 --- a/pkgs/development/python-modules/image-match/default.nix +++ b/pkgs/development/python-modules/image-match/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytestrunner, scikitimage }: +{ lib, buildPythonPackage, fetchFromGitHub, pytest-runner, scikitimage }: buildPythonPackage { pname = "image-match"; @@ -11,7 +11,7 @@ buildPythonPackage { sha256 = "0vlmpidmhkpgdzw2k03x5layhijcrjpmyfd93yv2ls77ihz00ix5"; }; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; propagatedBuildInputs = [ scikitimage diff --git a/pkgs/development/python-modules/inform/default.nix b/pkgs/development/python-modules/inform/default.nix index 86bad819a6f7..9f78d86a2be6 100644 --- a/pkgs/development/python-modules/inform/default.nix +++ b/pkgs/development/python-modules/inform/default.nix @@ -3,7 +3,7 @@ , six , hypothesis , pytest -, pytestrunner +, pytest-runner , pytestCheckHook }: @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "114cyff00j9r7qm2ld4w1a4kklr5gx570vk67p56gpr2553dkmly"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ arrow six ]; checkInputs = [ pytest hypothesis ]; diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index 7507789fd533..e386f390bc23 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy3k -, pytest, pytestrunner, pbr, glibcLocales , pytest-cov +, pytest, pytest-runner, pbr, glibcLocales , pytest-cov , requests, requests_oauthlib, requests_toolbelt, defusedxml , ipython }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "e2a94adff98e45b29ded030adc76103eab34fa7d4d57303f211f572bedba0e93"; }; - buildInputs = [ glibcLocales pytest pytest-cov pytestrunner pbr ]; + buildInputs = [ glibcLocales pytest pytest-cov pytest-runner pbr ]; propagatedBuildInputs = [ requests requests_oauthlib requests_toolbelt defusedxml pbr ipython ]; # impure tests because of connectivity attempts to jira servers diff --git a/pkgs/development/python-modules/keyutils/default.nix b/pkgs/development/python-modules/keyutils/default.nix index 4134c47084a2..3d1575d8c37f 100644 --- a/pkgs/development/python-modules/keyutils/default.nix +++ b/pkgs/development/python-modules/keyutils/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, keyutils, pytestrunner, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, keyutils, pytest-runner, pytest }: buildPythonPackage rec { pname = "keyutils"; @@ -13,7 +13,7 @@ buildPythonPackage rec { }; buildInputs = [ keyutils ]; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; meta = { description = "A set of python bindings for keyutils"; diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix index 36918a484c3e..8985e8fbcf51 100644 --- a/pkgs/development/python-modules/libais/default.nix +++ b/pkgs/development/python-modules/libais/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, - six, pytest, pytestrunner, pytest-cov, coverage + six, pytest, pytest-runner, pytest-cov, coverage }: buildPythonPackage rec { pname = "libais"; @@ -13,7 +13,7 @@ buildPythonPackage rec { # data files missing doCheck = false; - checkInputs = [ pytest pytestrunner pytest-cov coverage ]; + checkInputs = [ pytest pytest-runner pytest-cov coverage ]; propagatedBuildInputs = [ six ]; meta = with lib; { diff --git a/pkgs/development/python-modules/libcloud/2.nix b/pkgs/development/python-modules/libcloud/2.nix index 52c1cf9a9d7f..c59e026fe4f3 100644 --- a/pkgs/development/python-modules/libcloud/2.nix +++ b/pkgs/development/python-modules/libcloud/2.nix @@ -5,7 +5,7 @@ , mock , pycrypto , requests -, pytestrunner +, pytest-runner , pytest , requests-mock , typing @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "70096690b24a7832cc5abdfda1954b49fddc1c09a348a1e6caa781ac867ed4c6"; }; - checkInputs = [ mock pytest pytestrunner requests-mock ]; + checkInputs = [ mock pytest pytest-runner requests-mock ]; propagatedBuildInputs = [ pycrypto requests ] ++ lib.optionals isPy27 [ typing backports_ssl_match_hostname ]; diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index 0449f6099581..78afad13dd20 100644 --- a/pkgs/development/python-modules/libcloud/default.nix +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -5,7 +5,7 @@ , mock , pycrypto , requests -, pytestrunner +, pytest-runner , pytest , requests-mock , typing @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "d7450453eaf5904eb4fb4f74cf9f37dc83721a719bce34f5abb336b1a1ab974d"; }; - checkInputs = [ mock pytest pytestrunner requests-mock ]; + checkInputs = [ mock pytest pytest-runner requests-mock ]; propagatedBuildInputs = [ pycrypto requests ] ++ lib.optionals isPy27 [ typing ]; preConfigure = "cp libcloud/test/secrets.py-dist libcloud/test/secrets.py"; diff --git a/pkgs/development/python-modules/lomond/default.nix b/pkgs/development/python-modules/lomond/default.nix index 669f16e5f928..3efe41e00797 100644 --- a/pkgs/development/python-modules/lomond/default.nix +++ b/pkgs/development/python-modules/lomond/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, freezegun, fetchFromGitHub, lib, pytestCheckHook -, pytest-mock, pytestrunner, six, tornado_4 }: +, pytest-mock, pytest-runner, six, tornado_4 }: buildPythonPackage rec { pname = "lomond"; @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0lydq0imala08wxdyg2iwhqa6gcdrn24ah14h91h2zcxjhjk4gv8"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ six ]; checkInputs = [ pytestCheckHook freezegun pytest-mock tornado_4 ]; # Makes HTTP requests diff --git a/pkgs/development/python-modules/lyricwikia/default.nix b/pkgs/development/python-modules/lyricwikia/default.nix index a5ea55c39cf5..19bb14419a4f 100644 --- a/pkgs/development/python-modules/lyricwikia/default.nix +++ b/pkgs/development/python-modules/lyricwikia/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, pytestrunner, six, beautifulsoup4, requests, }: +{ lib, fetchPypi, buildPythonPackage, pytest-runner, six, beautifulsoup4, requests, }: buildPythonPackage rec { pname = "lyricwikia"; version = "0.1.11"; @@ -8,7 +8,7 @@ buildPythonPackage rec { sha256 = "0l5lkvr3299x79i7skdiggp67rzgax3s00psd1zqkxfysq27jvc8"; }; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; propagatedBuildInputs = [ six beautifulsoup4 requests ]; # upstream has no code tests doCheck = false; diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/pkgs/development/python-modules/marisa-trie/default.nix index 69f272c409d8..ade031409b41 100644 --- a/pkgs/development/python-modules/marisa-trie/default.nix +++ b/pkgs/development/python-modules/marisa-trie/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , cython -, pytestrunner +, pytest-runner , pytestCheckHook , hypothesis }: @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython - pytestrunner + pytest-runner ]; preBuild = '' diff --git a/pkgs/development/python-modules/markdownsuperscript/default.nix b/pkgs/development/python-modules/markdownsuperscript/default.nix index a7876a75e495..04e59287a86a 100644 --- a/pkgs/development/python-modules/markdownsuperscript/default.nix +++ b/pkgs/development/python-modules/markdownsuperscript/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, markdown, - pytest, pytestrunner, pytest-cov, coverage }: + pytest, pytest-runner, pytest-cov, coverage }: buildPythonPackage rec { pname = "MarkdownSuperscript"; @@ -20,7 +20,7 @@ buildPythonPackage rec { sed 's/=.*//' -i requirements/*.txt ''; - checkInputs = [ pytest pytestrunner pytest-cov coverage ]; + checkInputs = [ pytest pytest-runner pytest-cov coverage ]; meta = with lib; { description = "An extension to the Python Markdown package enabling superscript text"; diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix index 794b2c8f4add..8ee3d60f8010 100644 --- a/pkgs/development/python-modules/matchpy/default.nix +++ b/pkgs/development/python-modules/matchpy/default.nix @@ -5,7 +5,7 @@ , hopcroftkarp , multiset , pytest -, pytestrunner +, pytest-runner , hypothesis , setuptools-scm , isPy27 @@ -36,7 +36,7 @@ buildPythonPackage rec { --replace "pytest>=3.0,<4.0" "pytest" ''; - buildInputs = [ setuptools-scm pytestrunner ]; + buildInputs = [ setuptools-scm pytest-runner ]; checkInputs = [ pytest hypothesis ]; propagatedBuildInputs = [ hopcroftkarp multiset ]; diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix index b8439a0c23d4..354eace5047d 100644 --- a/pkgs/development/python-modules/matrix-client/default.nix +++ b/pkgs/development/python-modules/matrix-client/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , requests -, pytest, pytestrunner, responses +, pytest, pytest-runner, responses }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1mgjd0ymf9mvqjkvgx3xjhxap7rzdmpa21wfy0cxbw2xcswcrqyw"; }; - checkInputs = [ pytest pytestrunner responses ]; + checkInputs = [ pytest pytest-runner responses ]; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/mccabe/default.nix b/pkgs/development/python-modules/mccabe/default.nix index 03343aec16e8..f20cb18b4885 100644 --- a/pkgs/development/python-modules/mccabe/default.nix +++ b/pkgs/development/python-modules/mccabe/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner }: +{ lib, buildPythonPackage, fetchPypi, pytest, pytest-runner }: buildPythonPackage rec { pname = "mccabe"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "07w3p1qm44hgxf3vvwz84kswpsx6s7kvaibzrsx5dzm0hli1i3fx"; }; - buildInputs = [ pytest pytestrunner ]; + buildInputs = [ pytest pytest-runner ]; meta = with lib; { description = "McCabe checker, plugin for flake8"; diff --git a/pkgs/development/python-modules/measurement/default.nix b/pkgs/development/python-modules/measurement/default.nix index c3ce875b4f57..30969501213c 100644 --- a/pkgs/development/python-modules/measurement/default.nix +++ b/pkgs/development/python-modules/measurement/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildPythonPackage, isPy3k -, sympy, pytest, pytestrunner, sphinx, setuptools-scm }: +, sympy, pytest, pytest-runner, sphinx, setuptools-scm }: buildPythonPackage rec { pname = "measurement"; @@ -18,7 +18,7 @@ buildPythonPackage rec { sed -i 's|use_scm_version=True|version="${version}"|' setup.py ''; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; nativeBuildInputs = [ sphinx setuptools-scm ]; propagatedBuildInputs = [ sympy ]; diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 10cbc58eb8d8..ec19843ab9dc 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -1,7 +1,7 @@ { lib , fetchPypi , buildPythonPackage -, pytestCheckHook, pytestrunner, pytest-cov +, pytestCheckHook, pytest-runner, pytest-cov , isPy3k }: @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "25b4e5f22d3a37ddf3effc0710ba692cfc792c2b9edfb9c05aefe823256e84d5"; }; - checkInputs = [ pytestCheckHook pytestrunner pytest-cov ]; + checkInputs = [ pytestCheckHook pytest-runner pytest-cov ]; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/multiset/default.nix b/pkgs/development/python-modules/multiset/default.nix index e183031b8d95..fa2fa87d0e89 100644 --- a/pkgs/development/python-modules/multiset/default.nix +++ b/pkgs/development/python-modules/multiset/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , setuptools-scm -, pytestrunner +, pytest-runner , pytest }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "4801569c08bfcecfe7b0927b17f079c90f8607aca8fecaf42ded92b737162bc7"; }; - buildInputs = [ setuptools-scm pytestrunner ]; + buildInputs = [ setuptools-scm pytest-runner ]; checkInputs = [ pytest ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mwparserfromhell/default.nix b/pkgs/development/python-modules/mwparserfromhell/default.nix index 8c29971afe79..c1e57be4ded0 100644 --- a/pkgs/development/python-modules/mwparserfromhell/default.nix +++ b/pkgs/development/python-modules/mwparserfromhell/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, pytestrunner +, pytest-runner }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestrunner + pytest-runner ]; meta = with lib; { diff --git a/pkgs/development/python-modules/ndjson/default.nix b/pkgs/development/python-modules/ndjson/default.nix index b69e8401eb51..cd70025d6106 100644 --- a/pkgs/development/python-modules/ndjson/default.nix +++ b/pkgs/development/python-modules/ndjson/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, watchdog, flake8 -, pytest, pytestrunner, coverage, sphinx, twine }: +, pytest, pytest-runner, coverage, sphinx, twine }: buildPythonPackage rec { pname = "ndjson"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "v5dGy2uxy1PRcs2n8VTAfHhtZl/yg0Hk5om3lrIp5dY="; }; - checkInputs = [ pytest pytestrunner flake8 twine sphinx coverage watchdog ]; + checkInputs = [ pytest pytest-runner flake8 twine sphinx coverage watchdog ]; meta = with lib; { homepage = "https://github.com/rhgrant10/ndjson"; diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index 53577567bf6e..f9c27b4c79a3 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, cython, numpy, nine, pytest, pytestrunner, python-utils, enum34 }: +{ lib, buildPythonPackage, fetchPypi, cython, numpy, nine, pytest, pytest-runner, python-utils, enum34 }: buildPythonPackage rec { pname = "numpy-stl"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "411c633d2a03c295d98fb26023a6e7f574ceead04015d06e80cdab20b630a742"; }; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; checkPhase = "py.test"; diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix index ad9da46243b0..42249e933789 100644 --- a/pkgs/development/python-modules/omegaconf/default.nix +++ b/pkgs/development/python-modules/omegaconf/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, pytest, pytestrunner, pyyaml, six, pathlib2, isPy27 }: +, pytest, pytest-runner, pyyaml, six, pathlib2, isPy27 }: buildPythonPackage rec { pname = "omegaconf"; @@ -13,7 +13,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; propagatedBuildInputs = [ pyyaml six ] ++ lib.optional isPy27 pathlib2; meta = with lib; { diff --git a/pkgs/development/python-modules/packet-python/default.nix b/pkgs/development/python-modules/packet-python/default.nix index 1bbb713f40bd..c63c6df86f9f 100644 --- a/pkgs/development/python-modules/packet-python/default.nix +++ b/pkgs/development/python-modules/packet-python/default.nix @@ -6,7 +6,7 @@ # For tests/setup.py , pytest -, pytestrunner +, pytest-runner , requests-mock }: @@ -17,11 +17,11 @@ buildPythonPackage rec { inherit pname version; sha256 = "4af12f2fbcc9713878ab4ed571e9fda028bc68add34cde0e7226af4d833a4d38"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ requests ]; checkInputs = [ pytest - pytestrunner + pytest-runner requests-mock ]; diff --git a/pkgs/development/python-modules/paho-mqtt/default.nix b/pkgs/development/python-modules/paho-mqtt/default.nix index 92f8f5d90f10..e8344e88f110 100644 --- a/pkgs/development/python-modules/paho-mqtt/default.nix +++ b/pkgs/development/python-modules/paho-mqtt/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy3k -, stdenv, pytestrunner, pytest, mock }: +, stdenv, pytest-runner, pytest, mock }: buildPythonPackage rec { pname = "paho-mqtt"; @@ -18,7 +18,7 @@ buildPythonPackage rec { substituteInPlace setup.cfg --replace "--pylama" "" ''; - checkInputs = [ pytestrunner pytest ] ++ lib.optional (!isPy3k) mock; + checkInputs = [ pytest-runner pytest ] ++ lib.optional (!isPy3k) mock; doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix index decb15ff5e6c..709b257e3375 100644 --- a/pkgs/development/python-modules/parse-type/default.nix +++ b/pkgs/development/python-modules/parse-type/default.nix @@ -1,6 +1,6 @@ { lib, fetchPypi , buildPythonPackage, pythonOlder -, pytest, pytestrunner +, pytest, pytest-runner , parse, six, enum34 }: @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "02wclgiqky06y36b3q07b7ngpks5j0gmgl6n71ac2j2hscc0nsbz"; }; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ parse six ] ++ lib.optional (pythonOlder "3.4") enum34; checkPhase = '' diff --git a/pkgs/development/python-modules/parsedatetime/default.nix b/pkgs/development/python-modules/parsedatetime/default.nix index 77196a7c0e99..ba3662a44b03 100644 --- a/pkgs/development/python-modules/parsedatetime/default.nix +++ b/pkgs/development/python-modules/parsedatetime/default.nix @@ -3,7 +3,7 @@ , fetchPypi , isPy27 , pytest -, pytestrunner +, pytest-runner , future }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "4cb368fbb18a0b7231f4d76119165451c8d2e35951455dfee97c62a87b04d455"; }; - buildInputs = [ pytest pytestrunner ]; + buildInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ future ]; meta = with lib; { diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index 533a4dc3a308..71b670b707cc 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , six -, pytestrunner +, pytest-runner , pytest }: @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytestrunner pytest ]; + checkInputs = [ pytest-runner pytest ]; # Certain tests require network checkPhase = '' diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/pkgs/development/python-modules/pastedeploy/default.nix index 672708b0fd9d..b5d429de081a 100644 --- a/pkgs/development/python-modules/pastedeploy/default.nix +++ b/pkgs/development/python-modules/pastedeploy/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, pytestrunner +, pytest-runner , pytest }: @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "6dead6ab9823a85d585ef27f878bc647f787edb9ca8da0716aa9f1261b464817"; }; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index 783c936cf2d1..0f18a6ad2072 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -8,7 +8,7 @@ , semver , pytestCheckHook , pytest-cov -, pytestrunner +, pytest-runner , openapi-spec-validator }: @@ -22,7 +22,7 @@ buildPythonPackage rec { }; buildInputs = [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/praw/6.3.nix b/pkgs/development/python-modules/praw/6.3.nix index 242300949ecb..13ecab806c45 100644 --- a/pkgs/development/python-modules/praw/6.3.nix +++ b/pkgs/development/python-modules/praw/6.3.nix @@ -4,7 +4,7 @@ , betamax-matchers , mock , six -, pytestrunner +, pytest-runner , prawcore , pytest , requests-toolbelt @@ -24,7 +24,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/py-air-control-exporter/default.nix b/pkgs/development/python-modules/py-air-control-exporter/default.nix index c333c3ea4fd1..869aea01a29a 100644 --- a/pkgs/development/python-modules/py-air-control-exporter/default.nix +++ b/pkgs/development/python-modules/py-air-control-exporter/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchPypi, flask, isPy27, lib, nixosTests -, prometheus_client, py-air-control, pytestCheckHook, pytest-cov, pytestrunner +, prometheus_client, py-air-control, pytestCheckHook, pytest-cov, pytest-runner , setuptools-scm }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytestCheckHook pytest-cov pytestrunner ]; + checkInputs = [ pytestCheckHook pytest-cov pytest-runner ]; propagatedBuildInputs = [ flask prometheus_client py-air-control ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) py-air-control; }; diff --git a/pkgs/development/python-modules/py-multibase/default.nix b/pkgs/development/python-modules/py-multibase/default.nix index b229361917f6..87cfd6b8e427 100644 --- a/pkgs/development/python-modules/py-multibase/default.nix +++ b/pkgs/development/python-modules/py-multibase/default.nix @@ -4,7 +4,7 @@ , lib , morphys , pytest -, pytestrunner +, pytest-runner , python-baseconv , six }: @@ -24,7 +24,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pycategories/default.nix b/pkgs/development/python-modules/pycategories/default.nix index 48686225e1ef..ec902e0b385d 100644 --- a/pkgs/development/python-modules/pycategories/default.nix +++ b/pkgs/development/python-modules/pycategories/default.nix @@ -5,7 +5,7 @@ , lib , pytest , pythonOlder -, pytestrunner +, pytest-runner }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "bd70ecb5e94e7659e564ea153f0c7673291dc37c526c246800fc08d6c5378099"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; # Is private because the author states it's unmaintained # and shouldn't be used in production code diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index a0924fa7f633..539fb9b929d7 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchFromGitHub , isPy27 -, pytestrunner +, pytest-runner , pytestCheckHook , numpy , pillow @@ -36,7 +36,7 @@ buildPythonPackage { propagatedBuildInputs = [ numpy pillow ]; - checkInputs = [ pytestrunner pytestCheckHook ]; + checkInputs = [ pytest-runner pytestCheckHook ]; # Setting $HOME to prevent pytest to try to create a folder inside # /homeless-shelter which is read-only. diff --git a/pkgs/development/python-modules/pyee/default.nix b/pkgs/development/python-modules/pyee/default.nix index 833b83b39136..f4afd49bbc28 100644 --- a/pkgs/development/python-modules/pyee/default.nix +++ b/pkgs/development/python-modules/pyee/default.nix @@ -2,7 +2,7 @@ , fetchPypi , lib , vcversioner -, pytestrunner +, pytest-runner , mock , pytest , pytest-asyncio @@ -35,7 +35,7 @@ buildPythonPackage rec { pytest pytest-asyncio pytest-trio - pytestrunner + pytest-runner twisted ] ++ lib.optional isPy27 [ attrs diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix index ec4cff2de615..eb6734649b5d 100644 --- a/pkgs/development/python-modules/pygal/default.nix +++ b/pkgs/development/python-modules/pygal/default.nix @@ -6,7 +6,7 @@ , flask , pyquery , pytest -, pytestrunner +, pytest-runner , cairosvg , tinycss , cssselect @@ -38,7 +38,7 @@ buildPythonPackage rec { # Should be a check input, but upstream lists it under "setup_requires". # https://github.com/Kozea/pygal/issues/430 - pytestrunner + pytest-runner ]; checkInputs = [ diff --git a/pkgs/development/python-modules/pylint/1.9.nix b/pkgs/development/python-modules/pylint/1.9.nix index 64573a1a5282..5dbb3d6750f8 100644 --- a/pkgs/development/python-modules/pylint/1.9.nix +++ b/pkgs/development/python-modules/pylint/1.9.nix @@ -1,6 +1,6 @@ { stdenv, lib, buildPythonPackage, fetchPypi, astroid, six, isort, mccabe, configparser, backports_functools_lru_cache, singledispatch, - pytest, pytestrunner, setuptools }: + pytest, pytest-runner, setuptools }: buildPythonPackage rec { pname = "pylint"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "004kfapkqxqy2s85pmddqv0fabxdxywxrlbi549p0v237pr2v94p"; }; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ astroid six isort mccabe configparser backports_functools_lru_cache singledispatch setuptools ]; diff --git a/pkgs/development/python-modules/pymatgen-lammps/default.nix b/pkgs/development/python-modules/pymatgen-lammps/default.nix index 72f362f85c45..87d46a35fa84 100644 --- a/pkgs/development/python-modules/pymatgen-lammps/default.nix +++ b/pkgs/development/python-modules/pymatgen-lammps/default.nix @@ -2,7 +2,7 @@ , fetchurl , buildPythonPackage , pymatgen -, pytestrunner +, pytest-runner , pytestCheckHook , isPy3k }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0shldl8is3195jmji7dr3zsh1bzxlahaqrmpr28niks7nnfj80fx"; }; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; checkInputs = [ pytestCheckHook ]; propagatedBuildInputs = [ pymatgen ]; diff --git a/pkgs/development/python-modules/pynvim/default.nix b/pkgs/development/python-modules/pynvim/default.nix index 244b366081c0..67079a8c1d26 100644 --- a/pkgs/development/python-modules/pynvim/default.nix +++ b/pkgs/development/python-modules/pynvim/default.nix @@ -6,7 +6,7 @@ , greenlet , pythonOlder , isPyPy -, pytestrunner +, pytest-runner }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pytestrunner + pytest-runner ]; # Tests require pkgs.neovim, diff --git a/pkgs/development/python-modules/pyosf/default.nix b/pkgs/development/python-modules/pyosf/default.nix index c25b1b114355..07c657bf226e 100644 --- a/pkgs/development/python-modules/pyosf/default.nix +++ b/pkgs/development/python-modules/pyosf/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , isPy27 -, pytestrunner +, pytest-runner , requests }: @@ -19,7 +19,7 @@ buildPythonPackage rec { }; preBuild = "export HOME=$TMP"; - buildInputs = [ pytestrunner ]; # required via `setup_requires` + buildInputs = [ pytest-runner ]; # required via `setup_requires` propagatedBuildInputs = [ requests ]; doCheck = false; # requires network access diff --git a/pkgs/development/python-modules/pysrim/default.nix b/pkgs/development/python-modules/pysrim/default.nix index b8570427d303..4f295dfc7c27 100644 --- a/pkgs/development/python-modules/pysrim/default.nix +++ b/pkgs/development/python-modules/pysrim/default.nix @@ -1,7 +1,7 @@ { lib , fetchPypi , buildPythonPackage -, pytestrunner +, pytest-runner , numpy , pyyaml }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "ada088f73f7e1a3bf085206e81e0f83ed89c1d0b23a789ecd0ba0a250724aee8"; }; - buildInputs = [ pytestrunner ]; + buildInputs = [ pytest-runner ]; propagatedBuildInputs = [ numpy pyyaml ]; # Tests require git lfs download of repository diff --git a/pkgs/development/python-modules/pytest-pylint/default.nix b/pkgs/development/python-modules/pytest-pylint/default.nix index 16a1fb92dd6f..e03e0fbe626c 100644 --- a/pkgs/development/python-modules/pytest-pylint/default.nix +++ b/pkgs/development/python-modules/pytest-pylint/default.nix @@ -5,7 +5,7 @@ , pytest , pylint , six -, pytestrunner +, pytest-runner , toml }: @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "790c7a8019fab08e59bd3812db1657a01995a975af8b1c6ce95b9aa39d61da27"; }; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytestrunner/2.nix b/pkgs/development/python-modules/pytest-runner/2.nix similarity index 100% rename from pkgs/development/python-modules/pytestrunner/2.nix rename to pkgs/development/python-modules/pytest-runner/2.nix diff --git a/pkgs/development/python-modules/pytestrunner/default.nix b/pkgs/development/python-modules/pytest-runner/default.nix similarity index 100% rename from pkgs/development/python-modules/pytestrunner/default.nix rename to pkgs/development/python-modules/pytest-runner/default.nix diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix index 901a368d5d85..180264f102d0 100644 --- a/pkgs/development/python-modules/python-lz4/default.nix +++ b/pkgs/development/python-modules/python-lz4/default.nix @@ -7,7 +7,7 @@ , psutil , pytest , pytest-cov -, pytestrunner +, pytest-runner , setuptools-scm }: @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "009c4rbyj4cjb8fznccfpr5wrzdmi56wq990yjh22n0z2qqylmkf"; }; - nativeBuildInputs = [ setuptools-scm pkgconfig pytestrunner ]; + nativeBuildInputs = [ setuptools-scm pkgconfig pytest-runner ]; checkInputs = [ pytest pytest-cov psutil ]; propagatedBuildInputs = lib.optionals (!isPy3k) [ future ]; diff --git a/pkgs/development/python-modules/python-twitter/default.nix b/pkgs/development/python-modules/python-twitter/default.nix index c368d97633f4..f6814a8d0fda 100644 --- a/pkgs/development/python-modules/python-twitter/default.nix +++ b/pkgs/development/python-modules/python-twitter/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch -, pytestrunner +, pytest-runner , future , requests , responses @@ -31,7 +31,7 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ future requests requests_oauthlib ]; checkInputs = [ pytest responses hypothesis ]; diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix index 10dc9f305724..cb25b09dad72 100644 --- a/pkgs/development/python-modules/pythran/default.nix +++ b/pkgs/development/python-modules/pythran/default.nix @@ -2,7 +2,7 @@ , python , buildPythonPackage , fetchFromGitHub -, pytestrunner +, pytest-runner , ply , networkx , decorator @@ -39,7 +39,7 @@ in buildPythonPackage rec { ]; nativeBuildInputs = [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index 1a01eda244b0..ea40fc573b63 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, pytestrunner, pytestCheckHook, glib, vips, cffi +{ buildPythonPackage, fetchPypi, pytest-runner, pytestCheckHook, glib, vips, cffi , pkg-config, pkgconfig, lib }: buildPythonPackage rec { @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "244e79c625be65237677c79424d4476de6c406805910015d4adbd0186c64a6a2"; }; - nativeBuildInputs = [ pytestrunner pkgconfig pkg-config ]; + nativeBuildInputs = [ pytest-runner pkgconfig pkg-config ]; buildInputs = [ glib vips ]; diff --git a/pkgs/development/python-modules/qcelemental/default.nix b/pkgs/development/python-modules/qcelemental/default.nix index e06afb02165b..b6e0684a2d48 100644 --- a/pkgs/development/python-modules/qcelemental/default.nix +++ b/pkgs/development/python-modules/qcelemental/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, lib, fetchPypi, numpy -, pydantic, pint, networkx, pytestrunner, pytest-cov, pytest +, pydantic, pint, networkx, pytest-runner, pytest-cov, pytest } : buildPythonPackage rec { pname = "qcelemental"; version = "0.21.0"; - checkInputs = [ pytestrunner pytest-cov pytest ]; + checkInputs = [ pytest-runner pytest-cov pytest ]; propagatedBuildInputs = [ numpy pydantic pint networkx ]; src = fetchPypi { diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix index 793e1ada739e..0dd24112bd0b 100644 --- a/pkgs/development/python-modules/qcengine/default.nix +++ b/pkgs/development/python-modules/qcengine/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, lib, fetchPypi, pyyaml, qcelemental, pydantic -, py-cpuinfo, psutil, pytestrunner, pytest, pytest-cov +, py-cpuinfo, psutil, pytest-runner, pytest, pytest-cov } : buildPythonPackage rec { @@ -7,7 +7,7 @@ buildPythonPackage rec { version = "0.19.0"; checkInputs = [ - pytestrunner + pytest-runner pytest-cov pytest ]; diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index fae0bf08e54b..f422934f02fb 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, six, regex}: +{ lib, buildPythonPackage, fetchPypi, pytest, pytest-runner, six, regex}: buildPythonPackage rec { pname = "rebulk"; @@ -11,7 +11,7 @@ buildPythonPackage rec { # Some kind of trickery with imports that doesn't work. doCheck = false; - buildInputs = [ pytest pytestrunner ]; + buildInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ six regex ]; meta = with lib; { diff --git a/pkgs/development/python-modules/reflink/default.nix b/pkgs/development/python-modules/reflink/default.nix index e9b8beadd16d..9f5024daf7e8 100644 --- a/pkgs/development/python-modules/reflink/default.nix +++ b/pkgs/development/python-modules/reflink/default.nix @@ -3,7 +3,7 @@ , fetchPypi , lib , pytestCheckHook -, pytestrunner +, pytest-runner }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-ySU1gtskQTv9cDq/wbKkneePMbSQcjnyhumhkpoebjo="; }; - propagatedBuildInputs = [ cffi pytestrunner ]; + propagatedBuildInputs = [ cffi pytest-runner ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 3a3feaa14edc..42f10aedf393 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -17,7 +17,7 @@ , pytest , pytest-cov , pytest-mock -, pytestrunner +, pytest-runner , pytest-virtualenv , requests , six @@ -50,7 +50,7 @@ buildPythonPackage rec { pytest pytest-cov pytest-mock - pytestrunner + pytest-runner pytest-virtualenv requests six diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/pkgs/development/python-modules/secp256k1/default.nix index bb5cc138a749..58fa81b444f3 100644 --- a/pkgs/development/python-modules/secp256k1/default.nix +++ b/pkgs/development/python-modules/secp256k1/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pkg-config , pytest -, pytestrunner +, pytest-runner , cffi , secp256k1 }: @@ -18,7 +18,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pkg-config ]; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ cffi secp256k1 ]; # Tests are not included in archive diff --git a/pkgs/development/python-modules/setuptoolstrial/default.nix b/pkgs/development/python-modules/setuptoolstrial/default.nix index 26b8d732be1d..f959458d2653 100644 --- a/pkgs/development/python-modules/setuptoolstrial/default.nix +++ b/pkgs/development/python-modules/setuptoolstrial/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pytest , virtualenv -, pytestrunner +, pytest-runner , pytest-virtualenv , twisted , pathlib2 @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "14220f8f761c48ba1e2526f087195077cf54fad7098b382ce220422f0ff59b12"; }; - buildInputs = [ pytest virtualenv pytestrunner pytest-virtualenv ]; + buildInputs = [ pytest virtualenv pytest-runner pytest-virtualenv ]; propagatedBuildInputs = [ twisted pathlib2 ]; postPatch = '' diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix index e96161228a52..c82eba66acae 100644 --- a/pkgs/development/python-modules/slackclient/default.nix +++ b/pkgs/development/python-modules/slackclient/default.nix @@ -10,7 +10,7 @@ , pytest-cov , pytest-mock , pytestCheckHook -, pytestrunner +, pytest-runner , requests , responses , six @@ -45,7 +45,7 @@ buildPythonPackage rec { pytest-cov pytest-mock pytestCheckHook - pytestrunner + pytest-runner responses ]; diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index 67a6dba1a8ed..35f7d7c07c98 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -7,7 +7,7 @@ , sqlite-fts4 , tabulate , pytestCheckHook -, pytestrunner +, pytest-runner , black , hypothesis , sqlite @@ -32,7 +32,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestrunner + pytest-runner black hypothesis ]; diff --git a/pkgs/development/python-modules/srptools/default.nix b/pkgs/development/python-modules/srptools/default.nix index 68ca009d9dc2..5339529f3d75 100644 --- a/pkgs/development/python-modules/srptools/default.nix +++ b/pkgs/development/python-modules/srptools/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, six, pytest, pytestrunner }: +{ lib, buildPythonPackage, fetchPypi, six, pytest, pytest-runner }: buildPythonPackage rec { pname = "srptools"; @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; meta = with lib; { description = "Python-Tools to implement Secure Remote Password (SRP) authentication"; diff --git a/pkgs/development/python-modules/ssdeep/default.nix b/pkgs/development/python-modules/ssdeep/default.nix index 904595865b8c..510bbbac9518 100644 --- a/pkgs/development/python-modules/ssdeep/default.nix +++ b/pkgs/development/python-modules/ssdeep/default.nix @@ -5,7 +5,7 @@ , cffi , six , pytest -, pytestrunner +, pytest-runner }: buildPythonPackage rec { @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0px8k4fjbkjb717bg2v7rjhm4iclrxzq7sh0hfqs55f4ddqi0m8v"; }; - buildInputs = [ pkgs.ssdeep pytestrunner ]; + buildInputs = [ pkgs.ssdeep pytest-runner ]; checkInputs = [ pytest ]; propagatedBuildInputs = [ cffi six ]; diff --git a/pkgs/development/python-modules/sseclient/default.nix b/pkgs/development/python-modules/sseclient/default.nix index 6bbeb23ed1f5..a9fdfe2050e2 100644 --- a/pkgs/development/python-modules/sseclient/default.nix +++ b/pkgs/development/python-modules/sseclient/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , requests, six -, backports_unittest-mock, pytestCheckHook, pytestrunner }: +, backports_unittest-mock, pytestCheckHook, pytest-runner }: buildPythonPackage rec { pname = "sseclient"; @@ -15,7 +15,7 @@ buildPythonPackage rec { # some tests use python3 strings doCheck = !isPy27; - checkInputs = [ backports_unittest-mock pytestCheckHook pytestrunner ]; + checkInputs = [ backports_unittest-mock pytestCheckHook pytest-runner ]; # tries to open connection to wikipedia disabledTests = [ "event_stream" ]; diff --git a/pkgs/development/python-modules/stone/default.nix b/pkgs/development/python-modules/stone/default.nix index 21c92fcee7e9..8ea42d1f2795 100644 --- a/pkgs/development/python-modules/stone/default.nix +++ b/pkgs/development/python-modules/stone/default.nix @@ -2,7 +2,7 @@ , coverage , mock , ply -, pytestrunner +, pytest-runner , pytestCheckHook , six }: @@ -24,7 +24,7 @@ buildPythonPackage rec { --replace "coverage==5.3" "coverage" ''; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ ply six ]; diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix index fe92b71f3f52..e334608bd4dc 100644 --- a/pkgs/development/python-modules/subliminal/default.nix +++ b/pkgs/development/python-modules/subliminal/default.nix @@ -20,7 +20,7 @@ , pytest , pytest-flakes , pytest-cov -, pytestrunner +, pytest-runner }: buildPythonPackage rec { @@ -40,7 +40,7 @@ buildPythonPackage rec { checkInputs = [ sympy vcrpy pytest pytest-flakes - pytest-cov pytestrunner + pytest-cov pytest-runner ]; # https://github.com/Diaoul/subliminal/pull/963 diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix index d5dfda53c08c..83f6d9ac0637 100644 --- a/pkgs/development/python-modules/tatsu/default.nix +++ b/pkgs/development/python-modules/tatsu/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder , colorama, regex -, pytestrunner, pytestCheckHook, pytest-mypy +, pytest-runner, pytestCheckHook, pytest-mypy }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ colorama regex ]; checkInputs = [ pytestCheckHook pytest-mypy ]; diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 7a025577dbb0..05ca81772d81 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -6,7 +6,7 @@ , webencodings # Check inputs , pytest -, pytestrunner +, pytest-runner , pytest-cov , pytest-flake8 , pytest-isort @@ -34,7 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ webencodings ]; - checkInputs = [ pytest pytestrunner pytest-cov pytest-flake8 pytest-isort ]; + checkInputs = [ pytest pytest-runner pytest-cov pytest-flake8 pytest-isort ]; # https://github.com/PyCQA/pycodestyle/issues/598 preCheck = '' diff --git a/pkgs/development/python-modules/token-bucket/default.nix b/pkgs/development/python-modules/token-bucket/default.nix index f1e90114ac6d..508e38da4500 100644 --- a/pkgs/development/python-modules/token-bucket/default.nix +++ b/pkgs/development/python-modules/token-bucket/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytestrunner +, pytest-runner , pytestCheckHook }: @@ -18,7 +18,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pytestrunner + pytest-runner ]; checkInputs = [ diff --git a/pkgs/development/python-modules/torchgpipe/default.nix b/pkgs/development/python-modules/torchgpipe/default.nix index dbfad336d0f3..2c289f852699 100644 --- a/pkgs/development/python-modules/torchgpipe/default.nix +++ b/pkgs/development/python-modules/torchgpipe/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , isPy27 -, pytestrunner +, pytest-runner , pytestCheckHook , pytorch }: @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytorch ]; - checkInputs = [ pytestrunner pytestCheckHook ]; + checkInputs = [ pytest-runner pytestCheckHook ]; disabledTests = [ "test_inplace_on_requires_grad" "test_input_requiring_grad" diff --git a/pkgs/development/python-modules/variants/default.nix b/pkgs/development/python-modules/variants/default.nix index a9345b374a7e..2055a4813447 100644 --- a/pkgs/development/python-modules/variants/default.nix +++ b/pkgs/development/python-modules/variants/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage , isPy27 , fetchPypi -, pytestrunner +, pytest-runner , setuptools-scm , singledispatch ? null , pytest @@ -18,7 +18,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - pytestrunner + pytest-runner setuptools-scm ]; diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index c578b7c7c8c0..ecc13b1d6377 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -13,7 +13,7 @@ fontconfig, lib, stdenv, pytest, - pytestrunner, + pytest-runner, pytest-isort, pytest-flake8, pytest-cov, @@ -39,7 +39,7 @@ buildPythonPackage rec { --replace '[tool:pytest]' '[tool:pytest]\nflake8-ignore = E501' ''; - checkInputs = [ pytest pytestrunner pytest-isort pytest-flake8 pytest-cov ]; + checkInputs = [ pytest pytest-runner pytest-isort pytest-flake8 pytest-cov ]; FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 0aeb85e6ca2d..66d219f9348e 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , pythonOlder , multidict -, pytestrunner +, pytest-runner , pytest , typing-extensions , idna @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "8a9066529240171b68893d60dca86a763eae2139dd42f42106b03cf4b426bf10"; }; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytest pytest-runner ]; propagatedBuildInputs = [ multidict idna ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions diff --git a/pkgs/development/tools/analysis/cpplint/default.nix b/pkgs/development/tools/analysis/cpplint/default.nix index 61aee215031a..f880d8fa7b7f 100644 --- a/pkgs/development/tools/analysis/cpplint/default.nix +++ b/pkgs/development/tools/analysis/cpplint/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { patchShebangs cpplint_unittest.py ''; - checkInputs = with python3Packages; [ pytest pytestrunner ]; + checkInputs = with python3Packages; [ pytest pytest-runner ]; checkPhase = '' ./cpplint_unittest.py ''; diff --git a/pkgs/development/tools/asn2quickder/default.nix b/pkgs/development/tools/asn2quickder/default.nix index 9ffcbb172d48..1341017df056 100644 --- a/pkgs/development/tools/asn2quickder/default.nix +++ b/pkgs/development/tools/asn2quickder/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonApplication, fetchFromGitHub, makeWrapper, cmake -, pytestrunner, pytest, six, pyparsing, asn1ate }: +, pytest-runner, pytest, six, pyparsing, asn1ate }: buildPythonApplication rec { pname = "asn2quickder"; @@ -19,7 +19,7 @@ buildPythonApplication rec { dontUseCmakeConfigure = true; nativeBuildInputs = [ makeWrapper cmake ]; - checkInputs = [ pytestrunner pytest ]; + checkInputs = [ pytest-runner pytest ]; propagatedBuildInputs = [ pyparsing asn1ate six ]; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 787513855772..58a634ee86c9 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -499,7 +499,7 @@ self: super: old: { inherit (pkgs.python3Packages.jira) patches; buildInputs = (old.buildInputs or [ ]) ++ [ - self.pytestrunner + self.pytest-runner self.cryptography self.pyjwt ]; @@ -1269,8 +1269,6 @@ self: super: } ); - pytest-runner = super.pytest-runner or super.pytestrunner; - pytest-pylint = super.pytest-pylint.overridePythonAttrs ( old: { buildInputs = [ self.pytest-runner ]; diff --git a/pkgs/misc/flashfocus/default.nix b/pkgs/misc/flashfocus/default.nix index 1bac8b0fe0ce..6a8786be6eaa 100644 --- a/pkgs/misc/flashfocus/default.nix +++ b/pkgs/misc/flashfocus/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = with python3.pkgs; [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/dns/doh-proxy/default.nix b/pkgs/servers/dns/doh-proxy/default.nix index 8774715bb1d8..8128ec6f04d4 100644 --- a/pkgs/servers/dns/doh-proxy/default.nix +++ b/pkgs/servers/dns/doh-proxy/default.nix @@ -10,7 +10,7 @@ buildPythonApplication rec { sha256 = "1fxzxipzdvk75yrcr78mpdz8lwpisba67lk4jcwxdnkv6997dwfp"; }; - nativeBuildInputs = [ pytestrunner flake8]; + nativeBuildInputs = [ pytest-runner flake8]; propagatedBuildInputs = [ aioh2 diff --git a/pkgs/servers/radicale/2.x.nix b/pkgs/servers/radicale/2.x.nix index b0902feeead4..d4ab51ce84f8 100644 --- a/pkgs/servers/radicale/2.x.nix +++ b/pkgs/servers/radicale/2.x.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { ]; checkInputs = with python3.pkgs; [ - pytestrunner + pytest-runner pytest ]; diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index ab6b7d812211..28929615bcdb 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -100,7 +100,7 @@ pythonPackages.buildPythonApplication rec { mock pexpect pytest - pytestrunner + pytest-runner ]); postInstall = '' diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/tools/backup/zfs-replicate/default.nix index aae6ce329f68..fa2f69bb3ef5 100644 --- a/pkgs/tools/backup/zfs-replicate/default.nix +++ b/pkgs/tools/backup/zfs-replicate/default.nix @@ -1,5 +1,5 @@ { buildPythonApplication, click, fetchPypi, hypothesis, mypy, pytest -, pytest-cov, pytestrunner, lib, stringcase +, pytest-cov, pytest-runner, lib, stringcase }: buildPythonApplication rec { @@ -19,7 +19,7 @@ buildPythonApplication rec { ]; buildInputs = [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = [ diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index cd04e2020b1c..08da843ad33e 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { pythonPath = [ rtmpdump php wget ]; doCheck = false; # tests require network access - checkInputs = with python3Packages; [ ffmpeg pytest pytestrunner ]; + checkInputs = with python3Packages; [ ffmpeg pytest pytest-runner ]; meta = with lib; { description = "Downloads videos from Yle (Finnish Broadcasting Company) servers"; diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index a40e2ce33c99..d84f6f299005 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec { checkInputs = lib.optionals pythonSupport [ pythonPackages.pytest - pythonPackages.pytestrunner + pythonPackages.pytest-runner ]; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b64a5bb748ec..3fe3b02860de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25540,7 +25540,7 @@ in matrixcli = callPackage ../applications/networking/instant-messengers/matrixcli { inherit (python3Packages) buildPythonApplication buildPythonPackage - pygobject3 pytestrunner requests responses pytest python-olm + pygobject3 pytest-runner requests responses pytest python-olm canonicaljson; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index f42713fee3db..7e74bce1f7bf 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -55,6 +55,7 @@ mapAliases ({ pytestcov = pytest-cov; # added 2021-01-04 pytest-pep8 = pytestpep8; # added 2021-01-04 pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 + pytestrunner = pytest-runner; # added 2021-01-04 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 rotate-backups = throw "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # Added 2021-06-10 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f689a562a49d..3a811bc9b7d2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6883,8 +6883,7 @@ in { pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { }; - pytest-runner = self.pytestrunner; # added 2021-01-04 - pytestrunner = callPackage ../development/python-modules/pytestrunner { }; + pytest-runner = callPackage ../development/python-modules/pytest-runner { }; pytest-sanic = callPackage ../development/python-modules/pytest-sanic { sanic = self.sanic.override { doCheck = false; }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 471548b9fa20..decf36f31e8b 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -478,7 +478,7 @@ with self; with super; { pytest-mock = callPackage ../development/python-modules/pytest-mock/2.nix { }; - pytestrunner = callPackage ../development/python-modules/pytestrunner/2.nix { }; + pytest-runner = callPackage ../development/python-modules/pytest-runner/2.nix { }; pytest_xdist = self.pytest-xdist; # added 2021-01-04 pytest-xdist = callPackage ../development/python-modules/pytest-xdist/1.nix { }; From dd712027be98a6d782fc9cb492f557bb48e3dd31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:08:40 +0200 Subject: [PATCH 14/61] pythonPackages: deprecate pytestquickcheck alias --- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 7e74bce1f7bf..8c11398d6b9a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -55,6 +55,7 @@ mapAliases ({ pytestcov = pytest-cov; # added 2021-01-04 pytest-pep8 = pytestpep8; # added 2021-01-04 pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 + pytestquickcheck = pytest-quickcheck; # added 2021-07-20 pytestrunner = pytest-runner; # added 2021-01-04 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 rotate-backups = throw "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3a811bc9b7d2..640f1fdc2521 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6862,8 +6862,7 @@ in { pytest-qt = callPackage ../development/python-modules/pytest-qt { }; - pytest-quickcheck = self.pytestquickcheck; - pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; + pytest-quickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; pytest-raises = callPackage ../development/python-modules/pytest-raises { }; From 2e9c330216f5fbb3a5e645ba398a839c5ea08e61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:08:56 +0200 Subject: [PATCH 15/61] pythonPackages: deprecate pytest_xdist alias --- pkgs/applications/audio/quodlibet/default.nix | 2 +- pkgs/applications/office/paperless/default.nix | 2 +- pkgs/development/compilers/vyper/default.nix | 2 +- pkgs/development/python-modules/aria2p/default.nix | 4 ++-- pkgs/development/python-modules/certbot/default.nix | 4 ++-- pkgs/development/python-modules/debugpy/default.nix | 4 ++-- pkgs/development/python-modules/diskcache/default.nix | 4 ++-- pkgs/development/python-modules/dyn/default.nix | 4 ++-- pkgs/development/python-modules/hypothesis/2.nix | 4 ++-- pkgs/development/python-modules/ignite/default.nix | 4 ++-- pkgs/development/python-modules/keras/default.nix | 4 ++-- pkgs/development/python-modules/lazy_import/default.nix | 4 ++-- pkgs/development/python-modules/nipype/default.nix | 4 ++-- pkgs/development/python-modules/psautohint/default.nix | 4 ++-- pkgs/development/python-modules/pytest-django/default.nix | 4 ++-- pkgs/development/python-modules/pytest-randomly/default.nix | 4 ++-- pkgs/development/python-modules/sqlalchemy/default.nix | 2 +- pkgs/development/python-modules/stripe/default.nix | 4 ++-- pkgs/development/python-modules/typer/default.nix | 4 ++-- pkgs/tools/admin/lexicon/default.nix | 2 +- pkgs/tools/text/ocrmypdf/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 1 - pkgs/top-level/python2-packages.nix | 1 - 24 files changed, 37 insertions(+), 38 deletions(-) diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 24f9f057b65a..6c8ad8225f0b 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook gettext ]; - checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest_xdist polib xvfb-run dbus.daemon glibcLocales ]); + checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest-xdist polib xvfb-run dbus.daemon glibcLocales ]); buildInputs = [ gnome.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ] ++ (if xineBackend then [ xine-lib ] else with gst_all_1; diff --git a/pkgs/applications/office/paperless/default.nix b/pkgs/applications/office/paperless/default.nix index 68032ebe8497..74bdacd95845 100644 --- a/pkgs/applications/office/paperless/default.nix +++ b/pkgs/applications/office/paperless/default.nix @@ -148,7 +148,7 @@ let pytest pytest-django pytest-env - pytest_xdist + pytest-xdist ]; pyocrWithUserTesseract = pyPkgs: diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index 7df426177483..74c2503523e8 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, writeText, asttokens -, pycryptodome, pytest_xdist, pytest-cov, recommonmark, semantic-version, sphinx +, pycryptodome, pytest-xdist, pytest-cov, recommonmark, semantic-version, sphinx , sphinx_rtd_theme, pytest-runner }: let diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix index 4755c80e707c..2a7e6cb0df95 100644 --- a/pkgs/development/python-modules/aria2p/default.nix +++ b/pkgs/development/python-modules/aria2p/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, aria2, poetry, pytest, pytest-cov, pytest_xdist, responses +, aria2, poetry, pytest, pytest-cov, pytest-xdist, responses , asciimatics, loguru, requests, setuptools, websocket-client }: @@ -22,7 +22,7 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - checkInputs = [ aria2 responses pytest pytest-cov pytest_xdist ]; + checkInputs = [ aria2 responses pytest pytest-cov pytest-xdist ]; # Tests are not all stable/deterministic, # they rely on actually running an aria2c daemon and communicating with it, diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 7c324e646a4d..255c3ebfdeb9 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , ConfigArgParse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface , dialog, gnureadline -, pytest_xdist, pytestCheckHook, python-dateutil +, pytest-xdist, pytestCheckHook, python-dateutil }: buildPythonPackage rec { @@ -42,7 +42,7 @@ buildPythonPackage rec { checkInputs = [ python-dateutil pytestCheckHook - pytest_xdist + pytest-xdist ]; pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index da1f25ad2c3e..283682708840 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -8,7 +8,7 @@ , flask , psutil , pytest-timeout -, pytest_xdist +, pytest-xdist , pytestCheckHook , requests , isPy27 @@ -75,7 +75,7 @@ buildPythonPackage rec { flask psutil pytest-timeout - pytest_xdist + pytest-xdist pytestCheckHook requests ] ++ lib.optionals (!isPy27) [ diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix index 50b1a94c7795..0264c0ff10c5 100644 --- a/pkgs/development/python-modules/diskcache/default.nix +++ b/pkgs/development/python-modules/diskcache/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , pytestCheckHook , pytest-cov -, pytest_xdist +, pytest-xdist , pytest-django , mock }: @@ -23,7 +23,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook pytest-cov - pytest_xdist + pytest-xdist pytest-django mock ]; diff --git a/pkgs/development/python-modules/dyn/default.nix b/pkgs/development/python-modules/dyn/default.nix index 72986e7bda1e..8db7f6c9169d 100644 --- a/pkgs/development/python-modules/dyn/default.nix +++ b/pkgs/development/python-modules/dyn/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pytest, pytest-cov, mock -, pytest_xdist, covCore, glibcLocales }: +, pytest-xdist, covCore, glibcLocales }: buildPythonPackage rec { pname = "dyn"; @@ -16,7 +16,7 @@ buildPythonPackage rec { pytest pytest-cov mock - pytest_xdist + pytest-xdist covCore ]; # Disable checks because they are not stateless and require internet access. diff --git a/pkgs/development/python-modules/hypothesis/2.nix b/pkgs/development/python-modules/hypothesis/2.nix index 5b086d5f1a7f..47bc8860bc54 100644 --- a/pkgs/development/python-modules/hypothesis/2.nix +++ b/pkgs/development/python-modules/hypothesis/2.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub , isPy3k, attrs, coverage, enum34, pexpect -, doCheck ? true, pytest, pytest_xdist, flaky, mock +, doCheck ? true, pytest, pytest-xdist, flaky, mock , sortedcontainers }: buildPythonPackage rec { @@ -29,7 +29,7 @@ buildPythonPackage rec { sortedcontainers ] ++ lib.optional (!isPy3k) enum34; - checkInputs = [ pytest pytest_xdist flaky mock pexpect ]; + checkInputs = [ pytest pytest-xdist flaky mock pexpect ]; inherit doCheck; checkPhase = '' diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index b82fe568e2a9..432767b9f984 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook -, pytest_xdist +, pytest-xdist , pythonOlder , matplotlib , mock @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "057v8v5p2picmgiidr9lzjbh7nj54pv95m6lyya3y7dw4vzaamij"; }; - checkInputs = [ pytestCheckHook matplotlib mock pytest_xdist ]; + checkInputs = [ pytestCheckHook matplotlib mock pytest-xdist ]; propagatedBuildInputs = [ pytorch scikit-learn tqdm pynvml ]; # runs succesfully in 3.9, however, async isn't correctly closed so it will fail after test suite. diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index b6ac0a1fa132..28b09222b472 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytest, pytest-cov, pytest_xdist +, pytest, pytest-cov, pytest-xdist , six, numpy, scipy, pyyaml, h5py , keras-applications, keras-preprocessing }: @@ -16,7 +16,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytest-cov - pytest_xdist + pytest-xdist ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lazy_import/default.nix b/pkgs/development/python-modules/lazy_import/default.nix index 60eba0577b03..fe35126ea26c 100644 --- a/pkgs/development/python-modules/lazy_import/default.nix +++ b/pkgs/development/python-modules/lazy_import/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , pytest -, pytest_xdist +, pytest-xdist , six }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { checkInputs = [ pytest - pytest_xdist + pytest-xdist ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 7ecba3b7d3b1..8d0c597a1af0 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -19,7 +19,7 @@ , pybids , pydot , pytest -, pytest_xdist +, pytest-xdist , pytest-forked , rdflib , scipy @@ -93,7 +93,7 @@ buildPythonPackage rec { mock pytest pytest-forked - pytest_xdist + pytest-xdist pytest-cov which ]; diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix index 3a720bf328f3..ff312cbff891 100644 --- a/pkgs/development/python-modules/psautohint/default.nix +++ b/pkgs/development/python-modules/psautohint/default.nix @@ -2,7 +2,7 @@ , fonttools , lxml, fs # for fonttools extras , setuptools-scm -, pytestCheckHook, pytest-cov, pytest_xdist +, pytestCheckHook, pytest-cov, pytest-xdist }: buildPythonPackage rec { @@ -32,7 +32,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook pytest-cov - pytest_xdist + pytest-xdist ]; disabledTests = [ # Test that fails on pytest >= v6 diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 0253ed5a5138..47cc882f548e 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -5,7 +5,7 @@ , django , setuptools-scm , django-configurations -, pytest_xdist +, pytest-xdist , six }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pytest setuptools-scm ]; - checkInputs = [ pytest django-configurations pytest_xdist six ]; + checkInputs = [ pytest django-configurations pytest-xdist six ]; propagatedBuildInputs = [ django ]; # Complicated. Requires Django setup. diff --git a/pkgs/development/python-modules/pytest-randomly/default.nix b/pkgs/development/python-modules/pytest-randomly/default.nix index f8e240ca57e4..0020a4bf433f 100644 --- a/pkgs/development/python-modules/pytest-randomly/default.nix +++ b/pkgs/development/python-modules/pytest-randomly/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder , factory_boy, faker, numpy, backports-entry-points-selectable -, pytestCheckHook, pytest_xdist +, pytestCheckHook, pytest-xdist }: buildPythonPackage rec { @@ -23,7 +23,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytest_xdist + pytest-xdist numpy factory_boy faker diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 6c576f0b85e9..a3e00dff4ef6 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -9,7 +9,7 @@ , mock , pysqlite ? null , pytestCheckHook -, pytest_xdist +, pytest-xdist }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index a0b5c9799254..7aa955e99e25 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, requests, pytest, pytest-cov, pytest-mock, pytest_xdist }: +{ lib, buildPythonPackage, fetchPypi, requests, pytest, pytest-cov, pytest-mock, pytest-xdist }: buildPythonPackage rec { pname = "stripe"; @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ pytest pytest-cov pytest-mock pytest_xdist ]; + checkInputs = [ pytest pytest-cov pytest-mock pytest-xdist ]; meta = with lib; { description = "Stripe Python bindings"; diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix index 13d037515c3f..5b7b17c8bb84 100644 --- a/pkgs/development/python-modules/typer/default.nix +++ b/pkgs/development/python-modules/typer/default.nix @@ -5,7 +5,7 @@ , pytestCheckHook , shellingham , pytest-cov -, pytest_xdist +, pytest-xdist , pytest-sugar , coverage , mypy @@ -27,7 +27,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook pytest-cov - pytest_xdist + pytest-xdist pytest-sugar shellingham coverage diff --git a/pkgs/tools/admin/lexicon/default.nix b/pkgs/tools/admin/lexicon/default.nix index 7737205ce02d..c183e3741429 100644 --- a/pkgs/tools/admin/lexicon/default.nix +++ b/pkgs/tools/admin/lexicon/default.nix @@ -66,7 +66,7 @@ buildPythonApplication rec { mock pytest pytest-cov - pytest_xdist + pytest-xdist vcrpy ]; diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix index 0e13e4c5f35c..1a60d7d013ef 100644 --- a/pkgs/tools/text/ocrmypdf/default.nix +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -64,7 +64,7 @@ buildPythonApplication rec { pypdf2 pytest pytest-helpers-namespace - pytest_xdist + pytest-xdist pytest-cov python-xmp-toolkit pytestCheckHook diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 8c11398d6b9a..d84505d22a62 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -57,6 +57,7 @@ mapAliases ({ pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 pytestquickcheck = pytest-quickcheck; # added 2021-07-20 pytestrunner = pytest-runner; # added 2021-01-04 + pytest_xdist = pytest-xdist; # added 2021-01-04 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 rotate-backups = throw "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # Added 2021-06-10 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 640f1fdc2521..8ecef5f04efa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6926,7 +6926,6 @@ in { pytest-watch = callPackage ../development/python-modules/pytest-watch { }; - pytest_xdist = self.pytest-xdist; # added 2021-01-04 pytest-xdist = callPackage ../development/python-modules/pytest-xdist { }; pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index decf36f31e8b..48ddb18291af 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -480,7 +480,6 @@ with self; with super; { pytest-runner = callPackage ../development/python-modules/pytest-runner/2.nix { }; - pytest_xdist = self.pytest-xdist; # added 2021-01-04 pytest-xdist = callPackage ../development/python-modules/pytest-xdist/1.nix { }; python-otr = callPackage ../development/python-modules/python-otr { }; From a5158b8c01cc92b6057beec08ed402cc5614ccdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:19:21 +0200 Subject: [PATCH 16/61] pythonPackages: deprecate python_simple_hipchat alias --- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index d84505d22a62..bb986d7fd125 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -58,6 +58,7 @@ mapAliases ({ pytestquickcheck = pytest-quickcheck; # added 2021-07-20 pytestrunner = pytest-runner; # added 2021-01-04 pytest_xdist = pytest-xdist; # added 2021-01-04 + python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 rotate-backups = throw "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # Added 2021-06-10 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8ecef5f04efa..efd77004c3dd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7124,7 +7124,6 @@ in { python-sat = callPackage ../development/python-modules/python-sat { }; python-simple-hipchat = callPackage ../development/python-modules/python-simple-hipchat { }; - python_simple_hipchat = self.python-simple-hipchat; python-slugify = callPackage ../development/python-modules/python-slugify { }; From 703c10847211d13fd897a54061d90123680b410a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:21:18 +0200 Subject: [PATCH 17/61] pythonPackages: deprecate requests_toolbelt alias --- pkgs/applications/misc/khal/default.nix | 2 +- pkgs/applications/networking/sync/acd_cli/default.nix | 4 ++-- pkgs/development/python-modules/argcomplete/default.nix | 4 ++-- pkgs/development/python-modules/betamax-matchers/default.nix | 4 ++-- pkgs/development/python-modules/cherrypy/17.nix | 4 ++-- pkgs/development/python-modules/cherrypy/default.nix | 4 ++-- pkgs/development/python-modules/flickrapi/default.nix | 4 ++-- pkgs/development/python-modules/gradient/default.nix | 4 ++-- pkgs/development/python-modules/jira/default.nix | 4 ++-- pkgs/development/python-modules/prawcore/default.nix | 4 ++-- pkgs/development/python-modules/twine/default.nix | 4 ++-- pkgs/development/python-modules/vdirsyncer/default.nix | 4 ++-- pkgs/development/python-modules/webexteamssdk/default.nix | 4 ++-- pkgs/development/python-modules/zeep/default.nix | 4 ++-- pkgs/development/tools/cloudsmith-cli/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 18 files changed, 30 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index c7c184febe17..8ad7578adebb 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -20,7 +20,7 @@ with python3.pkgs; buildPythonApplication rec { pkgs.vdirsyncer pytz pyxdg - requests_toolbelt + requests-toolbelt tzlocal urwid pkginfo diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/pkgs/applications/networking/sync/acd_cli/default.nix index f630cb4071a4..95970a7b8709 100644 --- a/pkgs/applications/networking/sync/acd_cli/default.nix +++ b/pkgs/applications/networking/sync/acd_cli/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildPythonApplication, fuse -, appdirs, colorama, python-dateutil, requests, requests_toolbelt +, appdirs, colorama, python-dateutil, requests, requests-toolbelt , fusepy, sqlalchemy, setuptools }: buildPythonApplication rec { @@ -16,7 +16,7 @@ buildPythonApplication rec { }; propagatedBuildInputs = [ appdirs colorama python-dateutil fusepy requests - requests_toolbelt setuptools sqlalchemy ]; + requests-toolbelt setuptools sqlalchemy ]; makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${fuse}/lib/libfuse.so" ]; diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 6c62fd104f21..cf2f92557206 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -3,7 +3,7 @@ , importlib-metadata , pexpect , prettytable -, requests_toolbelt +, requests-toolbelt }: buildPythonPackage rec { pname = "argcomplete"; @@ -24,7 +24,7 @@ buildPythonPackage rec { importlib-metadata pexpect prettytable - requests_toolbelt + requests-toolbelt ]; pythonImportsCheck = [ "argcomplete" ]; diff --git a/pkgs/development/python-modules/betamax-matchers/default.nix b/pkgs/development/python-modules/betamax-matchers/default.nix index 459d3c51d7ed..087329d103e7 100644 --- a/pkgs/development/python-modules/betamax-matchers/default.nix +++ b/pkgs/development/python-modules/betamax-matchers/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, betamax, requests_toolbelt }: +, betamax, requests-toolbelt }: buildPythonPackage rec { pname = "betamax-matchers"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "07qpwjyq2i2aqhz5iwghnj4pqr2ys5n45v1vmpcfx9r5mhwrsq43"; }; - buildInputs = [ betamax requests_toolbelt ]; + buildInputs = [ betamax requests-toolbelt ]; meta = with lib; { homepage = "https://github.com/sigmavirus24/betamax_matchers"; diff --git a/pkgs/development/python-modules/cherrypy/17.nix b/pkgs/development/python-modules/cherrypy/17.nix index 82e878c83042..2ae180a8bae6 100644 --- a/pkgs/development/python-modules/cherrypy/17.nix +++ b/pkgs/development/python-modules/cherrypy/17.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildPythonPackage, fetchPypi , setuptools-scm , cheroot, contextlib2, portend, routes, six, zc_lockfile -, backports_unittest-mock, objgraph, pathpy, pytest, pytest-cov, backports_functools_lru_cache, requests_toolbelt +, backports_unittest-mock, objgraph, pathpy, pytest, pytest-cov, backports_functools_lru_cache, requests-toolbelt }: buildPythonPackage rec { @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ - backports_unittest-mock objgraph pathpy pytest pytest-cov backports_functools_lru_cache requests_toolbelt + backports_unittest-mock objgraph pathpy pytest pytest-cov backports_functools_lru_cache requests-toolbelt ]; checkPhase = '' diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index b4fa2b8aeb45..0c6f83ea71db 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -2,7 +2,7 @@ , setuptools-scm , cheroot, portend, more-itertools, zc_lockfile, routes , jaraco_collections -, objgraph, pytest, pytest-cov, pathpy, requests_toolbelt, pytest-services +, objgraph, pytest, pytest-cov, pathpy, requests-toolbelt, pytest-services , fetchpatch }: @@ -47,7 +47,7 @@ buildPythonPackage rec { ]; checkInputs = [ - objgraph pytest pytest-cov pathpy requests_toolbelt pytest-services + objgraph pytest pytest-cov pathpy requests-toolbelt pytest-services ]; # Keyboard interrupt ends test suite run diff --git a/pkgs/development/python-modules/flickrapi/default.nix b/pkgs/development/python-modules/flickrapi/default.nix index c989cfbb56d5..d7d20f19ea7b 100644 --- a/pkgs/development/python-modules/flickrapi/default.nix +++ b/pkgs/development/python-modules/flickrapi/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , requests -, requests_toolbelt +, requests-toolbelt , requests_oauthlib , pytest , pytest-runner @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "03g2z21k6nhxgwysjrgnxj9m1yg25mnnkr10gpyfhfkd9w77pcpz"; }; - propagatedBuildInputs = [ requests requests_toolbelt requests_oauthlib ]; + propagatedBuildInputs = [ requests requests-toolbelt requests_oauthlib ]; checkInputs = [ pytest pytest-runner pytest-cov responses ]; doCheck = false; # Otherwise: diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix index 92ddbbd73f7b..57b58699ec38 100644 --- a/pkgs/development/python-modules/gradient/default.nix +++ b/pkgs/development/python-modules/gradient/default.nix @@ -15,7 +15,7 @@ , pyopenssl , pyyaml , requests -, requests_toolbelt +, requests-toolbelt , terminaltables , websocket-client }: @@ -53,7 +53,7 @@ buildPythonPackage rec { pyopenssl pyyaml requests - requests_toolbelt + requests-toolbelt terminaltables websocket-client ]; diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index e386f390bc23..a3f790abfc51 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy3k , pytest, pytest-runner, pbr, glibcLocales , pytest-cov -, requests, requests_oauthlib, requests_toolbelt, defusedxml +, requests, requests_oauthlib, requests-toolbelt, defusedxml , ipython }: @@ -16,7 +16,7 @@ buildPythonPackage rec { }; buildInputs = [ glibcLocales pytest pytest-cov pytest-runner pbr ]; - propagatedBuildInputs = [ requests requests_oauthlib requests_toolbelt defusedxml pbr ipython ]; + propagatedBuildInputs = [ requests requests_oauthlib requests-toolbelt defusedxml pbr ipython ]; # impure tests because of connectivity attempts to jira servers doCheck = false; diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix index 686487c0256d..cb72e69af77d 100644 --- a/pkgs/development/python-modules/prawcore/default.nix +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -4,7 +4,7 @@ , requests , testfixtures , mock -, requests_toolbelt +, requests-toolbelt , betamax , betamax-serializers , betamax-matchers @@ -32,7 +32,7 @@ buildPythonPackage rec { betamax betamax-serializers betamax-matchers - requests_toolbelt + requests-toolbelt pytestCheckHook ]; diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index b78f38c46cf8..da5c4a9c3f51 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -5,7 +5,7 @@ , pyblake2 , readme_renderer , requests -, requests_toolbelt +, requests-toolbelt , setuptools-scm , tqdm , colorama @@ -30,7 +30,7 @@ buildPythonPackage rec { pyblake2 readme_renderer requests - requests_toolbelt + requests-toolbelt tqdm colorama rfc3986 diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index 1dd80b52d19b..cdd8ff02b97e 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -6,7 +6,7 @@ , click , click-log , click-threading -, requests_toolbelt +, requests-toolbelt , requests , requests_oauthlib # required for google oauth sync , atomicwrites @@ -34,7 +34,7 @@ buildPythonPackage rec { click-threading requests requests_oauthlib # required for google oauth sync - requests_toolbelt + requests-toolbelt ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/webexteamssdk/default.nix b/pkgs/development/python-modules/webexteamssdk/default.nix index 21c9e352bf0d..e70cdfd96c86 100644 --- a/pkgs/development/python-modules/webexteamssdk/default.nix +++ b/pkgs/development/python-modules/webexteamssdk/default.nix @@ -4,7 +4,7 @@ , future , pyjwt , requests -, requests_toolbelt +, requests-toolbelt }: buildPythonPackage rec { @@ -22,7 +22,7 @@ buildPythonPackage rec { future pyjwt requests - requests_toolbelt + requests-toolbelt ]; # Tests require a Webex Teams test domain diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index 7c72d2500346..16fb27774631 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -19,7 +19,7 @@ , pythonOlder , pytz , requests -, requests_toolbelt +, requests-toolbelt , requests-file , requests-mock , xmlsec @@ -47,7 +47,7 @@ buildPythonPackage rec { lxml pytz requests - requests_toolbelt + requests-toolbelt requests-file xmlsec ]; diff --git a/pkgs/development/tools/cloudsmith-cli/default.nix b/pkgs/development/tools/cloudsmith-cli/default.nix index 8de2bc1aeed2..8d36c8990828 100644 --- a/pkgs/development/tools/cloudsmith-cli/default.nix +++ b/pkgs/development/tools/cloudsmith-cli/default.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { colorama future requests - requests_toolbelt + requests-toolbelt semver simplejson six diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fe3b02860de..28d0674bd8b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22964,7 +22964,7 @@ in acd-cli = callPackage ../applications/networking/sync/acd_cli { inherit (python3Packages) buildPythonApplication appdirs colorama python-dateutil - requests requests_toolbelt setuptools sqlalchemy fusepy; + requests requests-toolbelt setuptools sqlalchemy fusepy; }; adobe-reader = pkgsi686Linux.callPackage ../applications/misc/adobe-reader { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index bb986d7fd125..2573d07e4a20 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -60,6 +60,7 @@ mapAliases ({ pytest_xdist = pytest-xdist; # added 2021-01-04 python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 + requests_toolbelt = requests-toolbelt; # added 2017-09-26 rotate-backups = throw "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # Added 2021-06-10 setuptools_scm = setuptools-scm; # added 2021-06-03 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index efd77004c3dd..12fd990bad1e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7551,8 +7551,6 @@ in { requests-toolbelt = callPackage ../development/python-modules/requests-toolbelt { }; - requests_toolbelt = self.requests-toolbelt; # Old attr, 2017-09-26 - requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket { }; requirements-detector = callPackage ../development/python-modules/requirements-detector { }; From 5c31546ae8a4b0103ed7d5378c8e281df8946585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:22:39 +0200 Subject: [PATCH 18/61] pythonPackages: deprecate scikitlearn alias --- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 2573d07e4a20..f97da2c4b34a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -62,6 +62,7 @@ mapAliases ({ qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 requests_toolbelt = requests-toolbelt; # added 2017-09-26 rotate-backups = throw "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 + scikitlearn = scikit-learn; # added 2021-07-21 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # Added 2021-06-10 setuptools_scm = setuptools-scm; # added 2021-06-03 smart_open = smart-open; # added 2021-03-14 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 12fd990bad1e..f789bce4a8bd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7804,8 +7804,6 @@ in { inherit (pkgs) gfortran glibcLocales; }; - scikitlearn = self.scikit-learn; - scikit-optimize = callPackage ../development/python-modules/scikit-optimize { }; scikits-odes = callPackage ../development/python-modules/scikits-odes { }; From 5c425ca23d9e36854f4bacaf3365d85f330553dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:24:25 +0200 Subject: [PATCH 19/61] python-aliases: sort --- pkgs/top-level/python-aliases.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index f97da2c4b34a..4a689edc1afc 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -34,6 +34,7 @@ in mapAliases ({ blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29 + bt_proximity = bt-proximity; # added 2021-07-02 bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 dateutil = python-dateutil; # added 2021-07-03 detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 @@ -70,5 +71,4 @@ mapAliases ({ topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 tvnamer = throw "python3Packages.tvnamer was moved to tvnamer"; # 2021-07-05 websocket_client = websocket-client; - bt_proximity = bt-proximity; # added 2021-07-02 }) From 9df3d2ca2c2dff2961a0be338fb90454e11349fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:24:38 +0200 Subject: [PATCH 20/61] pythonPackages: deprecate zc_buildout221 alias --- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4a689edc1afc..376250bcb2f6 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -71,4 +71,5 @@ mapAliases ({ topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 tvnamer = throw "python3Packages.tvnamer was moved to tvnamer"; # 2021-07-05 websocket_client = websocket-client; + zc_buildout221 = zc_buildout; # added 2021-07-21 }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f789bce4a8bd..e9289880cac1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9447,9 +9447,7 @@ in { zarr = callPackage ../development/python-modules/zarr { }; - zc_buildout221 = callPackage ../development/python-modules/buildout { }; - - zc_buildout = self.zc_buildout221; # A patched version of buildout, useful for buildout based development on Nix + zc_buildout = callPackage ../development/python-modules/buildout { }; zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { }; From b4099137b1c8e9e9dd78705058fabe785eba9df7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:26:16 +0200 Subject: [PATCH 21/61] pythonPackages: deprecate ConfigArgParse alias --- pkgs/applications/misc/coursera-dl/default.nix | 2 +- pkgs/applications/misc/rofimoji/default.nix | 4 ++-- pkgs/applications/science/misc/snakemake/default.nix | 2 +- pkgs/development/misc/resholve/resholve.nix | 2 +- pkgs/development/python-modules/certbot/default.nix | 4 ++-- pkgs/development/python-modules/libagent/default.nix | 4 ++-- pkgs/development/python-modules/xml2rfc/default.nix | 4 ++-- pkgs/misc/acpilight/default.nix | 2 +- pkgs/tools/admin/gixy/default.nix | 2 +- pkgs/tools/misc/yle-dl/default.nix | 2 +- pkgs/tools/networking/linkchecker/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 1 - 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/pkgs/applications/misc/coursera-dl/default.nix index 56938f5338dc..954501c0b7fe 100644 --- a/pkgs/applications/misc/coursera-dl/default.nix +++ b/pkgs/applications/misc/coursera-dl/default.nix @@ -18,7 +18,7 @@ in pythonPackages.buildPythonApplication rec { buildInputs = with pythonPackages; [ glibcLocales ]; - propagatedBuildInputs = with pythonPackages; [ attrs beautifulsoup4 ConfigArgParse keyring pyasn1 requests six urllib3 ]; + propagatedBuildInputs = with pythonPackages; [ attrs beautifulsoup4 configargparse keyring pyasn1 requests six urllib3 ]; checkInputs = with pythonPackages; [ pytest mock ]; diff --git a/pkgs/applications/misc/rofimoji/default.nix b/pkgs/applications/misc/rofimoji/default.nix index 79a4d9fc7abe..d0d59af604d4 100644 --- a/pkgs/applications/misc/rofimoji/default.nix +++ b/pkgs/applications/misc/rofimoji/default.nix @@ -5,7 +5,7 @@ , waylandSupport ? true , x11Support ? true -, ConfigArgParse +, configargparse , rofi , wl-clipboard , wtype @@ -26,7 +26,7 @@ buildPythonApplication rec { # `rofi` and the `waylandSupport` and `x11Support` dependencies # contain binaries needed at runtime. - propagatedBuildInputs = with lib; [ ConfigArgParse rofi ] + propagatedBuildInputs = with lib; [ configargparse rofi ] ++ optionals waylandSupport [ wl-clipboard wtype ] ++ optionals x11Support [ xdotool xsel ]; diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 5270cac57823..419323cfa31f 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ appdirs - ConfigArgParse + configargparse connection-pool datrie docutils diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix index 4d039770ce0e..d3603266bea9 100644 --- a/pkgs/development/misc/resholve/resholve.nix +++ b/pkgs/development/misc/resholve/resholve.nix @@ -43,7 +43,7 @@ python27Packages.buildPythonApplication { nativeBuildInputs = [ installShellFiles ]; - propagatedBuildInputs = [ deps.oildev python27Packages.ConfigArgParse ]; + propagatedBuildInputs = [ deps.oildev python27Packages.configargparse ]; patchPhase = '' for file in resholve; do diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 255c3ebfdeb9..61ec6c2125ff 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , python, runCommand , fetchFromGitHub -, ConfigArgParse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface +, configargparse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface , dialog, gnureadline , pytest-xdist, pytestCheckHook, python-dateutil }: @@ -21,7 +21,7 @@ buildPythonPackage rec { sourceRoot = "source/${pname}"; propagatedBuildInputs = [ - ConfigArgParse + configargparse acme configobj cryptography diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index 5334513e23c8..24d8ada58902 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildPythonPackage, ed25519, ecdsa , semver, mnemonic, - unidecode, mock, pytest , backports-shutil-which, ConfigArgParse, + unidecode, mock, pytest , backports-shutil-which, configargparse, python-daemon, pymsgbox }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "16y1y9ahcv3wj7f0v4mfiwzkmn2hz1iv7y13cgr57sxa3ymyqx6c"; }; - propagatedBuildInputs = [ unidecode backports-shutil-which ConfigArgParse + propagatedBuildInputs = [ unidecode backports-shutil-which configargparse python-daemon pymsgbox ecdsa ed25519 mnemonic semver ]; checkInputs = [ mock pytest ]; diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 9837128a7fdc..c975218e5b1d 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, buildPythonPackage, pythonAtLeast, intervaltree, pyflakes, requests, lxml, google-i18n-address -, pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint, pyyaml, jinja2, ConfigArgParse, appdirs +, pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint, pyyaml, jinja2, configargparse, appdirs }: buildPythonPackage rec { @@ -27,7 +27,7 @@ buildPythonPackage rec { pypdf2 dict2xml weasyprint - ConfigArgParse + configargparse appdirs ]; diff --git a/pkgs/misc/acpilight/default.nix b/pkgs/misc/acpilight/default.nix index b5a385ab4076..d6fead938a45 100644 --- a/pkgs/misc/acpilight/default.nix +++ b/pkgs/misc/acpilight/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; pyenv = python3.withPackages (pythonPackages: with pythonPackages; [ - ConfigArgParse + configargparse ]); postConfigure = '' diff --git a/pkgs/tools/admin/gixy/default.nix b/pkgs/tools/admin/gixy/default.nix index 1711792ab2bc..65ca85b463e9 100644 --- a/pkgs/tools/admin/gixy/default.nix +++ b/pkgs/tools/admin/gixy/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ cached-property - ConfigArgParse + configargparse pyparsing jinja2 nose diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index 08da843ad33e..209072da3b0b 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - attrs ConfigArgParse ffmpeg future lxml requests + attrs configargparse ffmpeg future lxml requests ]; pythonPath = [ rtmpdump php wget ]; diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index 05da924c47e4..480321ad15fc 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { nativeBuildInputs = [ gettext ]; propagatedBuildInputs = [ - ConfigArgParse + configargparse argcomplete beautifulsoup4 pyopenssl diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28d0674bd8b0..55550e8fa11a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26825,7 +26825,7 @@ in rofi-systemd = callPackage ../tools/system/rofi-systemd { }; rofimoji = callPackage ../applications/misc/rofimoji { - inherit (python3Packages) buildPythonApplication ConfigArgParse; + inherit (python3Packages) buildPythonApplication configargparse; }; rootlesskit = callPackage ../tools/virtualization/rootlesskit {}; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 376250bcb2f6..4582583f33ba 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -36,6 +36,7 @@ mapAliases ({ blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29 bt_proximity = bt-proximity; # added 2021-07-02 bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 + ConfigArgParse = configargparse; # added 2021-03-18 dateutil = python-dateutil; # added 2021-07-03 detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 dftfit = throw "it's dependency lammps-cython no longer builds"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e9289880cac1..c554aa014ea4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1607,7 +1607,6 @@ in { conda = callPackage ../development/python-modules/conda { }; - ConfigArgParse = self.configargparse; # added 2021-03-18 configargparse = callPackage ../development/python-modules/configargparse { }; configobj = callPackage ../development/python-modules/configobj { }; From 4a87fb096d66eb7336d30d326c6839fe71a399cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 20 Jul 2021 23:27:12 +0200 Subject: [PATCH 22/61] pythonPackages: deprecate djangorestframework-jwt alias --- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4582583f33ba..294c90f66566 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -42,6 +42,7 @@ mapAliases ({ dftfit = throw "it's dependency lammps-cython no longer builds"; diff_cover = diff-cover; # added 2021-07-02 discogs_client = discogs-client; # added 2021-07-02 + djangorestframework-jwt = drf-jwt; dns = dnspython; # Alias for compatibility, 2017-12-10 faulthandler = throw "faulthandler is built into ${python.executable}"; gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c554aa014ea4..3a2c7aec4f43 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2063,8 +2063,6 @@ in { djangorestframework = callPackage ../development/python-modules/djangorestframework { }; - djangorestframework-jwt = self.drf-jwt; - djangorestframework-simplejwt = callPackage ../development/python-modules/djangorestframework-simplejwt { }; django_reversion = callPackage ../development/python-modules/django_reversion { }; From 0a97ad68276544f9be5e0f79d79c7e515d740421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:34:51 +0200 Subject: [PATCH 23/61] brotli: cleanup --- pkgs/tools/compression/brotli/default.nix | 28 +++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index af0cbc4fe22e..dfac5af0980b 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch +{ lib +, stdenv +, fetchFromGitHub +, cmake +, fetchpatch , staticOnly ? stdenv.hostPlatform.isStatic }: @@ -11,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "google"; repo = "brotli"; - rev = "v" + version; + rev = "v${version}"; sha256 = "z6Dhrabav1MDQ4rAcXaDv0aN+qOoh9cvoXZqEWBB13c="; }; @@ -24,8 +28,7 @@ stdenv.mkDerivation rec { sha256 = "sOeXNVsCaBSD9i82GRUDrkyreGeQ7qaJWjjy/uLL0/0="; }); - cmakeFlags = [] - ++ lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF"; + cmakeFlags = lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF"; outputs = [ "out" "dev" "lib" ]; @@ -36,13 +39,13 @@ stdenv.mkDerivation rec { # This breaks on Darwin because our cmake hook tries to make a build folder # and the wonderful bazel BUILD file is already there (yay case-insensitivity?) prePatch = '' - rm BUILD + rm BUILD - # Upstream fixed this reference to runtime-path after the release - # and with this references g++ complains about invalid option -R - sed -i 's/ -R''${libdir}//' scripts/libbrotli*.pc.in - cat scripts/libbrotli*.pc.in - ''; + # Upstream fixed this reference to runtime-path after the release + # and with this references g++ complains about invalid option -R + sed -i 's/ -R''${libdir}//' scripts/libbrotli*.pc.in + cat scripts/libbrotli*.pc.in + ''; # Don't bother with "man" output for now, # it currently only makes the manpages hard to use. @@ -53,10 +56,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - inherit (src.meta) homepage; - + homepage = "https://github.com/google/brotli"; description = "A generic-purpose lossless compression algorithm and tool"; - longDescription = '' Brotli is a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 @@ -69,7 +70,6 @@ stdenv.mkDerivation rec { in the following internet draft: http://www.ietf.org/id/draft-alakuijala-brotli ''; - license = licenses.mit; maintainers = with maintainers; [ freezeboy ]; platforms = platforms.all; From eaf2c4a2dda0ff1a86f4c6074d839cf763880180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:36:12 +0200 Subject: [PATCH 24/61] bsc: cleanup --- pkgs/tools/compression/bsc/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/compression/bsc/default.nix b/pkgs/tools/compression/bsc/default.nix index ac0c0544f017..93b715f853cf 100644 --- a/pkgs/tools/compression/bsc/default.nix +++ b/pkgs/tools/compression/bsc/default.nix @@ -1,30 +1,31 @@ -{ lib, stdenv, fetchurl, openmp ? null }: +{ lib, stdenv, fetchFromGitHub, openmp }: stdenv.mkDerivation rec { pname = "bsc"; version = "3.1.0"; - src = fetchurl { - url = "https://github.com/IlyaGrebnov/libbsc/archive/${version}.tar.gz"; - sha256 = "01yhizaf6qjv1plyrx0fcib264maa5qwvgfvvid9rzlzj9fxjib6"; + src = fetchFromGitHub { + owner = "IlyaGrebnov"; + repo = "libbsc"; + rev = version; + sha256 = "0c0jmirh9y23kyi1jnrm13sa3xsjn54jazfr84ag45pai279fciz"; }; enableParallelBuilding = true; buildInputs = lib.optional stdenv.isDarwin openmp; - prePatch = '' + postPatch = '' substituteInPlace makefile \ --replace 'g++' '$(CXX)' ''; - preInstall = '' - makeFlagsArray+=("PREFIX=$out") - ''; + makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { description = "High performance block-sorting data compression library"; homepage = "http://libbsc.com/"; + maintainers = with maintainers; [ ]; # Later commits changed the licence to Apache2 (no release yet, though) license = with licenses; [ lgpl3Plus ]; platforms = platforms.unix; From 7c49b4143cf3bafbf9c3ebf87ff012488f13dedb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:37:36 +0200 Subject: [PATCH 25/61] bsdiff: cleanup --- pkgs/tools/compression/bsdiff/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/compression/bsdiff/default.nix b/pkgs/tools/compression/bsdiff/default.nix index 8b5dfe919c7d..8f8818781ab4 100644 --- a/pkgs/tools/compression/bsdiff/default.nix +++ b/pkgs/tools/compression/bsdiff/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.3"; src = fetchurl { - url = "https://www.daemonology.net/bsdiff/${pname}-${version}.tar.gz"; + url = "https://www.daemonology.net/bsdiff/${pname}-${version}.tar.gz"; sha256 = "0j2zm3z271x5aw63mwhr3vymzn45p2vvrlrpm9cz2nywna41b0hq"; }; @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { cp bspatch.1 $out/share/man/man1 ''; - meta = { + meta = with lib; { description = "An efficient binary diff/patch tool"; - homepage = "http://www.daemonology.net/bsdiff"; - license = lib.licenses.bsd2; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.thoughtpolice ]; + homepage = "https://www.daemonology.net/bsdiff/"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = [ maintainers.thoughtpolice ]; }; } From a2d112eb4b0d82e6ea7e76f3ca7d8d195f32cbfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:38:03 +0200 Subject: [PATCH 26/61] dejsonlz4: cleanup --- pkgs/tools/compression/dejsonlz4/default.nix | 48 ++++++++++---------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/pkgs/tools/compression/dejsonlz4/default.nix b/pkgs/tools/compression/dejsonlz4/default.nix index 07b6a5979a4f..0dd703035fa9 100644 --- a/pkgs/tools/compression/dejsonlz4/default.nix +++ b/pkgs/tools/compression/dejsonlz4/default.nix @@ -1,28 +1,30 @@ { lib, stdenv, fetchFromGitHub }: + stdenv.mkDerivation rec { - pname = "dejsonlz4"; - version = "1.1"; - src = fetchFromGitHub { - owner = "avih"; - repo = pname; - rev = "v${version}"; - sha256 = "0ggs69qamaama5mid07mhp95m1x42wljdb953lrwfr7p8p6f8czh"; - }; + pname = "dejsonlz4"; + version = "1.1"; - buildPhase = '' - ${stdenv.cc.targetPrefix}cc -o dejsonlz4 src/dejsonlz4.c src/lz4.c - ''; + src = fetchFromGitHub { + owner = "avih"; + repo = pname; + rev = "v${version}"; + sha256 = "0ggs69qamaama5mid07mhp95m1x42wljdb953lrwfr7p8p6f8czh"; + }; - installPhase = '' - mkdir -p $out/bin/ - cp dejsonlz4 $out/bin/ - ''; + buildPhase = '' + ${stdenv.cc.targetPrefix}cc -o dejsonlz4 src/dejsonlz4.c src/lz4.c + ''; - meta = with lib; { - description = "Decompress Mozilla Firefox bookmarks backup files"; - homepage = "https://github.com/avih/dejsonlz4"; - license = licenses.bsd2; - maintainers = with maintainers; [ mt-caret ]; - platforms = platforms.all; - }; - } + installPhase = '' + mkdir -p $out/bin/ + cp dejsonlz4 $out/bin/ + ''; + + meta = with lib; { + description = "Decompress Mozilla Firefox bookmarks backup files"; + homepage = "https://github.com/avih/dejsonlz4"; + license = licenses.bsd2; + maintainers = with maintainers; [ mt-caret ]; + platforms = platforms.all; + }; +} From 9807562b1fc23c1afd26b249d0dfcccc3102ef69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:38:55 +0200 Subject: [PATCH 27/61] gzrt: cleanup --- pkgs/tools/compression/gzrt/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/compression/gzrt/default.nix b/pkgs/tools/compression/gzrt/default.nix index 18efc1b64c28..664c1eb78565 100644 --- a/pkgs/tools/compression/gzrt/default.nix +++ b/pkgs/tools/compression/gzrt/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "gzrt-0.8"; + pname = "gzrt"; + version = "0.8"; src = fetchurl { - url = "https://www.urbanophile.com/arenn/coding/gzrt/${name}.tar.gz"; + url = "https://www.urbanophile.com/arenn/coding/gzrt/gzrt-${version}.tar.gz"; sha256 = "1vhzazj47xfpbfhzkwalz27cc0n5gazddmj3kynhk0yxv99xrdxh"; }; @@ -15,10 +16,11 @@ stdenv.mkDerivation rec { cp gzrecover $out/bin ''; - meta = { + meta = with lib; { homepage = "https://www.urbanophile.com/arenn/hacking/gzrt/"; description = "The gzip Recovery Toolkit"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; + maintainers = with maintainers; [ ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; }; } From 459da1755b09c6b99355f15c8011d98a5c18bcec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:39:50 +0200 Subject: [PATCH 28/61] kzipmix: cleanup --- pkgs/tools/compression/kzipmix/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/compression/kzipmix/default.nix b/pkgs/tools/compression/kzipmix/default.nix index 73931f6bcaea..ab325ac14a83 100644 --- a/pkgs/tools/compression/kzipmix/default.nix +++ b/pkgs/tools/compression/kzipmix/default.nix @@ -1,10 +1,11 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "kzipmix-20091108"; +stdenv.mkDerivation rec { + pname = "kzipmix"; + version = "20091108"; src = fetchurl { - url = "http://static.jonof.id.au/dl/kenutils/kzipmix-20091108-linux.tar.gz"; + url = "http://static.jonof.id.au/dl/kenutils/kzipmix-${version}-linux.tar.gz"; sha256 = "19gyn8pblffdz1bf3xkbpzx8a8wn3xb0v411pqzmz5g5l6pm5gph"; }; @@ -16,10 +17,10 @@ stdenv.mkDerivation { patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/zipmix ''; - meta = { + meta = with lib; { description = "A tool that aggressively optimizes the sizes of Zip archives"; - license = lib.licenses.unfree; + license = licenses.unfree; homepage = "http://advsys.net/ken/utils.htm"; - maintainers = [ lib.maintainers.sander ]; + maintainers = [ maintainers.sander ]; }; } From 7ca9718c5fab01370539d0dc576f760f7fd5d032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:40:22 +0200 Subject: [PATCH 29/61] lbzip2: cleanup --- pkgs/tools/compression/lbzip2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix index ad36ebb81de6..6d4017ac62ca 100644 --- a/pkgs/tools/compression/lbzip2/default.nix +++ b/pkgs/tools/compression/lbzip2/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, gnulib, perl, autoconf, automake }: stdenv.mkDerivation rec { + pname = "lbzip2"; version = "2.5"; - name = "lbzip2-${version}"; src = fetchFromGitHub { owner = "kjn"; repo = "lbzip2"; - sha256 = "1h321wva6fp6khz6x0i6rqb76xh327nw6v5jhgjpcckwdarj5jv8"; rev = "v${version}"; + sha256 = "1h321wva6fp6khz6x0i6rqb76xh327nw6v5jhgjpcckwdarj5jv8"; }; buildInputs = [ gnulib perl ]; From 40e00bb8d4a07663a277e01a35087cbc13779895 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:41:20 +0200 Subject: [PATCH 30/61] lhasa: cleanup --- pkgs/tools/compression/lhasa/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/compression/lhasa/default.nix b/pkgs/tools/compression/lhasa/default.nix index 77df84879b8d..4f1ba702831f 100644 --- a/pkgs/tools/compression/lhasa/default.nix +++ b/pkgs/tools/compression/lhasa/default.nix @@ -1,21 +1,24 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "lhasa"; + version = "0.3.1"; -stdenv.mkDerivation { - name = "lhasa-0.3.1"; src = fetchurl { - url = "https://soulsphere.org/projects/lhasa/lhasa-0.3.1.tar.gz"; + url = "https://soulsphere.org/projects/lhasa/lhasa-${version}.tar.gz"; sha256 = "092zi9av18ma20c6h9448k0bapvx2plnp292741dvfd9hmgqxc1z"; }; - meta = { + + meta = with lib; { description = "Free Software replacement for the Unix LHA tool"; longDescription = '' Lhasa is a Free Software replacement for the Unix LHA tool, for decompressing .lzh (LHA / LHarc) and .lzs (LArc) archives. The backend for the tool is a library, so that it can be reused for other purposes. ''; - license = lib.licenses.isc; + license = licenses.isc; homepage = "http://fragglet.github.io/lhasa"; - maintainers = with lib; [ maintainers.sander ]; - platforms = with lib.platforms; linux ++ darwin; + maintainers = [ maintainers.sander ]; + platforms = platforms.unix; }; } From 8f9e79923c5a9ca62ca1f84c003c7ff7a86d9d4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:41:59 +0200 Subject: [PATCH 31/61] lrzip: cleanup --- pkgs/tools/compression/lrzip/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index 820389300e3b..02f62c3e3c01 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -1,8 +1,8 @@ -{lib, stdenv, fetchurl, zlib, lzo, bzip2, lz4, nasm, perl}: +{ lib, stdenv, fetchurl, zlib, lzo, bzip2, lz4, nasm, perl }: stdenv.mkDerivation rec { - version = "0.641"; pname = "lrzip"; + version = "0.641"; src = fetchurl { url = "http://ck.kolivas.org/apps/lrzip/${pname}-${version}.tar.xz"; @@ -15,10 +15,11 @@ stdenv.mkDerivation rec { "--disable-asm" ]; - meta = { + meta = with lib; { homepage = "http://ck.kolivas.org/apps/lrzip/"; description = "The CK LRZIP compression program (LZMA + RZIP)"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; + maintainers = with maintainers; [ ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; }; } From 68e843b5046fc88429d5615197c6f05515f4e7e2 Mon Sep 17 00:00:00 2001 From: Roman Timushev Date: Wed, 21 Jul 2021 13:51:51 +0200 Subject: [PATCH 32/61] npm-merge-driver: init at 2.3.6 --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 1065 +++++++++-------- 2 files changed, 583 insertions(+), 483 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 7e17928d7dcb..e2c4d4414175 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -178,6 +178,7 @@ , "np" , "npm" , "npm-check-updates" +, "npm-merge-driver" , {"npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0"} , "ocaml-language-server" , "parcel-bundler" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 1f7599914136..79425525bb0c 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -310,13 +310,13 @@ let sha1 = "e70187f8a862e191b1bce6c0268f13acd3a56b20"; }; }; - "@babel/cli-7.14.5" = { + "@babel/cli-7.14.8" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.14.5"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.14.5.tgz"; - sha512 = "poegjhRvXHWO0EAsnYajwYZuqcz7gyfxwfaecUESxDujrqOivf3zrjFbub8IJkrqEaz3fvJWh001EzxBub54fg=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.14.8.tgz"; + sha512 = "lcy6Lymft9Rpfqmrqdd4oTDdUx9ZwaAhAfywVrHG4771Pa6PPT0danJ1kDHBXYqh4HHSmIdA+nlmfxfxSDPtBg=="; }; }; "@babel/code-frame-7.10.4" = { @@ -364,13 +364,13 @@ let sha512 = "O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w=="; }; }; - "@babel/core-7.14.6" = { + "@babel/core-7.14.8" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.14.6"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.14.6.tgz"; - sha512 = "gJnOEWSqTk96qG5BoIrl5bVtc23DCycmIePPYnamY9RboYdI4nFy5vAQMSl81O5K/W0sLDWfGysnOECC+KUUCA=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.14.8.tgz"; + sha512 = "/AtaeEhT6ErpDhInbXmjHcUQXH0L0TEgscfcxk1qbOvLuKCa5aZT0SOOtDKFY96/CLROwbLSKyFor6idgNaU4Q=="; }; }; "@babel/core-7.9.0" = { @@ -382,13 +382,13 @@ let sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; }; }; - "@babel/generator-7.14.5" = { + "@babel/generator-7.14.8" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.14.5"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.14.5.tgz"; - sha512 = "y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.14.8.tgz"; + sha512 = "cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg=="; }; }; "@babel/helper-annotate-as-pure-7.14.5" = { @@ -418,13 +418,13 @@ let sha512 = "v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw=="; }; }; - "@babel/helper-create-class-features-plugin-7.14.6" = { + "@babel/helper-create-class-features-plugin-7.14.8" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.14.6"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.6.tgz"; - sha512 = "Z6gsfGofTxH/+LQXqYEK45kxmcensbzmk/oi8DmaQytlQCgqNZt9XQF8iqlI/SeXWVjaMNxvYvzaYw+kh42mDg=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.8.tgz"; + sha512 = "bpYvH8zJBWzeqi1o+co8qOrw+EXzQ/0c74gVmY205AWXy9nifHrOg77y+1zwxX5lXE7Icq4sPlSQ4O2kWBrteQ=="; }; }; "@babel/helper-create-regexp-features-plugin-7.14.5" = { @@ -499,13 +499,13 @@ let sha512 = "SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ=="; }; }; - "@babel/helper-module-transforms-7.14.5" = { + "@babel/helper-module-transforms-7.14.8" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.14.5"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz"; - sha512 = "iXpX4KW8LVODuAieD7MzhNjmM6dzYY5tfRqT+R9HDXWl0jPn/djKmA+G9s/2C2T9zggw5tK1QNqZ70USfedOwA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz"; + sha512 = "RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA=="; }; }; "@babel/helper-optimise-call-expression-7.14.5" = { @@ -553,13 +553,13 @@ let sha512 = "3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow=="; }; }; - "@babel/helper-simple-access-7.14.5" = { + "@babel/helper-simple-access-7.14.8" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.14.5"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz"; - sha512 = "nfBN9xvmCt6nrMZjfhkl7i0oTV3yxR4/FztsbOASyTvVcoYd0TRHh7eMLdlEcCqobydC0LAF3LtC92Iwxo0wyw=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz"; + sha512 = "TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg=="; }; }; "@babel/helper-skip-transparent-expression-wrappers-7.14.5" = { @@ -580,13 +580,13 @@ let sha512 = "hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA=="; }; }; - "@babel/helper-validator-identifier-7.14.5" = { + "@babel/helper-validator-identifier-7.14.8" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.14.5"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz"; - sha512 = "5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz"; + sha512 = "ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow=="; }; }; "@babel/helper-validator-option-7.14.5" = { @@ -607,13 +607,13 @@ let sha512 = "YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ=="; }; }; - "@babel/helpers-7.14.6" = { + "@babel/helpers-7.14.8" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.14.6"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.6.tgz"; - sha512 = "yesp1ENQBiLI+iYHSJdoZKUtRpfTlL1grDIX9NRlAVppljLw/4tTyYupIB7uIYmC3stW/imAv8EqaKaS/ibmeA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.8.tgz"; + sha512 = "ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw=="; }; }; "@babel/highlight-7.14.5" = { @@ -634,13 +634,13 @@ let sha512 = "OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw=="; }; }; - "@babel/parser-7.14.7" = { + "@babel/parser-7.14.8" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.14.7"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.14.7.tgz"; - sha512 = "X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.14.8.tgz"; + sha512 = "syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA=="; }; }; "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" = { @@ -1399,13 +1399,13 @@ let sha512 = "9PMijx8zFbCwTHrd2P4PJR5nWGH3zWebx2OcpTjqQrHhCiL2ssSR2Sc9ko2BsI2VmVBfoaQmPrlMTCui4LmXQg=="; }; }; - "@babel/preset-env-7.14.7" = { + "@babel/preset-env-7.14.8" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.14.7"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.7.tgz"; - sha512 = "itOGqCKLsSUl0Y+1nSfhbuuOlTs0MJk2Iv7iSH+XT/mR8U1zRLO7NjWlYXB47yhK4J/7j+HYty/EhFZDYKa/VA=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.8.tgz"; + sha512 = "a9aOppDU93oArQ51H+B8M1vH+tayZbuBqzjOhntGetZVa+4tTu5jp+XTwqHGG2lxslqomPYVSjIxQkFwXzgnxg=="; }; }; "@babel/preset-flow-7.14.5" = { @@ -1489,13 +1489,13 @@ let sha512 = "aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA=="; }; }; - "@babel/runtime-7.14.6" = { + "@babel/runtime-7.14.8" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.14.6"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.6.tgz"; - sha512 = "/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz"; + sha512 = "twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg=="; }; }; "@babel/runtime-7.9.0" = { @@ -1507,22 +1507,22 @@ let sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA=="; }; }; - "@babel/runtime-corejs3-7.14.7" = { + "@babel/runtime-corejs3-7.14.8" = { name = "_at_babel_slash_runtime-corejs3"; packageName = "@babel/runtime-corejs3"; - version = "7.14.7"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.7.tgz"; - sha512 = "Wvzcw4mBYbTagyBVZpAJWI06auSIj033T/yNE0Zn1xcup83MieCddZA7ls3kme17L4NOGBrQ09Q+nKB41RLWBA=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.8.tgz"; + sha512 = "4dMD5QRBkumn45oweR0SxoNtt15oz3BUBAQ8cIx7HJqZTtE8zjpM0My8aHJHVnyf4XfRg6DNzaE1080WLBiC1w=="; }; }; - "@babel/standalone-7.14.7" = { + "@babel/standalone-7.14.8" = { name = "_at_babel_slash_standalone"; packageName = "@babel/standalone"; - version = "7.14.7"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.14.7.tgz"; - sha512 = "7RlfMPR4604SbYpj5zvs2ZK587hVhixgU9Pd9Vs8lB8KYtT3U0apXSf0vZXhy8XRh549eUmJOHXhWKTO3ObzOQ=="; + url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.14.8.tgz"; + sha512 = "5Aa1Bhis4oZD23iLJE5CDYHEs1zSC3ejppHE5aim0OWjGCWTa9Oq1PwopK4u1++ao6B6POW/PqNZjOCZNTSx0Q=="; }; }; "@babel/template-7.14.5" = { @@ -1534,13 +1534,13 @@ let sha512 = "6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g=="; }; }; - "@babel/traverse-7.14.7" = { + "@babel/traverse-7.14.8" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.14.7"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.7.tgz"; - sha512 = "9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.8.tgz"; + sha512 = "kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg=="; }; }; "@babel/types-7.13.12" = { @@ -1552,13 +1552,13 @@ let sha512 = "K4nY2xFN4QMvQwkQ+zmBDp6ANMbVNw6BbxWmYA4qNjhR9W+Lj/8ky5MEY2Me5r+B2c6/v6F53oMndG+f9s3IiA=="; }; }; - "@babel/types-7.14.5" = { + "@babel/types-7.14.8" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.14.5"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.14.5.tgz"; - sha512 = "M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.14.8.tgz"; + sha512 = "iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q=="; }; }; "@braintree/sanitize-url-3.1.0" = { @@ -2497,13 +2497,13 @@ let sha512 = "d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw=="; }; }; - "@google-cloud/pubsub-2.16.0" = { + "@google-cloud/pubsub-2.16.1" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "2.16.0"; + version = "2.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.16.0.tgz"; - sha512 = "1cZveyznm9qHXzRqlbS3GLeDiaFp8JVN6Urkrt5hgJGWP/IY9kxuJ0ZCnCeZE4x9O/+a5hWgKaQtBKseJYw//Q=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.16.1.tgz"; + sha512 = "+uO7r9uRfD/x0BzBI67clbIu0VIdqYLZ5NINuGEsMiAXIGWQWmceuLMixMEb/JOxeaqKygH1mL2rshkDisUmGg=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -4171,13 +4171,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-15.11.5" = { + "@netlify/build-16.0.1" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "15.11.5"; + version = "16.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-15.11.5.tgz"; - sha512 = "qsL1bvVAa5ZPIkYxo1Z4vdOcq8sDxQhyKjDqPAEasLqfX3ZTABctze3WdD6WmpyR9wzQEJLpCy1s3ncTDeiU0w=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-16.0.1.tgz"; + sha512 = "DRuFNlK309541EbnY4xHBXrYTgn4K59IpzbE9+ACCuOOav0lJHrVXTeZCzl2dAg/dvEp0/9YwDncmyjr4uKqWQ=="; }; }; "@netlify/cache-utils-1.0.7" = { @@ -4189,13 +4189,13 @@ let sha512 = "yrdrnQkzg/qMovoFYwQ24UVt/OyHtP+t0KpQFd7eBl6gnuuGGgxFocaFFv6eKpMVwzHTsOwx/y9B/FcC3/6cfA=="; }; }; - "@netlify/config-12.6.0" = { + "@netlify/config-13.0.0" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "12.6.0"; + version = "13.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-12.6.0.tgz"; - sha512 = "L+ZmoGsO2Gql+T6+147G7ZctcXgViuh8Q1ReADICM4xdaYVmipRFC+ICU4iJ8I9UQnc0M7qM0ZHzKuhTdPJfiA=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-13.0.0.tgz"; + sha512 = "d7NNG3lbvZN/w9eCRdlFKBY21Vpjxlwis08v5NJjkZpNTuuAuemNFrhZv2y5zmy33TM+zTrkaoEAk6vJ96R5cQ=="; }; }; "@netlify/esbuild-0.13.6" = { @@ -4261,13 +4261,13 @@ let sha512 = "Z2RNrNhO7fsNFmpUQ+eNawgtfHwbGH/4Hji2g+GCRYL7W60kgK5rsWxveky1Nrye45I2OQn/4ZGapKqB1IqTaw=="; }; }; - "@netlify/routing-local-proxy-0.30.2" = { + "@netlify/routing-local-proxy-0.31.0" = { name = "_at_netlify_slash_routing-local-proxy"; packageName = "@netlify/routing-local-proxy"; - version = "0.30.2"; + version = "0.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/routing-local-proxy/-/routing-local-proxy-0.30.2.tgz"; - sha512 = "rQnv383/vFF1x3iKnY/2Q2i7Z7RhugfoVfAIbEJ2bIaWFMQ2YcGMVpwj1w8rK+4MGH5uwvlNNlfE0gGYQOq+4Q=="; + url = "https://registry.npmjs.org/@netlify/routing-local-proxy/-/routing-local-proxy-0.31.0.tgz"; + sha512 = "SSlWic9za/0QtfCP7GllJcOV98BWlx2goOF9bLLhmsHGiPfrhlhZfemqdMtKM4BIs+G70wzUqaIYeyjtxVh37A=="; }; }; "@netlify/run-utils-1.0.7" = { @@ -4639,13 +4639,13 @@ let sha512 = "SWTdXsVheRmlotWNjKzPOb6Js6tjSqA2a8z9+glDJng0Aqjzti8MEWOtuT8ZSu6wHnci7LZNuarE87+WJBG4vg=="; }; }; - "@octokit/openapi-types-8.3.0" = { + "@octokit/openapi-types-9.0.0" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "8.3.0"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-8.3.0.tgz"; - sha512 = "ZFyQ30tNpoATI7o+Z9MWFUzUgWisB8yduhcky7S4UYsRijgIGSnwUKzPBDGzf/Xkx1DuvUtqzvmuFlDSqPJqmQ=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.0.0.tgz"; + sha512 = "GSpv5VUFqarOXZl6uWPsDnjChkKCxnaMALmQhzvCWGiMxONQxX7ZwlomCMS+wB1KqxLPCA5n6gYt016oEMkHmQ=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4675,13 +4675,13 @@ let sha512 = "mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA=="; }; }; - "@octokit/plugin-rest-endpoint-methods-5.4.1" = { + "@octokit/plugin-rest-endpoint-methods-5.4.2" = { name = "_at_octokit_slash_plugin-rest-endpoint-methods"; packageName = "@octokit/plugin-rest-endpoint-methods"; - version = "5.4.1"; + version = "5.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.4.1.tgz"; - sha512 = "Nx0g7I5ayAYghsLJP4Q1Ch2W9jYYM0FlWWWZocUro8rNxVwuZXGfFd7Rcqi9XDWepSXjg1WByiNJnZza2hIOvQ=="; + url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.4.2.tgz"; + sha512 = "imNDDvUMy9YzECcP6zTcKNjwutSwqCYGMZjLPnBHF0kdb3V9URrHWmalD0ZvNEYjwbpm2zw8RPewj3ebCpMBRw=="; }; }; "@octokit/request-5.6.0" = { @@ -4702,22 +4702,22 @@ let sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg=="; }; }; - "@octokit/rest-18.6.7" = { + "@octokit/rest-18.6.8" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "18.6.7"; + version = "18.6.8"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.6.7.tgz"; - sha512 = "Kn6WrI2ZvmAztdx+HEaf88RuJn+LK72S8g6OpciE4kbZddAN84fu4fiPGxcEu052WmqKVnA/cnQsbNlrYC6rqQ=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.6.8.tgz"; + sha512 = "n2aT0mJL9N/idCPmnBynCino1qNScfRHvr8OeskQdBNhUYAMc7cxoc8KLlv1DMWxlZUNhed+5kVdu7majVdVag=="; }; }; - "@octokit/types-6.19.0" = { + "@octokit/types-6.19.1" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.19.0"; + version = "6.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.19.0.tgz"; - sha512 = "9wdZFiJfonDyU6DjIgDHxAIn92vdSUBOwAXbO2F9rOFt6DJwuAkyGLu1CvdJPphCbPBoV9iSDMX7y4fu0v6AtA=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.19.1.tgz"; + sha512 = "hMI2EokQzMG8ABWcnvcrabqQFuFHqUdN0HUOG4DPTaOtnf/jqhzhK1SHOGu5vDlI/x+hWJ60e28VxB7QhOP0CQ=="; }; }; "@open-policy-agent/opa-wasm-1.2.0" = { @@ -5476,13 +5476,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.13.4" = { + "@serverless/components-3.14.0" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.13.4"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.13.4.tgz"; - sha512 = "Qv0hDwj5dG2WaCnVvfzZ4LggMWPfONVtCUWIM7LbCGwVq+K3nnkdql1nJqrfCMkqc3rz2hjxck35ckOPxDiVRQ=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.14.0.tgz"; + sha512 = "Ssuu+OcyWvisGIMZD4Lr9Uj20Ndgb9a8Z/Jw4VbhFS+grc89uK7vZR3pS9I4LTfTUKH4HUbMJXxDndNEFGgLAA=="; }; }; "@serverless/core-1.1.2" = { @@ -5557,13 +5557,13 @@ let sha512 = "cl5uPaGg72z0sCUpF0zsOhwYYUV72Gxc1FwFfxltO8hSvMeFDvwD7JrNE4kHcIcKRjwPGbSH0fdVPUpErZ8Mog=="; }; }; - "@serverless/utils-5.4.0" = { + "@serverless/utils-5.5.0" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.4.0.tgz"; - sha512 = "abEYhQ8Bgh48w/8uzvv8hlfOXsbkvTns3vuMU4THpb0nhbhqL7Y4AWf6z4wJFxcMd0yffkgUQWwSzYHwGJp3kA=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.5.0.tgz"; + sha512 = "cn1eoSla6/hbytPgwh3tiUCeBjVBHt3nKgFwYtF0Aj3B1V+qaBMLOcXmXop+WHhWUil8rP4R9HJ4buR5BgLYWw=="; }; }; "@serverless/utils-china-1.1.4" = { @@ -7213,6 +7213,15 @@ let sha512 = "8h7k1YgQKxKXWckzFCMfsIwn0Y61UK6tlD6y2lOb3hTOIMlK3t9/QwHOhc81TwU+RMf0As5fj7NPjroERCnejQ=="; }; }; + "@types/node-16.4.0" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "16.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-16.4.0.tgz"; + sha512 = "HrJuE7Mlqcjj+00JqMWpZ3tY8w7EUd+S0U3L1+PQSWiXZbOgyQDvi+ogoUxaHApPJq5diKxYBQwA3iIlNcPqOg=="; + }; + }; "@types/node-6.14.13" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -11254,13 +11263,13 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.949.0" = { + "aws-sdk-2.950.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.949.0"; + version = "2.950.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.949.0.tgz"; - sha512 = "n9vqtsLPmSvJcvYvBLBbI1n4GZokwc/5zgHZD7VxdioLNXo1nHQ3VUi4MiW+3kIN40NUNf+Gc5vpc82yNYCvsw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.950.0.tgz"; + sha512 = "iFC5fKLuFLEV27xeKmxDHDZzIDj4upm5+Ts3NpYYRbwPlOG0nE0gZzf9fRYkLkLgTr0TQq26CbKorgeo+6ailw=="; }; }; "aws-sign2-0.6.0" = { @@ -14674,13 +14683,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001245" = { + "caniuse-lite-1.0.30001246" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001245"; + version = "1.0.30001246"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001245.tgz"; - sha512 = "768fM9j1PKXpOCKws6eTo3RHmvTUsG9UrpT4WoREFeZgJBTi4/X9g565azS/rVUGtqb8nt7FjLeF5u4kukERnA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001246.tgz"; + sha512 = "Tc+ff0Co/nFNbLOrziBXmMVtpt9S2c2Y+Z9Nk9Khj09J+0zR9ejvIW5qkZAErCbOrVODCx/MN+GpB5FNBs5GFA=="; }; }; "canvas-2.8.0" = { @@ -17365,13 +17374,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.98" = { + "constructs-3.3.99" = { name = "constructs"; packageName = "constructs"; - version = "3.3.98"; + version = "3.3.99"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.98.tgz"; - sha512 = "VvDuJMqDUb16jB4EsCHthVb74yJcnD/5XWkybYgK5Ieee5o54eyxEzM9jFbZEasysPX4zR05Z/ygEzdlj+QZPg=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.99.tgz"; + sha512 = "uX3bZtp6Zn53Utyurp4DrKolIDUuiDddHVTgsQ39KhVRkQ8TRMtl0nyXllysMtu78t8zLo9QygeyQ0QOBy3LHw=="; }; }; "consume-http-header-1.0.0" = { @@ -18140,13 +18149,13 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; - "create-gatsby-1.9.0" = { + "create-gatsby-1.10.0" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.9.0.tgz"; - sha512 = "KYQnXV2uaZCUt3y4Kkh4hlBGg4LYc6XCEdp99CEfMKOCu34rte5+6c1EZRpphATLqdKIitdFlPp5dJm3knBeMA=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.10.0.tgz"; + sha512 = "EiN8bJepWMN4itheoQ9ul1jNrSWoWy5Cw+kAfF1sN0J7ZWtuYCFfRZX97VRTt6C7bvlHkTw7gew2pUbFS8La+Q=="; }; }; "create-graphback-1.0.1" = { @@ -21857,13 +21866,13 @@ let sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g=="; }; }; - "duplexify-4.1.1" = { + "duplexify-4.1.2" = { name = "duplexify"; packageName = "duplexify"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/duplexify/-/duplexify-4.1.1.tgz"; - sha512 = "DY3xVEmVHTv1wSzKNbwoU6nVjzI369Y6sPoqfYr0/xlx3IdX2n94xIszTcjPO8W8ZIv0Wb0PXNcjuZyT4wiICA=="; + url = "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz"; + sha512 = "fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw=="; }; }; "duration-0.2.2" = { @@ -22055,13 +22064,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.780" = { + "electron-to-chromium-1.3.782" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.780"; + version = "1.3.782"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.780.tgz"; - sha512 = "2KQ9OYm9WMUNpAPA/4aerURl3hwRc9tNlpsiEj3Y8Gf7LVf26NzyLIX2v0hSagQwrS9+cWab+28A2GPKDoVNRA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.782.tgz"; + sha512 = "6AI2se1NqWA1SBf/tlD6tQD/6ZOt+yAhqmrTlh4XZw4/g0Mt3p6JhTQPZxRPxPZiOg0o7ss1EBP/CpYejfnoIA=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -25000,13 +25009,13 @@ let sha512 = "sXAMgFk67fQLcetXustxfKX+PZgHIUFn96Xld9uH8aXPdX3xOp0/jg9OdouVTvQrf7mrn+wAa4jN/y9fUOOiRA=="; }; }; - "file-type-16.5.1" = { + "file-type-16.5.2" = { name = "file-type"; packageName = "file-type"; - version = "16.5.1"; + version = "16.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-16.5.1.tgz"; - sha512 = "Pi1G43smrCy82Q3be3sfKaeS5uHdfj905dP88YqhroG6TYbVY2ljTdDXeXqa6Cn5nOk6znOjWM2uZptA8vH/qQ=="; + url = "https://registry.npmjs.org/file-type/-/file-type-16.5.2.tgz"; + sha512 = "lnHRZj2USLF3v4C5ZY7/vQQeoTVA1YV9TtD6UUCr9z5Cd0uyutqxPBJxkXzM6lufPNuSfefq/yFmnSPz0C3wNw=="; }; }; "file-type-3.9.0" = { @@ -26602,31 +26611,31 @@ let sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9"; }; }; - "gatsby-core-utils-2.9.0" = { + "gatsby-core-utils-2.10.0" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "2.9.0"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.9.0.tgz"; - sha512 = "LKmkk4B/VnSEYKR9W/C8Lp9lwk/l/qY5jbsoiChc43F67VM667gITWH0noSUdcGzbEsN8xi0Wuc8dMA6BvKkvg=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.10.0.tgz"; + sha512 = "xvVebKSrjHkZQQkeEjuAekCAg17KT2l44d/yn7w2dzBGay244m8hoY8LRtLRdsrSp30ix89QklefuP9frEfhbA=="; }; }; - "gatsby-recipes-0.20.0" = { + "gatsby-recipes-0.21.0" = { name = "gatsby-recipes"; packageName = "gatsby-recipes"; - version = "0.20.0"; + version = "0.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.20.0.tgz"; - sha512 = "GsQOovAFImV3MtZVTTjv6utMRRo5QDC1+7l3Je3kqHz425J7UcmjMH/ZzHdzIZ1hO2/RUgGoFXAbWgqhipJp2g=="; + url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.21.0.tgz"; + sha512 = "oo9ci5G6TiXc5wVnRrTfJhX92ZsjICVa0ldX7aQ/8JR77HelfO3MFfQuIkswla+o0MGcbyxgVoLX45kgzY7aaA=="; }; }; - "gatsby-telemetry-2.9.0" = { + "gatsby-telemetry-2.10.0" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "2.9.0"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.9.0.tgz"; - sha512 = "Ji40by9qHm9Zz2vKIBACT77awt0FpqKES9uT9nLmaqyiOZ/7Hs1dKwMrZ2yCkHNBh6S9RplcgfUQLq2LE4oeaA=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.10.0.tgz"; + sha512 = "uon+KRo6NQqkc6Qk/QTw+RmaxIjFFIK7cSU8XXE3y353il2Tk04Kxct2hMHn8Zdl4TYyKla1T5UIvVV/EfpBcg=="; }; }; "gauge-1.2.7" = { @@ -33435,13 +33444,13 @@ let sha512 = "Heu6D+yI5mmUklLQdX3PdDvHUQm14618Fj4PQM9seKa4cohxzJ7EHopfRObKYHMko9awopx4Qr7Gtu6u/QPqfw=="; }; }; - "jsii-srcmak-0.1.301" = { + "jsii-srcmak-0.1.302" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.301"; + version = "0.1.302"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.301.tgz"; - sha512 = "RmUimAPVkk1QflCGjJVUsQsv+W+lD6yZMLpHEHkNEdUvlYSUkZIM2VXjF7LUw7HnS9gFFBftUd6W02OVGbd9Bg=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.302.tgz"; + sha512 = "UsXZ6LGLqP/nUNyq0ey3xOLpNDpkye5HeNAnJCVqw4vsT9o5EX7MHv9ca/JDlt7fWn+cUdo/Bcj5UZJvg+Chfg=="; }; }; "json-bigint-0.2.3" = { @@ -33750,13 +33759,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.1.270" = { + "json2jsii-0.1.272" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.1.270"; + version = "0.1.272"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.270.tgz"; - sha512 = "blBOb7+GDWTLv6jxye684joWzQyuFM6HT+NsPQPuASkT7pABBt3Xx2wsVm/qMJeg7ITufgSfeh1TnNrFROicMg=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.272.tgz"; + sha512 = "OUZqjQhnRalQmQx3kFM3mG5DQcfEYzmUYBWGdb6QwGLuvwB/eJ2PhXuLEkGF+PhRwOrW5IyEcF8U+O39mh3G5Q=="; }; }; "json3-3.2.6" = { @@ -35101,13 +35110,13 @@ let sha512 = "yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw=="; }; }; - "lighthouse-logger-1.2.0" = { + "lighthouse-logger-1.3.0" = { name = "lighthouse-logger"; packageName = "lighthouse-logger"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.2.0.tgz"; - sha512 = "wzUvdIeJZhRsG6gpZfmSCfysaxNEr43i+QT+Hie94wvHDKFLi4n7C2GqZ4sTC+PH5b5iktmXJvU87rWvhP3lHw=="; + url = "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.3.0.tgz"; + sha512 = "BbqAKApLb9ywUli+0a+PcV04SyJ/N1q/8qgCNe6U97KbPCS1BTksEuHFLYdvc8DltuhfxIUBqDZsC0bBGtl3lA=="; }; }; "lightning-3.3.12" = { @@ -35137,6 +35146,15 @@ let sha512 = "z/bfkDEAKyN0HtN7rkiyVlDA3J5L/jxXsE4YuGfQPa8TyPWovyLdo6/aHP0mMy8n+G4tq0g2oKZ/1Z5ONJAVqA=="; }; }; + "lightning-3.4.0" = { + name = "lightning"; + packageName = "lightning"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lightning/-/lightning-3.4.0.tgz"; + sha512 = "lD6PgHipqedfFcTEf/9mDF3s4KGO/lecr02W6zHBJHohNphuBUZS1z68kKRJAl3N4iHmDEfLxt+G86PBP0jhHw=="; + }; + }; "lilconfig-2.0.3" = { name = "lilconfig"; packageName = "lilconfig"; @@ -35281,6 +35299,15 @@ let sha512 = "EBEeBymqktoaViGAG5aVmgIOZpWc6IwDqxq93ZYYIw+Uc9Vy/86nUDPx8A/jJC0f8lwEGcqT+hnSIiBF4SyqeA=="; }; }; + "ln-service-51.10.0" = { + name = "ln-service"; + packageName = "ln-service"; + version = "51.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-service/-/ln-service-51.10.0.tgz"; + sha512 = "k6wGBB6RfyHhMY296MsHhZrVuJSqNsqx3nF3WM5lkKAg+58OdU6bLzqVttpit9uHamc6tssD2GDxNS6gdUzOYQ=="; + }; + }; "ln-service-51.8.2" = { name = "ln-service"; packageName = "ln-service"; @@ -35317,6 +35344,15 @@ let sha512 = "FMfcEISlboFVz+wLTAJ+FnEIQkoMR7IHcUg4l5JNwsU/UOijM1vTQDFhHVqg5fEQAFboZe3lNd7Rh1uxxqs47Q=="; }; }; + "ln-sync-0.4.7" = { + name = "ln-sync"; + packageName = "ln-sync"; + version = "0.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-sync/-/ln-sync-0.4.7.tgz"; + sha512 = "2yqc59OhK0affnkwhgw7iY4x2tKZTb8y8KSWxRHn6cSXL3clUJgXdTNOGr4Jp8j1TkTl0iRVnLSNZlRbtU4vVA=="; + }; + }; "ln-telegram-3.2.9" = { name = "ln-telegram"; packageName = "ln-telegram"; @@ -45265,6 +45301,15 @@ let sha512 = "iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA=="; }; }; + "peek-readable-3.1.4" = { + name = "peek-readable"; + packageName = "peek-readable"; + version = "3.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.4.tgz"; + sha512 = "DX7ec7frSMtCWw+zMd27f66hcxIz/w9LQTY2RflB4WNHCVPAye1pJiP2t3gvaaOhu7IOhtPbHw8MemMj+F5lrg=="; + }; + }; "peek-readable-4.0.0" = { name = "peek-readable"; packageName = "peek-readable"; @@ -51584,13 +51629,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.53.2" = { + "rollup-2.53.3" = { name = "rollup"; packageName = "rollup"; - version = "2.53.2"; + version = "2.53.3"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.53.2.tgz"; - sha512 = "1CtEYuS5CRCzFZ7SNW5528SlDlk4VDXIRGwbm/2POQxA/G4+7/crIqJwkmnj8Q/74hGx4oVlNvh4E1CJQ5hZ6w=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.53.3.tgz"; + sha512 = "79QIGP5DXz5ZHYnCPi3tLz+elOQi6gudp9YINdaJdjG0Yddubo6JRFUM//qCZ0Bap/GJrsUoEBVdSOc4AkMlRA=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -55202,13 +55247,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.21" = { + "sscaff-1.2.22" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.21"; + version = "1.2.22"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.21.tgz"; - sha512 = "X9Ei1liwS+LljdRsWz/QbgYK2sByLbDpvLTwVlL8+fGSz9Oh1D85WU3TR8kCCuPKLvfdGWIRimSQWvJ8zh5riw=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.22.tgz"; + sha512 = "aEkcIR+UIro2xsDASNy/K0v7hxGi18jgFshHpGrJ/tfB0GlQHQJR0W9y23mNxfDmFg/lbTaR0BdEsgC0znNEGA=="; }; }; "ssh-config-1.1.6" = { @@ -56480,6 +56525,15 @@ let sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa"; }; }; + "strtok3-6.1.3" = { + name = "strtok3"; + packageName = "strtok3"; + version = "6.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/strtok3/-/strtok3-6.1.3.tgz"; + sha512 = "ssWSKFOeUTurMSucgyUf+a6Z9mVTYrsYiyEK5RLnh8BM6sFrKSljVlnjZXIDxMguYfdQI+mUPFHo88FYTxq1XA=="; + }; + }; "strtok3-6.2.2" = { name = "strtok3"; packageName = "strtok3"; @@ -58623,6 +58677,15 @@ let sha512 = "wnQcqlreS6VjthyHO3Y/kpK/emflxDBNhlNUPfh7wE39KnuDdOituXomIbyI79vBtF0Ninpkh72mcuRHo+RG3Q=="; }; }; + "token-types-3.1.0" = { + name = "token-types"; + packageName = "token-types"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/token-types/-/token-types-3.1.0.tgz"; + sha512 = "WhoeIW7UTn7NC7L0t/4x3vU/YYSS1oeUxYgiGXQLd82Kaf1qtlxOex3ETY0+o2QuRgAdyursMlUhQBKDCfMUkQ=="; + }; + }; "toml-2.3.6" = { name = "toml"; packageName = "toml"; @@ -66429,7 +66492,7 @@ in sources."@hyperswarm/hypersign-2.1.1" sources."@hyperswarm/network-2.1.0" sources."@leichtgewicht/ip-codec-2.0.3" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."abstract-extension-3.1.1" sources."abstract-leveldown-6.2.3" sources."ansi-colors-3.2.3" @@ -66743,7 +66806,7 @@ in sources."pump-3.0.0" (sources."pumpify-2.0.1" // { dependencies = [ - sources."duplexify-4.1.1" + sources."duplexify-4.1.2" sources."readable-stream-3.6.0" ]; }) @@ -66934,7 +66997,7 @@ in ]; }) sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -66959,7 +67022,7 @@ in sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.49" sources."@types/json-schema-7.0.8" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -66998,7 +67061,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.2" @@ -67025,7 +67088,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -67273,12 +67336,12 @@ in sources."@apollographql/graphql-upload-8-fork-8.1.3" sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - sources."@babel/core-7.14.6" - sources."@babel/generator-7.14.5" + sources."@babel/core-7.14.8" + sources."@babel/generator-7.14.8" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" sources."@babel/helper-compilation-targets-7.14.5" - sources."@babel/helper-create-class-features-plugin-7.14.6" + sources."@babel/helper-create-class-features-plugin-7.14.8" sources."@babel/helper-create-regexp-features-plugin-7.14.5" sources."@babel/helper-define-polyfill-provider-0.2.3" sources."@babel/helper-explode-assignable-expression-7.14.5" @@ -67287,20 +67350,20 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.7" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -67367,7 +67430,7 @@ in sources."@babel/plugin-transform-typescript-7.14.6" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - sources."@babel/preset-env-7.14.7" + sources."@babel/preset-env-7.14.8" sources."@babel/preset-flow-7.14.5" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.14.5" @@ -67378,10 +67441,10 @@ in sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" @@ -67434,7 +67497,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -67577,7 +67640,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -67705,7 +67768,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -68598,12 +68661,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/generator-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/generator-7.14.8" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/types-7.14.5" + sources."@babel/types-7.14.8" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -68679,12 +68742,12 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.6" // { + (sources."@babel/core-7.14.8" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.14.5" // { + (sources."@babel/generator-7.14.8" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -68695,19 +68758,19 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -68715,7 +68778,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."browserslist-4.16.6" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -68726,7 +68789,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -68820,7 +68883,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -68855,9 +68918,9 @@ in }; dependencies = [ sources."browserslist-4.16.6" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."colorette-1.2.2" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."escalade-3.1.1" sources."fraction.js-4.1.1" sources."node-releases-1.1.73" @@ -68884,14 +68947,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.949.0" // { + (sources."aws-sdk-2.950.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -69095,10 +69158,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "10.7.0"; + version = "10.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.0.tgz"; - sha512 = "rJ29qKw5UMS5WM9hdur696oXNiuszSJLhYKMBQuHDuwITeuwNk9GYhXyXRVFFOKVNetjsP/HruSU6tZ3jBq4kQ=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.1.tgz"; + sha512 = "V3LVbkFNTiy+ctpvCDgEgP8e0myUC/Iupm8D9URkS76SFYibAoMX3elcLVtsOXXqM4QyRrg29iGZj+HB+sQCHg=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -69111,7 +69174,7 @@ in sources."@cto.af/textdecoder-0.0.0" (sources."@grpc/grpc-js-1.3.2" // { dependencies = [ - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" ]; }) sources."@grpc/proto-loader-0.6.2" @@ -69478,7 +69541,34 @@ in sources."ws-7.5.0" ]; }) - (sources."ln-service-51.9.0" // { + (sources."ln-service-51.10.0" // { + dependencies = [ + sources."@grpc/grpc-js-1.3.6" + sources."@grpc/proto-loader-0.6.4" + sources."@types/express-4.17.13" + sources."@types/node-16.3.3" + sources."@types/request-2.48.6" + sources."@types/ws-7.4.7" + sources."bn.js-5.2.0" + sources."form-data-2.5.1" + sources."lightning-3.4.0" + sources."ws-7.5.3" + ]; + }) + (sources."ln-sync-0.4.7" // { + dependencies = [ + sources."@grpc/grpc-js-1.3.6" + sources."@grpc/proto-loader-0.6.4" + sources."@types/express-4.17.13" + sources."@types/node-16.3.3" + sources."@types/request-2.48.6" + sources."@types/ws-7.4.7" + sources."bn.js-5.2.0" + sources."form-data-2.5.1" + sources."lightning-3.4.0" + ]; + }) + (sources."ln-telegram-3.2.9" // { dependencies = [ sources."@grpc/grpc-js-1.3.5" sources."@grpc/proto-loader-0.6.4" @@ -69487,23 +69577,24 @@ in sources."@types/request-2.48.6" sources."@types/ws-7.4.6" sources."bn.js-5.2.0" + sources."cbor-7.0.5" sources."form-data-2.5.1" sources."lightning-3.3.16" + sources."ln-service-51.9.0" + (sources."ln-sync-0.4.6" // { + dependencies = [ + sources."@grpc/grpc-js-1.3.4" + sources."@grpc/proto-loader-0.6.3" + sources."@types/express-4.17.12" + sources."@types/node-15.12.5" + sources."@types/request-2.48.5" + sources."@types/ws-7.4.5" + sources."lightning-3.3.12" + ]; + }) sources."ws-7.5.3" ]; }) - (sources."ln-sync-0.4.6" // { - dependencies = [ - sources."@grpc/grpc-js-1.3.4" - sources."@grpc/proto-loader-0.6.3" - sources."@types/node-15.12.5" - sources."@types/ws-7.4.5" - sources."bn.js-5.2.0" - sources."cbor-7.0.5" - sources."lightning-3.3.12" - ]; - }) - sources."ln-telegram-3.2.9" sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" sources."lodash.clonedeep-4.5.0" @@ -69626,7 +69717,7 @@ in sources."process-nextick-args-2.0.1" (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" ]; }) sources."proxy-addr-2.0.7" @@ -70344,10 +70435,10 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/parser-7.14.8" + sources."@babel/types-7.14.8" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@types/minimist-1.2.2" @@ -70806,7 +70897,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -71240,7 +71331,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.29.3" - sources."constructs-3.3.98" + sources."constructs-3.3.99" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -71313,13 +71404,13 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.301" // { + (sources."jsii-srcmak-0.1.302" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.3.0" - sources."json2jsii-0.1.270" + sources."json2jsii-0.1.272" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -71355,7 +71446,7 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.21" + sources."sscaff-1.2.22" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -71470,7 +71561,7 @@ in sources."commonmark-0.29.3" sources."compress-commons-4.1.1" sources."concat-map-0.0.1" - sources."constructs-3.3.98" + sources."constructs-3.3.99" sources."convert-to-spaces-1.0.2" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" @@ -71589,7 +71680,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.301" // { + (sources."jsii-srcmak-0.1.302" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -71672,7 +71763,7 @@ in sources."slice-ansi-3.0.0" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.21" + sources."sscaff-1.2.22" sources."stack-utils-2.0.3" sources."stream-buffers-3.0.2" (sources."streamroller-2.2.4" // { @@ -72147,10 +72238,10 @@ in coc-java = nodeEnv.buildNodePackage { name = "coc-java"; packageName = "coc-java"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-java/-/coc-java-1.5.3.tgz"; - sha512 = "St4Vg5DSHaBW0zqXoSKlKL0KJiASSGMIKDUX2zp/l8ImJd6YI5+SoEwYjCxA2c5x01hZ7k3prXDdfgpKp304RA=="; + url = "https://registry.npmjs.org/coc-java/-/coc-java-1.5.4.tgz"; + sha512 = "6/dloBU+OuRHO/YxX/vWYEFykCQSyN+ASTiwIw0O/l5CyDh9E967sLtodN9uH/MAyExOYfl5i65zI20CMZ6zDQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -72473,7 +72564,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -72552,7 +72643,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { @@ -72650,7 +72741,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -73607,31 +73698,31 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - sources."@babel/core-7.14.6" - sources."@babel/generator-7.14.5" + sources."@babel/core-7.14.8" + sources."@babel/generator-7.14.8" sources."@babel/helper-compilation-targets-7.14.5" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -73661,7 +73752,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -73699,7 +73790,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -73986,7 +74077,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -74101,7 +74192,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -75159,14 +75250,14 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/normalize-package-data-2.4.1" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -75537,7 +75628,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -76852,7 +76943,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.2" sources."abbrev-1.1.1" @@ -77447,12 +77538,12 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.6" // { + (sources."@babel/core-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.5" + sources."@babel/generator-7.14.8" sources."@babel/helper-annotate-as-pure-7.14.5" (sources."@babel/helper-compilation-targets-7.14.5" // { dependencies = [ @@ -77464,17 +77555,17 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-proposal-object-rest-spread-7.14.7" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -77482,15 +77573,15 @@ in sources."@babel/plugin-transform-parameters-7.14.5" sources."@babel/plugin-transform-react-jsx-7.14.5" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@sindresorhus/is-4.0.1" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -77525,7 +77616,7 @@ in sources."quick-lru-4.0.1" ]; }) - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -77562,7 +77653,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -77805,7 +77896,7 @@ in src = ../../applications/video/epgstation; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -79507,7 +79598,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -79668,7 +79759,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -79856,7 +79947,7 @@ in sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.14.5" + sources."@babel/generator-7.14.8" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" (sources."@babel/helper-compilation-targets-7.14.5" // { @@ -79864,7 +79955,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.6" + sources."@babel/helper-create-class-features-plugin-7.14.8" sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ @@ -79877,24 +79968,24 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-proposal-async-generator-functions-7.14.7" sources."@babel/plugin-proposal-class-properties-7.12.13" sources."@babel/plugin-proposal-dynamic-import-7.14.5" @@ -79976,10 +80067,10 @@ in }) sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.12.17" - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@expo/apple-utils-0.0.0-alpha.20" sources."@expo/bunyan-4.0.0" sources."@expo/config-5.0.5" @@ -80399,7 +80490,7 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."caseless-0.12.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -80668,7 +80759,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -81741,7 +81832,7 @@ in ]; }) sources."ripemd160-2.0.2" - sources."rollup-2.53.2" + sources."rollup-2.53.3" (sources."rollup-plugin-terser-7.0.2" // { dependencies = [ sources."commander-2.20.3" @@ -82274,7 +82365,7 @@ in sources."workbox-broadcast-update-6.1.5" (sources."workbox-build-6.1.5" // { dependencies = [ - (sources."@babel/core-7.14.6" // { + (sources."@babel/core-7.14.8" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -82390,8 +82481,8 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - sources."@babel/core-7.14.6" - sources."@babel/generator-7.14.5" + sources."@babel/core-7.14.8" + sources."@babel/generator-7.14.8" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-compilation-targets-7.14.5" sources."@babel/helper-function-name-7.14.5" @@ -82399,17 +82490,17 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-proposal-object-rest-spread-7.14.7" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -82417,10 +82508,10 @@ in sources."@babel/plugin-transform-parameters-7.14.5" sources."@babel/plugin-transform-react-jsx-7.14.5" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/normalize-package-data-2.4.1" sources."@types/yauzl-2.9.2" sources."@types/yoga-layout-1.9.2" @@ -82447,7 +82538,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -82472,7 +82563,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.869402" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -82664,17 +82755,17 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/generator-7.14.5" + sources."@babel/generator-7.14.8" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" (sources."@heroku-cli/color-1.1.14" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -83292,7 +83383,7 @@ in sources."@google-cloud/precise-date-2.0.3" sources."@google-cloud/projectify-2.1.0" sources."@google-cloud/promisify-2.0.3" - (sources."@google-cloud/pubsub-2.16.0" // { + (sources."@google-cloud/pubsub-2.16.1" // { dependencies = [ sources."google-auth-library-7.3.0" ]; @@ -83326,7 +83417,7 @@ in sources."@types/json-schema-7.0.8" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -83542,7 +83633,7 @@ in ]; }) sources."duplexer3-0.1.4" - sources."duplexify-4.1.1" + sources."duplexify-4.1.2" sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" @@ -84252,7 +84343,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -84432,7 +84523,7 @@ in dependencies = [ sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/through-0.0.30" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -85119,10 +85210,10 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "3.9.0"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.9.0.tgz"; - sha512 = "mfd+e5dNzQ8CkjggrYw3PkQwizJmK1+hR6VWmstDkc5+h1c6xFFNFfauexllDFi8H1SMokAEV4TQRDYDilpByw=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.10.0.tgz"; + sha512 = "RgHTA2qdxhdUugoi+S6BCv6LFDYxuV7P8QfbG0QRmmIAybtmpgfse6oLspWgtXwR4liRDZh/hRgwVA4y48JmlA=="; }; dependencies = [ (sources."@ardatan/aggregate-error-0.0.6" // { @@ -85132,13 +85223,13 @@ in }) sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.6" // { + (sources."@babel/core-7.14.8" // { dependencies = [ sources."semver-6.3.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.14.5" // { + (sources."@babel/generator-7.14.8" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -85154,22 +85245,22 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-proposal-object-rest-spread-7.10.4" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-syntax-jsx-7.14.5" @@ -85177,11 +85268,11 @@ in sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-transform-parameters-7.14.5" sources."@babel/plugin-transform-react-jsx-7.14.5" - sources."@babel/runtime-7.14.6" - sources."@babel/standalone-7.14.7" + sources."@babel/runtime-7.14.8" + sources."@babel/standalone-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@graphql-tools/schema-7.1.5" sources."@graphql-tools/utils-7.10.0" sources."@hapi/address-2.1.4" @@ -85217,7 +85308,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-patch-0.0.30" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/node-fetch-2.5.11" sources."@types/unist-2.0.6" sources."@types/yargs-15.0.14" @@ -85284,7 +85375,7 @@ in sources."call-bind-1.0.2" sources."camel-case-4.1.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -85345,7 +85436,7 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."cors-2.8.5" - sources."create-gatsby-1.9.0" + sources."create-gatsby-1.10.0" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -85380,7 +85471,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -85392,13 +85483,12 @@ in sources."escape-string-regexp-1.0.5" sources."estree-util-is-identifier-name-1.1.0" sources."etag-1.8.1" - (sources."execa-3.4.0" // { + (sources."execa-5.1.1" // { dependencies = [ sources."cross-spawn-7.0.3" - sources."get-stream-5.2.0" + sources."get-stream-6.0.1" sources."is-stream-2.0.0" sources."npm-run-path-4.0.1" - sources."p-finally-2.0.1" sources."path-key-3.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -85433,7 +85523,7 @@ in }) sources."fast-copy-2.1.1" sources."figures-3.2.0" - sources."file-type-16.5.1" + sources."file-type-16.5.2" sources."fill-range-7.0.1" sources."filter-obj-1.1.0" (sources."finalhandler-1.1.2" // { @@ -85452,22 +85542,13 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."gatsby-core-utils-2.9.0" - (sources."gatsby-recipes-0.20.0" // { + sources."gatsby-core-utils-2.10.0" + (sources."gatsby-recipes-0.21.0" // { dependencies = [ - sources."cross-spawn-7.0.3" - sources."execa-4.1.0" - sources."get-stream-5.2.0" - sources."is-stream-2.0.0" - sources."npm-run-path-4.0.1" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" sources."strip-ansi-6.0.0" - sources."which-2.0.2" ]; }) - sources."gatsby-telemetry-2.9.0" + sources."gatsby-telemetry-2.10.0" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" @@ -85498,7 +85579,7 @@ in sources."inherits-2.0.3" ]; }) - sources."human-signals-1.1.1" + sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."import-lazy-2.1.0" @@ -85661,7 +85742,7 @@ in sources."path-key-2.0.1" sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" - sources."peek-readable-4.0.0" + sources."peek-readable-3.1.4" sources."picomatch-2.3.0" sources."pkg-dir-4.2.0" sources."prepend-http-2.0.0" @@ -85791,7 +85872,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" sources."strip-json-comments-2.0.1" - sources."strtok3-6.2.2" + sources."strtok3-6.1.3" sources."style-to-object-0.3.0" sources."supports-color-5.5.0" sources."term-size-2.2.1" @@ -85801,7 +85882,7 @@ in sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" - sources."token-types-2.1.1" + sources."token-types-3.1.0" sources."trim-0.0.1" sources."trim-trailing-lines-1.1.4" sources."trough-1.0.5" @@ -86156,7 +86237,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -86513,7 +86594,7 @@ in dependencies = [ sources."@ardatan/aggregate-error-0.0.6" sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -86607,7 +86688,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -89693,7 +89774,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.949.0" // { + (sources."aws-sdk-2.950.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -90410,7 +90491,7 @@ in sha512 = "sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw=="; }; dependencies = [ - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.9.0" @@ -91717,7 +91798,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -92739,7 +92820,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -92861,19 +92942,19 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-8.3.0" + sources."@octokit/openapi-types-9.0.0" sources."@octokit/plugin-enterprise-rest-6.0.1" sources."@octokit/plugin-paginate-rest-2.14.0" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.4.1" + sources."@octokit/plugin-rest-endpoint-methods-5.4.2" (sources."@octokit/request-5.6.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.6.7" - sources."@octokit/types-6.19.0" + sources."@octokit/rest-18.6.8" + sources."@octokit/types-6.19.1" sources."@tootallnate/once-1.1.2" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" @@ -94404,12 +94485,12 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - sources."@babel/core-7.14.6" - sources."@babel/generator-7.14.5" + sources."@babel/core-7.14.8" + sources."@babel/generator-7.14.8" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" sources."@babel/helper-compilation-targets-7.14.5" - sources."@babel/helper-create-class-features-plugin-7.14.6" + sources."@babel/helper-create-class-features-plugin-7.14.8" sources."@babel/helper-create-regexp-features-plugin-7.14.5" sources."@babel/helper-define-polyfill-provider-0.2.3" sources."@babel/helper-explode-assignable-expression-7.14.5" @@ -94418,24 +94499,24 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.14.7" @@ -94502,13 +94583,13 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - sources."@babel/preset-env-7.14.7" + sources."@babel/preset-env-7.14.8" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -94529,7 +94610,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.8" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" @@ -94702,7 +94783,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -94826,7 +94907,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -96074,7 +96155,7 @@ in }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -96732,20 +96813,20 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "4.4.4"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-4.4.4.tgz"; - sha512 = "vDyRF0MxUCccnk/nttQtWSE+KrcHgqjT0s/SyK7Hw06dAKg9X5kDyvDXjHQl2Dmc8Nc68050xc9ql36xUid2dQ=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-5.0.0.tgz"; + sha512 = "bOXs3BRJ/3wC9aAIMw3r7IwQFDSDz+BG69nERTH11YqFLP45SLpro1lhGUIY4M28AdiX6DbHdC3zBZb2+4QONw=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.6" // { + (sources."@babel/core-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.5" + sources."@babel/generator-7.14.8" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" (sources."@babel/helper-compilation-targets-7.14.5" // { @@ -96753,7 +96834,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.6" + sources."@babel/helper-create-class-features-plugin-7.14.8" sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ @@ -96766,18 +96847,18 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -96787,7 +96868,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.7" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -96850,16 +96931,16 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.14.7" // { + (sources."@babel/preset-env-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@bugsnag/browser-7.10.5" sources."@bugsnag/core-7.10.0" sources."@bugsnag/cuid-3.0.0" @@ -96869,7 +96950,7 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-15.11.5" // { + (sources."@netlify/build-16.0.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."boxen-4.2.0" @@ -96891,7 +96972,7 @@ in sources."slash-3.0.0" ]; }) - (sources."@netlify/config-12.6.0" // { + (sources."@netlify/config-13.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -96927,7 +97008,7 @@ in ]; }) sources."@netlify/plugins-list-2.19.3" - sources."@netlify/routing-local-proxy-0.30.2" + sources."@netlify/routing-local-proxy-0.31.0" (sources."@netlify/run-utils-1.0.7" // { dependencies = [ sources."execa-3.4.0" @@ -97060,18 +97141,18 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-8.3.0" + sources."@octokit/openapi-types-9.0.0" sources."@octokit/plugin-paginate-rest-2.14.0" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.4.1" + sources."@octokit/plugin-rest-endpoint-methods-5.4.2" (sources."@octokit/request-5.6.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.6.7" - sources."@octokit/types-6.19.0" + sources."@octokit/rest-18.6.8" + sources."@octokit/types-6.19.1" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-18.1.0" // { dependencies = [ @@ -97108,7 +97189,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/node-fetch-2.5.11" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-1.17.1" @@ -97267,7 +97348,7 @@ in sources."call-me-maybe-1.0.1" sources."callsite-1.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."cardinal-2.1.1" (sources."chalk-4.1.1" // { dependencies = [ @@ -97533,7 +97614,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -98351,7 +98432,7 @@ in sources."reusify-1.0.4" sources."rfdc-1.3.0" sources."rimraf-3.0.2" - sources."rollup-2.53.2" + sources."rollup-2.53.3" (sources."rollup-plugin-inject-3.0.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -99237,7 +99318,7 @@ in sha512 = "r+wpPLWySuj/toc1mMkR8++mpFoTm9RZwsqe6guFc/IwEpQdDpmYkT11OGmTqjUqr8WdteOP+MNvdgNgtTzyxQ=="; }; dependencies = [ - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@mapbox/node-pre-gyp-1.0.5" sources."@node-red/editor-api-2.0.1" sources."@node-red/editor-client-2.0.1" @@ -99262,7 +99343,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.7" @@ -99374,7 +99455,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - (sources."duplexify-4.1.1" // { + (sources."duplexify-4.1.2" // { dependencies = [ sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" @@ -99996,7 +100077,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -100022,7 +100103,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -100901,6 +100982,24 @@ in bypassCache = true; reconstructLock = true; }; + npm-merge-driver = nodeEnv.buildNodePackage { + name = "npm-merge-driver"; + packageName = "npm-merge-driver"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-merge-driver/-/npm-merge-driver-2.3.6.tgz"; + sha512 = "uPjCEWZ93f379zw0AMEgFtZIlpSSnpXc8BEIcs8yYHEZs5Y3d85OZHisLjNhjbYnbdAznxTq+VbyBWAQZDEm9w=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "git merge driver for automatically merging lockfiles"; + homepage = "https://github.com/npm/npm-merge-driver#readme"; + license = "ISC"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; "npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0" = nodeEnv.buildNodePackage { name = "npm2nix"; packageName = "npm2nix"; @@ -101127,14 +101226,14 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.6" // { + (sources."@babel/core-7.14.8" // { dependencies = [ sources."json5-2.2.0" sources."semver-6.3.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.14.5" // { + (sources."@babel/generator-7.14.8" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -101146,7 +101245,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.6" + sources."@babel/helper-create-class-features-plugin-7.14.8" sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ @@ -101159,20 +101258,20 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.7" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -101239,16 +101338,16 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.14.7" // { + (sources."@babel/preset-env-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -101370,7 +101469,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -101508,7 +101607,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -103173,7 +103272,7 @@ in sha512 = "/DGG+QcSPraMAIxaoGCNqb2A6Xkm2jBQMsj2mjb4ag236ByTY9Xhpikvj5ixwlSQV0euuJw4fphKCd5YHRPS8w=="; }; dependencies = [ - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/parser-7.13.13" sources."@babel/types-7.13.12" sources."@nodelib/fs.scandir-2.1.5" @@ -104508,15 +104607,15 @@ in sha512 = "coA9MuNPfN+8TyFj7aOycw2e5W9t+sSgFOUyK30oDrh2MWWWHLjY0I4V1puyCconC2arggfDE2GYXvqOTCGv9Q=="; }; dependencies = [ - sources."@babel/cli-7.14.5" + sources."@babel/cli-7.14.8" sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.6" // { + (sources."@babel/core-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.5" + sources."@babel/generator-7.14.8" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" (sources."@babel/helper-compilation-targets-7.14.5" // { @@ -104524,7 +104623,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.6" + sources."@babel/helper-create-class-features-plugin-7.14.8" sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ @@ -104537,20 +104636,20 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.7" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -104625,7 +104724,7 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.14.7" // { + (sources."@babel/preset-env-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; @@ -104634,16 +104733,16 @@ in sources."@babel/preset-react-7.14.5" sources."@babel/preset-stage-0-7.8.3" sources."@babel/register-7.14.5" - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@reach/router-1.3.4" sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.4" sources."@types/json-schema-7.0.8" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -104831,7 +104930,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -105060,7 +105159,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -106423,7 +106522,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - (sources."@babel/generator-7.14.5" // { + (sources."@babel/generator-7.14.8" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -106434,13 +106533,13 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-module-imports-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" - sources."@babel/runtime-7.14.6" + sources."@babel/parser-7.14.8" + sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" @@ -106930,10 +107029,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.53.2"; + version = "2.53.3"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.53.2.tgz"; - sha512 = "1CtEYuS5CRCzFZ7SNW5528SlDlk4VDXIRGwbm/2POQxA/G4+7/crIqJwkmnj8Q/74hGx4oVlNvh4E1CJQ5hZ6w=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.53.3.tgz"; + sha512 = "79QIGP5DXz5ZHYnCPi3tLz+elOQi6gudp9YINdaJdjG0Yddubo6JRFUM//qCZ0Bap/GJrsUoEBVdSOc4AkMlRA=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -106955,7 +107054,7 @@ in src = ../../misc/vscode-extensions/rust-analyzer/build-deps; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -107259,7 +107358,7 @@ in sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.53.2" + sources."rollup-2.53.3" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."semver-7.3.5" @@ -107673,7 +107772,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.13.4" // { + (sources."@serverless/components-3.14.0" // { dependencies = [ (sources."@serverless/utils-4.1.0" // { dependencies = [ @@ -107716,7 +107815,7 @@ in ]; }) sources."@serverless/template-1.1.4" - (sources."@serverless/utils-5.4.0" // { + (sources."@serverless/utils-5.5.0" // { dependencies = [ sources."get-stream-6.0.1" sources."jwt-decode-3.1.2" @@ -107734,7 +107833,7 @@ in sources."@types/keyv-3.1.2" sources."@types/lodash-4.14.171" sources."@types/long-4.0.1" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/request-2.48.6" sources."@types/request-promise-native-1.0.18" sources."@types/responselike-1.0.0" @@ -107795,7 +107894,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.949.0" // { + (sources."aws-sdk-2.950.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -107977,7 +108076,7 @@ in sources."dotenv-10.0.0" sources."dotenv-expand-5.1.0" sources."duplexer3-0.1.4" - sources."duplexify-4.1.1" + sources."duplexify-4.1.2" sources."duration-0.2.2" sources."ecc-jsbn-0.1.2" sources."emoji-regex-8.0.0" @@ -108024,7 +108123,7 @@ in sources."fd-slicer-1.1.0" sources."fecha-4.2.1" sources."figures-3.2.0" - sources."file-type-16.5.1" + sources."file-type-16.5.2" sources."file-uri-to-path-1.0.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.3.0" @@ -108270,7 +108369,7 @@ in sources."path-loader-1.0.10" sources."path-type-4.0.0" sources."path2-0.1.0" - sources."peek-readable-4.0.0" + sources."peek-readable-3.1.4" sources."pend-1.2.0" sources."performance-now-2.1.0" sources."picomatch-2.3.0" @@ -108381,7 +108480,7 @@ in sources."strip-dirs-2.1.0" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.2.2" + sources."strtok3-6.1.3" (sources."superagent-3.8.3" // { dependencies = [ sources."debug-3.2.7" @@ -108442,7 +108541,7 @@ in sources."to-buffer-1.1.1" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" - sources."token-types-2.1.1" + sources."token-types-3.1.0" sources."tough-cookie-2.5.0" sources."traverse-0.6.6" sources."trim-repeated-1.0.0" @@ -109911,7 +110010,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -111177,7 +111276,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.949.0" // { + (sources."aws-sdk-2.950.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -111961,31 +112060,31 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - sources."@babel/core-7.14.6" - sources."@babel/generator-7.14.5" + sources."@babel/core-7.14.8" + sources."@babel/generator-7.14.8" sources."@babel/helper-compilation-targets-7.14.5" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -112015,7 +112114,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -112053,7 +112152,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -112295,7 +112394,7 @@ in sources."@emmetio/abbreviation-2.2.2" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."anymatch-3.1.2" @@ -113643,7 +113742,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" @@ -114453,7 +114552,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -115991,7 +116090,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -116391,7 +116490,7 @@ in sources."buffer-from-1.1.1" sources."call-bind-1.0.2" sources."camelcase-6.2.0" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" (sources."chalk-4.1.1" // { dependencies = [ sources."supports-color-7.2.0" @@ -116431,7 +116530,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -116981,7 +117080,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" sources."@emmetio/extract-abbreviation-0.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -116998,7 +117097,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -117921,7 +118020,7 @@ in sha512 = "uhSNGU27KDT2e2v51l/NqMc59O7X0DG7CHonZOwsnvMHLvyudCLZgXCU8Rw4T8gpqg2asn50vfPHq7l3DGlN5w=="; }; dependencies = [ - sources."@babel/runtime-corejs3-7.14.7" + sources."@babel/runtime-corejs3-7.14.8" sources."@mapbox/node-pre-gyp-1.0.5" sources."@tootallnate/once-1.1.2" sources."@types/raf-3.4.0" @@ -118144,7 +118243,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -118170,7 +118269,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -118470,7 +118569,7 @@ in sources."lcid-3.1.1" sources."levn-0.4.1" sources."lie-3.3.0" - sources."lighthouse-logger-1.2.0" + sources."lighthouse-logger-1.3.0" sources."lines-and-columns-1.1.6" sources."lodash.clonedeep-4.5.0" sources."lodash.includes-4.3.0" @@ -118733,7 +118832,7 @@ in sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.8" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -118756,11 +118855,11 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.16.6" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."chrome-trace-event-1.0.3" sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.7.1" sources."escalade-3.1.1" @@ -118898,7 +118997,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -119552,7 +119651,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."ansi-regex-5.0.0" @@ -119988,7 +120087,7 @@ in sha512 = "dbHkO8dp4/KDsU5V7akSWVdWB+yyfadR0q3vGxRKXxg1umiYlFUrPuiu66Iy4IpRRr2Qrqx495kInkZJIJtqmA=="; }; dependencies = [ - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -120926,7 +121025,7 @@ in dependencies = [ sources."@types/fs-extra-9.0.12" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/node-fetch-2.5.11" sources."ansi-styles-4.3.0" sources."asynckit-0.4.0" From d56417ecd9f5662e9aeb7927800d9935419f735a Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 21 Jul 2021 14:27:54 +0200 Subject: [PATCH 33/61] lsiutil: 1.60 -> 1.72 Also make various improvements and fixes: - Rename pname from lsiutils to lsiutil since that is the actual name - Update the URL since the old one was broken - Inline the call to fetchurl - Use the installPhase to install instead of installing in the buildPhase - Replace a call to the modprobe binary with the absolute path to the binary - Properly determine the absolute path of the mknod binary - Update the description with text from the source code header - Declare that this only works on Linux - Add myself as maintainer --- pkgs/os-specific/linux/lsiutil/default.nix | 59 ++++++++++++---------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/os-specific/linux/lsiutil/default.nix index 1b1acdb535f5..f88cdcda5237 100644 --- a/pkgs/os-specific/linux/lsiutil/default.nix +++ b/pkgs/os-specific/linux/lsiutil/default.nix @@ -1,41 +1,44 @@ -{ lib, stdenv, fetchurl, unzip }: +{ lib +, stdenv +, fetchurl +, kmod +, coreutils +}: -let - - version = "1.60"; +stdenv.mkDerivation rec { + pname = "lsiutil"; + version = "1.72"; src = fetchurl { - name = "lsiutil-${version}.zip"; - url = "http://www.lsi.com/DistributionSystem/AssetDocument/support/downloads/hbas/fibre_channel/hardware_drivers/LSIUtil%20Kit_${version}.zip"; - sha256 = "1d4337faa56e24f7d98db87b9de94d6e2c17ab671f4e301b93833eea08b9e426"; + url = "https://github.com/exactassembly/meta-xa-stm/raw/f96cf6e13f3c9c980f5651510dd96279b9b2af4f/recipes-support/lsiutil/files/lsiutil-${version}.tar.gz"; + sha256 = "sha256-aTi+EogY1aDWYq3anjRkjz1mzINVfUPQbOPHthxrvS4="; }; -in + buildPhase = '' + runHook preBuild -stdenv.mkDerivation { - pname = "lsiutils"; - inherit version; + substituteInPlace lsiutil.c \ + --replace /sbin/modprobe "${kmod}/bin/modprobe" \ + --replace /bin/mknod "${coreutils}/bin/mknod" + gcc -Wall -O lsiutil.c -o lsiutil - srcs = [ src "Source/lsiutil.tar.gz" ]; + runHook postBuild + ''; - nativeBuildInputs = [ unzip ]; + installPhase = '' + runHook preInstall - sourceRoot = "lsiutil"; + mkdir -p "$out/bin" + install -Dm755 lsiutil "$out/bin/lsiutil" - preBuild = - '' - mkdir -p $out/bin - substituteInPlace Makefile --replace /usr/bin $out/bin - substituteInPlace lsiutil.c \ - --replace /sbin/modprobe modprobe \ - --replace /bin/mknod $(type -P mknod) - ''; + runHook postInstall + ''; - installPhase = "true"; - - meta = { - homepage = "http://www.lsi.com/"; - description = "LSI Logic Fusion MPT command line management tool"; - license = lib.licenses.unfree; + meta = with lib; { + homepage = "https://github.com/exactassembly/meta-xa-stm/tree/master/recipes-support/lsiutil/files"; + description = "Configuration utility for MPT adapters (FC, SCSI, and SAS/SATA)"; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ Luflosi ]; }; } From 75286ae01675cb3de19bd5c1fad4ef428cbcc727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:43:46 +0200 Subject: [PATCH 34/61] lzop: cleanup --- pkgs/tools/compression/lzop/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/tools/compression/lzop/default.nix index be31048c2186..8bf58d9cc356 100644 --- a/pkgs/tools/compression/lzop/default.nix +++ b/pkgs/tools/compression/lzop/default.nix @@ -1,9 +1,11 @@ -{lib, stdenv, fetchurl, lzo}: +{ lib, stdenv, fetchurl, lzo }: stdenv.mkDerivation rec { - name = "lzop-1.04"; + pname = "lzop"; + version = "1.04"; + src = fetchurl { - url = "https://www.lzop.org/download/${name}.tar.gz"; + url = "https://www.lzop.org/download/lzop-${version}.tar.gz"; sha256 = "0h9gb8q7y54m9mvy3jvsmxf21yx8fc3ylzh418hgbbv0i8mbcwky"; }; @@ -12,6 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.lzop.org"; description = "Fast file compressor"; + maintainers = with maintainers; [ ]; license = licenses.gpl2; platforms = platforms.unix; }; From d04efb055ca9db7d7676d6502d15e1438a20c12f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:44:58 +0200 Subject: [PATCH 35/61] pigz: cleanup --- pkgs/tools/compression/pigz/default.nix | 28 ++++++++++++------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index a4cdcc08549e..6dbe190c400b 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -1,36 +1,34 @@ { lib, stdenv, fetchurl, zlib, util-linux }: -let name = "pigz"; - version = "2.6"; -in -stdenv.mkDerivation { - name = name + "-" + version; +stdenv.mkDerivation rec { + pname = "pigz"; + version = "2.6"; src = fetchurl { - url = "https://www.zlib.net/${name}/${name}-${version}.tar.gz"; + url = "https://www.zlib.net/${pname}/${pname}-${version}.tar.gz"; sha256 = "sha256-Lu17DXRJ0dcJA/KmLNYAXSYus6jJ6YaHvIy7WAnbKn0="; }; enableParallelBuilding = true; - buildInputs = [zlib] ++ lib.optional stdenv.isLinux util-linux; + buildInputs = [ zlib ] ++ lib.optional stdenv.isLinux util-linux; makeFlags = [ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" ]; doCheck = stdenv.isLinux; checkTarget = "tests"; - installPhase = - '' - install -Dm755 pigz "$out/bin/pigz" - ln -s pigz "$out/bin/unpigz" - install -Dm755 pigz.1 "$out/share/man/man1/pigz.1" - ln -s pigz.1 "$out/share/man/man1/unpigz.1" - install -Dm755 pigz.pdf "$out/share/doc/pigz/pigz.pdf" + installPhase = '' + install -Dm755 pigz "$out/bin/pigz" + ln -s pigz "$out/bin/unpigz" + install -Dm755 pigz.1 "$out/share/man/man1/pigz.1" + ln -s pigz.1 "$out/share/man/man1/unpigz.1" + install -Dm755 pigz.pdf "$out/share/doc/pigz/pigz.pdf" ''; meta = with lib; { - homepage = "http://www.zlib.net/pigz/"; + homepage = "https://www.zlib.net/pigz/"; description = "A parallel implementation of gzip for multi-core machines"; + maintainers = with maintainers; [ ]; license = licenses.zlib; platforms = platforms.unix; }; From ab4a6cbdafb150e20ff1826c8b77c064703c3c2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:45:43 +0200 Subject: [PATCH 36/61] pixz: cleanup --- pkgs/tools/compression/pixz/default.nix | 45 +++++++++++++++++-------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/tools/compression/pixz/default.nix index bb504e85f612..ec05a44a5189 100644 --- a/pkgs/tools/compression/pixz/default.nix +++ b/pkgs/tools/compression/pixz/default.nix @@ -1,25 +1,42 @@ -{ - lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config - , asciidoc, libxslt, libxml2, docbook_xml_dtd_45, docbook_xsl - , libarchive, xz +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, automake +, libtool +, pkg-config +, asciidoc +, libxslt +, libxml2 +, docbook_xml_dtd_45 +, docbook_xsl +, libarchive +, xz }: + stdenv.mkDerivation rec { - baseName = "pixz"; + pname = "pixz"; version = "1.0.7"; - name = "${baseName}-${version}"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - autoconf automake libtool asciidoc libxslt libxml2 - docbook_xml_dtd_45 docbook_xsl - libarchive xz + autoconf + automake + libtool + asciidoc + libxslt + libxml2 + docbook_xml_dtd_45 + docbook_xsl + libarchive + xz ]; preBuild = '' echo "XML_CATALOG_FILES='$XML_CATALOG_FILES'" ''; src = fetchFromGitHub { owner = "vasi"; - repo = baseName; + repo = pname; rev = "v${version}"; sha256 = "163axxs22w7pghr786hda22mnlpvmi50hzhfr9axwyyjl9n41qs2"; }; @@ -27,10 +44,10 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = { + meta = with lib; { description = "A parallel compressor/decompressor for xz format"; - license = lib.licenses.bsd2; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.unix; + license = licenses.bsd2; + maintainers = [ maintainers.raskin ]; + platforms = platforms.unix; }; } From 676fe1cc8fb7cfc89d246fbb2a1c36d9e9ebcf75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:48:43 +0200 Subject: [PATCH 37/61] pxz: cleanup --- pkgs/tools/compression/pxz/default.nix | 34 ++++++++++++++------------ 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/compression/pxz/default.nix b/pkgs/tools/compression/pxz/default.nix index eb1f5d3570b1..725dd4defb92 100644 --- a/pkgs/tools/compression/pxz/default.nix +++ b/pkgs/tools/compression/pxz/default.nix @@ -1,15 +1,14 @@ -{ lib, stdenv, fetchgit, xz }: +{ lib, stdenv, fetchFromGitHub, xz }: -let name = "pxz"; - version = "4.999.9beta+git"; -in -stdenv.mkDerivation { - name = name + "-" + version; +stdenv.mkDerivation rec { + pname = "pxz"; + version = "4.999.9beta+git"; - src = fetchgit { - url = "https://github.com/jnovy/pxz.git"; - rev = "ae808463c2950edfdedb8fb49f95006db0a18667"; - sha256 = "0na2kw8cf0qd8l1aywlv9m3xrxnqlcwxfdwp3f7x9vxwqx3k32kc"; + src = fetchFromGitHub { + owner = "jnovy"; + repo = "pxz"; + rev = "124382a6d0832b13b7c091f72264f8f3f463070a"; + sha256 = "15mmv832iqsqwigidvwnf0nyivxf0y8m22j2szy4h0xr76x4z21m"; }; buildInputs = [ xz ]; @@ -30,15 +29,18 @@ stdenv.mkDerivation { cp pxz.1 $out/share/man/man1 ''; - meta = { + meta = with lib; { homepage = "https://jnovy.fedorapeople.org/pxz/"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [pashev]; - description = ''Parallel XZ is a compression utility that takes advantage of + license = licenses.gpl2Plus; + maintainers = with maintainers; [ pashev ]; + description = "compression utility that runs LZMA compression of different parts on multiple cores simultaneously"; + longDescription = '' + Parallel XZ is a compression utility that takes advantage of running LZMA compression of different parts of an input file on multiple cores and processors simultaneously. Its primary goal is to utilize all resources to speed up compression time with minimal possible influence - on compression ratio''; - platforms = with lib.platforms; linux; + on compression ratio + ''; + platforms = with platforms; linux; }; } From 56d6f78a0ddb993c2629efa567d09a9c61ba7173 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:49:44 +0200 Subject: [PATCH 38/61] rzip: cleanup --- pkgs/tools/compression/rzip/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix index 60364afa9f30..5f878f8c494f 100644 --- a/pkgs/tools/compression/rzip/default.nix +++ b/pkgs/tools/compression/rzip/default.nix @@ -1,9 +1,11 @@ -{lib, stdenv, fetchurl, fetchpatch, bzip2}: +{ lib, stdenv, fetchurl, fetchpatch, bzip2 }: + +stdenv.mkDerivation rec { + pname = "rzip"; + version = "2.1"; -stdenv.mkDerivation { - name = "rzip-2.1"; src = fetchurl { - url = "mirror://samba/rzip/rzip-2.1.tar.gz"; + url = "mirror://samba/rzip/rzip-${version}.tar.gz"; sha256 = "4bb96f4d58ccf16749ed3f836957ce97dbcff3e3ee5fd50266229a48f89815b7"; }; buildInputs = [ bzip2 ]; @@ -16,10 +18,11 @@ stdenv.mkDerivation { }) ]; - meta = { + meta = with lib; { homepage = "https://rzip.samba.org/"; description = "Compression program"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; + maintainers = with maintainers; [ ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; }; } From 09f99feeba84c614d01b3653567b54de9c4dd88e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 21 Jul 2021 13:50:26 +0200 Subject: [PATCH 39/61] zsync: cleanup --- pkgs/tools/compression/zsync/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/compression/zsync/default.nix b/pkgs/tools/compression/zsync/default.nix index 94921397e303..b92112a4816e 100644 --- a/pkgs/tools/compression/zsync/default.nix +++ b/pkgs/tools/compression/zsync/default.nix @@ -1,20 +1,21 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "zsync-0.6.2"; + pname = "zsync"; + version = "0.6.2"; src = fetchurl { - url = "http://zsync.moria.org.uk/download/${name}.tar.bz2"; + url = "http://zsync.moria.org.uk/download/${pname}-${version}.tar.bz2"; sha256 = "1wjslvfy76szf0mgg2i9y9q30858xyjn6v2acc24zal76d1m778b"; }; makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ]; - meta = { + meta = with lib; { homepage = "http://zsync.moria.org.uk/"; description = "File distribution system using the rsync algorithm"; - license = lib.licenses.free; - maintainers = with lib.maintainers; [viric]; - platforms = with lib.platforms; all; + license = licenses.free; + maintainers = with maintainers; [ viric ]; + platforms = with platforms; all; }; } From acf6abcafcf0282cbc2ea85e10ce759e5203d445 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 20 Jul 2021 19:58:09 -0400 Subject: [PATCH 40/61] kodi: set proper PYTHONPATH for addons --- .../video/kodi-packages/certifi/default.nix | 7 +++++-- .../video/kodi-packages/chardet/default.nix | 7 +++++-- .../video/kodi-packages/dateutil/default.nix | 7 +++++-- .../video/kodi-packages/idna/default.nix | 7 +++++-- .../kodi-packages/inputstreamhelper/default.nix | 7 +++++-- .../video/kodi-packages/kodi-six/default.nix | 7 +++++-- .../video/kodi-packages/myconnpy/default.nix | 7 +++++-- .../video/kodi-packages/pdfreader/default.nix | 2 ++ .../video/kodi-packages/requests/default.nix | 7 +++++-- .../video/kodi-packages/signals/default.nix | 7 +++++-- .../video/kodi-packages/urllib3/default.nix | 7 +++++-- .../video/kodi-packages/websocket/default.nix | 7 +++++-- .../video/kodi-packages/youtube/default.nix | 7 +++++-- pkgs/applications/video/kodi/wrapper.nix | 17 ++++++++++++++--- 14 files changed, 76 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/video/kodi-packages/certifi/default.nix b/pkgs/applications/video/kodi-packages/certifi/default.nix index b99a64f3eec3..1088f560adf9 100644 --- a/pkgs/applications/video/kodi-packages/certifi/default.nix +++ b/pkgs/applications/video/kodi-packages/certifi/default.nix @@ -9,8 +9,11 @@ buildKodiAddon rec { sha256 = "1z49b8va7wdyr714c8ixb2sldi0igffcjj3xpbmga58ph0z985vy"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.certifi"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.certifi"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/chardet/default.nix b/pkgs/applications/video/kodi-packages/chardet/default.nix index cfe3d501cbd4..fe482447cfa3 100644 --- a/pkgs/applications/video/kodi-packages/chardet/default.nix +++ b/pkgs/applications/video/kodi-packages/chardet/default.nix @@ -9,8 +9,11 @@ buildKodiAddon rec { sha256 = "1jsd165mb1b8jdan2jbjd3y3xa0xam2cxcccmwazkybpa0r6a7dj"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.chardet"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.chardet"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/dateutil/default.nix b/pkgs/applications/video/kodi-packages/dateutil/default.nix index 665858d3d573..54a22cedf905 100644 --- a/pkgs/applications/video/kodi-packages/dateutil/default.nix +++ b/pkgs/applications/video/kodi-packages/dateutil/default.nix @@ -14,8 +14,11 @@ buildKodiAddon rec { six ]; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.dateutil"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.dateutil"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/idna/default.nix b/pkgs/applications/video/kodi-packages/idna/default.nix index c90f52ffdc94..01f16696faee 100644 --- a/pkgs/applications/video/kodi-packages/idna/default.nix +++ b/pkgs/applications/video/kodi-packages/idna/default.nix @@ -9,8 +9,11 @@ buildKodiAddon rec { sha256 = "0pm86m8kh2p0brps3xzxcmmabvb4izkglzkj8dsn33br3vlc7cm7"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.idna"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.idna"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix b/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix index 4ca45f8b7b90..fcf53e7a1694 100644 --- a/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix +++ b/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix @@ -9,8 +9,11 @@ buildKodiAddon rec { sha256 = "0y4xn3ygwv1kb7gya7iwdga0g9sa89snpnram0wwqzqn8wn2lyb4"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.inputstreamhelper"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.inputstreamhelper"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/kodi-six/default.nix b/pkgs/applications/video/kodi-packages/kodi-six/default.nix index b4f1169b36db..24404ef349e2 100644 --- a/pkgs/applications/video/kodi-packages/kodi-six/default.nix +++ b/pkgs/applications/video/kodi-packages/kodi-six/default.nix @@ -10,8 +10,11 @@ buildKodiAddon rec { sha256 = "14m232p9hx925pbk8knsg994m1nbpa5278zmcrnfblh4z84gjv4x"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.kodi-six"; + passthru = { + pythonPath = "libs"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.kodi-six"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/myconnpy/default.nix b/pkgs/applications/video/kodi-packages/myconnpy/default.nix index bd0c98137a5a..e39625545f6a 100644 --- a/pkgs/applications/video/kodi-packages/myconnpy/default.nix +++ b/pkgs/applications/video/kodi-packages/myconnpy/default.nix @@ -9,8 +9,11 @@ buildKodiAddon rec { sha256 = "1cx3qdzw9lkkmbyvyrmc2i193is20fihn2sfl7kmv43f708vam0k"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.myconnpy"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.myconnpy"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/pdfreader/default.nix b/pkgs/applications/video/kodi-packages/pdfreader/default.nix index 8896a94c9c39..62a5853c796b 100644 --- a/pkgs/applications/video/kodi-packages/pdfreader/default.nix +++ b/pkgs/applications/video/kodi-packages/pdfreader/default.nix @@ -11,6 +11,8 @@ buildKodiAddon rec { sha256 = "0nkqhlm1gyagq6xpdgqvd5qxyr2ngpml9smdmzfabc8b972mwjml"; }; + passthru.pythonPath = "lib/api"; + meta = with lib; { homepage = "https://forum.kodi.tv/showthread.php?tid=187421"; description = "A comic book reader"; diff --git a/pkgs/applications/video/kodi-packages/requests/default.nix b/pkgs/applications/video/kodi-packages/requests/default.nix index 0f2d5044f04c..c5759fcc325b 100644 --- a/pkgs/applications/video/kodi-packages/requests/default.nix +++ b/pkgs/applications/video/kodi-packages/requests/default.nix @@ -16,8 +16,11 @@ buildKodiAddon rec { urllib3 ]; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.requests"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.requests"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/signals/default.nix b/pkgs/applications/video/kodi-packages/signals/default.nix index bba7b112e9f0..b66b1e99a8bf 100644 --- a/pkgs/applications/video/kodi-packages/signals/default.nix +++ b/pkgs/applications/video/kodi-packages/signals/default.nix @@ -9,8 +9,11 @@ buildKodiAddon rec { sha256 = "1qcjbakch8hvx02wc01zv014nmzgn6ahc4n2bj5mzr114ppd3hjs"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.signals"; + passthru= { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.signals"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/urllib3/default.nix b/pkgs/applications/video/kodi-packages/urllib3/default.nix index 12d8e60d67be..de0fbb997654 100644 --- a/pkgs/applications/video/kodi-packages/urllib3/default.nix +++ b/pkgs/applications/video/kodi-packages/urllib3/default.nix @@ -9,8 +9,11 @@ buildKodiAddon rec { sha256 = "1d2k6gbsnhdadcl1xc7igz4m71z2fcnpln5ppfjv455cmkk110vf"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.urllib3"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.urllib3"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/websocket/default.nix b/pkgs/applications/video/kodi-packages/websocket/default.nix index 3c83e1f9b000..423dfa73f34f 100644 --- a/pkgs/applications/video/kodi-packages/websocket/default.nix +++ b/pkgs/applications/video/kodi-packages/websocket/default.nix @@ -14,8 +14,11 @@ buildKodiAddon rec { six ]; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.websocket"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.websocket"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/youtube/default.nix b/pkgs/applications/video/kodi-packages/youtube/default.nix index 65613658e0f0..8e57adbfb1af 100644 --- a/pkgs/applications/video/kodi-packages/youtube/default.nix +++ b/pkgs/applications/video/kodi-packages/youtube/default.nix @@ -16,8 +16,11 @@ buildKodiAddon rec { inputstreamhelper ]; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.youtube"; + passthru = { + pythonPath = "resources/lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.youtube"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix index 86164682138d..7377e638676e 100644 --- a/pkgs/applications/video/kodi/wrapper.nix +++ b/pkgs/applications/video/kodi/wrapper.nix @@ -1,8 +1,19 @@ -{ lib, makeWrapper, buildEnv, kodi, addons }: +{ lib, makeWrapper, buildEnv, kodi, addons, callPackage }: let + kodiPackages = callPackage ../../../top-level/kodi-packages.nix { inherit kodi; }; + # linux distros are supposed to provide pillow and pycryptodome - requiredPythonPackages = with kodi.pythonPackages; [ pillow pycryptodome] ++ addons; + requiredPythonPath = with kodi.pythonPackages; makePythonPath ([ pillow pycryptodome ]); + + # each kodi addon can potentially export a python module which should be included in PYTHONPATH + # see any addon which supplies `passthru.pythonPath` and the corresponding entry in the addons `addon.xml` + # eg. `` -> pythonPath = "lib"; + additionalPythonPath = + let + addonsWithPythonPath = lib.filter (addon: addon ? pythonPath) addons; + in + lib.concatMapStringsSep ":" (addon: "${addon}${kodiPackages.addonDir}/${addon.namespace}/${addon.pythonPath}") addonsWithPythonPath; in buildEnv { @@ -18,7 +29,7 @@ buildEnv { for exe in kodi{,-standalone} do makeWrapper ${kodi}/bin/$exe $out/bin/$exe \ - --prefix PYTHONPATH : ${kodi.pythonPackages.makePythonPath requiredPythonPackages} \ + --prefix PYTHONPATH : ${requiredPythonPath}:${additionalPythonPath} \ --prefix KODI_HOME : $out/share/kodi \ --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath (lib.concatMap From 4ca54a6ef9ebf5f0ad2219179796e39253221a74 Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Wed, 21 Jul 2021 13:21:25 -0300 Subject: [PATCH 41/61] vscode-extensions.foam.foam-vscode: 0.13.7 -> 0.14.1 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index c47e17b1c129..08bf2307d785 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -497,6 +497,12 @@ let }; foam.foam-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "foam-vscode"; + publisher = "foam"; + version = "0.14.1"; + sha256 = "sha256-w9xGkezS3A9z6sTk8WWgW7g8qYX6mJFfRV0lv5cu160="; + }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog"; description = "A personal knowledge management and sharing system for VSCode "; @@ -505,12 +511,6 @@ let license = licenses.mit; maintainers = with maintainers; [ ratsclub ]; }; - mktplcRef = { - name = "foam-vscode"; - publisher = "foam"; - version = "0.13.7"; - sha256 = "Y2pcd4iXPiuhJdD/9d+tbTJN18O4+kRMqUdOtbx8xy8="; - }; }; formulahendry.auto-close-tag = buildVscodeMarketplaceExtension { From d7b89d596f5218dc4851186f5d99e2bde89924c8 Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Wed, 21 Jul 2021 13:37:17 -0300 Subject: [PATCH 42/61] vscode-extensions.angular.ng-template: init at 12.1.2 --- pkgs/misc/vscode-extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index c47e17b1c129..873ae9135a5e 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -85,6 +85,23 @@ let }; }; + angular.ng-template = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "ng-template"; + publisher = "Angular"; + version = "12.1.2"; + sha256 = "sha256-fIHh1eRmu4zSgrtZr0XwLB+1Ad6a/0ABC55akGr0DOA="; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog"; + description = "Editor services for Angular templates"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Angular.ng-template"; + homepage = "https://github.com/angular/vscode-ng-language-service"; + license = licenses.mit; + maintainers = with maintainers; [ ratsclub ]; + }; + }; + antfu.icons-carbon = buildVscodeMarketplaceExtension { mktplcRef = { name = "icons-carbon"; From d2b557bcdd52dbd79cc8074d859d390eaed81a1f Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 21 Jul 2021 19:37:43 +0300 Subject: [PATCH 43/61] grapejuice: 3.12.5 -> 3.40.14 --- pkgs/games/grapejuice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/grapejuice/default.nix b/pkgs/games/grapejuice/default.nix index 1cb27f7b8c52..586d93151e2c 100644 --- a/pkgs/games/grapejuice/default.nix +++ b/pkgs/games/grapejuice/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "grapejuice"; - version = "3.12.5"; + version = "3.40.14"; src = fetchFromGitLab { owner = "BrinkerVII"; repo = "grapejuice"; rev = "v${version}"; - sha256 = "1xgxyfwwghy9l17i6y40axdrpp4fgxgdr5y97flwmfivif01ifs1"; + sha256 = "1bmkkmi1gx5kc39cjnz5bzwqaicxs0zb6bcv4iny9qccbqf3icrd"; }; nativeBuildInputs = [ From 787feb03db8c8e346edc10fb46f40ec7220ae2d4 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 21 Jul 2021 20:59:47 +0300 Subject: [PATCH 44/61] nexus: use jre8_headless --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8738ed9bf2e..5f00c2bff212 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13949,7 +13949,9 @@ in nix-build-uncached = callPackage ../development/tools/misc/nix-build-uncached { }; - nexus = callPackage ../development/tools/repository-managers/nexus { }; + nexus = callPackage ../development/tools/repository-managers/nexus { + jre_headless = jre8_headless; + }; nwjs = callPackage ../development/tools/nwjs { gconf = pkgs.gnome2.GConf; From e060a9515343e5240e2f6a4ff8354ff2a0096b43 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 21 Jul 2021 21:12:41 +0300 Subject: [PATCH 45/61] strawberry: add glib-networking --- pkgs/applications/audio/strawberry/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index a1cba439c493..8fb3bda683fe 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -28,6 +28,7 @@ , qtx11extras , qttools , withGstreamer ? true +, glib-networking , gst_all_1 ? null , withVlc ? true , libvlc ? null @@ -69,6 +70,7 @@ mkDerivation rec { p11-kit ] ++ lib.optionals withGstreamer (with gst_all_1; [ + glib-networking gstreamer gst-plugins-base gst-plugins-good @@ -85,8 +87,11 @@ mkDerivation rec { util-linux ]; - postInstall = '' - qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + postInstall = lib.optionalString withGstreamer '' + qtWrapperArgs+=( + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" + ) ''; meta = with lib; { From a10a648a436724888b3368db52534aa9f0152df8 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 21 Jul 2021 14:32:30 -0400 Subject: [PATCH 46/61] fcp: 0.2.0 -> 0.2.1 --- pkgs/tools/misc/fcp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fcp/default.nix b/pkgs/tools/misc/fcp/default.nix index db4330e5b0f1..7124e9078457 100644 --- a/pkgs/tools/misc/fcp/default.nix +++ b/pkgs/tools/misc/fcp/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fcp"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "svetlitski"; repo = pname; rev = "v${version}"; - sha256 = "0ahd79dh48hsi4bhs4zs0a7hr55jzsjix9c61lc42ipdbqgifg2d"; + sha256 = "0f242n8w88rikg1srimdifadhggrb2r1z0g65id60ahb4bjm8a0x"; }; - cargoSha256 = "1arrw4fz3f3wfjy9nb8vm707vhh4x0vv9wv8z2s07b4qcwwih8k4"; + cargoSha256 = "0gw7gjfwc4r03rg6z65ml0y37sh4yf716isqs0mb4jqkp7rwfbc9"; nativeBuildInputs = [ expect ]; From c9004a2ccc96dc32df373aa067cee9be752562cd Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 21 Jul 2021 21:42:22 +0300 Subject: [PATCH 47/61] virtinst: remove because its included in virt-manager --- .../virtualization/virtinst/default.nix | 47 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 pkgs/applications/virtualization/virtinst/default.nix diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix deleted file mode 100644 index 37f03d8772f5..000000000000 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchurl, python2Packages, intltool, libxml2Python }: - -with lib; - -let version = "0.600.4"; in - -stdenv.mkDerivation rec { - pname = "virtinst"; - inherit version; - - src = fetchurl { - url = "http://virt-manager.org/download/sources/virtinst/virtinst-${version}.tar.gz"; - sha256 = "175laiy49dni8hzi0cn14bbsdsigvgr9h6d9z2bcvbpa29spldvf"; - }; - - pythonPath = with python2Packages; - [ setuptools eventlet greenlet gflags netaddr carrot routes - PasteDeploy m2crypto ipy twisted - distutils_extra simplejson cheetah lockfile httplib2 - # !!! should libvirt be a build-time dependency? Note that - # libxml2Python is a dependency of libvirt.py. - libvirt libxml2Python urlgrabber - ]; - - buildInputs = - [ python2Packages.python - python2Packages.wrapPython - python2Packages.mox - intltool - ] ++ pythonPath; - - buildPhase = "python setup.py build"; - - installPhase = - '' - python setup.py install --prefix="$out"; - wrapPythonPrograms - ''; - - meta = { - homepage = "http://virt-manager.org"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [qknight]; - description = "Command line tool which provides an easy way to provision operating systems into virtual machines"; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8c59db87b739..eeb6df85462a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -886,6 +886,7 @@ mapAliases ({ virtviewer = virt-viewer; # added 2015-12-24 virtmanager = virt-manager; # added 2019-10-29 virtmanager-qt = virt-manager-qt; # added 2019-10-29 + virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # added 2021-07-21 vorbisTools = vorbis-tools; # added 2016-01-26 webkit = webkitgtk; # added 2019-03-05 webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8738ed9bf2e..b27c051849ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27707,8 +27707,6 @@ in qtermwidget = lxqt.qtermwidget; }; - virtinst = callPackage ../applications/virtualization/virtinst {}; - virtscreen = callPackage ../tools/admin/virtscreen {}; virtual-ans = callPackage ../applications/audio/virtual-ans {}; From 7c1d4d8255e5a3a1e7ae629a168af20e79c37fa0 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Thu, 22 Jul 2021 02:04:47 +0700 Subject: [PATCH 48/61] coq: enable parallel building --- pkgs/applications/science/logic/coq/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index b5c66289c9d3..cd19b9a94424 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -162,6 +162,7 @@ self = stdenv.mkDerivation { prefixKey = "-prefix "; buildFlags = [ "revision" "coq" "coqide" "bin/votour" ]; + enableParallelBuilding = true; createFindlibDestdir = true; From 669849691ee6e58e6e9b9d1b2672df46e00343da Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 21 Jul 2021 22:46:13 +0200 Subject: [PATCH 49/61] python3Packages.homepluscontrol: 0.0.5 -> 0.0.61 --- pkgs/development/python-modules/homepluscontrol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/homepluscontrol/default.nix b/pkgs/development/python-modules/homepluscontrol/default.nix index 680c4a5a7266..7870247e2fdf 100644 --- a/pkgs/development/python-modules/homepluscontrol/default.nix +++ b/pkgs/development/python-modules/homepluscontrol/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "homepluscontrol"; - version = "0.0.5"; + version = "0.0.61"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "chemaaa"; repo = pname; rev = version; - sha256 = "1nd3a7nhh1xb70cdh2h2bimwbffvpc3457smyzr9fqkjwfbcrr93"; + sha256 = "1g61xj417dz1nz5g5ic8rs34fp424zvbgsymry1zldg3gskaqgvk"; }; propagatedBuildInputs = [ From 0d82c3a0e743e3b837a476c3f0f6d286e902464f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 21 Jul 2021 22:55:12 +0200 Subject: [PATCH 50/61] python3Packages.soco: 0.22.6 -> 0.23.1 --- pkgs/development/python-modules/soco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index edadde8995ec..af2226741301 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "soco"; - version = "0.22.6"; + version = "0.23.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SoCo"; repo = "SoCo"; rev = "v${version}"; - sha256 = "06qar4syi6g3x84klnk0mg6w5ryl50c5k3s1hag4rimbkap3x6ks"; + sha256 = "15q82fq10d162xanypn1k51y15r38l7sj0417jzbjx40zz6c93f7"; }; propagatedBuildInputs = [ From 9bee9d6d476b5cecad597c184a761c088b0058b2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 21 Jul 2021 23:02:27 +0200 Subject: [PATCH 51/61] python3Packages.surepy: 0.6.0 -> 0.7.0 --- pkgs/development/python-modules/surepy/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/surepy/default.nix b/pkgs/development/python-modules/surepy/default.nix index 39be204a3d31..e983dfc0e7fd 100644 --- a/pkgs/development/python-modules/surepy/default.nix +++ b/pkgs/development/python-modules/surepy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "surepy"; - version = "0.6.0"; + version = "0.7.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "benleb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XoYiZPBc9SybyKocui1HqSA+YPiPpbupJWMCfmQT5RU="; + sha256 = "04ywkbgs1lnnlhxakbr96crwc8hl97px8w7yigps2ki69md0xf60"; }; postPatch = '' @@ -35,7 +35,9 @@ buildPythonPackage rec { --replace 'attrs = "^20.3.0"' 'attrs = "*"' ''; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ aiodns @@ -53,6 +55,7 @@ buildPythonPackage rec { # Project has no tests doCheck = false; + pythonImportsCheck = [ "surepy" ]; meta = with lib; { From aaa06c39d5169fa245c42e08758698cee3efb281 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 22 Jul 2021 01:06:19 +0200 Subject: [PATCH 52/61] kzipmix: 20091108 -> 20200115 --- pkgs/tools/compression/kzipmix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/compression/kzipmix/default.nix b/pkgs/tools/compression/kzipmix/default.nix index ab325ac14a83..9072a24b7fb5 100644 --- a/pkgs/tools/compression/kzipmix/default.nix +++ b/pkgs/tools/compression/kzipmix/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "kzipmix"; - version = "20091108"; + version = "20200115"; src = fetchurl { url = "http://static.jonof.id.au/dl/kenutils/kzipmix-${version}-linux.tar.gz"; - sha256 = "19gyn8pblffdz1bf3xkbpzx8a8wn3xb0v411pqzmz5g5l6pm5gph"; + sha256 = "sha256-ePgye0D6/ED53zx6xffLnYhkjed7SPU4BLOZQr9E3yA="; }; installPhase = '' mkdir -p $out/bin - cp kzip zipmix $out/bin + cp amd64/{kzip,zipmix} $out/bin patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/kzip patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/zipmix From 93de4f3f6c9ec0ce574add26adef73cf5b594018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 22 Jul 2021 01:09:13 +0200 Subject: [PATCH 53/61] pxz: drop no longer required patch --- pkgs/tools/compression/pxz/_SC_ARG_MAX.patch | 36 -------------------- pkgs/tools/compression/pxz/default.nix | 2 -- 2 files changed, 38 deletions(-) delete mode 100644 pkgs/tools/compression/pxz/_SC_ARG_MAX.patch diff --git a/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch b/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch deleted file mode 100644 index fac8f1fc147c..000000000000 --- a/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch +++ /dev/null @@ -1,36 +0,0 @@ -From b8f9827fc4de9296c7a6f5e6fdac46e070cd6cb4 Mon Sep 17 00:00:00 2001 -From: Igor Pashev -Date: Sat, 1 Nov 2014 18:10:05 +0300 -Subject: [PATCH] Fixed crash on Linux when stack size is unlimited - ---- - pxz.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/pxz.c b/pxz.c -index 9cb843e..52713e2 100644 ---- a/pxz.c -+++ b/pxz.c -@@ -65,7 +65,7 @@ FILE **ftemp; - char str[0x100]; - char buf[BUFFSIZE]; - char *xzcmd; --size_t xzcmd_max; -+const size_t xzcmd_max = 10240; - - unsigned opt_complevel = 6, opt_stdout, opt_keep, opt_threads, opt_verbose; - unsigned opt_force, opt_stdout; -@@ -243,9 +243,12 @@ int main( int argc, char **argv ) { - lzma_filter filters[LZMA_FILTERS_MAX + 1]; - lzma_options_lzma lzma_options; - -- xzcmd_max = sysconf(_SC_ARG_MAX); - page_size = sysconf(_SC_PAGE_SIZE); - xzcmd = malloc(xzcmd_max); -+ if (!xzcmd) { -+ fprintf(stderr, "Failed to allocate %lu bytes for xz command.\n", xzcmd_max); -+ return -1; -+ } - snprintf(xzcmd, xzcmd_max, XZ_BINARY); - - parse_args(argc, argv); diff --git a/pkgs/tools/compression/pxz/default.nix b/pkgs/tools/compression/pxz/default.nix index 725dd4defb92..4ea95a3f78ac 100644 --- a/pkgs/tools/compression/pxz/default.nix +++ b/pkgs/tools/compression/pxz/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { buildInputs = [ xz ]; - patches = [ ./_SC_ARG_MAX.patch ]; - buildPhase = '' gcc -o pxz pxz.c -llzma \ -fopenmp -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2 \ From 5871962ba579ffef8475300c5f6ed5bfba7f97b9 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 22 Jul 2021 00:16:45 +0300 Subject: [PATCH 54/61] virtscreen: unbreak --- pkgs/tools/admin/virtscreen/default.nix | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/virtscreen/default.nix b/pkgs/tools/admin/virtscreen/default.nix index ebfd6c21772f..a1558248f802 100644 --- a/pkgs/tools/admin/virtscreen/default.nix +++ b/pkgs/tools/admin/virtscreen/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, x11vnc, xrandr, libGL }: +{ lib +, stdenv +, fetchFromGitHub +, python3Packages +, x11vnc +, xrandr +, libGL +, qt5 +}: python3Packages.buildPythonApplication rec { pname = "virtscreen"; @@ -16,6 +24,8 @@ python3Packages.buildPythonApplication rec { sha256 = "005qach6phz8w17k8kqmyd647c6jkfybczybxq0yxi5ik0s91a08"; }; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + propagatedBuildInputs = with python3Packages; [ netifaces pyqt5 @@ -24,10 +34,17 @@ python3Packages.buildPythonApplication rec { xrandr ]; - postPatch = let - ext = stdenv.hostPlatform.extensions.sharedLibrary; in '' + dontWrapQtApps = true; + + makeWrapperArgs = [ + "\${qtWrapperArgs[@]}" + # import Qt.labs.platform failed without this + "--prefix QML2_IMPORT_PATH : ${qt5.qtquickcontrols2.bin}/${qt5.qtbase.qtQmlPrefix}" + ]; + + postPatch = '' substituteInPlace virtscreen/__main__.py \ - --replace "'GL'" "'${libGL}/lib/libGL${ext}'" \ + --replace "'GL'" "'${libGL}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}'" \ ''; meta = with lib; { From e133ff645ebcda2e2da6cecaad6d6a85b542d970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 22 Jul 2021 02:18:02 +0200 Subject: [PATCH 55/61] strawberry: cleanup --- .../applications/audio/strawberry/default.nix | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 8fb3bda683fe..6cc55650220a 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -19,19 +19,19 @@ , protobuf , sqlite , taglib -, libpulseaudio ? null -, libselinux ? null -, libsepol ? null -, p11-kit ? null -, util-linux ? null +, libpulseaudio +, libselinux +, libsepol +, p11-kit +, util-linux , qtbase , qtx11extras , qttools , withGstreamer ? true , glib-networking -, gst_all_1 ? null +, gst_all_1 , withVlc ? true -, libvlc ? null +, libvlc }: mkDerivation rec { @@ -62,21 +62,18 @@ mkDerivation rec { taglib qtbase qtx11extras - ] - ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ libpulseaudio libselinux libsepol p11-kit - ] - ++ lib.optionals withGstreamer (with gst_all_1; [ + ] ++ lib.optionals withGstreamer (with gst_all_1; [ glib-networking gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly - ]) - ++ lib.optional withVlc libvlc; + ]) ++ lib.optional withVlc libvlc; nativeBuildInputs = [ cmake From 429bbe3bc309ea5a36477c4d8cd17414e2f5a945 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 21 Jul 2021 20:21:05 -0400 Subject: [PATCH 56/61] tidyp: revert to fetchurl fetchFromGitHub doesn't build --- pkgs/development/libraries/tidyp/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/development/libraries/tidyp/default.nix index c676f8f0174d..268a5f8e5c6b 100644 --- a/pkgs/development/libraries/tidyp/default.nix +++ b/pkgs/development/libraries/tidyp/default.nix @@ -1,14 +1,12 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "tidyp"; version = "1.04"; - src = fetchFromGitHub { - owner = "petdance"; - repo = "tidyp"; - rev = version; - sha256 = "0jslskziwzk4hb6i640fvpnbv2zxrvim6pdx2gwx5wyc64aviskc"; + src = fetchurl { + url = "https://github.com/downloads/petdance/tidyp/${pname}-${version}.tar.gz"; + sha256 = "0f5ky0ih4vap9c6j312jn73vn8m2bj69pl2yd3a5nmv35k9zmc10"; }; hardeningDisable = [ "format" ]; From 56c11fe8a4fe79c60c64ca65a8bde65d22c85b6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 22 Jul 2021 02:25:17 +0200 Subject: [PATCH 57/61] dnscontrol: 3.10.1 -> 3.11.0 --- pkgs/applications/networking/dnscontrol/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 69f71a7479e1..494a40c6bfe0 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.10.1"; + version = "3.11.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fYQqH/J027XJPML/qKMpuu2Nxuvb0cyjOu2czLH8SoM="; + sha256 = "sha256-ExpwJ4lMrYy1WztYo+RYa9jb8slIa3IJk/SUKA1fBKI="; }; - vendorSha256 = "sha256-225TR9jTZSGEJZz3csl/pR/v2unUK67l08x5ESQTJzA="; + vendorSha256 = "sha256-IXA4YNdWR6DWIH4ceif2XcAdwnMr2kCuG3ozagtzsgo="; subPackages = [ "." ]; From 1f183abb9eeac059629ca5bbf94a275d96f9cafa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 22 Jul 2021 02:30:58 +0200 Subject: [PATCH 58/61] treewide: remove discogs_client alias --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/tools/audio/beets/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 123984e66a49..675d9b437576 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -176,7 +176,7 @@ "digital_ocean" = ps: with ps; [ digital-ocean ]; "digitalloggers" = ps: with ps; [ ]; # missing inputs: dlipower "directv" = ps: with ps; [ directv ]; - "discogs" = ps: with ps; [ discogs_client ]; + "discogs" = ps: with ps; [ discogs-client ]; "discord" = ps: with ps; [ discordpy ]; "discovery" = ps: with ps; [ aiohttp-cors ifaddr netdisco zeroconf ]; "dlib_face_detect" = ps: with ps; [ face_recognition ]; diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index c218aa7e4e12..059174ae0a27 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -133,7 +133,7 @@ in pythonPackages.buildPythonApplication rec { ++ lib.optional enableAcoustid pythonPackages.pyacoustid ++ lib.optional enableBeatport pythonPackages.requests_oauthlib ++ lib.optional enableConvert ffmpeg - ++ lib.optional enableDiscogs pythonPackages.discogs_client + ++ lib.optional enableDiscogs pythonPackages.discogs-client ++ lib.optional (enableFetchart || enableDeezer || enableEmbyupdate @@ -175,7 +175,7 @@ in pythonPackages.buildPythonApplication rec { # https://github.com/beetbox/beets/blob/v1.4.9/setup.py pylast mpd2 - discogs_client + discogs-client pyxdg ]; From 38bc6d4941e5272f7475b0313abd95d9375ec11a Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 21 Jul 2021 20:35:43 -0400 Subject: [PATCH 59/61] tidyp: document autoreconf issues with a source tarball Co-authored-by: Sandro --- pkgs/development/libraries/tidyp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/development/libraries/tidyp/default.nix index 268a5f8e5c6b..c2a8ae0337ac 100644 --- a/pkgs/development/libraries/tidyp/default.nix +++ b/pkgs/development/libraries/tidyp/default.nix @@ -5,6 +5,8 @@ stdenv.mkDerivation rec { version = "1.04"; src = fetchurl { + # downloads from a legacy GitHub download page from ~11 years ago + # project does not work with autoconf anymore and the configure script cannot be generated from the source download url = "https://github.com/downloads/petdance/tidyp/${pname}-${version}.tar.gz"; sha256 = "0f5ky0ih4vap9c6j312jn73vn8m2bj69pl2yd3a5nmv35k9zmc10"; }; From e383b11197db54bc0417f77d87978c5c5c6efa5c Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Wed, 21 Jul 2021 13:24:34 -0300 Subject: [PATCH 60/61] vscode-extensions.svsool.markdown-memo: 0.3.8 -> 0.3.9 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 6ecdd4cc2f2f..a6ea451ba1c3 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1244,8 +1244,8 @@ let mktplcRef = { name = "markdown-memo"; publisher = "svsool"; - version = "0.3.8"; - sha256 = "eFiCCXxrOnXwJK1AOMfIDsPGsFG3ArLD1X/uAEH5lRY="; + version = "0.3.9"; + sha256 = "sha256-BsKFHR3wkSRHS8QOi63vLwGj3T2CPzvqXhgtEOq6gJM="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/svsool.markdown-memo/changelog"; From 64538f92553066d0ce61024b306046912c6392e4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 21 Jul 2021 10:46:44 +0000 Subject: [PATCH 61/61] dua: 2.14.1 -> 2.14.2 --- pkgs/tools/misc/dua/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index d097beca9114..627f22361794 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.14.1"; + version = "2.14.2"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-46azJ7q0Ix/8wdg01hYQ2V2E4tBD/NDdHpexnFBD5so="; + sha256 = "sha256-gUTDiUH/jlGAGbhOOCa63wfNy5Y8W6VWlSb9E+hQjHY="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-hCf6Ih2bJrMX2ntWbIrX3Dk8wI5tio+OcN4WNWuU7j4="; + cargoSha256 = "sha256-P8QFeP5KD5YeD4Px7OQNwCrvErgT9ytr4OlFkXuPgGU="; doCheck = false;