From 934f40ee87321f25b15f1652dbaa51fdd22fdca1 Mon Sep 17 00:00:00 2001 From: caverav Date: Sat, 28 Feb 2026 12:49:46 -0300 Subject: [PATCH 1/4] python3Packages.opentelemetry-instrumentation-threading: init at 0.55b0 Package opentelemetry-instrumentation-threading from the opentelemetry-python-contrib source tree. Required by semgrep 1.152.0 runtime dependencies. --- .../default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/opentelemetry-instrumentation-threading/default.nix diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-threading/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-threading/default.nix new file mode 100644 index 000000000000..0521aa192c3d --- /dev/null +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-threading/default.nix @@ -0,0 +1,37 @@ +{ + buildPythonPackage, + hatchling, + opentelemetry-api, + opentelemetry-instrumentation, + opentelemetry-test-utils, + pytestCheckHook, + wrapt, +}: + +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-threading"; + pyproject = true; + + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-threading"; + + build-system = [ hatchling ]; + + dependencies = [ + opentelemetry-api + opentelemetry-instrumentation + wrapt + ]; + + nativeCheckInputs = [ + opentelemetry-test-utils + pytestCheckHook + ]; + + pythonImportsCheck = [ "opentelemetry.instrumentation.threading" ]; + + meta = opentelemetry-instrumentation.meta // { + description = "Thread context propagation support for OpenTelemetry"; + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-threading"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 86e17acd313e..c50431f774fc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11630,6 +11630,10 @@ self: super: with self; { callPackage ../development/python-modules/opentelemetry-instrumentation-sqlalchemy { }; + opentelemetry-instrumentation-threading = + callPackage ../development/python-modules/opentelemetry-instrumentation-threading + { }; + opentelemetry-instrumentation-urllib3 = callPackage ../development/python-modules/opentelemetry-instrumentation-urllib3 { }; From 97a61859ab2031e72300a5241332991aff509c40 Mon Sep 17 00:00:00 2001 From: caverav Date: Sat, 28 Feb 2026 12:49:51 -0300 Subject: [PATCH 2/4] semgrep: 1.145.0 -> 1.152.0 - run update.sh to refresh source, wheel, and submodule hashes - add missing runtime deps required by 1.152.0: semantic-version and opentelemetry-instrumentation-threading https://github.com/semgrep/semgrep/releases/tag/v1.152.0 --- .../python-modules/semgrep/common.nix | 16 ++++++++-------- .../python-modules/semgrep/default.nix | 4 ++++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/semgrep/common.nix b/pkgs/development/python-modules/semgrep/common.nix index 6ff3fd04259b..d77ec89cf6fe 100644 --- a/pkgs/development/python-modules/semgrep/common.nix +++ b/pkgs/development/python-modules/semgrep/common.nix @@ -1,9 +1,9 @@ { lib }: rec { - version = "1.145.0"; + version = "1.152.0"; - srcHash = "sha256-yeTToWfCchGHGsSx/Ly3FQmj7K8iW66qItYs0MVtJvo="; + srcHash = "sha256-CwF9URo3nUfkIWP277y03Bq9P6FUC4CQLjuiYwCPR6M="; # submodule dependencies # these are fetched so we: @@ -13,8 +13,8 @@ rec { "cli/src/semgrep/semgrep_interfaces" = { owner = "semgrep"; repo = "semgrep-interfaces"; - rev = "e5da9678488bc24e0d5c27a4de71ad67d375cc58"; - hash = "sha256-9ilDZQmKYD2JN+CQ8VVyNyrjKYXttF+3KspRPHhuPF8="; + rev = "76ce6450aba3422c297b35a16e38b9fd740fc860"; + hash = "sha256-hU76aICQEI7n4tWwZX2fRjgiVw811E4UDkfqQqxX8c0="; }; }; @@ -25,19 +25,19 @@ rec { core = { x86_64-linux = { platform = "musllinux_1_0_x86_64.manylinux2014_x86_64"; - hash = "sha256-W6qWqGiuqOJcBAvTIbTCj4aMLMiAhabJ22lldu3cAR4="; + hash = "sha256-XFZfCxvfCSAs2NxCCbmIU2uN0StNwEPSGaTmaHpYMPo="; }; aarch64-linux = { platform = "musllinux_1_0_aarch64.manylinux2014_aarch64"; - hash = "sha256-WM2aq4PpYSNqB8PONJAqrYAzQNhIoK1MQvqoJri4S/Q="; + hash = "sha256-XdmzHKizsxrls1Ry7pW40f4BRjA6HEayhDUXuxDHoWk="; }; x86_64-darwin = { platform = "macosx_10_14_x86_64"; - hash = "sha256-cpE+GBOZnWsNKRTFzpAQCl+JaqPl0bgLvW4GFdwnMQc="; + hash = "sha256-4ZVFhsN5VyDE/VTnzfellv2dHQIT2nCTKd/54UBRPw0="; }; aarch64-darwin = { platform = "macosx_11_0_arm64"; - hash = "sha256-FAjHtlrGLOGxE7c0/Qd+SpX6NTIh09zDbVAbxQHCDKc="; + hash = "sha256-rEK6kAEKdwIOcmdMhyjTn5MIXbEwLPqrZV3pg3cQINk="; }; }; diff --git a/pkgs/development/python-modules/semgrep/default.nix b/pkgs/development/python-modules/semgrep/default.nix index 8f1bc81e0b2e..7b5adc161094 100644 --- a/pkgs/development/python-modules/semgrep/default.nix +++ b/pkgs/development/python-modules/semgrep/default.nix @@ -21,6 +21,7 @@ opentelemetry-api, opentelemetry-exporter-otlp-proto-http, opentelemetry-instrumentation-requests, + opentelemetry-instrumentation-threading, opentelemetry-sdk, mcp, packaging, @@ -32,6 +33,7 @@ requests, rich, ruamel-yaml, + semantic-version, tomli, tqdm, types-freezegun, @@ -94,6 +96,7 @@ buildPythonPackage rec { requests rich ruamel-yaml + semantic-version tqdm packaging jsonschema @@ -109,6 +112,7 @@ buildPythonPackage rec { opentelemetry-sdk opentelemetry-exporter-otlp-proto-http opentelemetry-instrumentation-requests + opentelemetry-instrumentation-threading ]; doCheck = true; From c5752e2f8429c311c8c67029d617cec5d07a0c19 Mon Sep 17 00:00:00 2001 From: caverav Date: Sat, 28 Feb 2026 12:49:57 -0300 Subject: [PATCH 3/4] maintainers: add caverav --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c304ebff9c23..230de6b58c67 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4453,6 +4453,12 @@ githubId = 495429; name = "Claas Augner"; }; + caverav = { + email = "camilo@fvv.cl"; + github = "caverav"; + githubId = 66751764; + name = "Camilo Vera Vidales"; + }; cawilliamson = { email = "home@chrisaw.com"; github = "cawilliamson"; From 69fb0ee8b9f329da0fb446af9f483d97a59e8f8f Mon Sep 17 00:00:00 2001 From: caverav Date: Fri, 20 Feb 2026 12:08:08 -0300 Subject: [PATCH 4/4] semgrep: add caverav as maintainer --- pkgs/development/python-modules/semgrep/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/semgrep/common.nix b/pkgs/development/python-modules/semgrep/common.nix index d77ec89cf6fe..65a674251561 100644 --- a/pkgs/development/python-modules/semgrep/common.nix +++ b/pkgs/development/python-modules/semgrep/common.nix @@ -57,6 +57,7 @@ rec { maintainers = with lib.maintainers; [ jk ambroisie + caverav ]; }; }