Skip to content

Commit e44cc8a

Browse files
authored
trytond: 7.4.10 -> 7.6.2 (#417426)
2 parents c5f326b + b14fc80 commit e44cc8a

File tree

3 files changed

+68
-7
lines changed

3 files changed

+68
-7
lines changed
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
{
2+
lib,
3+
buildPythonPackage,
4+
fetchFromGitHub,
5+
hatchling,
6+
hatch-regex-commit,
7+
pytestCheckHook,
8+
pytest-cov-stub,
9+
argon2-cffi,
10+
bcrypt,
11+
}:
12+
13+
buildPythonPackage rec {
14+
pname = "pwdlib";
15+
version = "0.2.1";
16+
pyproject = true;
17+
18+
src = fetchFromGitHub {
19+
owner = "frankie567";
20+
repo = "pwdlib";
21+
tag = "v${version}";
22+
hash = "sha256-aPrgn5zfKk72QslGzb0acCNnZ7m3lyIBjvu4yhfZhSQ=";
23+
};
24+
25+
build-system = [
26+
hatchling
27+
hatch-regex-commit
28+
];
29+
30+
dependencies = [
31+
argon2-cffi
32+
bcrypt
33+
];
34+
35+
pythonImportsCheck = [ "pwdlib" ];
36+
37+
nativeCheckInputs = [
38+
pytestCheckHook
39+
pytest-cov-stub
40+
];
41+
42+
meta = {
43+
description = "Modern password hashing for Python";
44+
changelog = "https://github.com/frankie567/pwdlib/releases/tag/v${version}";
45+
homepage = "https://github.com/frankie567/pwdlib";
46+
license = lib.licenses.mit;
47+
maintainers = with lib.maintainers; [ emaryn ];
48+
};
49+
}

pkgs/development/python-modules/trytond/default.nix

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,24 @@
2020
weasyprint,
2121
gevent,
2222
pillow,
23+
pwdlib,
24+
simpleeval,
2325
withPostgresql ? true,
2426
psycopg2,
2527
unittestCheckHook,
28+
writableTmpDirAsHomeHook,
2629
}:
2730

2831
buildPythonPackage rec {
2932
pname = "trytond";
30-
version = "7.4.10";
33+
version = "7.6.2";
3134
pyproject = true;
3235

3336
disabled = pythonOlder "3.7";
3437

3538
src = fetchPypi {
3639
inherit pname version;
37-
hash = "sha256-kzoZDcHNPjmsNxrQ11MAksK+24nI1YNmONQd21s3weA=";
40+
hash = "sha256-KD9gZ0ForX1iYQMYlsle2fJ+zlmQOymDf71p17aCr1k=";
3841
};
3942

4043
build-system = [ setuptools ];
@@ -58,16 +61,23 @@ buildPythonPackage rec {
5861
weasyprint
5962
gevent
6063
pillow
64+
pwdlib
65+
simpleeval
6166
]
6267
++ relatorio.optional-dependencies.fodt
6368
++ passlib.optional-dependencies.bcrypt
6469
++ passlib.optional-dependencies.argon2
6570
++ lib.optional withPostgresql psycopg2;
6671

67-
nativeCheckInputs = [ unittestCheckHook ];
72+
# Fontconfig error: Cannot load default config file: No such file: (null)
73+
doCheck = false;
74+
75+
nativeCheckInputs = [
76+
unittestCheckHook
77+
writableTmpDirAsHomeHook
78+
];
6879

6980
preCheck = ''
70-
export HOME=$(mktemp -d)
7181
export TRYTOND_DATABASE_URI="sqlite://"
7282
export DB_NAME=":memory:";
7383
'';
@@ -77,7 +87,7 @@ buildPythonPackage rec {
7787
"trytond.tests"
7888
];
7989

80-
meta = with lib; {
90+
meta = {
8191
description = "Server of the Tryton application platform";
8292
longDescription = ''
8393
The server for Tryton, a three-tier high-level general purpose
@@ -89,9 +99,9 @@ buildPythonPackage rec {
8999
'';
90100
homepage = "http://www.tryton.org/";
91101
changelog = "https://foss.heptapod.net/tryton/tryton/-/blob/trytond-${version}/trytond/CHANGELOG?ref_type=tags";
92-
license = licenses.gpl3Plus;
102+
license = lib.licenses.gpl3Plus;
93103
broken = stdenv.hostPlatform.isDarwin;
94-
maintainers = with maintainers; [
104+
maintainers = with lib.maintainers; [
95105
udono
96106
johbo
97107
];

pkgs/top-level/python-packages.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11977,6 +11977,8 @@ self: super: with self; {
1197711977

1197811978
pvo = callPackage ../development/python-modules/pvo { };
1197911979

11980+
pwdlib = callPackage ../development/python-modules/pwdlib { };
11981+
1198011982
pweave = callPackage ../development/python-modules/pweave { };
1198111983

1198211984
pwinput = callPackage ../development/python-modules/pwinput { };

0 commit comments

Comments
 (0)