From 4c31da767fdff1c0ab237f7c8d12ef8edbbef92f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 18 Jan 2021 18:47:39 +0100 Subject: [PATCH 1/7] perlPackages.Safe-Hole: Mark broken on darwin --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a9c0c79ba8b2..8a5b9bd6ae52 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19038,6 +19038,7 @@ let description = "lib/Safe/Hole.pm"; license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/toddr/Safe-Hole"; + broken = stdenv.isDarwin; }; }; From 601917ea95b4413f7c2e7f9f8f2114850d982de8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 18 Jan 2021 20:26:37 +0100 Subject: [PATCH 2/7] pythonPackages.azure-synapse-artifacts: Fix meta --- .../python-modules/azure-synapse-artifacts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index f33df1fdbe8d..5a414388c4c8 100644 --- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -23,8 +23,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "azure.synapse.artifacts" ]; meta = with lib; { - description = "CHANGE"; - homepage = "https://github.com/CHANGE/azure-synapse-artifacts/"; + description = "Microsoft Azure Synapse Artifacts Client Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; From 72e80a623eace7daf48f95f7460a95fffea6e24b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 18 Jan 2021 23:13:36 +0100 Subject: [PATCH 3/7] pythonPackages.mxnet: Remove old substituteInPlace --- pkgs/development/python-modules/mxnet/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mxnet/default.nix b/pkgs/development/python-modules/mxnet/default.nix index 65eb2d44ffcc..d32905e7e611 100644 --- a/pkgs/development/python-modules/mxnet/default.nix +++ b/pkgs/development/python-modules/mxnet/default.nix @@ -20,9 +20,7 @@ buildPythonPackage { postPatch = '' substituteInPlace python/setup.py \ - --replace "graphviz<0.9.0," "graphviz" \ - --replace "numpy<=1.15.2," "numpy" \ - --replace "requests<2.19.0," "requests" + --replace "graphviz<0.9.0," "graphviz" ''; preConfigure = '' From 69d3c5d89b8e44c7977e3102bf11162b0c0c35b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 18 Jan 2021 23:41:39 +0100 Subject: [PATCH 4/7] pythonPackages.spyder: Remove old substituteInPlace --- pkgs/development/python-modules/spyder/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index de1b8123dd97..26013e71158d 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -44,8 +44,7 @@ buildPythonPackage rec { sed -i /pyqtwebengine/d setup.py substituteInPlace setup.py \ --replace "pyqt5<5.13" "pyqt5" \ - --replace "parso==0.7.0" "parso" \ - --replace "jedi==0.17.1" "jedi" + --replace "parso==0.7.0" "parso" ''; postInstall = '' From 6ed5025067ef681d95192aaeffb6cf99ec640e96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 20 Jan 2021 11:24:45 +0100 Subject: [PATCH 5/7] pythonPackages.bellows: Execute tests again --- .../python-modules/bellows/default.nix | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 614a1ad98a91..6ee8b6499b58 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -1,26 +1,27 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi +{ lib, stdenv, buildPythonPackage, fetchFromGitHub , click, click-log, pure-pcapy3 -, pyserial, pyserial-asyncio, voluptuous, zigpy -, asynctest, pytest, pytest-asyncio }: +, pyserial-asyncio, voluptuous, zigpy +, asynctest, pytestCheckHook, pytest-asyncio }: -let +buildPythonPackage rec { pname = "bellows"; version = "0.21.0"; -in buildPythonPackage rec { - inherit pname version; - - src = fetchPypi { - inherit pname version; - sha256 = "fd2ac40c1f3550580dc561ae58d7d15cfa12e6a7cc5d35ee80e7a1cb6a4cda4f"; + src = fetchFromGitHub { + owner = "zigpy"; + repo = "bellows"; + rev = version; + sha256 = "1gja7cb1cyzbi19k8awa2gyc3bjam0adapalpk5slxny0vxlc73a"; }; propagatedBuildInputs = [ - click click-log pure-pcapy3 pyserial pyserial-asyncio voluptuous zigpy + click click-log pure-pcapy3 pyserial-asyncio voluptuous zigpy ]; checkInputs = [ - asynctest pytest pytest-asyncio + asynctest + pytestCheckHook + pytest-asyncio ]; prePatch = '' From 9c6ca673a76e2c97ed7425cd9807c13bd1bc4945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 20 Jan 2021 11:54:00 +0100 Subject: [PATCH 6/7] python37Packages.google-music: Remove stale postPatch --- pkgs/development/python-modules/google-music/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/python-modules/google-music/default.nix b/pkgs/development/python-modules/google-music/default.nix index e5b42c5310f7..90978ad2cba7 100644 --- a/pkgs/development/python-modules/google-music/default.nix +++ b/pkgs/development/python-modules/google-music/default.nix @@ -19,11 +19,6 @@ buildPythonPackage rec { sha256 = "0fsp491ifsw0i1r98l8xr41m8d00nw9n5bin8k3laqzq1p65d6dp"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "audio-metadata>=0.8,<0.9" "audio-metadata" - ''; - propagatedBuildInputs = [ appdirs audio-metadata From f1478a78ff3c1c2ce6abb6cf603206cb8d4e08c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 20 Jan 2021 11:54:42 +0100 Subject: [PATCH 7/7] python38Packages.bidict: Remove stale patch, use pytestCheckHook --- pkgs/development/python-modules/bidict/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix index 34b9f4cf5ff0..dcb684a55e0d 100644 --- a/pkgs/development/python-modules/bidict/default.nix +++ b/pkgs/development/python-modules/bidict/default.nix @@ -3,7 +3,7 @@ , sphinx , hypothesis , py -, pytest +, pytestCheckHook , pytest-benchmark , sortedcollections , sortedcontainers @@ -23,23 +23,14 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ sphinx ]; - # this can be removed >0.19.0 - postPatch = '' - substituteInPlace setup.py \ - --replace "setuptools_scm < 4" "setuptools_scm" - ''; - checkInputs = [ hypothesis py - pytest + pytestCheckHook pytest-benchmark sortedcollections sortedcontainers ]; - checkPhase = '' - pytest tests - ''; meta = with lib; { homepage = "https://github.com/jab/bidict";