From 03649bfdf23866ecfdf373d259615a60adfd0239 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sat, 13 Jan 2024 09:43:02 +0100 Subject: [PATCH] python3Packages.flask-security-too: fix for webauth 2 also removes pydantic (since webauth 2 doesn't use it anymore) Signed-off-by: Florian Brandes Co-authored-by: Sandro --- nixos/tests/pgadmin4.nix | 3 +-- .../python-modules/flask-security-too/default.nix | 14 +++++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/nixos/tests/pgadmin4.nix b/nixos/tests/pgadmin4.nix index bde9afbe6cd9..b726a3eb3b94 100644 --- a/nixos/tests/pgadmin4.nix +++ b/nixos/tests/pgadmin4.nix @@ -56,8 +56,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: # check for missing support files (css, js etc). Should catch not-generated files during build. See e.g. https://github.com/NixOS/nixpkgs/pull/229184 machine.succeed("wget -nv --level=1 --spider --recursive localhost:5051/login") # test idempotenceny - machine.systemctl("stop pgadmin.service") - machine.systemctl("start pgadmin.service") + machine.systemctl("restart pgadmin.service") machine.wait_for_unit("pgadmin") machine.wait_until_succeeds("curl -sS localhost:5051") machine.wait_until_succeeds("curl -sS localhost:5051/login | grep \"pgAdmin 4\" > /dev/null") diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index b8f375dbcf09..9fab0385e463 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pythonOlder , setuptools -, pydantic +, fetchpatch # extras: babel , babel @@ -59,6 +59,16 @@ buildPythonPackage rec { hash = "sha256-we2TquU28qP/ir4eE67J0Nlft/8IL8w7Ny3ypSE5cNk="; }; + patches = [ + # https://github.com/Flask-Middleware/flask-security/pull/901 + (fetchpatch { + name = "fixes-for-py_webauthn-2.0.patch"; + url = "https://github.com/Flask-Middleware/flask-security/commit/5725f7021343567ec0b25c890e859f4e84c93ba6.patch"; + hash = "sha256-4EgwT4zRj0mh4ZaoZFz7H5KeiZ9zs+BY4siYm8DwMfU="; + excludes = [ "CHANGES.rst" ]; + }) + ]; + nativeBuildInputs = [ setuptools ]; @@ -128,7 +138,5 @@ buildPythonPackage rec { description = "Simple security for Flask apps (fork)"; license = licenses.mit; maintainers = with maintainers; [ gador ]; - # https://github.com/Flask-Middleware/flask-security/pull/851 - broken = versionAtLeast pydantic.version "2"; }; }