diff --git a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix index 9cfd59498482..b40a48c5f2bd 100644 --- a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix +++ b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix @@ -13,20 +13,20 @@ stdenv.mkDerivation rec { pname = "lasuite-docs-collaboration-server"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; tag = "v${version}"; - hash = "sha256-rhbS6NYk8sZmtrNpKJrm24vOwAJGEDVS9fpFWuyvPGA="; + hash = "sha256-vZkqHlZ1aDOXcrdyV8BXmI95AmMalXOuVLS9XWB/YxU="; }; sourceRoot = "source/src/frontend"; offlineCache = fetchYarnDeps { yarnLock = "${src}/src/frontend/yarn.lock"; - hash = "sha256-ZMeLHpwM0yZvYmA/HSuWbcdqxOH707NNzXppEzV2wEw="; + hash = "sha256-3yRKWIOPBRrOxBWUW3C5xFjb2dcA6c3cMOD8PZWjHNA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/lasuite-docs-frontend/package.nix b/pkgs/by-name/la/lasuite-docs-frontend/package.nix index 8f3542f7d722..c58deafdcac1 100644 --- a/pkgs/by-name/la/lasuite-docs-frontend/package.nix +++ b/pkgs/by-name/la/lasuite-docs-frontend/package.nix @@ -12,20 +12,20 @@ stdenv.mkDerivation rec { pname = "lasuite-docs-frontend"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; tag = "v${version}"; - hash = "sha256-rhbS6NYk8sZmtrNpKJrm24vOwAJGEDVS9fpFWuyvPGA="; + hash = "sha256-vZkqHlZ1aDOXcrdyV8BXmI95AmMalXOuVLS9XWB/YxU="; }; sourceRoot = "source/src/frontend"; offlineCache = fetchYarnDeps { yarnLock = "${src}/src/frontend/yarn.lock"; - hash = "sha256-ZMeLHpwM0yZvYmA/HSuWbcdqxOH707NNzXppEzV2wEw="; + hash = "sha256-3yRKWIOPBRrOxBWUW3C5xFjb2dcA6c3cMOD8PZWjHNA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/lasuite-docs/package.nix b/pkgs/by-name/la/lasuite-docs/package.nix index 865fb2419bb5..d78fd1a44b7d 100644 --- a/pkgs/by-name/la/lasuite-docs/package.nix +++ b/pkgs/by-name/la/lasuite-docs/package.nix @@ -4,7 +4,6 @@ python3, fetchFromGitHub, nixosTests, - fetchPypi, fetchYarnDeps, nodejs, yarnBuildHook, @@ -15,23 +14,15 @@ let self = python3; packageOverrides = self: super: { django = super.django_5_2; - django-csp = super.django-csp.overridePythonAttrs rec { - version = "4.0"; - src = fetchPypi { - inherit version; - pname = "django_csp"; - hash = "sha256-snAQu3Ausgo9rTKReN8rYaK4LTOLcPvcE8OjvShxKDM="; - }; - }; }; }; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; tag = "v${version}"; - hash = "sha256-rhbS6NYk8sZmtrNpKJrm24vOwAJGEDVS9fpFWuyvPGA="; + hash = "sha256-vZkqHlZ1aDOXcrdyV8BXmI95AmMalXOuVLS9XWB/YxU="; }; mail-templates = stdenv.mkDerivation { @@ -71,46 +62,51 @@ python.pkgs.buildPythonApplication rec { build-system = with python.pkgs; [ setuptools ]; - dependencies = with python.pkgs; [ - beautifulsoup4 - boto3 - celery - django - django-configurations - django-cors-headers - django-countries - django-csp - django-extensions - django-filter - django-lasuite - django-parler - django-redis - django-storages - django-timezone-field - django-treebeard - djangorestframework - drf-spectacular - drf-spectacular-sidecar - dockerflow - easy-thumbnails - factory-boy - gunicorn - jsonschema - lxml - markdown - mozilla-django-oidc - nested-multipart-parser - openai - psycopg - pycrdt - pyjwt - pyopenssl - python-magic - redis - requests - sentry-sdk - whitenoise - ]; + dependencies = + with python.pkgs; + [ + beautifulsoup4 + boto3 + celery + django + django-configurations + django-cors-headers + django-countries + django-csp + django-extensions + django-filter + django-lasuite + django-parler + django-redis + django-storages + django-timezone-field + django-treebeard + djangorestframework + drf-spectacular + drf-spectacular-sidecar + dockerflow + easy-thumbnails + factory-boy + gunicorn + jsonschema + lxml + markdown + mozilla-django-oidc + nested-multipart-parser + openai + psycopg + pycrdt + pyjwt + pyopenssl + python-magic + redis + requests + sentry-sdk + whitenoise + ] + ++ celery.optional-dependencies.redis + ++ django-lasuite.optional-dependencies.all + ++ django-storages.optional-dependencies.s3; pythonRelaxDeps = true; diff --git a/pkgs/by-name/la/lasuite-meet/package.nix b/pkgs/by-name/la/lasuite-meet/package.nix index cd0cab878064..020f75f210f0 100644 --- a/pkgs/by-name/la/lasuite-meet/package.nix +++ b/pkgs/by-name/la/lasuite-meet/package.nix @@ -32,44 +32,49 @@ python.pkgs.buildPythonApplication rec { build-system = with python.pkgs; [ setuptools ]; - dependencies = with python.pkgs; [ - aiohttp - boto3 - brevo-python - brotli - celery - django - django-configurations - django-cors-headers - django-countries - django-extensions - django-lasuite - django-parler - django-redis - django-storages - django-timezone-field - djangorestframework - dockerflow - drf-spectacular - drf-spectacular-sidecar - easy-thumbnails - factory-boy - gunicorn - jsonschema - june-analytics-python - livekit-api - markdown - mozilla-django-oidc - nested-multipart-parser - psycopg - pyjwt - pyopenssl - python-frontmatter - redis - requests - sentry-sdk - whitenoise - ]; + dependencies = + with python.pkgs; + [ + aiohttp + boto3 + brevo-python + brotli + celery + django + django-configurations + django-cors-headers + django-countries + django-extensions + django-lasuite + django-parler + django-redis + django-storages + django-timezone-field + djangorestframework + dockerflow + drf-spectacular + drf-spectacular-sidecar + easy-thumbnails + factory-boy + gunicorn + jsonschema + june-analytics-python + livekit-api + markdown + mozilla-django-oidc + nested-multipart-parser + psycopg + pyjwt + pyopenssl + python-frontmatter + redis + requests + sentry-sdk + whitenoise + ] + ++ celery.optional-dependencies.redis + ++ django-lasuite.optional-dependencies.all + ++ django-storages.optional-dependencies.s3; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/django-lasuite/default.nix b/pkgs/development/python-modules/django-lasuite/default.nix index 753eceb4ce50..e571f8b42ac2 100644 --- a/pkgs/development/python-modules/django-lasuite/default.nix +++ b/pkgs/development/python-modules/django-lasuite/default.nix @@ -15,20 +15,21 @@ pytest-django, responses, celery, + freezegun, pytestCheckHook, nixosTests, }: buildPythonPackage rec { pname = "django-lasuite"; - version = "0.0.18"; + version = "0.0.22"; pyproject = true; src = fetchFromGitHub { owner = "suitenumerique"; repo = "django-lasuite"; tag = "v${version}"; - hash = "sha256-kXRaoVOyabGPCnO8uyWHbpE0zOIYZkHcqmWNSz0BHZY="; + hash = "sha256-T9FLxgWePifYIiD2Ivbfir2dlpUvZl2jj8y86VbxVDk="; }; build-system = [ hatchling ]; @@ -44,15 +45,22 @@ buildPythonPackage rec { requests-toolbelt ]; + optional-dependencies = lib.fix (self: { + all = with self; configuration ++ malware_detection; + configuration = [ django-configurations ]; + malware_detection = [ celery ]; + }); + pythonRelaxDeps = true; nativeCheckInputs = [ - celery + factory-boy + freezegun pytestCheckHook pytest-django - factory-boy responses - ]; + ] + ++ lib.concatAttrValues optional-dependencies; preCheck = '' export PYTHONPATH=tests:$PYTHONPATH