From c85b1949aa3c396aa8dc12b511bf60d7c90264b6 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 4 Jun 2026 12:33:33 +0200 Subject: [PATCH 1/8] python3Packages.opentelemetry-instrumentation-psycopg: init at 0.63b1 --- .../default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/opentelemetry-instrumentation-psycopg/default.nix diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-psycopg/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-psycopg/default.nix new file mode 100644 index 000000000000..ebdb66e32a67 --- /dev/null +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-psycopg/default.nix @@ -0,0 +1,39 @@ +{ + buildPythonPackage, + pytestCheckHook, + hatchling, + opentelemetry-api, + opentelemetry-instrumentation, + opentelemetry-instrumentation-dbapi, + opentelemetry-test-utils, + psycopg, +}: + +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-psycopg"; + pyproject = true; + + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-psycopg"; + + build-system = [ hatchling ]; + + dependencies = [ + psycopg + opentelemetry-api + opentelemetry-instrumentation + opentelemetry-instrumentation-dbapi + ]; + + nativeCheckInputs = [ + opentelemetry-test-utils + pytestCheckHook + ]; + + pythonImportsCheck = [ "opentelemetry.instrumentation.psycopg" ]; + + meta = opentelemetry-instrumentation.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-psycopg"; + description = "OpenTelemetry Psycopg Instrumentation"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 59128805b25d..2f43b2d7ce1b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11953,6 +11953,10 @@ self: super: with self; { callPackage ../development/python-modules/opentelemetry-instrumentation-logging { }; + opentelemetry-instrumentation-psycopg = + callPackage ../development/python-modules/opentelemetry-instrumentation-psycopg + { }; + opentelemetry-instrumentation-psycopg2 = callPackage ../development/python-modules/opentelemetry-instrumentation-psycopg2 { }; From 478109bb6c1e956612d9a9f7c90010b1b075120d Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 30 Apr 2026 16:21:52 +0200 Subject: [PATCH 2/8] python3Packages.translate-toolkit: 3.19.5 -> 3.19.10 Diff: https://github.com/translate/translate/compare/3.19.5...3.19.10 Changelog: https://docs.translatehouse.org/projects/translate-toolkit/en/latest/releases/3.19.10.html --- .../python-modules/translate-toolkit/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/translate-toolkit/default.nix b/pkgs/development/python-modules/translate-toolkit/default.nix index 28e64d4cb293..e5f603b78ba6 100644 --- a/pkgs/development/python-modules/translate-toolkit/default.nix +++ b/pkgs/development/python-modules/translate-toolkit/default.nix @@ -29,18 +29,19 @@ addBinToPathHook, pytest-xdist, gettext, + syrupy, }: buildPythonPackage (finalAttrs: { pname = "translate-toolkit"; - version = "3.19.5"; + version = "3.19.10"; pyproject = true; src = fetchFromGitHub { owner = "translate"; repo = "translate"; tag = finalAttrs.version; - hash = "sha256-NJuhkJyXfGO2iwvcHUrfMZi55t1+89RN6jEIxHk8mcs="; + hash = "sha256-bDvj+zTD15bCr8xA+ovKWEMabC4xB9Jsdz66RYtdaBU="; }; build-system = [ setuptools-scm ]; @@ -50,6 +51,8 @@ buildPythonPackage (finalAttrs: { unicode-segmentation-rs ]; + pythonRelaxDeps = [ "lxml" ]; + optional-dependencies = { chardet = [ charset-normalizer ]; fluent = [ fluent-syntax ]; @@ -69,6 +72,7 @@ buildPythonPackage (finalAttrs: { pytestCheckHook addBinToPathHook pytest-xdist + syrupy gettext ] ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; @@ -78,12 +82,6 @@ buildPythonPackage (finalAttrs: { "test_timezones" ]; - disabledTestPaths = [ - # Require pytest-snapshot but there are no snapshots checked in - "tests/translate/tools/test_pocount.py" - "tests/translate/tools/test_junitmsgfmt.py" - ]; - pythonImportsCheck = [ "translate" ]; __darwinAllowLocalNetworking = true; From fb9c3e09b4627fdb373cb07088d74e2680a0f2c9 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 30 Apr 2026 16:57:10 +0200 Subject: [PATCH 3/8] python3Packages.social-auth-core: 4.8.5 -> 4.9.1 Diff: https://github.com/python-social-auth/social-core/compare/4.8.5...4.9.1 Changelog: https://github.com/python-social-auth/social-core/blob/4.9.1/CHANGELOG.md --- pkgs/development/python-modules/social-auth-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/social-auth-core/default.nix b/pkgs/development/python-modules/social-auth-core/default.nix index edc2f91a3db4..a4b893b5e62c 100644 --- a/pkgs/development/python-modules/social-auth-core/default.nix +++ b/pkgs/development/python-modules/social-auth-core/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "social-auth-core"; - version = "4.8.5"; + version = "4.9.1"; pyproject = true; src = fetchFromGitHub { owner = "python-social-auth"; repo = "social-core"; tag = version; - hash = "sha256-hYqfahjeNRpfpnNdDRTF9VPaoUh5R+nMDM3frvRI5Nw="; + hash = "sha256-HIRqueDoT5MiK5wYto1/MhZOJVBGUdsHma/klOyVHtM="; }; nativeBuildInputs = [ setuptools ]; From 181a52a4999773451cfe8d3cf7bcf507580d3db3 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 30 Apr 2026 17:01:47 +0200 Subject: [PATCH 4/8] python3Packages.social-auth-app-django: 5.8.0 -> 5.9.0 Diff: https://github.com/python-social-auth/social-app-django/compare/5.8.0...5.9.0 Changelog: https://github.com/python-social-auth/social-app-django/blob/5.9.0/CHANGELOG.md --- .../python-modules/social-auth-app-django/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/social-auth-app-django/default.nix b/pkgs/development/python-modules/social-auth-app-django/default.nix index 9a0a1c5b85a5..b825aa5fcd14 100644 --- a/pkgs/development/python-modules/social-auth-app-django/default.nix +++ b/pkgs/development/python-modules/social-auth-app-django/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "social-auth-app-django"; - version = "5.8.0"; + version = "5.9.0"; pyproject = true; src = fetchFromGitHub { owner = "python-social-auth"; repo = "social-app-django"; tag = version; - hash = "sha256-NAUCA+FMMgY4xMYspiRO5Kt/S2jbSKDRnBxwmATYxKo="; + hash = "sha256-kyiN7HblqN66Slrub2IphCXBBy6UKxd7PbVHkjuHzkI="; }; build-system = [ setuptools ]; From f7923509f8a86ff9bda102a9b89d421b7b78d5b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 May 2026 09:33:27 +0000 Subject: [PATCH 5/8] python3Packages.weblate-schemas: 2025.6 -> 2026.4, use fetchFromGitHub Changelog: https://github.com/WeblateOrg/weblate_schemas/blob/2026.4/CHANGES.rst --- .../weblate-schemas/default.nix | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/weblate-schemas/default.nix b/pkgs/development/python-modules/weblate-schemas/default.nix index 875ad8802fbe..5de6969fd76b 100644 --- a/pkgs/development/python-modules/weblate-schemas/default.nix +++ b/pkgs/development/python-modules/weblate-schemas/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, fqdn, jsonschema, @@ -11,30 +11,28 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "weblate-schemas"; - version = "2025.6"; + version = "2026.4"; pyproject = true; - src = fetchPypi { - pname = "weblate_schemas"; - inherit version; - hash = "sha256-Kxu+8CiJ343PmCdY5rSbTqsWmVMLnz9inAH726g5TQQ="; + src = fetchFromGitHub { + owner = "WeblateOrg"; + repo = "weblate_schemas"; + tag = finalAttrs.version; + hash = "sha256-OPuhRsUmVte54UPNna76N5Kbg1Tl7p8OdKbE6VHWcvg="; }; build-system = [ setuptools ]; dependencies = [ - fqdn jsonschema - rfc3987 - strict-rfc3339 ]; nativeCheckInputs = [ - fedora-messaging pytestCheckHook + fedora-messaging ] ++ jsonschema.optional-dependencies.format; @@ -43,9 +41,9 @@ buildPythonPackage rec { meta = { description = "Schemas used by Weblate"; homepage = "https://github.com/WeblateOrg/weblate_schemas"; - changelog = "https://github.com/WeblateOrg/weblate_schemas/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/WeblateOrg/weblate_schemas/blob/${finalAttrs.version}/CHANGES.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ erictapen ]; }; -} +}) From 79f4be41c286b2f7eee03fab76629ac14ba303cc Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Fri, 12 Jun 2026 18:08:32 +0200 Subject: [PATCH 6/8] python3Packages.translate-toolkit: 3.19.10 -> 3.19.11 Diff: https://github.com/translate/translate/compare/3.19.10...3.19.11 Changelog: https://docs.translatehouse.org/projects/translate-toolkit/en/latest/releases/3.19.11.html --- 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 e5f603b78ba6..de0e669b4cca 100644 --- a/pkgs/development/python-modules/translate-toolkit/default.nix +++ b/pkgs/development/python-modules/translate-toolkit/default.nix @@ -34,14 +34,14 @@ buildPythonPackage (finalAttrs: { pname = "translate-toolkit"; - version = "3.19.10"; + version = "3.19.11"; pyproject = true; src = fetchFromGitHub { owner = "translate"; repo = "translate"; tag = finalAttrs.version; - hash = "sha256-bDvj+zTD15bCr8xA+ovKWEMabC4xB9Jsdz66RYtdaBU="; + hash = "sha256-+94oo6IYnRR4jnR60C3WNjesK6Tk6jND3xsYyx6sw0U="; }; build-system = [ setuptools-scm ]; From 0d890069f0e2674bd2457d6fd88e132f30f006f3 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Fri, 12 Jun 2026 18:10:28 +0200 Subject: [PATCH 7/8] python3Packages.translation-finder: 2.24 -> 3.1 Diff: https://github.com/WeblateOrg/translation-finder/compare/2.24...3.1 Changelog: https://github.com/WeblateOrg/translation-finder/blob/3.1/CHANGES.rst --- .../development/python-modules/translation-finder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/translation-finder/default.nix b/pkgs/development/python-modules/translation-finder/default.nix index afbbf84b5185..f7bf943da299 100644 --- a/pkgs/development/python-modules/translation-finder/default.nix +++ b/pkgs/development/python-modules/translation-finder/default.nix @@ -11,7 +11,7 @@ buildPythonPackage (finalAttrs: { pname = "translation-finder"; - version = "2.24"; + version = "3.1"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage (finalAttrs: { owner = "WeblateOrg"; repo = "translation-finder"; tag = finalAttrs.version; - hash = "sha256-OVAsw+snISVyz3ZvcfqCpv0BRfTNzYSpI+YLafW5OQg="; + hash = "sha256-sRqn7K39R4A83USCng5wu14eKq4VqUp9tPzg8Qb8MOU="; }; build-system = [ setuptools ]; From 9a4c4ed4491c3cb90ac6032d6ea9dcf7a5e0f85d Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 30 Apr 2026 16:24:45 +0200 Subject: [PATCH 8/8] weblate: 5.17 -> 2026.6.1 Changelog: https://github.com/WeblateOrg/weblate/releases/tag/weblate-2026.5 Changelog: https://github.com/WeblateOrg/weblate/releases/tag/weblate-2026.6 Changelog: https://github.com/WeblateOrg/weblate/releases/tag/weblate-2026.6.1 --- pkgs/by-name/we/weblate/package.nix | 61 +++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix index 00ab7b20626d..d2c7f00cb18d 100644 --- a/pkgs/by-name/we/weblate/package.nix +++ b/pkgs/by-name/we/weblate/package.nix @@ -50,7 +50,7 @@ let in python3Packages.buildPythonApplication (finalAttrs: { pname = "weblate"; - version = "5.17"; + version = "2026.6.1"; pyproject = true; outputs = [ @@ -62,11 +62,14 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "WeblateOrg"; repo = "weblate"; tag = "weblate-${finalAttrs.version}"; - hash = "sha256-+czdS1cICvm8esXxJG9BjzPTJExajxvDoRVH7f+t6lY="; + hash = "sha256-7dhEkU2sVIjMPPR/0U2sMFXG6bl8s5WDvw8MyZZhqNE="; }; postPatch = '' sed -i 's|/bin/true|true|g' weblate/addons/example_pre.py + + sed -i 's/"setuptools==.*"/"setuptools"/' pyproject.toml + sed -i 's/"translate-toolkit==.*"/"translate-toolkit"/' pyproject.toml ''; build-system = with python3Packages; [ setuptools ]; @@ -93,27 +96,40 @@ python3Packages.buildPythonApplication (finalAttrs: { ${manage} compress ''; - pythonRelaxDeps = [ - "requests" - "pygobject" - "certifi" - "hiredis" - ]; + # Upstream pins all dependencies, so their version constraints are mostly meanningless, + # except for a few packages maintained by themselfes. + # https://github.com/WeblateOrg/weblate/issues/20003#issuecomment-4691837274 + pythonRelaxDeps = + let + # Dependencies owned by Weblate that should always be in the exact version specified + coreDeps = [ + "weblate-fonts" + "weblate-schemas" + "weblate-language-data" + "translation-finder" + "translate-toolkit" + ]; + in + lib.concatMap ( + p: if lib.elem p.pname coreDeps then [ ] else [ p.pname ] + ) finalAttrs.passthru.dependencies; dependencies = with python3Packages; [ ahocorasick-rs altcha + argon2-cffi-bindings + argon2-cffi (toPythonModule (borgbackup.override { python3 = python; })) celery certifi + cffi charset-normalizer confusable-homoglyphs crispy-bootstrap5 cryptography cssselect - cython cyrtranslit dateparser diff-match-patch @@ -143,13 +159,23 @@ python3Packages.buildPythonApplication (finalAttrs: { mistletoe nh3 openpyxl + opentelemetry-exporter-otlp-proto-http + opentelemetry-instrumentation-celery + opentelemetry-instrumentation-django + opentelemetry-instrumentation-psycopg + opentelemetry-instrumentation-redis + opentelemetry-instrumentation-requests + opentelemetry-sdk packaging pillow pyaskalono + pyasn1 pycairo pygments pygobject pyicumessageformat + pyjwt + pyopenssl pyparsing python-dateutil qrcode @@ -165,6 +191,7 @@ python3Packages.buildPythonApplication (finalAttrs: { tesserocr translate-toolkit translation-finder + twisted unidecode urllib3 user-agents @@ -190,10 +217,6 @@ python3Packages.buildPythonApplication (finalAttrs: { # Commented entries are not packaged yet optional-dependencies = with python3Packages; { - alibaba = [ - aliyun-python-sdk-alimt - aliyun-python-sdk-core - ]; amazon = [ boto3 ]; # gelf = [ logging-gelf ]; # gerrit = [ git-review ]; @@ -201,11 +224,17 @@ python3Packages.buildPythonApplication (finalAttrs: { google-cloud-storage google-cloud-translate ]; + google-errors = [ + google-cloud-error-reporting + ]; ldap = [ django-auth-ldap ]; # mercurial = [ mercurial ]; - openai = [ openai ]; postgres = [ psycopg ]; - saml = [ python3-saml ]; + rollbar = [ rollbar ]; + saml = [ + python3-saml + xmlsec + ]; # saml2idp = [ djangosaml2idp2 ]; sphinx = [ sphinx ]; # wllegal = [ wllegal ]; @@ -231,7 +260,6 @@ python3Packages.buildPythonApplication (finalAttrs: { pytest-django pytest-xdist responses - respx selenium standardwebhooks @@ -307,6 +335,7 @@ python3Packages.buildPythonApplication (finalAttrs: { # Tries to resolve DNS "weblate/api/tests.py::ProjectAPITest::test_install_machinery" + "weblate/addons/tests.py::WebhooksAddonTest::test_form" # djangosaml2idp2 is not packaged yet "weblate/utils/tests/test_djangosaml2idp.py"