pyrox.dev
lol
Merge pull request #39236 from ckauhaus/vulnix-update-1.6
vulnix: 1.4.0 -> 1.6.1
authored by
Jörg Thalheim
and committed by
GitHub
c0eaaaef
67a67413
+26
-8
pkgs/tools/security/vulnix/default.nix
+26
-8
pkgs/tools/security/vulnix/default.nix
···
1
-
{ stdenv, pythonPackages, fetchurl, callPackage, nix }:
1
+
{ stdenv, pythonPackages, fetchurl, callPackage, nix, ronn }:
2
2
3
3
pythonPackages.buildPythonApplication rec {
4
-
name = "${pname}-${version}";
5
4
pname = "vulnix";
6
-
version = "1.4.0";
5
+
version = "1.6.1";
7
6
8
7
src = pythonPackages.fetchPypi {
9
8
inherit pname version;
10
-
sha256 = "19kfqxlrigrgwn74x06m70ar2fhyhic5kfmdanjwjcbaxblha3l8";
9
+
sha256 = "0j6v6phq3naqnpvzxxnynsyv9y7bhig1gzvg594qpknqgyzj16bf";
11
10
};
12
11
13
-
buildInputs = with pythonPackages; [ flake8 pytest pytestcov ];
12
+
buildInputs =
13
+
[ ronn ] ++
14
+
(with pythonPackages; [ freezegun pytest pytestcov ]);
14
15
15
16
propagatedBuildInputs = [
16
17
nix
···
20
21
lxml
21
22
pyyaml
22
23
requests
24
+
toml
23
25
zodb
24
26
]);
25
27
26
-
postPatch = ''
27
-
sed -i -e 's/==\([^=]\+\)/>=\1/g' setup.py
28
+
outputs = [ "out" "doc" ];
29
+
30
+
# pytest-flake8 is currently broken
31
+
# re-enable after it has been fixed
32
+
# https://github.com/NixOS/nixpkgs/issues/39206
33
+
patches = [ ./disable-flake8.patch ];
34
+
35
+
postBuild = ''
36
+
make -C doc
28
37
'';
29
38
30
-
checkPhase = "py.test";
39
+
checkPhase = "py.test src/vulnix";
40
+
41
+
postInstall = ''
42
+
install -D -t $out/share/man/man1 doc/vulnix.1
43
+
install -D -t $out/share/man/man5 doc/vulnix-whitelist.5
44
+
install -D -t $doc/share/doc/vulnix README.rst CHANGES.rst
45
+
gzip $doc/share/doc/vulnix/*.rst
46
+
'';
47
+
48
+
dontStrip = true;
31
49
32
50
meta = with stdenv.lib; {
33
51
description = "NixOS vulnerability scanner";
+23
pkgs/tools/security/vulnix/disable-flake8.patch
+23
pkgs/tools/security/vulnix/disable-flake8.patch
···
1
+
diff --git a/setup.cfg b/setup.cfg
2
+
index a9e37ce..41b9886 100644
3
+
--- a/setup.cfg
4
+
+++ b/setup.cfg
5
+
@@ -1,5 +1,5 @@
6
+
[tool:pytest]
7
+
-addopts = --flake8 --tb=native --cov=src --cov-report=html --junitxml=report.xml -m 'not jenkinsonly' src/vulnix
8
+
+addopts = --tb=native --cov=src --cov-report=html --junitxml=report.xml -m 'not jenkinsonly' src/vulnix
9
+
markers = slow: This is a non-unit test and thus is not run by default. Use ``-m slow`` to run these, or ``-m 1`` to run all tests.
10
+
11
+
[aliases]
12
+
diff --git a/setup.py b/setup.py
13
+
index a9315e5..d14ad59 100644
14
+
--- a/setup.py
15
+
+++ b/setup.py
16
+
@@ -35,7 +35,6 @@ setup(
17
+
'freezegun>0.3',
18
+
'pytest>=3.2',
19
+
'pytest-cov>=2.5',
20
+
- 'pytest-flake8',
21
+
'pytest-runner>=2.11,<3dev',
22
+
'pytest-timeout>=1.2',
23
+
'setuptools_scm>=1.15',