uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
101
pkgs/development/python-modules/flask-appbuilder/default.nix
Normal file
101
pkgs/development/python-modules/flask-appbuilder/default.nix
Normal file
|
|
@ -0,0 +1,101 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, apispec
|
||||
, colorama
|
||||
, click
|
||||
, email_validator
|
||||
, flask
|
||||
, flask-babel
|
||||
, flask_login
|
||||
, flask-openid
|
||||
, flask_sqlalchemy
|
||||
, flask-wtf
|
||||
, flask-jwt-extended
|
||||
, jsonschema
|
||||
, marshmallow
|
||||
, marshmallow-enum
|
||||
, marshmallow-sqlalchemy
|
||||
, python-dateutil
|
||||
, pythonOlder
|
||||
, prison
|
||||
, pyjwt
|
||||
, pyyaml
|
||||
, sqlalchemy-utils
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flask-appbuilder";
|
||||
version = "4.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Flask-AppBuilder";
|
||||
inherit version;
|
||||
hash = "sha256-g+iHUL83PokXPGu7HJ8ffLocQr0uGpMqS5MbfIlZZ2E=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# https://github.com/dpgaspar/Flask-AppBuilder/pull/1734
|
||||
name = "flask-appbuilder-wtf3.patch";
|
||||
url = "https://github.com/dpgaspar/Flask-AppBuilder/commit/bccb3d719cd3ceb872fe74a9ab304d74664fbf43.patch";
|
||||
sha256 = "1rsci0ynb7y6k53j164faggjr2g6l5v78w7953qbxcy8f55sb2fv";
|
||||
excludes = [
|
||||
"requirements.txt"
|
||||
"setup.py"
|
||||
"examples/employees/app/views.py"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
apispec
|
||||
colorama
|
||||
click
|
||||
email_validator
|
||||
flask
|
||||
flask-babel
|
||||
flask_login
|
||||
flask-openid
|
||||
flask_sqlalchemy
|
||||
flask-wtf
|
||||
flask-jwt-extended
|
||||
jsonschema
|
||||
marshmallow
|
||||
marshmallow-enum
|
||||
marshmallow-sqlalchemy
|
||||
python-dateutil
|
||||
prison
|
||||
pyjwt
|
||||
pyyaml
|
||||
sqlalchemy-utils
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "apispec[yaml]>=3.3, <4" "apispec[yaml] >=3.3" \
|
||||
--replace "Flask-Login>=0.3, <0.5" "Flask-Login >=0.3" \
|
||||
--replace "Flask-WTF>=0.14.2, <0.15.0" "Flask-WTF" \
|
||||
--replace "WTForms<3.0.0" "WTForms" \
|
||||
--replace "marshmallow-sqlalchemy>=0.22.0, <0.27.0" "marshmallow-sqlalchemy" \
|
||||
--replace "prison>=0.2.1, <1.0.0" "prison"
|
||||
'';
|
||||
|
||||
# Majority of tests require network access or mongo
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"flask_appbuilder"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Application development framework, built on top of Flask";
|
||||
homepage = "https://github.com/dpgaspar/flask-appbuilder/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
diff --git a/flask_appbuilder/security/api.py b/flask_appbuilder/security/api.py
|
||||
index 2e2dfd612..df1bd5a25 100644
|
||||
--- a/flask_appbuilder/security/api.py
|
||||
+++ b/flask_appbuilder/security/api.py
|
||||
@@ -3,7 +3,7 @@
|
||||
create_access_token,
|
||||
create_refresh_token,
|
||||
get_jwt_identity,
|
||||
- jwt_refresh_token_required,
|
||||
+ jwt_required,
|
||||
)
|
||||
|
||||
from ..api import BaseApi, safe
|
||||
@@ -118,7 +118,7 @@ def login(self):
|
||||
return self.response(200, **resp)
|
||||
|
||||
@expose("/refresh", methods=["POST"])
|
||||
- @jwt_refresh_token_required
|
||||
+ @jwt_required(refresh=True)
|
||||
@safe
|
||||
def refresh(self):
|
||||
"""
|
||||
diff --git a/flask_appbuilder/security/manager.py b/flask_appbuilder/security/manager.py
|
||||
index fe7697007..3b22ab255 100644
|
||||
--- a/flask_appbuilder/security/manager.py
|
||||
+++ b/flask_appbuilder/security/manager.py
|
||||
@@ -297,7 +297,7 @@ def create_jwt_manager(self, app) -> JWTManager:
|
||||
"""
|
||||
jwt_manager = JWTManager()
|
||||
jwt_manager.init_app(app)
|
||||
- jwt_manager.user_loader_callback_loader(self.load_user_jwt)
|
||||
+ jwt_manager.user_lookup_loader(self.load_user_jwt)
|
||||
return jwt_manager
|
||||
|
||||
def create_builtin_roles(self):
|
||||
@@ -1944,7 +1944,8 @@ def del_permission_role(self, role, perm_view):
|
||||
def load_user(self, pk):
|
||||
return self.get_user_by_id(int(pk))
|
||||
|
||||
- def load_user_jwt(self, pk):
|
||||
+ def load_user_jwt(self, _jwt_header, jwt_data):
|
||||
+ pk = jwt_data["sub"]
|
||||
user = self.load_user(pk)
|
||||
# Set flask g.user to JWT user, we can't do it on before request
|
||||
g.user = user
|
||||
Loading…
Add table
Add a link
Reference in a new issue