From a1c15989aa8363a80f32123ea0030ecef68576a9 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 30 May 2017 12:39:20 +0100 Subject: [PATCH] python.pkgs.flask_migrate: 1.7.0 -> 2.0.3 fixes build against new dependencies after some test tinkering, seems we can remove the python3-patching as there exists a "python" symlink now --- .../python-modules/flask-migrate/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +--------------- 2 files changed, 30 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/flask-migrate/default.nix diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix new file mode 100644 index 00000000000..26fbed4ca5e --- /dev/null +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, python, glibcLocales, flask, flask_sqlalchemy, flask_script, alembic +}: + +with stdenv.lib; + +buildPythonPackage rec { + pname = "Flask-Migrate"; + version = "2.0.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "107x78lkqsnbg92dld3dkagg07jvchp3ib3y0sivc4ipz6n1y7rk"; + }; + + checkInputs = optional isPy3k glibcLocales; + propagatedBuildInputs = [ flask flask_sqlalchemy flask_script alembic ]; + + # tests invoke the flask cli which uses click and therefore has py3k encoding troubles + preCheck = optionalString isPy3k '' + export LANG="en_US.UTF-8" + ''; + + meta = { + description = "SQLAlchemy database migrations for Flask applications using Alembic"; + license = licenses.mit; + homepage = https://github.com/miguelgrinberg/Flask-Migrate; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aae6e2f743c..e9f2f0f19d2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11020,30 +11020,7 @@ in { flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login.nix { }; - flask_migrate = buildPythonPackage rec { - name = "Flask-Migrate-${version}"; - version = "1.7.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/F/Flask-Migrate/Flask-Migrate-1.7.0.tar.gz"; - sha256 = "16d7vnaj9xmxvb3qbcmhahm3ldfdhzzi6y221h62x4v1v1jayx7v"; - }; - - # When tests run with python3*, tests should run commands as "python3 ", - # not "python " - patchPhase = '' - substituteInPlace tests/test_migrate.py --replace "python" "${python.executable}" - substituteInPlace tests/test_multidb_migrate.py --replace "python" "${python.executable}" - ''; - - propagatedBuildInputs = with self ; [ flask flask_sqlalchemy flask_script alembic ]; - - meta = { - description = "SQLAlchemy database migrations for Flask applications using Alembic"; - license = licenses.mit; - homepage = https://github.com/miguelgrinberg/Flask-Migrate; - }; - }; + flask_migrate = callPackage ../development/python-modules/flask-migrate { }; flask_oauthlib = callPackage ../development/python-modules/flask-oauthlib.nix { };