From 94a932337f30e7cdda484c6f6cc47cc9f8aaba96 Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 23 Aug 2023 22:58:53 +0900 Subject: [PATCH] python310Packages.flask-script: rename from flask_script --- pkgs/applications/misc/privacyidea/default.nix | 2 +- pkgs/development/python-modules/flask-assets/default.nix | 4 ++-- pkgs/development/python-modules/flask-migrate/default.nix | 4 ++-- pkgs/development/python-modules/flask-script/default.nix | 7 ++++--- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index 86a8f8aaf985..ce6adcef7ff1 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -198,7 +198,7 @@ python3'.pkgs.buildPythonPackage rec { ]; propagatedBuildInputs = with python3'.pkgs; [ - cryptography pyrad pymysql python-dateutil flask-versioned flask_script + cryptography pyrad pymysql python-dateutil flask-versioned flask-script defusedxml croniter flask-migrate pyjwt configobj sqlsoup pillow python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2 diff --git a/pkgs/development/python-modules/flask-assets/default.nix b/pkgs/development/python-modules/flask-assets/default.nix index 5012e42462ba..07c384d1c6ae 100644 --- a/pkgs/development/python-modules/flask-assets/default.nix +++ b/pkgs/development/python-modules/flask-assets/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, flask, webassets, flask_script, nose }: +{ lib, buildPythonPackage, fetchPypi, flask, webassets, flask-script, nose }: buildPythonPackage rec { pname = "flask-assets"; @@ -16,7 +16,7 @@ buildPythonPackage rec { substituteInPlace tests/test_integration.py --replace "'/foo'" "'/x/foo'" ''; - propagatedBuildInputs = [ flask webassets flask_script nose ]; + propagatedBuildInputs = [ flask webassets flask-script nose ]; meta = with lib; { homepage = "https://github.com/miracle2k/flask-assets"; diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index f65912be08de..d5bb05b58917 100644 --- a/pkgs/development/python-modules/flask-migrate/default.nix +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -4,7 +4,7 @@ , pythonOlder , alembic , flask -, flask_script +, flask-script , flask-sqlalchemy , pytestCheckHook , setuptools @@ -40,7 +40,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - flask_script + flask-script ]; meta = with lib; { diff --git a/pkgs/development/python-modules/flask-script/default.nix b/pkgs/development/python-modules/flask-script/default.nix index 3c130890e6cb..cd7122813227 100644 --- a/pkgs/development/python-modules/flask-script/default.nix +++ b/pkgs/development/python-modules/flask-script/default.nix @@ -1,12 +1,13 @@ { lib, buildPythonPackage, fetchPypi, flask, pytest }: buildPythonPackage rec { - pname = "Flask-Script"; + pname = "flask-script"; version = "2.0.6"; src = fetchPypi { - inherit pname version; - sha256 = "0r8w2v89nj6b9p91p495cga5m72a673l2wc0hp0zqk05j4yrc9b4"; + pname = "Flask-Script"; + inherit version; + hash = "sha256-ZCWWPZEFTPzBhYBxQccxSpxa1GMlkRvSTctIm9AWHGU="; }; propagatedBuildInputs = [ flask ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index c5301f107977..9649d074e027 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -139,6 +139,7 @@ mapAliases ({ flask_migrate = flask-migrate; # added 2023-08-23 flask_principal = flask-principal; # added 2023-08-23 flask-restplus = throw "flask-restplus is no longer maintained, use flask-restx instead"; # added 2023-02-21 + flask_script = flask-script; # added 2023-08-23 flask_sqlalchemy = flask-sqlalchemy; # added 2022-07-20 flask_testing = flask-testing; # added 2022-04-25 flask_wtf = flask-wtf; # added 2022-05-24 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 914465b89f81..4c0f19cb2ceb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3857,7 +3857,7 @@ self: super: with self; { flask-reverse-proxy-fix = callPackage ../development/python-modules/flask-reverse-proxy-fix { }; - flask_script = callPackage ../development/python-modules/flask-script { }; + flask-script = callPackage ../development/python-modules/flask-script { }; flask-seasurf = callPackage ../development/python-modules/flask-seasurf { };