diff --git a/pkgs/applications/networking/powerdns-admin/default.nix b/pkgs/applications/networking/powerdns-admin/default.nix index 81195c4e212..51a51b3fb1c 100644 --- a/pkgs/applications/networking/powerdns-admin/default.nix +++ b/pkgs/applications/networking/powerdns-admin/default.nix @@ -29,7 +29,7 @@ let }; pythonDeps = with python.pkgs; [ - flask flask_assets flask_login flask_sqlalchemy flask_migrate flask-seasurf flask_mail flask-session flask-sslify + flask flask_assets flask_login flask-sqlalchemy flask_migrate flask-seasurf flask_mail flask-session flask-sslify mysqlclient psycopg2 sqlalchemy cffi configobj cryptography bcrypt requests ldap pyotp qrcode dnspython gunicorn python3-saml pytz cssmin rjsmin authlib bravado-core diff --git a/pkgs/development/python-modules/factory_boy/default.nix b/pkgs/development/python-modules/factory_boy/default.nix index 1c612e2b57e..407083e4f69 100644 --- a/pkgs/development/python-modules/factory_boy/default.nix +++ b/pkgs/development/python-modules/factory_boy/default.nix @@ -4,7 +4,7 @@ , faker , fetchPypi , flask -, flask_sqlalchemy +, flask-sqlalchemy , mongoengine , pytestCheckHook , sqlalchemy @@ -28,7 +28,7 @@ buildPythonPackage rec { checkInputs = [ django flask - flask_sqlalchemy + flask-sqlalchemy mongoengine pytestCheckHook sqlalchemy diff --git a/pkgs/development/python-modules/flask-admin/default.nix b/pkgs/development/python-modules/flask-admin/default.nix index 75573c7a69d..a3bc87c8d08 100644 --- a/pkgs/development/python-modules/flask-admin/default.nix +++ b/pkgs/development/python-modules/flask-admin/default.nix @@ -6,7 +6,7 @@ , enum34 , fetchPypi , flask -, flask_sqlalchemy +, flask-sqlalchemy , flask-babelex , flask-mongoengine , geoalchemy2 @@ -46,7 +46,7 @@ buildPythonPackage rec { arrow colour email-validator - flask_sqlalchemy + flask-sqlalchemy flask-babelex flask-mongoengine geoalchemy2 diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index 8d79b6b7c8b..e52ecfc6493 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -10,7 +10,7 @@ , flask-babel , flask_login , flask-openid -, flask_sqlalchemy +, flask-sqlalchemy , flask-wtf , flask-jwt-extended , jsonschema @@ -61,7 +61,7 @@ buildPythonPackage rec { flask-babel flask_login flask-openid - flask_sqlalchemy + flask-sqlalchemy flask-wtf flask-jwt-extended jsonschema diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index 9f70e129ae1..04532032038 100644 --- a/pkgs/development/python-modules/flask-migrate/default.nix +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -5,7 +5,7 @@ , alembic , flask , flask_script -, flask_sqlalchemy +, flask-sqlalchemy , python }: @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ alembic flask - flask_sqlalchemy + flask-sqlalchemy ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index e1a598d3a0b..35216c6c03a 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -12,7 +12,7 @@ , flask_mail # extras: fsqla -, flask_sqlalchemy +, flask-sqlalchemy , sqlalchemy , sqlalchemy-utils @@ -74,7 +74,7 @@ buildPythonPackage rec { flask_mail ]; fsqla = [ - flask_sqlalchemy + flask-sqlalchemy sqlalchemy sqlalchemy-utils ]; diff --git a/pkgs/development/python-modules/ihatemoney/default.nix b/pkgs/development/python-modules/ihatemoney/default.nix index bacaea2f2cb..71eb8feb543 100644 --- a/pkgs/development/python-modules/ihatemoney/default.nix +++ b/pkgs/development/python-modules/ihatemoney/default.nix @@ -17,7 +17,7 @@ , flask_mail , flask_migrate , flask-restful -, flask_sqlalchemy +, flask-sqlalchemy , flask-talisman , flask-wtf , debts diff --git a/pkgs/development/python-modules/nplusone/default.nix b/pkgs/development/python-modules/nplusone/default.nix index 898d209d913..13e0d28a301 100644 --- a/pkgs/development/python-modules/nplusone/default.nix +++ b/pkgs/development/python-modules/nplusone/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchFromGitHub , flake8 -, flask_sqlalchemy +, flask-sqlalchemy , isPy27 , mock , peewee @@ -33,7 +33,7 @@ buildPythonPackage rec { checkInputs = [ flake8 - flask_sqlalchemy + flask-sqlalchemy mock peewee pytest-django diff --git a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix index da64d44a43f..d0970d4277d 100644 --- a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , flask , flask_login -, flask_sqlalchemy +, flask-sqlalchemy , flexmock , pytestCheckHook , sqlalchemy @@ -33,7 +33,7 @@ buildPythonPackage rec { sqlalchemy-i18n flask flask_login - flask_sqlalchemy + flask-sqlalchemy flexmock ]; diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 58bba70e902..4813cd84364 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -32,7 +32,7 @@ let flask_login flask_mail flask_migrate - flask_sqlalchemy + flask-sqlalchemy flask-wtf flask-compress passlib diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index e056a381f5a..b5f3a9b39a3 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -73,6 +73,7 @@ mapAliases ({ email_validator = email-validator; # added 2022-06-22 fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30 faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12 + flask_sqlalchemy = flask-sqlalchemy; # added 2022-07-20 flask_testing = flask-testing; # added 2022-04-25 flask_wtf = flask-wtf; # added 2022-05-24 garminconnect-ha = garminconnect; # added 2022-02-05 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dca15a31b89..29a3ab98091 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3219,7 +3219,7 @@ in { flask-sockets = callPackage ../development/python-modules/flask-sockets { }; - flask_sqlalchemy = callPackage ../development/python-modules/flask-sqlalchemy { }; + flask-sqlalchemy = callPackage ../development/python-modules/flask-sqlalchemy { }; flask-sslify = callPackage ../development/python-modules/flask-sslify { };