BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

python3Packages.flask-security-too: fix for webauth 2

Browse source 
also removes pydantic (since webauth 2 doesn't use it anymore)

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
Florian Brandes 2024-01-13 09:43:02 +01:00
parent c2eb9919f7
commit 03649bfdf2
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nixos/tests/pgadmin4.nix
View file

@ -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 # 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") machine.succeed("wget -nv --level=1 --spider --recursive localhost:5051/login")
# test idempotenceny # test idempotenceny
machine.systemctl("stop pgadmin.service") machine.systemctl("restart pgadmin.service")
machine.systemctl("start pgadmin.service")
machine.wait_for_unit("pgadmin") machine.wait_for_unit("pgadmin")
machine.wait_until_succeeds("curl -sS localhost:5051") machine.wait_until_succeeds("curl -sS localhost:5051")
machine.wait_until_succeeds("curl -sS localhost:5051/login | grep \"<title>pgAdmin 4</title>\" > /dev/null") machine.wait_until_succeeds("curl -sS localhost:5051/login | grep \"<title>pgAdmin 4</title>\" > /dev/null")

14
pkgs/development/python-modules/flask-security-too/default.nix
View file

@ -3,7 +3,7 @@
, fetchPypi , fetchPypi
, pythonOlder , pythonOlder
, setuptools , setuptools
, pydantic , fetchpatch
# extras: babel # extras: babel
, babel , babel
@ -59,6 +59,16 @@ buildPythonPackage rec {
hash = "sha256-we2TquU28qP/ir4eE67J0Nlft/8IL8w7Ny3ypSE5cNk="; 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 = [ nativeBuildInputs = [
setuptools setuptools
]; ];
@ -128,7 +138,5 @@ buildPythonPackage rec {
description = "Simple security for Flask apps (fork)"; description = "Simple security for Flask apps (fork)";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ gador ]; maintainers = with maintainers; [ gador ];
# https://github.com/Flask-Middleware/flask-security/pull/851
broken = versionAtLeast pydantic.version "2";
}; };
} }