From df6fa25783715bad3678daee7973552630f7522e Mon Sep 17 00:00:00 2001 From: Alexis Ehret Date: Sat, 4 Nov 2023 18:51:58 +0100 Subject: [PATCH] fix(etesync-dav): remove pinned dependencies flask 2.0.3 isn't available on Pypi anymore. So I removed the explicit dependencies. --- .../applications/misc/etesync-dav/default.nix | 51 +------------------ 1 file changed, 2 insertions(+), 49 deletions(-) diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix index 0c83c8a9b81f..a4bbdc2eb7b3 100644 --- a/pkgs/applications/misc/etesync-dav/default.nix +++ b/pkgs/applications/misc/etesync-dav/default.nix @@ -7,54 +7,7 @@ , radicale3 }: -let - python = python3.override { - packageOverrides = self: super: { - flask = super.flask.overridePythonAttrs (old: rec { - version = "2.0.3"; - src = old.src.override { - inherit version; - hash = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0="; - }; - - patches = [ - # Pulling in this patch lets us continue running tests without any - # other changes using setuptools >= 67.5.0. - (fetchpatch { - name = "remove-deprecated-pkg-resources.patch"; - url = "https://github.com/pallets/flask/commit/751d85f3de3f726446bb12e4ddfae885a6645ba1.patch"; - hash = "sha256-T4vKSSe3P0xtb2/iQjm0RH2Bwk1ZHWiPoX1Ycr63EqU="; - includes = [ "src/flask/cli.py" ]; - }) - ]; - }); - flask-wtf = super.flask-wtf.overridePythonAttrs (old: rec { - version = "0.15.1"; - format = "setuptools"; - src = old.src.override { - inherit version; - pname = "Flask-WTF"; - hash = "sha256-/xdxhfiRMC3CU0N/5jCB56RqTpmsph3+CG+yPlT/8tw="; - }; - disabledTests = [ - "test_outside_request" - ]; - disabledTestPaths = [ - "tests/test_form.py" - "tests/test_html5.py" - ]; - patches = [ ]; - }); - werkzeug = super.werkzeug.overridePythonAttrs (old: rec { - version = "2.0.3"; - src = old.src.override { - inherit version; - hash = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw="; - }; - }); - }; - }; -in python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "etesync-dav"; version = "0.32.1"; @@ -71,7 +24,7 @@ in python.pkgs.buildPythonApplication rec { }) ]; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ appdirs etebase etesync