From 24bb48919bd9710e0b942ba16355fa873d3a002f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 20 Apr 2025 14:11:25 -0700 Subject: [PATCH 1/5] python313Packages.sentry-sdk: 1.45.1 -> 2.25.0 --- pkgs/by-name/au/authentik/package.nix | 2 +- pkgs/by-name/pr/pretix/package.nix | 2 -- pkgs/by-name/we/weblate/package.nix | 1 - pkgs/development/python-modules/swh-core/default.nix | 4 ++-- pkgs/development/python-modules/wandb/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 2 +- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix index b6b1a3b465da..c8c7410d8d4c 100644 --- a/pkgs/by-name/au/authentik/package.nix +++ b/pkgs/by-name/au/authentik/package.nix @@ -278,7 +278,7 @@ let pyyaml requests-oauthlib scim2-filter-parser - sentry-sdk_2 + sentry-sdk service-identity setproctitle structlog diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index cb6a67f343f2..e107b60f95be 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -46,8 +46,6 @@ let }; pretix-plugin-build = self.callPackage ./plugin-build.nix { }; - - sentry-sdk = super.sentry-sdk_2; }; }; diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix index d0ba6ade99bb..08eff3ae9e67 100644 --- a/pkgs/by-name/we/weblate/package.nix +++ b/pkgs/by-name/we/weblate/package.nix @@ -17,7 +17,6 @@ let python = python3.override { packageOverrides = final: prev: { django = prev.django_5; - sentry-sdk = prev.sentry-sdk_2; djangorestframework = prev.djangorestframework.overridePythonAttrs (old: { # https://github.com/encode/django-rest-framework/discussions/9342 disabledTests = (old.disabledTests or [ ]) ++ [ "test_invalid_inputs" ]; diff --git a/pkgs/development/python-modules/swh-core/default.nix b/pkgs/development/python-modules/swh-core/default.nix index aa0ca05d0318..c56bbba926f7 100644 --- a/pkgs/development/python-modules/swh-core/default.nix +++ b/pkgs/development/python-modules/swh-core/default.nix @@ -9,7 +9,7 @@ python-magic, pyyaml, requests, - sentry-sdk_2, + sentry-sdk, tenacity, setuptools, setuptools-scm, @@ -65,7 +65,7 @@ buildPythonPackage rec { python-magic pyyaml requests - sentry-sdk_2 + sentry-sdk tenacity ]; diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index ff06d4e43051..524f49e5a7ef 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -28,7 +28,7 @@ pydantic, pyyaml, requests, - sentry-sdk_2, + sentry-sdk, setproctitle, setuptools, pythonOlder, @@ -188,7 +188,7 @@ buildPythonPackage rec { pydantic pyyaml requests - sentry-sdk_2 + sentry-sdk setproctitle # setuptools is necessary since pkg_resources is required at runtime. setuptools diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0245f230c105..edd7cda0d495 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15579,7 +15579,7 @@ self: super: with self; { sentinels = callPackage ../development/python-modules/sentinels { }; - sentry-sdk = sentry-sdk_1; + sentry-sdk = sentry-sdk_2; sentry-sdk_1 = callPackage ../development/python-modules/sentry-sdk/1.nix { }; From 7e5ce7491779a041107131080090aafc11d0db9c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 21 Apr 2025 01:45:20 +0200 Subject: [PATCH 2/5] pretix: drop geoip2 override --- pkgs/by-name/pr/pretix/package.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index e107b60f95be..d417a13e161e 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -25,16 +25,6 @@ let }; }); - geoip2 = super.geoip2.overridePythonAttrs rec { - version = "5.0.1"; - - src = fetchPypi { - pname = "geoip2"; - inherit version; - hash = "sha256-kK+LbTaH877yUfJwitAXsw1ifRFEwAQOq8TJAXqAfYY="; - }; - }; - stripe = super.stripe.overridePythonAttrs rec { version = "7.9.0"; From 84faa614a5256a84e3dd4e445053ff76f4c0a5d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 20 Apr 2025 16:47:07 -0700 Subject: [PATCH 3/5] python313Packages.proton-vpn-network-manager: mark broken --- .../python-modules/proton-vpn-network-manager/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix index 937c54b5c103..da9b102da053 100644 --- a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix +++ b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix @@ -77,6 +77,7 @@ buildPythonPackage rec { ''; meta = { + broken = true; # ModuleNotFoundError: No module named 'proton.vpn.local_agent' description = "Provides the necessary functionality for other ProtonVPN components to interact with NetworkManager"; homepage = "https://github.com/ProtonVPN/python-proton-vpn-network-manager"; license = lib.licenses.gpl3Only; From 02658aa368b96d3b4b1387057b315c05ba5ceac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 20 Apr 2025 16:49:18 -0700 Subject: [PATCH 4/5] python313Packages.sentry-sdk_1: drop --- .../python-modules/sentry-sdk/1.nix | 135 ------------------ pkgs/top-level/python-packages.nix | 2 - 2 files changed, 137 deletions(-) delete mode 100644 pkgs/development/python-modules/sentry-sdk/1.nix diff --git a/pkgs/development/python-modules/sentry-sdk/1.nix b/pkgs/development/python-modules/sentry-sdk/1.nix deleted file mode 100644 index a5b722ef1816..000000000000 --- a/pkgs/development/python-modules/sentry-sdk/1.nix +++ /dev/null @@ -1,135 +0,0 @@ -{ - lib, - stdenv, - aiohttp, - apache-beam, - asttokens, - blinker, - bottle, - buildPythonPackage, - celery, - certifi, - chalice, - django, - executing, - falcon, - fetchFromGitHub, - flask, - gevent, - httpx, - jsonschema, - mock, - pure-eval, - pyrsistent, - pyspark, - pysocks, - pytest-forked, - pytest-localserver, - pytest-watch, - pytestCheckHook, - pythonOlder, - quart, - rq, - sanic, - setuptools, - sqlalchemy, - tornado, - urllib3, -}: - -buildPythonPackage rec { - pname = "sentry-sdk"; - version = "1.45.1"; - pyproject = true; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "getsentry"; - repo = "sentry-python"; - rev = "refs/tags/${version}"; - hash = "sha256-ZNJsxbQcW5g/bKqN18z+BspKyI34+vkj6vQ9akE1Ook="; - }; - - build-system = [ setuptools ]; - - dependencies = [ - certifi - urllib3 - ]; - - optional-dependencies = { - aiohttp = [ aiohttp ]; - beam = [ apache-beam ]; - bottle = [ bottle ]; - celery = [ celery ]; - chalice = [ chalice ]; - django = [ django ]; - falcon = [ falcon ]; - flask = [ - flask - blinker - ]; - httpx = [ httpx ]; - pyspark = [ pyspark ]; - pure_eval = [ - asttokens - executing - pure-eval - ]; - quart = [ - quart - blinker - ]; - rq = [ rq ]; - sanic = [ sanic ]; - sqlalchemy = [ sqlalchemy ]; - tornado = [ tornado ]; - }; - - nativeCheckInputs = [ - asttokens - executing - gevent - jsonschema - mock - pure-eval - pyrsistent - pysocks - pytest-forked - pytest-localserver - pytest-watch - pytestCheckHook - ]; - - doCheck = pythonOlder "3.13" && !stdenv.hostPlatform.isDarwin; - - disabledTests = [ - # Issue with the asseration - "test_auto_enabling_integrations_catches_import_error" - "test_default_release" - ]; - - disabledTestPaths = - [ - # Various integration tests fail every once in a while when we - # upgrade dependencies, so don't bother testing them. - "tests/integrations/" - ] - ++ lib.optionals (stdenv.buildPlatform != "x86_64-linux") [ - # test crashes on aarch64 - "tests/test_transport.py" - ]; - - pythonImportsCheck = [ "sentry_sdk" ]; - - meta = with lib; { - description = "Python SDK for Sentry.io"; - homepage = "https://github.com/getsentry/sentry-python"; - changelog = "https://github.com/getsentry/sentry-python/blob/${version}/CHANGELOG.md"; - license = licenses.bsd2; - maintainers = with maintainers; [ - fab - ]; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index edd7cda0d495..3e1704457b2d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15581,8 +15581,6 @@ self: super: with self; { sentry-sdk = sentry-sdk_2; - sentry-sdk_1 = callPackage ../development/python-modules/sentry-sdk/1.nix { }; - sentry-sdk_2 = callPackage ../development/python-modules/sentry-sdk/default.nix { }; sepaxml = callPackage ../development/python-modules/sepaxml { }; From a9e79b0f3c00ac2f5ca9a9e772c3f1b39ae9af10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 20 Apr 2025 16:49:43 -0700 Subject: [PATCH 5/5] python313Packages.sentry-sdk_2: turn into alias --- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 43c91f01609a..44cef4e10582 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -694,6 +694,7 @@ mapAliases ({ scikits-samplerate = throw "scikits-samplerate has been removed, it was unsed and unmaintained since 2015"; # added 2024-05-23 selectors2 = throw "selectors2 has been removed: archived by upstream."; # added 2024-07-27 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10 + sentry-sdk_2 = sentry-sdk; # added 2025-04-20 sequoia = throw "python3Packages.sequoia was replaced by pysequoia - built from a dedicated repository, with a new API."; # added 2023-06-24 setuptools_dso = setuptools-dso; # added 2024-03-03 setuptools_scm = setuptools-scm; # added 2021-06-03 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3e1704457b2d..ab486878f17f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15579,9 +15579,7 @@ self: super: with self; { sentinels = callPackage ../development/python-modules/sentinels { }; - sentry-sdk = sentry-sdk_2; - - sentry-sdk_2 = callPackage ../development/python-modules/sentry-sdk/default.nix { }; + sentry-sdk = callPackage ../development/python-modules/sentry-sdk/default.nix { }; sepaxml = callPackage ../development/python-modules/sepaxml { };