diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix index e3efa1b482ef..4d1fea61386c 100644 --- a/pkgs/by-name/vu/vunnel/package.nix +++ b/pkgs/by-name/vu/vunnel/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "vunnel"; - version = "0.48.0"; + version = "0.55.1"; pyproject = true; src = fetchFromGitHub { owner = "anchore"; repo = "vunnel"; tag = "v${finalAttrs.version}"; - hash = "sha256-D0/DoYmmLeAvGnr6ljE8p0B6dmFi4UHwcWCQRb85OkM="; + hash = "sha256-D3f+r+FGcdetE8kwSddVRE9qQ+LiwUHaJaUqUS086cs="; leaveDotGit = true; }; @@ -55,6 +55,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { sqlalchemy xsdata xxhash + yardstick zstandard ] ++ xsdata.optional-dependencies.cli diff --git a/pkgs/development/python-modules/omitempty/default.nix b/pkgs/development/python-modules/omitempty/default.nix new file mode 100644 index 000000000000..e5f2dbcb4168 --- /dev/null +++ b/pkgs/development/python-modules/omitempty/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, +}: + +buildPythonPackage (finalAttrs: { + pname = "omitempty"; + version = "0.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bfontaine"; + repo = "omitempty"; + tag = finalAttrs.version; + hash = "sha256-XQ887ArfxXnPJcCksgS5Zkg9VAfGRxu0wapewsnqdpY="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "omitempty" ]; + + # Tests are outdated + doCheck = false; + + meta = { + description = "Go's omitempty for Python"; + homepage = "https://github.com/bfontaine/omitempty"; + changelog = "https://github.com/bfontaine/omitempty/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +}) diff --git a/pkgs/development/python-modules/yardstick/default.nix b/pkgs/development/python-modules/yardstick/default.nix new file mode 100644 index 000000000000..315df02cd4e4 --- /dev/null +++ b/pkgs/development/python-modules/yardstick/default.nix @@ -0,0 +1,77 @@ +{ + lib, + buildPythonPackage, + click, + dataclass-wizard, + dataclasses-json, + fetchFromGitHub, + gitpython, + hatchling, + importlib-metadata, + mergedeep, + omitempty, + prompt-toolkit, + pygments, + pytest-asyncio, + pytest-cov-stub, + pytest-mock, + pytestCheckHook, + pyyaml, + requests, + tabulate, + uv-dynamic-versioning, + xxhash, + zstandard, +}: + +buildPythonPackage (finalAttrs: { + pname = "yardstick"; + version = "0.16.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "anchore"; + repo = "yardstick"; + tag = "v${finalAttrs.version}"; + hash = "sha256-4Kwgm2gmgOam7AVzlGYT3QhAyJf14h3pZohrhbzprpg="; + }; + + build-system = [ + hatchling + uv-dynamic-versioning + ]; + + dependencies = [ + click + dataclass-wizard + dataclasses-json + gitpython + importlib-metadata + mergedeep + omitempty + prompt-toolkit + pygments + pyyaml + requests + tabulate + xxhash + zstandard + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytest-cov-stub + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "yardstick" ]; + + meta = { + description = "Module to compare vulnerability scanners results"; + homepage = "https://github.com/anchore/yardstick"; + changelog = "https://github.com/anchore/yardstick/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 15d499c9bd01..86e17acd313e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11309,6 +11309,8 @@ self: super: with self; { omemo-dr = callPackage ../development/python-modules/omemo-dr { }; + omitempty = callPackage ../development/python-modules/omitempty { }; + omnikinverter = callPackage ../development/python-modules/omnikinverter { }; omnilogic = callPackage ../development/python-modules/omnilogic { }; @@ -21190,6 +21192,8 @@ self: super: with self; { yaramod = callPackage ../development/python-modules/yaramod { }; + yardstick = callPackage ../development/python-modules/yardstick { }; + yarg = callPackage ../development/python-modules/yarg { }; yargy = callPackage ../development/python-modules/yargy { };