From efcd99da80e4b22d1c8d9f0693703f5f0dccccb7 Mon Sep 17 00:00:00 2001 From: tea Date: Sat, 4 May 2024 07:55:29 +0200 Subject: [PATCH] lib4sbom: move to development/python-modules --- .../python-modules/lib4sbom/default.nix} | 12 ++++++++---- pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) rename pkgs/{by-name/li/lib4sbom/package.nix => development/python-modules/lib4sbom/default.nix} (87%) diff --git a/pkgs/by-name/li/lib4sbom/package.nix b/pkgs/development/python-modules/lib4sbom/default.nix similarity index 87% rename from pkgs/by-name/li/lib4sbom/package.nix rename to pkgs/development/python-modules/lib4sbom/default.nix index c9c159f1b6ad..0840b14c70b7 100644 --- a/pkgs/by-name/li/lib4sbom/package.nix +++ b/pkgs/development/python-modules/lib4sbom/default.nix @@ -1,9 +1,13 @@ { lib -, python3Packages +, buildPythonPackage , fetchFromGitHub +, pyyaml +, semantic-version +, defusedxml +, pytestCheckHook }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "lib4sbom"; version = "0.7.1"; format = "setuptools"; @@ -15,13 +19,13 @@ python3Packages.buildPythonPackage rec { hash = "sha256-UQZZYTRDbUqSH6F8hjhp9L70025cRO3zXQ8Aoznotg4="; }; - propagatedBuildInputs = with python3Packages; [ + dependencies = [ pyyaml semantic-version defusedxml ]; - nativeCheckInputs = with python3Packages; [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a78d1c956a7a..d2bc87b3c22e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6564,6 +6564,8 @@ self: super: with self; { pa-ringbuffer = callPackage ../development/python-modules/pa-ringbuffer { }; + lib4sbom = callPackage ../development/python-modules/lib4sbom { }; + libais = callPackage ../development/python-modules/libais { }; libarchive-c = callPackage ../development/python-modules/libarchive-c {