Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b73fd0c5627c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 30ce98bbc336
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 30, 2017

  1. 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
    @risicle
    risicle committed May 30, 2017
    Copy the full SHA
    a1c1598 View commit details

  2. Merge pull request #26233 from risicle/flask-migrate-bump 

    python.pkgs.flask_migrate: 1.7.0 -> 2.0.3
    @FRidh
    FRidh authored May 30, 2017
    Copy the full SHA
    30ce98b View commit details
Showing with 30 additions and 24 deletions.
  1. +29 −0 pkgs/development/python-modules/flask-migrate/default.nix
  2. +1 −24 pkgs/top-level/python-packages.nix
29 changes: 29 additions & 0 deletions pkgs/development/python-modules/flask-migrate/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
}
25 changes: 1 addition & 24 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -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 <args>",
# not "python <args>"
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 { };