nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-29 16:24:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #156350 from symphorien/ihm-unbreak-once-again

Browse Source
This commit is contained in:
Sandro 2022-01-24 00:55:43 +01:00 committed by GitHub
commit 39ea430092
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
pkgs/development/python-modules/ihatemoney/default.nix
View File

@ -39,25 +39,9 @@
, psycopg2 # optional, for postgresql support
, flask_testing
, pytestCheckHook
, fetchpatch
}:
# ihatemoney is not really a library. It will only ever be imported
# by the interpreter of uwsgi. So overrides for its depencies are fine.
let
# sqlalchemy-continuum requires sqlalchemy < 1.4
pinned_sqlalchemy = sqlalchemy.overridePythonAttrs (
old: rec {
pname = "SQLAlchemy";
version = "1.3.24";
src = fetchPypi {
inherit pname version;
sha256 = "06bmxzssc66cblk1hamskyv5q3xf1nh1py3vi6dka4lkpxy7gfzb";
};
}
);
in
buildPythonPackage rec {
pname = "ihatemoney";
version = "5.1.1";
@ -81,16 +65,7 @@ buildPythonPackage rec {
flask-babel
flask-cors
flask_mail
(
flask_migrate.override {
flask_sqlalchemy = flask_sqlalchemy.override {
sqlalchemy = pinned_sqlalchemy;
};
alembic = alembic.override {
sqlalchemy = pinned_sqlalchemy;
};
}
)
flask_migrate
flask-restful
flask-talisman
flask_wtf
@ -103,40 +78,27 @@ buildPythonPackage rec {
pytz
requests
six
(
(
sqlalchemy-continuum.override {
sqlalchemy = pinned_sqlalchemy;
sqlalchemy-utils = sqlalchemy-utils.override {
sqlalchemy = pinned_sqlalchemy;
};
sqlalchemy-i18n = sqlalchemy-i18n.override {
sqlalchemy = pinned_sqlalchemy;
sqlalchemy-utils = sqlalchemy-utils.override {
sqlalchemy = pinned_sqlalchemy;
};
};
flask_sqlalchemy = flask_sqlalchemy.override {
sqlalchemy = pinned_sqlalchemy;
};
}
).overridePythonAttrs (
old: {
doCheck = false;
}
)
)
sqlalchemy-continuum
werkzeug
wtforms
psycopg2
debts
];
# upstream performed the update without needing to patch the code
# the original patch does not apply, sadly
# https://github.com/spiral-project/ihatemoney/pull/912
patches = [
# fix build with wtforms 3. remove with next release
(fetchpatch {
url = "https://github.com/spiral-project/ihatemoney/commit/40ce32d9fa58a60d26a4d0df547b8deb709c330d.patch";
sha256 = "sha256-2ewOu21qhq/AOZaE9qrF5J6HH0h6ohFgjDb+BYjJnuQ=";
excludes = [ "setup.cfg" ];
})
];
postPatch = ''
substituteInPlace setup.cfg --replace "Flask-WTF>=0.14.3,<1" "Flask-WTF>=0.14.3,<2"
substituteInPlace setup.cfg \
--replace "Flask-WTF>=0.14.3,<1" "Flask-WTF>=0.14.3,<2" \
--replace "SQLAlchemy>=1.3.0,<1.4" "SQLAlchemy>=1.3.0,<1.5" \
--replace "WTForms>=2.3.1,<2.4" "WTForms"
'';
checkInputs = [
@ -144,6 +106,8 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportChecks = [ "ihatemoney" ];
disabledTests = [
"test_notifications" # requires running service.
"test_invite" # requires running service.

6
pkgs/development/python-modules/sqlalchemy-continuum/default.nix
View File

@ -13,11 +13,11 @@
buildPythonPackage rec {
pname = "SQLAlchemy-Continuum";
version = "1.3.11";
version = "1.3.12";
src = fetchPypi {
inherit pname version;
sha256 = "1c9yd9s98crqgs39rc2ld2r0nchgyjrfbjdlqb99y4hhc6lv04xw";
sha256 = "rlHl59MAQhsicMtZQT9rv1iQrDyVYJlawtyhvFaAM7o=";
};
propagatedBuildInputs = [
@ -41,7 +41,5 @@ buildPythonPackage rec {
homepage = "https://github.com/kvesteri/sqlalchemy-continuum/";
description = "Versioning and auditing extension for SQLAlchemy";
license = licenses.bsd3;
# https://github.com/kvesteri/sqlalchemy-continuum/issues/255
broken = lib.versionAtLeast sqlalchemy.version "1.4";
};
}