From 79701ac7e98aef7ff676267d1276f81abaf41d83 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Jul 2025 16:18:57 +0000 Subject: [PATCH 1/2] python3Packages.weblate-schemas: 2025.2 -> 2025.5 --- pkgs/development/python-modules/weblate-schemas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weblate-schemas/default.nix b/pkgs/development/python-modules/weblate-schemas/default.nix index 4181eb68a018..4563d1ee40ac 100644 --- a/pkgs/development/python-modules/weblate-schemas/default.nix +++ b/pkgs/development/python-modules/weblate-schemas/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "weblate-schemas"; - version = "2025.2"; + version = "2025.5"; pyproject = true; src = fetchPypi { pname = "weblate_schemas"; inherit version; - hash = "sha256-C8+p+NHCAbLnHh8ujV5YdbjFSzXsKAoUyNhM3iIRPG4="; + hash = "sha256-ZhFF3UD7lX/KXVDZFOn+Gc1w/cpzzVYVrbpVeJ9/wiE="; }; build-system = [ setuptools ]; From 15f1903fc773094b070701637632eff32ba3d133 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Fri, 15 Aug 2025 14:13:26 +0200 Subject: [PATCH 2/2] weblate: 5.12.2 -> 5.13 Changelog: https://github.com/WeblateOrg/weblate/releases/tag/weblate-5.13 --- pkgs/by-name/we/weblate/cache.lock.patch | 22 ---------------------- pkgs/by-name/we/weblate/package.nix | 17 +++-------------- 2 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 pkgs/by-name/we/weblate/cache.lock.patch diff --git a/pkgs/by-name/we/weblate/cache.lock.patch b/pkgs/by-name/we/weblate/cache.lock.patch deleted file mode 100644 index dc5c50cdf77e..000000000000 --- a/pkgs/by-name/we/weblate/cache.lock.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/weblate/utils/lock.py b/weblate/utils/lock.py -index 53c1486bc9..a0a5fc5a74 100644 ---- a/weblate/utils/lock.py -+++ b/weblate/utils/lock.py -@@ -43,8 +43,6 @@ class WeblateLock: - self._name = self._format_template(cache_template) - self._lock = cache.lock( - key=self._name, -- expire=3600, -- auto_renewal=True, - ) - self._enter_implementation = self._enter_redis - else: -@@ -62,7 +60,7 @@ class WeblateLock: - - def _enter_redis(self): - try: -- lock_result = self._lock.acquire(timeout=self._timeout) -+ lock_result = self._lock.acquire() - except AlreadyAcquired: - return - diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix index 36bbdc21b1ea..82f83e075713 100644 --- a/pkgs/by-name/we/weblate/package.nix +++ b/pkgs/by-name/we/weblate/package.nix @@ -27,7 +27,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "weblate"; - version = "5.12.2"; + version = "5.13"; pyproject = true; @@ -40,14 +40,9 @@ python.pkgs.buildPythonApplication rec { owner = "WeblateOrg"; repo = "weblate"; tag = "weblate-${version}"; - hash = "sha256-YaP0lhL7E0pv3ZyfpQ47CjhrzjJPDwGpSTcgXDaMZdA="; + hash = "sha256-fx07SmQodgC4bI/zQT6TNcvGYzVoKT42aXpUx5SlUrk="; }; - patches = [ - # FIXME This shouldn't be necessary and probably has to do with some dependency mismatch. - ./cache.lock.patch - ]; - build-system = with python.pkgs; [ setuptools ]; nativeBuildInputs = [ gettext ]; @@ -83,6 +78,7 @@ python.pkgs.buildPythonApplication rec { certifi charset-normalizer crispy-bootstrap3 + crispy-bootstrap5 cryptography cssselect cython @@ -125,7 +121,6 @@ python.pkgs.buildPythonApplication rec { pyicumessageformat pyparsing python-dateutil - python-redis-lock qrcode rapidfuzz redis @@ -145,16 +140,10 @@ python.pkgs.buildPythonApplication rec { weblate-schemas ] ++ django.optional-dependencies.argon2 - ++ python-redis-lock.optional-dependencies.django ++ celery.optional-dependencies.redis ++ drf-spectacular.optional-dependencies.sidecar ++ drf-standardized-errors.optional-dependencies.openapi; - pythonRelaxDeps = [ - "certifi" - "lxml" - ]; - optional-dependencies = { postgres = with python.pkgs; [ psycopg ]; };