pyrox.dev
Merge pull request #249058 from fabaff/checkov-bump
checkov: 2.3.361 -> 2.3.364
authored by Fabian Affolter and committed by GitHub 6df7fdc2 32c7b9a2
+29
-12
pkgs/development/python-modules/spdx-tools/default.nix
+29
-12
pkgs/development/python-modules/spdx-tools/default.nix
···
1
1
{ lib
2
-
, buildPythonPackage
3
2
, beartype
3
+
, buildPythonPackage
4
4
, click
5
-
, fetchPypi
5
+
, fetchFromGitHub
6
6
, license-expression
7
+
, ply
8
+
, pytestCheckHook
9
+
, pythonOlder
7
10
, pyyaml
8
11
, rdflib
9
-
, ply
10
12
, semantic-version
13
+
, setuptools
14
+
, setuptools-scm
15
+
, uritools
11
16
, xmltodict
12
-
, pytestCheckHook
13
-
, pythonOlder
14
-
, uritools
15
17
}:
16
18
17
19
buildPythonPackage rec {
18
20
pname = "spdx-tools";
19
21
version = "0.8.0";
20
-
format = "setuptools";
22
+
format = "pyproject";
21
23
22
24
disabled = pythonOlder "3.7";
23
25
24
-
src = fetchPypi {
25
-
inherit pname version;
26
-
hash = "sha256-ZoCb94eDtHFH3K9ppju51WHrReay7BXC6P4VUOJK4c0=";
26
+
src = fetchFromGitHub {
27
+
owner = "spdx";
28
+
repo = "tools-python";
29
+
rev = "refs/tags/v${version}";
30
+
hash = "sha256-TMiaxapJuiLqm+x9K49MIzeWOE/CRAI+M1+9OeU0YvM=";
27
31
};
32
+
33
+
SETUPTOOLS_SCM_PRETEND_VERSION = version;
34
+
35
+
nativeBuildInputs = [
36
+
setuptools
37
+
setuptools-scm
38
+
];
28
39
29
40
propagatedBuildInputs = [
30
41
beartype
···
47
58
];
48
59
49
60
disabledTestPaths = [
50
-
# Depends on the currently not packaged pyshacl module.
61
+
# Test depends on the currently not packaged pyshacl module
51
62
"tests/spdx3/validation/json_ld/test_shacl_validation.py"
52
63
];
53
64
65
+
disabledTests = [
66
+
# Missing files
67
+
"test_spdx2_convert_to_spdx3"
68
+
"test_json_writer"
69
+
];
70
+
54
71
meta = with lib; {
55
72
description = "SPDX parser and tools";
56
73
homepage = "https://github.com/spdx/tools-python";
57
74
changelog = "https://github.com/spdx/tools-python/blob/v${version}/CHANGELOG.md";
58
75
license = licenses.asl20;
59
-
maintainers = [ ];
76
+
maintainers = with maintainers; [ fab ];
60
77
};
61
78
}
+2
-2
pkgs/development/tools/analysis/checkov/default.nix
+2
-2
pkgs/development/tools/analysis/checkov/default.nix
···
22
22
23
23
buildPythonApplication rec {
24
24
pname = "checkov";
25
-
version = "2.3.361";
25
+
version = "2.3.364";
26
26
format = "setuptools";
27
27
28
28
src = fetchFromGitHub {
29
29
owner = "bridgecrewio";
30
30
repo = pname;
31
31
rev = "refs/tags/${version}";
32
-
hash = "sha256-k357VjGB+mKsKsd+l0S2lMh1f5za5Htlm4AWEVisQss=";
32
+
hash = "sha256-pec8JLFLqhe75G2Tk/3EwGYr9Dg2xgT8MlVS471QH60=";
33
33
};
34
34
35
35
patches = [