Skip to content

Commit 9395b1b

Browse files
mweineltmweinelt
authored
lasuite-docs: 4.0.0 -> 4.1.0; python3Packages.django-lasuite: 0.0.18 -> 0.0.22 (NixOS#469628)
2 parents 65fa288 + 8ba7d9e commit 9395b1b

File tree

5 files changed

+109
-100
lines changed

5 files changed

+109
-100
lines changed

‎pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@
1313

1414
stdenv.mkDerivation rec {
1515
pname = "lasuite-docs-collaboration-server";
16-
version = "4.0.0";
16+
version = "4.1.0";
1717

1818
src = fetchFromGitHub {
1919
owner = "suitenumerique";
2020
repo = "docs";
2121
tag = "v${version}";
22-
hash = "sha256-rhbS6NYk8sZmtrNpKJrm24vOwAJGEDVS9fpFWuyvPGA=";
22+
hash = "sha256-vZkqHlZ1aDOXcrdyV8BXmI95AmMalXOuVLS9XWB/YxU=";
2323
};
2424

2525
sourceRoot = "source/src/frontend";
2626

2727
offlineCache = fetchYarnDeps {
2828
yarnLock = "${src}/src/frontend/yarn.lock";
29-
hash = "sha256-ZMeLHpwM0yZvYmA/HSuWbcdqxOH707NNzXppEzV2wEw=";
29+
hash = "sha256-3yRKWIOPBRrOxBWUW3C5xFjb2dcA6c3cMOD8PZWjHNA=";
3030
};
3131

3232
nativeBuildInputs = [

‎pkgs/by-name/la/lasuite-docs-frontend/package.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@
1212

1313
stdenv.mkDerivation rec {
1414
pname = "lasuite-docs-frontend";
15-
version = "4.0.0";
15+
version = "4.1.0";
1616

1717
src = fetchFromGitHub {
1818
owner = "suitenumerique";
1919
repo = "docs";
2020
tag = "v${version}";
21-
hash = "sha256-rhbS6NYk8sZmtrNpKJrm24vOwAJGEDVS9fpFWuyvPGA=";
21+
hash = "sha256-vZkqHlZ1aDOXcrdyV8BXmI95AmMalXOuVLS9XWB/YxU=";
2222
};
2323

2424
sourceRoot = "source/src/frontend";
2525

2626
offlineCache = fetchYarnDeps {
2727
yarnLock = "${src}/src/frontend/yarn.lock";
28-
hash = "sha256-ZMeLHpwM0yZvYmA/HSuWbcdqxOH707NNzXppEzV2wEw=";
28+
hash = "sha256-3yRKWIOPBRrOxBWUW3C5xFjb2dcA6c3cMOD8PZWjHNA=";
2929
};
3030

3131
nativeBuildInputs = [

‎pkgs/by-name/la/lasuite-docs/package.nix‎

Lines changed: 47 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
python3,
55
fetchFromGitHub,
66
nixosTests,
7-
fetchPypi,
87
fetchYarnDeps,
98
nodejs,
109
yarnBuildHook,
@@ -15,23 +14,15 @@ let
1514
self = python3;
1615
packageOverrides = self: super: {
1716
django = super.django_5_2;
18-
django-csp = super.django-csp.overridePythonAttrs rec {
19-
version = "4.0";
20-
src = fetchPypi {
21-
inherit version;
22-
pname = "django_csp";
23-
hash = "sha256-snAQu3Ausgo9rTKReN8rYaK4LTOLcPvcE8OjvShxKDM=";
24-
};
25-
};
2617
};
2718
};
2819

29-
version = "4.0.0";
20+
version = "4.1.0";
3021
src = fetchFromGitHub {
3122
owner = "suitenumerique";
3223
repo = "docs";
3324
tag = "v${version}";
34-
hash = "sha256-rhbS6NYk8sZmtrNpKJrm24vOwAJGEDVS9fpFWuyvPGA=";
25+
hash = "sha256-vZkqHlZ1aDOXcrdyV8BXmI95AmMalXOuVLS9XWB/YxU=";
3526
};
3627

3728
mail-templates = stdenv.mkDerivation {
@@ -71,46 +62,51 @@ python.pkgs.buildPythonApplication rec {
7162

7263
build-system = with python.pkgs; [ setuptools ];
7364

74-
dependencies = with python.pkgs; [
75-
beautifulsoup4
76-
boto3
77-
celery
78-
django
79-
django-configurations
80-
django-cors-headers
81-
django-countries
82-
django-csp
83-
django-extensions
84-
django-filter
85-
django-lasuite
86-
django-parler
87-
django-redis
88-
django-storages
89-
django-timezone-field
90-
django-treebeard
91-
djangorestframework
92-
drf-spectacular
93-
drf-spectacular-sidecar
94-
dockerflow
95-
easy-thumbnails
96-
factory-boy
97-
gunicorn
98-
jsonschema
99-
lxml
100-
markdown
101-
mozilla-django-oidc
102-
nested-multipart-parser
103-
openai
104-
psycopg
105-
pycrdt
106-
pyjwt
107-
pyopenssl
108-
python-magic
109-
redis
110-
requests
111-
sentry-sdk
112-
whitenoise
113-
];
65+
dependencies =
66+
with python.pkgs;
67+
[
68+
beautifulsoup4
69+
boto3
70+
celery
71+
django
72+
django-configurations
73+
django-cors-headers
74+
django-countries
75+
django-csp
76+
django-extensions
77+
django-filter
78+
django-lasuite
79+
django-parler
80+
django-redis
81+
django-storages
82+
django-timezone-field
83+
django-treebeard
84+
djangorestframework
85+
drf-spectacular
86+
drf-spectacular-sidecar
87+
dockerflow
88+
easy-thumbnails
89+
factory-boy
90+
gunicorn
91+
jsonschema
92+
lxml
93+
markdown
94+
mozilla-django-oidc
95+
nested-multipart-parser
96+
openai
97+
psycopg
98+
pycrdt
99+
pyjwt
100+
pyopenssl
101+
python-magic
102+
redis
103+
requests
104+
sentry-sdk
105+
whitenoise
106+
]
107+
++ celery.optional-dependencies.redis
108+
++ django-lasuite.optional-dependencies.all
109+
++ django-storages.optional-dependencies.s3;
114110

115111
pythonRelaxDeps = true;
116112

‎pkgs/by-name/la/lasuite-meet/package.nix‎

Lines changed: 43 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -32,44 +32,49 @@ python.pkgs.buildPythonApplication rec {
3232

3333
build-system = with python.pkgs; [ setuptools ];
3434

35-
dependencies = with python.pkgs; [
36-
aiohttp
37-
boto3
38-
brevo-python
39-
brotli
40-
celery
41-
django
42-
django-configurations
43-
django-cors-headers
44-
django-countries
45-
django-extensions
46-
django-lasuite
47-
django-parler
48-
django-redis
49-
django-storages
50-
django-timezone-field
51-
djangorestframework
52-
dockerflow
53-
drf-spectacular
54-
drf-spectacular-sidecar
55-
easy-thumbnails
56-
factory-boy
57-
gunicorn
58-
jsonschema
59-
june-analytics-python
60-
livekit-api
61-
markdown
62-
mozilla-django-oidc
63-
nested-multipart-parser
64-
psycopg
65-
pyjwt
66-
pyopenssl
67-
python-frontmatter
68-
redis
69-
requests
70-
sentry-sdk
71-
whitenoise
72-
];
35+
dependencies =
36+
with python.pkgs;
37+
[
38+
aiohttp
39+
boto3
40+
brevo-python
41+
brotli
42+
celery
43+
django
44+
django-configurations
45+
django-cors-headers
46+
django-countries
47+
django-extensions
48+
django-lasuite
49+
django-parler
50+
django-redis
51+
django-storages
52+
django-timezone-field
53+
djangorestframework
54+
dockerflow
55+
drf-spectacular
56+
drf-spectacular-sidecar
57+
easy-thumbnails
58+
factory-boy
59+
gunicorn
60+
jsonschema
61+
june-analytics-python
62+
livekit-api
63+
markdown
64+
mozilla-django-oidc
65+
nested-multipart-parser
66+
psycopg
67+
pyjwt
68+
pyopenssl
69+
python-frontmatter
70+
redis
71+
requests
72+
sentry-sdk
73+
whitenoise
74+
]
75+
++ celery.optional-dependencies.redis
76+
++ django-lasuite.optional-dependencies.all
77+
++ django-storages.optional-dependencies.s3;
7378

7479
pythonRelaxDeps = true;
7580

‎pkgs/development/python-modules/django-lasuite/default.nix‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,21 @@
1515
pytest-django,
1616
responses,
1717
celery,
18+
freezegun,
1819
pytestCheckHook,
1920
nixosTests,
2021
}:
2122

2223
buildPythonPackage rec {
2324
pname = "django-lasuite";
24-
version = "0.0.18";
25+
version = "0.0.22";
2526
pyproject = true;
2627

2728
src = fetchFromGitHub {
2829
owner = "suitenumerique";
2930
repo = "django-lasuite";
3031
tag = "v${version}";
31-
hash = "sha256-kXRaoVOyabGPCnO8uyWHbpE0zOIYZkHcqmWNSz0BHZY=";
32+
hash = "sha256-T9FLxgWePifYIiD2Ivbfir2dlpUvZl2jj8y86VbxVDk=";
3233
};
3334

3435
build-system = [ hatchling ];
@@ -44,15 +45,22 @@ buildPythonPackage rec {
4445
requests-toolbelt
4546
];
4647

48+
optional-dependencies = lib.fix (self: {
49+
all = with self; configuration ++ malware_detection;
50+
configuration = [ django-configurations ];
51+
malware_detection = [ celery ];
52+
});
53+
4754
pythonRelaxDeps = true;
4855

4956
nativeCheckInputs = [
50-
celery
57+
factory-boy
58+
freezegun
5159
pytestCheckHook
5260
pytest-django
53-
factory-boy
5461
responses
55-
];
62+
]
63+
++ lib.concatAttrValues optional-dependencies;
5664

5765
preCheck = ''
5866
export PYTHONPATH=tests:$PYTHONPATH

0 commit comments

Comments
 (0)