From 0d282a3f8165f7449930c4a39f3a149a924a502c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 18 Mar 2026 18:09:51 +0100 Subject: [PATCH 1/2] python3Packages.cyclonedx-python-lib: 11.6.0 -> 11.7.0 Diff: https://github.com/CycloneDX/cyclonedx-python-lib/compare/v11.6.0...v11.7.0 Changelog: https://github.com/CycloneDX/cyclonedx-python-lib/releases/tag/v11.7.0 --- .../python-modules/cyclonedx-python-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 53b612c9c60a..7a112ab5079c 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "11.6.0"; + version = "11.7.0"; pyproject = true; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-python-lib"; tag = "v${version}"; - hash = "sha256-LnXunfYUz76XIHEXhaFJymBMFln8sIH0yxCodRmKdY0="; + hash = "sha256-35JTr2he7sHOqG3Nd0UM9CZ4Q/HFv3UQsF6hxOKR/+k="; }; pythonRelaxDeps = [ "py-serializable" ]; From 257445a490939ae1e6e438bc5e75e98e6215082a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 18 Mar 2026 18:17:10 +0100 Subject: [PATCH 2/2] python3Packages.cyclonedx-python-lib: modernize --- .../cyclonedx-python-lib/default.nix | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 7a112ab5079c..62b1935e1896 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -20,7 +20,7 @@ xmldiff, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cyclonedx-python-lib"; version = "11.7.0"; pyproject = true; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-python-lib"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-35JTr2he7sHOqG3Nd0UM9CZ4Q/HFv3UQsF6hxOKR/+k="; }; @@ -54,12 +54,8 @@ buildPythonPackage rec { jsonschema lxml ]; - json-validation = [ - jsonschema - ]; - xml-validation = [ - lxml - ]; + json-validation = [ jsonschema ]; + xml-validation = [ lxml ]; }; nativeCheckInputs = [ @@ -67,7 +63,7 @@ buildPythonPackage rec { pytestCheckHook xmldiff ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies); pythonImportsCheck = [ "cyclonedx" ]; @@ -93,8 +89,8 @@ buildPythonPackage rec { meta = { description = "Python library for generating CycloneDX SBOMs"; homepage = "https://github.com/CycloneDX/cyclonedx-python-lib"; - changelog = "https://github.com/CycloneDX/cyclonedx-python-lib/releases/tag/${src.tag}"; - license = with lib.licenses; [ asl20 ]; + changelog = "https://github.com/CycloneDX/cyclonedx-python-lib/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +})