Merge pull request #168710 from fabaff/bump-checkov
checkov: 2.0.1034 -> 2.0.1065
This commit is contained in:
commit
a2c87f6132
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bc-python-hcl2";
|
||||
version = "0.3.37";
|
||||
version = "0.3.39";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-+Wr/JF9es2LQhQ5rc0iyGZa0Di5CsFo9k36WI7jrOqs=";
|
||||
hash = "sha256-JMQ2sLgAnMJ1/0nR8LgKbpPB43gVKtCtrZKr/T4p0O8=";
|
||||
};
|
||||
|
||||
# Nose is required during build process, so can not use `checkInputs`.
|
||||
|
|
|
@ -6,27 +6,28 @@
|
|||
, lxml
|
||||
, packageurl-python
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, python
|
||||
, pythonOlder
|
||||
, requirements-parser
|
||||
, setuptools
|
||||
, toml
|
||||
, types-setuptools
|
||||
, types-toml
|
||||
, xmldiff
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cyclonedx-python-lib";
|
||||
version = "2.0.0";
|
||||
version = "2.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CycloneDX";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-S1bcUCHe4UYJuSHI8LMQZ/reS6YAE0hxrpw+QweFm/8=";
|
||||
hash = "sha256-QylA3bf0P65prR74H5+Sm51xWjjhOYpe4jHX7m/f6mI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -46,13 +47,21 @@ buildPythonPackage rec {
|
|||
checkInputs = [
|
||||
jsonschema
|
||||
lxml
|
||||
pytestCheckHook
|
||||
xmldiff
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"cyclonedx"
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
# Tests require network access
|
||||
rm tests/test_output_json.py
|
||||
${python.interpreter} -m unittest discover -s tests -v
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for generating CycloneDX SBOMs";
|
||||
homepage = "https://github.com/CycloneDX/cyclonedx-python-lib";
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycep-parser";
|
||||
version = "0.3.2";
|
||||
version = "0.3.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "gruebel";
|
||||
repo = "pycep";
|
||||
rev = version;
|
||||
hash = "sha256-ud26xJQWdu7wtv75/K16HSSw0MvaSr3H1hDZBPjSzYE=";
|
||||
hash = "sha256-o2sYPvZVevDqZV8EtKWTL2zHHzX2kmTZ4iVHsUhFv7M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -41,8 +41,7 @@ buildPythonPackage rec {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'version = "0.3.2-alpha.4"' 'version = "${version}"' \
|
||||
--replace 'regex = "^2022.3.2"' 'regex = "*"'
|
||||
--replace 'regex = "^2022.3.15"' 'regex = "*"'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
@ -32,13 +32,13 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.1034";
|
||||
version = "2.0.1065";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-amSgg/6yYaLKzwkO7dq06zvh4744RyTVhd/tdurHKa4=";
|
||||
hash = "sha256-q51do9Kbl85p+wOMnFM4QpjezHll8sTmw8vffWcQrRE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
@ -95,7 +95,7 @@ buildPythonApplication rec {
|
|||
substituteInPlace setup.py \
|
||||
--replace "cyclonedx-python-lib>=0.11.0,<1.0.0" "cyclonedx-python-lib>=0.11.0" \
|
||||
--replace "prettytable>=3.0.0" "prettytable" \
|
||||
--replace "pycep-parser==0.3.3" "pycep-parser"
|
||||
--replace "pycep-parser==0.3.4" "pycep-parser"
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
|
|
Loading…
Reference in a new issue