From 1135bbb6758ccdc7a0ca0efbe24c0ba04a8e9140 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 26 Jan 2026 12:56:07 +0100 Subject: [PATCH 1/8] python313Packages.commoncode: 32.4.0 -> 32.4.2 Diff: https://github.com/nexB/commoncode/compare/v32.4.0...v32.4.2 Changelog: https://github.com/nexB/commoncode/blob/v32.4.2/CHANGELOG.rst --- pkgs/development/python-modules/commoncode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix index 87bf7d225fa7..2a4d0af5dd09 100644 --- a/pkgs/development/python-modules/commoncode/default.nix +++ b/pkgs/development/python-modules/commoncode/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "commoncode"; - version = "32.4.0"; + version = "32.4.2"; pyproject = true; src = fetchFromGitHub { owner = "nexB"; repo = "commoncode"; tag = "v${version}"; - hash = "sha256-k9E/Yz6G3IHJPf3BlscZNSL4Qk9WyGU3vXA+U+GwWA0="; + hash = "sha256-A2FE+qhLQahuAtptP3hCnIUgh7j61Wf02avO6DM0b5E="; }; dontConfigure = true; From 67696b0939517537d71db6e4037c20cd9d494290 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 26 Jan 2026 12:56:28 +0100 Subject: [PATCH 2/8] python313Packages.container-inspector: 33.0.1 -> 33.1.0 Changelog: https://github.com/nexB/container-inspector/releases/tag/v33.1.0 --- .../python-modules/container-inspector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/container-inspector/default.nix b/pkgs/development/python-modules/container-inspector/default.nix index 31e4b94387b1..8493b777ecd5 100644 --- a/pkgs/development/python-modules/container-inspector/default.nix +++ b/pkgs/development/python-modules/container-inspector/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "container-inspector"; - version = "33.0.1"; + version = "33.1.0"; pyproject = true; src = fetchFromGitHub { owner = "nexB"; repo = "container-inspector"; tag = "v${version}"; - hash = "sha256-bXJ4UIDVhiU0DurEeRiyLlSUrNRgwoMqAxXxGb/CcJs="; + hash = "sha256-uwfqPh4e5zNO0K5rKZ2pxgOkX/KF9pzCsKdYbQuw9MA="; }; dontConfigure = true; From 2b1021e63a986543264d9eba807b1ee589daaa9b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 26 Jan 2026 12:59:24 +0100 Subject: [PATCH 3/8] python313Packages.commoncode: migrate to finalAttrs --- pkgs/development/python-modules/commoncode/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix index 2a4d0af5dd09..7a8482db6ec4 100644 --- a/pkgs/development/python-modules/commoncode/default.nix +++ b/pkgs/development/python-modules/commoncode/default.nix @@ -14,7 +14,7 @@ text-unidecode, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "commoncode"; version = "32.4.2"; pyproject = true; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nexB"; repo = "commoncode"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-A2FE+qhLQahuAtptP3hCnIUgh7j61Wf02avO6DM0b5E="; }; @@ -66,8 +66,8 @@ buildPythonPackage rec { meta = { description = "Set of common utilities, originally split from ScanCode"; homepage = "https://github.com/nexB/commoncode"; - changelog = "https://github.com/nexB/commoncode/blob/${src.tag}/CHANGELOG.rst"; + changelog = "https://github.com/nexB/commoncode/blob/${finalAttrs.src.tag}/CHANGELOG.rst"; license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) From 1ccdb2a64afdb4d9b2af7892c18464b7614cf32e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 26 Jan 2026 13:00:51 +0100 Subject: [PATCH 4/8] python313Packages.container-inspector: modernize --- .../python-modules/container-inspector/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/container-inspector/default.nix b/pkgs/development/python-modules/container-inspector/default.nix index 8493b777ecd5..da2a8d11f986 100644 --- a/pkgs/development/python-modules/container-inspector/default.nix +++ b/pkgs/development/python-modules/container-inspector/default.nix @@ -10,7 +10,7 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "container-inspector"; version = "33.1.0"; pyproject = true; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nexB"; repo = "container-inspector"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-uwfqPh4e5zNO0K5rKZ2pxgOkX/KF9pzCsKdYbQuw9MA="; }; @@ -26,7 +26,7 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ attrs click dockerfile-parse @@ -40,8 +40,8 @@ buildPythonPackage rec { meta = { description = "Suite of analysis utilities and command line tools for container images"; homepage = "https://github.com/nexB/container-inspector"; - changelog = "https://github.com/nexB/container-inspector/releases/tag/v${version}"; - license = with lib.licenses; [ asl20 ]; + changelog = "https://github.com/nexB/container-inspector/releases/tag/v${finalAttrs.src.tag}"; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) From 81fde0f76c5e7d556d754b2142836671d614dde3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 26 Jan 2026 13:30:43 +0100 Subject: [PATCH 5/8] python313Packages.spdx-tools: 0.8.3 -> 0.8.4 Changelog: https://github.com/spdx/tools-python/blob/v0.8.4/CHANGELOG.md --- .../python-modules/spdx-tools/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/spdx-tools/default.nix b/pkgs/development/python-modules/spdx-tools/default.nix index 08458f9bb14e..d153461f16d1 100644 --- a/pkgs/development/python-modules/spdx-tools/default.nix +++ b/pkgs/development/python-modules/spdx-tools/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, click, fetchFromGitHub, - fetchpatch, license-expression, ply, pytestCheckHook, @@ -19,25 +18,16 @@ buildPythonPackage rec { pname = "spdx-tools"; - version = "0.8.3"; + version = "0.8.4"; pyproject = true; src = fetchFromGitHub { owner = "spdx"; repo = "tools-python"; tag = "v${version}"; - hash = "sha256-r7+RYGoq3LJYN1jYfwzb1r3fc/kL+CPd4pmGATFq8Pw="; + hash = "sha256-loD+YXRCEYRynOKf7Da43SA7JQVYP1IzJe2f7ssJTtI="; }; - patches = [ - # https://github.com/spdx/tools-python/issues/844 - (fetchpatch { - name = "beartype-0.20-compat.patch"; - url = "https://github.com/spdx/tools-python/pull/841/commits/3b13bd5af36a2b78f5c87fdbadc3f2601d2dcd8d.patch"; - hash = "sha256-8sQNGRss4R1olsw+xGps3NICyimBxKv47TaSrCcnVhA="; - }) - ]; - build-system = [ setuptools setuptools-scm From f6719a7001dde1686e50d09c65a5f6d402d2e4c4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 26 Jan 2026 13:36:43 +0100 Subject: [PATCH 6/8] python313Packages.spdx-tools: migrate to finalAttrs --- pkgs/development/python-modules/spdx-tools/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/spdx-tools/default.nix b/pkgs/development/python-modules/spdx-tools/default.nix index d153461f16d1..b3dfe906c11f 100644 --- a/pkgs/development/python-modules/spdx-tools/default.nix +++ b/pkgs/development/python-modules/spdx-tools/default.nix @@ -16,7 +16,7 @@ xmltodict, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "spdx-tools"; version = "0.8.4"; pyproject = true; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "spdx"; repo = "tools-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-loD+YXRCEYRynOKf7Da43SA7JQVYP1IzJe2f7ssJTtI="; }; @@ -63,8 +63,8 @@ buildPythonPackage rec { meta = { description = "SPDX parser and tools"; homepage = "https://github.com/spdx/tools-python"; - changelog = "https://github.com/spdx/tools-python/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/spdx/tools-python/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) From e23f40419543777e647d26796ff73a3c26abd642 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 26 Jan 2026 13:45:47 +0100 Subject: [PATCH 7/8] python314Packages.multiregex: init at 2.0.3 Quickly match many regexes against a string https://github.com/quantco/multiregex --- .../python-modules/multiregex/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/multiregex/default.nix diff --git a/pkgs/development/python-modules/multiregex/default.nix b/pkgs/development/python-modules/multiregex/default.nix new file mode 100644 index 000000000000..caa7739cc86c --- /dev/null +++ b/pkgs/development/python-modules/multiregex/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pyahocorasick, + pytestCheckHook, + setuptools-scm, + setuptools, +}: + +buildPythonPackage rec { + pname = "multiregex"; + version = "2.0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "quantco"; + repo = "multiregex"; + tag = version; + hash = "sha256-S10FJwtFNK4CarE2YAcUM38hRYTDL0Vp4B8NqGvJs5M="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ pyahocorasick ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "multiregex" ]; + + meta = { + description = "Quickly match many regexes against a string"; + homepage = "https://github.com/quantco/multiregex"; + changelog = "https://github.com/quantco/multiregex/blob/${src.tag}/CHANGELOG.rst"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 200a96eb4b2d..ac68f2364703 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10154,6 +10154,8 @@ self: super: with self; { multiprocess = callPackage ../development/python-modules/multiprocess { }; + multiregex = callPackage ../development/python-modules/multiregex { }; + multiscale-spatial-image = callPackage ../development/python-modules/multiscale-spatial-image { }; multiset = callPackage ../development/python-modules/multiset { }; From f552317227feb0e1aa0f9e8e61c54b7ba35bf24e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 26 Jan 2026 13:49:39 +0100 Subject: [PATCH 8/8] python314Packages.scancode-toolkit: 32.4.1 -> 32.5.0 Changelog: https://github.com/nexB/scancode-toolkit/blob/v32.5.0/CHANGELOG.rst --- .../python-modules/scancode-toolkit/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index bfde86cd69ab..ffd1f0fcdf90 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -30,6 +30,7 @@ license-expression, lxml, markupsafe, + multiregex, packageurl-python, packaging, parameter-expansion-patched, @@ -60,12 +61,13 @@ buildPythonPackage rec { pname = "scancode-toolkit"; - version = "32.4.1"; + version = "32.5.0"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-qZUILeB1lGv0V9Uq81/aOI9pJTtayfZH/O5kwNnpf28="; + pname = "scancode_toolkit"; + inherit version; + hash = "sha256-WXAZCk0aRmKb1UU1ud95mZFHAMC9U+gDRd9w7TZTVSA="; }; dontConfigure = true; @@ -101,6 +103,7 @@ buildPythonPackage rec { license-expression lxml markupsafe + multiregex packageurl-python packaging parameter-expansion-patched @@ -126,9 +129,7 @@ buildPythonPackage rec { xmltodict ]; - nativeBuildInputs = [ - writableTmpDirAsHomeHook - ]; + nativeBuildInputs = [ writableTmpDirAsHomeHook ]; nativeCheckInputs = [ pytestCheckHook ];