diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix index a104e1e1aeb7..ea8982249a0b 100644 --- a/pkgs/development/python-modules/pybotvac/default.nix +++ b/pkgs/development/python-modules/pybotvac/default.nix @@ -5,25 +5,32 @@ , requests , requests-oauthlib , voluptuous +, setuptools }: buildPythonPackage rec { pname = "pybotvac"; - version = "0.0.24"; - format = "setuptools"; + version = "0.0.25"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SXIs9AUXWm1H49MVDT4z6msNPaW5sAU20rcsWZ7ERdU="; + hash = "sha256-EvGBStEYgqFO9GMtxs1qtDixb4y2Ptom8xncRUv4ur4="; }; - patches = [ - ./urllib3-2.0-compat.patch + postPatch = '' + substituteInPlace pybotvac/robot.py \ + --replace-fail "import urllib3" "" \ + --replace-fail "urllib3.disable_warnings(urllib3.exceptions.SubjectAltNameWarning)" "# urllib3.disable_warnings(urllib3.exceptions.SubjectAltNameWarning)" + ''; + + build-system = [ + setuptools ]; - propagatedBuildInputs = [ + dependencies = [ requests requests-oauthlib voluptuous diff --git a/pkgs/development/python-modules/pybotvac/urllib3-2.0-compat.patch b/pkgs/development/python-modules/pybotvac/urllib3-2.0-compat.patch deleted file mode 100644 index 8b6ef4e91cc3..000000000000 --- a/pkgs/development/python-modules/pybotvac/urllib3-2.0-compat.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/pybotvac/robot.py b/pybotvac/robot.py -index f87546f..e9a61de 100644 ---- a/pybotvac/robot.py -+++ b/pybotvac/robot.py -@@ -6,7 +6,6 @@ from datetime import datetime, timezone - from email.utils import format_datetime - - import requests --import urllib3 - from voluptuous import ( - ALLOW_EXTRA, - All, -@@ -21,8 +20,6 @@ from voluptuous import ( - from .exceptions import NeatoRobotException, NeatoUnsupportedDevice - from .neato import Neato # For default Vendor argument - --# Disable warning due to SubjectAltNameWarning in certificate --urllib3.disable_warnings(urllib3.exceptions.SubjectAltNameWarning) - - _LOGGER = logging.getLogger(__name__) -