From 91e8779c41d804e464a34176500134fe0ab87470 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 6 Dec 2025 09:45:07 -0800 Subject: [PATCH 1/5] python3Packages.kombu: 5.5.4 -> 5.6.1 Diff: https://github.com/celery/kombu/compare/v5.5.4...v5.6.1 Changelog: https://github.com/celery/kombu/blob/v5.6.1/Changelog.rst --- .../python-modules/kombu/default.nix | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index b5878244d4c7..9c014b9683c3 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -7,23 +7,23 @@ boto3, buildPythonPackage, confluent-kafka, - fetchPypi, + fetchFromGitHub, google-cloud-pubsub, google-cloud-monitoring, + grpcio, hypothesis, kazoo, msgpack, packaging, + protobuf, pycurl, pymongo, #, pyro4 pytestCheckHook, - pythonOlder, pyyaml, redis, setuptools, sqlalchemy, - typing-extensions, tzdata, urllib3, vine, @@ -31,25 +31,24 @@ buildPythonPackage rec { pname = "kombu"; - version = "5.5.4"; + version = "5.6.1"; pyproject = true; - disabled = pythonOlder "3.9"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-iGYAFoJ16+rak7iI6DE1L+V4FoNC8NHVgz2Iug2Ec2M="; + src = fetchFromGitHub { + owner = "celery"; + repo = "kombu"; + tag = "v${version}"; + hash = "sha256-kywPcWhc+iMh4OOH8gobA6NFismRvihgNMcxxw+2p/4="; }; build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ amqp packaging tzdata vine - ] - ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ]; + ]; optional-dependencies = { msgpack = [ msgpack ]; @@ -72,6 +71,8 @@ buildPythonPackage rec { gcpubsub = [ google-cloud-pubsub google-cloud-monitoring + grpcio + protobuf ]; # pyro4 doesn't support Python 3.11 #pyro = [ From ff991039202e9553b41433232bcd102734b23c45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 6 Dec 2025 09:38:06 -0800 Subject: [PATCH 2/5] python3Packages.celery: 5.5.3 -> 5.6.0 Diff: https://github.com/celery/celery/compare/v5.5.3...v5.6.0 Changelog: https://github.com/celery/celery/blob/v5.6.0/Changelog.rst --- pkgs/development/python-modules/celery/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index ab0889594166..0dbddb329633 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -10,6 +10,7 @@ click-repl, click, cryptography, + exceptiongroup, fetchFromGitHub, gevent, google-cloud-firestore, @@ -29,6 +30,7 @@ python-dateutil, pyyaml, setuptools, + tzlocal, vine, # The AMQP REPL depends on click-repl, which is incompatible with our version # of click. @@ -37,14 +39,14 @@ buildPythonPackage rec { pname = "celery"; - version = "5.5.3"; + version = "5.6.0"; pyproject = true; src = fetchFromGitHub { owner = "celery"; repo = "celery"; tag = "v${version}"; - hash = "sha256-+sickqRfSkBxhcO0W9na6Uov4kZ7S5oqpXXKX0iRQ0w="; + hash = "sha256-BKF+p35Z5r/WRjuOaSFtESkbo+N+tbd0R40EWl0iU9I="; }; patches = lib.optionals (!withAmqpRepl) [ @@ -58,8 +60,10 @@ buildPythonPackage rec { click click-didyoumean click-plugins + exceptiongroup kombu python-dateutil + tzlocal vine ] ++ lib.optionals withAmqpRepl [ @@ -108,6 +112,7 @@ buildPythonPackage rec { disabledTests = [ "msgpack" "test_check_privileges_no_fchown" + "test_uses_utc_timezone" # seems to only fail on higher core counts # AssertionError: assert 3 == 0 "test_setup_security_disabled_serializers" @@ -133,7 +138,7 @@ buildPythonPackage rec { meta = { description = "Distributed task queue"; homepage = "https://github.com/celery/celery/"; - changelog = "https://github.com/celery/celery/releases/tag/v${version}"; + changelog = "https://github.com/celery/celery/blob/${src.tag}/Changelog.rst"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fab ]; mainProgram = "celery"; From 47aa718bb71377b80c11e7bebd73b80048c02e36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 6 Dec 2025 10:13:21 -0800 Subject: [PATCH 3/5] python3Packages.celery-batches: unpin celery --- pkgs/development/python-modules/celery-batches/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/celery-batches/default.nix b/pkgs/development/python-modules/celery-batches/default.nix index 7a6893fc0749..e129dcf10248 100644 --- a/pkgs/development/python-modules/celery-batches/default.nix +++ b/pkgs/development/python-modules/celery-batches/default.nix @@ -20,6 +20,11 @@ buildPythonPackage rec { build-system = [ setuptools ]; + pythonRelaxDeps = [ + # https://github.com/clokep/celery-batches/pull/100 + "celery" + ]; + dependencies = [ celery ]; # requires a running celery From 5962e951a809c9375b386c3cb329f9e0caae86c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 6 Dec 2025 10:17:02 -0800 Subject: [PATCH 4/5] paperless-ngx: unpin celery --- pkgs/by-name/pa/paperless-ngx/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 26151ee97a9b..92664ff0ef05 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -167,6 +167,7 @@ python.pkgs.buildPythonApplication rec { ]; pythonRelaxDeps = [ + "celery" "django-allauth" "python-dotenv" "redis" From 37abaa02847eb14ca5d2cfa4d20112891a951625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 6 Dec 2025 10:22:58 -0800 Subject: [PATCH 5/5] weblate: unpin celery --- pkgs/by-name/we/weblate/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix index 3295df657819..862abe80beb9 100644 --- a/pkgs/by-name/we/weblate/package.nix +++ b/pkgs/by-name/we/weblate/package.nix @@ -64,6 +64,7 @@ python.pkgs.buildPythonApplication rec { ''; pythonRelaxDeps = [ + "celery" "certifi" "django-appconf" ];