From 912fce04942ccfb1057a1d19e1d26245031e6295 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Aug 2024 02:46:50 +0000 Subject: [PATCH 1/3] python312Packages.lib4sbom: 0.7.2 -> 0.7.3 --- pkgs/development/python-modules/lib4sbom/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/lib4sbom/default.nix b/pkgs/development/python-modules/lib4sbom/default.nix index 6cdbefeb65da..8960c7a54fd9 100644 --- a/pkgs/development/python-modules/lib4sbom/default.nix +++ b/pkgs/development/python-modules/lib4sbom/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "lib4sbom"; - version = "0.7.2"; + version = "0.7.3"; format = "setuptools"; src = fetchFromGitHub { owner = "anthonyharrison"; repo = pname; - rev = "v${version}"; - hash = "sha256-sjfOCG1E5Of+HPcfRsBwEKmGkhUOIkAARWja81FL2PY="; + rev = "refs/tags/v${version}"; + hash = "sha256-RuIvhlLnWf/ayU6tjpHYKvBFqU8ojPwJK/pDIdLrD2s="; }; dependencies = [ From 3753d69d824628fc5742e5dbd61e96ef3219487c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Aug 2024 08:47:03 +0200 Subject: [PATCH 2/3] python312Packages.lib4sbom: add changelog to meta --- pkgs/development/python-modules/lib4sbom/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/lib4sbom/default.nix b/pkgs/development/python-modules/lib4sbom/default.nix index 8960c7a54fd9..8f414dce9914 100644 --- a/pkgs/development/python-modules/lib4sbom/default.nix +++ b/pkgs/development/python-modules/lib4sbom/default.nix @@ -54,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to ingest and generate SBOMs"; homepage = "https://github.com/anthonyharrison/lib4sbom"; + changelog = "https://github.com/anthonyharrison/lib4sbom/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ teatwig ]; }; From 1e7863e7e7fe15882ab634ff4b53ec53cf89c270 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Aug 2024 08:50:11 +0200 Subject: [PATCH 3/3] python312Packages.lib4sbom: refactor --- .../python-modules/lib4sbom/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/lib4sbom/default.nix b/pkgs/development/python-modules/lib4sbom/default.nix index 8f414dce9914..3dc8f0c4c236 100644 --- a/pkgs/development/python-modules/lib4sbom/default.nix +++ b/pkgs/development/python-modules/lib4sbom/default.nix @@ -1,29 +1,35 @@ { lib, buildPythonPackage, + defusedxml, fetchFromGitHub, + pytestCheckHook, + pythonOlder, pyyaml, semantic-version, - defusedxml, - pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "lib4sbom"; version = "0.7.3"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "anthonyharrison"; - repo = pname; + repo = "lib4sbom"; rev = "refs/tags/v${version}"; hash = "sha256-RuIvhlLnWf/ayU6tjpHYKvBFqU8ojPwJK/pDIdLrD2s="; }; + build-system = [ setuptools ]; + dependencies = [ + defusedxml pyyaml semantic-version - defusedxml ]; nativeCheckInputs = [ pytestCheckHook ];