From cdfd00bf8347ff6d03ab357390c7c372b080e5b5 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Tue, 15 Oct 2024 14:36:28 +0200 Subject: [PATCH 1/5] python3Packages.drf-spectacular: add optional-dependencies for sidecar extra --- pkgs/development/python-modules/drf-spectacular/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/drf-spectacular/default.nix b/pkgs/development/python-modules/drf-spectacular/default.nix index cb9adc54051d..546e672dd938 100644 --- a/pkgs/development/python-modules/drf-spectacular/default.nix +++ b/pkgs/development/python-modules/drf-spectacular/default.nix @@ -93,6 +93,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "drf_spectacular" ]; + optional-dependencies.sidecar = [ drf-spectacular-sidecar ]; + meta = with lib; { description = "Sane and flexible OpenAPI 3 schema generation for Django REST framework"; homepage = "https://github.com/tfranzel/drf-spectacular"; From c1671f32d4f36f5aafbfb55c01ac1eb2a0309ad9 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Sun, 10 Nov 2024 16:15:49 +0100 Subject: [PATCH 2/5] python3Packages.translate-toolkit: 1.13.4 -> 1.14.1 https://github.com/translate/translate/releases/tag/3.13.5 https://github.com/translate/translate/releases/tag/3.14.0 https://github.com/translate/translate/releases/tag/3.14.1 --- pkgs/development/python-modules/translate-toolkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/translate-toolkit/default.nix b/pkgs/development/python-modules/translate-toolkit/default.nix index f76c4d946e76..b309c81130c1 100644 --- a/pkgs/development/python-modules/translate-toolkit/default.nix +++ b/pkgs/development/python-modules/translate-toolkit/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "translate-toolkit"; - version = "3.13.4"; + version = "3.14.1"; pyproject = true; build-system = [ setuptools-scm ]; @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "translate_toolkit"; inherit version; - hash = "sha256-d0q4xpN37xeLSmQMBrDGZlGjAj4hHfkazGUHzl89UHI="; + hash = "sha256-IUjEN8Up1Or4nFo71WkDduq+6Xw8ObfUgkABp88zPoY="; }; dependencies = [ From 796a4b45090f0ffee5b6385d022d246162846814 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Oct 2024 03:35:08 +0000 Subject: [PATCH 3/5] python312Packages.django-otp-webauthn: 0.3.0 -> 0.4.0 https://github.com/Stormbase/django-otp-webauthn/releases/tag/v0.4.0 --- .../python-modules/django-otp-webauthn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-otp-webauthn/default.nix b/pkgs/development/python-modules/django-otp-webauthn/default.nix index 304d6f543ae4..ba7df273d615 100644 --- a/pkgs/development/python-modules/django-otp-webauthn/default.nix +++ b/pkgs/development/python-modules/django-otp-webauthn/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "django-otp-webauthn"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; src = fetchPypi { inherit version; pname = "django_otp_webauthn"; - hash = "sha256-+Y46/PDeXL9zayoZykaU63faQmnLHzYPmqJJeRBx+hs="; + hash = "sha256-BXwIjQjynTjFK+bNML5i35qxQ7TJeb4Xc+duS6Y+5Fk="; }; build-system = [ hatchling ]; From caf7fa14fa8a6f8f2aa00b4f999d778a4a0c1d44 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Sun, 10 Nov 2024 16:06:46 +0100 Subject: [PATCH 4/5] python3Packages.diff-match-patch: 20230430 -> 20241021 https://github.com/diff-match-patch-python/diff-match-patch/releases/tag/v20241021 --- .../python-modules/diff-match-patch/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/diff-match-patch/default.nix b/pkgs/development/python-modules/diff-match-patch/default.nix index 7c7936ec8816..a794308df314 100644 --- a/pkgs/development/python-modules/diff-match-patch/default.nix +++ b/pkgs/development/python-modules/diff-match-patch/default.nix @@ -8,15 +8,16 @@ buildPythonPackage rec { pname = "diff-match-patch"; - version = "20230430"; - format = "pyproject"; + version = "20241021"; + pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-lTAZzbnJ0snke1sSvP889HRvxFmOtAYHb6H8J+ah8Vw="; + pname = "diff_match_patch"; + inherit version; + hash = "sha256-vq5XqZ+kgIRTKTXuKWi4Zh24YYYuyCxvIfSs3W2DUHM="; }; - nativeBuildInputs = [ flit-core ]; + dependencies = [ flit-core ]; nativeCheckInputs = [ unittestCheckHook ]; From f32cd1b634c7a844f863879b71212caa36d9363b Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Tue, 22 Oct 2024 09:47:52 +0200 Subject: [PATCH 5/5] weblate: 5.7.2 -> 5.8.1 https://github.com/WeblateOrg/weblate/releases/tag/weblate-5.8 https://github.com/WeblateOrg/weblate/releases/tag/weblate-5.8.1 https://github.com/WeblateOrg/weblate/releases/tag/weblate-5.8.2 https://github.com/WeblateOrg/weblate/releases/tag/weblate-5.8.3 --- pkgs/by-name/we/weblate/package.nix | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix index ec952498d215..1d2f3aad8103 100644 --- a/pkgs/by-name/we/weblate/package.nix +++ b/pkgs/by-name/we/weblate/package.nix @@ -15,9 +15,7 @@ let python = python3.override { packageOverrides = final: prev: { - django = prev.django_5.overridePythonAttrs (old: { - dependencies = old.dependencies ++ prev.django_5.optional-dependencies.argon2; - }); + django = prev.django_5; sentry-sdk = prev.sentry-sdk_2; djangorestframework = prev.djangorestframework.overridePythonAttrs (old: { # https://github.com/encode/django-rest-framework/discussions/9342 @@ -28,10 +26,12 @@ let in python.pkgs.buildPythonApplication rec { pname = "weblate"; - version = "5.7.2"; + version = "5.8.3"; pyproject = true; + disabled = python.pythonOlder "3.11"; + outputs = [ "out" "static" @@ -41,18 +41,9 @@ python.pkgs.buildPythonApplication rec { owner = "WeblateOrg"; repo = "weblate"; rev = "refs/tags/weblate-${version}"; - hash = "sha256-cIwCNYXbg7l6z9OAkMAGJ783QI/nCOyrhLPURDcDv+Y="; + hash = "sha256-Kmna23jhhFRJ0ExplYNPFEaIAJxmwHU2azivfKHHnjs="; }; - pythonRelaxDeps = [ - # https://github.com/WeblateOrg/weblate/commit/9695f912b0d24ae999d9442bb49719b4bb552696 - "qrcode" - # https://github.com/WeblateOrg/weblate/commit/1cf2a423b20fcd2dde18a43277311334e38208e7 - "rapidfuzz" - # https://github.com/WeblateOrg/weblate/commit/3e34566fd7c151e1983586586bd7651cefe79585 - "redis" - ]; - patches = [ # FIXME This shouldn't be necessary and probably has to do with some dependency mismatch. ./cache.lock.patch @@ -93,6 +84,7 @@ python.pkgs.buildPythonApplication rec { cssselect cython cyrtranslit + dateparser diff-match-patch django-appconf django-celery-beat @@ -105,6 +97,7 @@ python.pkgs.buildPythonApplication rec { django-otp-webauthn django djangorestframework + drf-spectacular filelock fluent-syntax gitpython @@ -142,8 +135,10 @@ python.pkgs.buildPythonApplication rec { weblate-language-data weblate-schemas ] + ++ django.optional-dependencies.argon2 ++ python-redis-lock.optional-dependencies.django - ++ celery.optional-dependencies.redis; + ++ celery.optional-dependencies.redis + ++ drf-spectacular.optional-dependencies.sidecar; optional-dependencies = { postgres = with python.pkgs; [ psycopg ];