diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-04-21 12:08:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-21 12:08:25 +0100 |
| commit | c0eaaaef33b3ab5ac9d07cb6ddea25b57c4c0a3f (patch) | |
| tree | 8f78272bf52b93e83238532259b901d046b32971 /pkgs/tools/security | |
| parent | 67a6741305db66b531ce097e215d32f9b5a05c8a (diff) | |
| parent | 7808216f7b61496688bde4e97f42eb3b12eeb723 (diff) | |
| download | nixlib-c0eaaaef33b3ab5ac9d07cb6ddea25b57c4c0a3f.tar nixlib-c0eaaaef33b3ab5ac9d07cb6ddea25b57c4c0a3f.tar.gz nixlib-c0eaaaef33b3ab5ac9d07cb6ddea25b57c4c0a3f.tar.bz2 nixlib-c0eaaaef33b3ab5ac9d07cb6ddea25b57c4c0a3f.tar.lz nixlib-c0eaaaef33b3ab5ac9d07cb6ddea25b57c4c0a3f.tar.xz nixlib-c0eaaaef33b3ab5ac9d07cb6ddea25b57c4c0a3f.tar.zst nixlib-c0eaaaef33b3ab5ac9d07cb6ddea25b57c4c0a3f.zip | |
Merge pull request #39236 from ckauhaus/vulnix-update-1.6
vulnix: 1.4.0 -> 1.6.1
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/vulnix/default.nix | 34 | ||||
| -rw-r--r-- | pkgs/tools/security/vulnix/disable-flake8.patch | 23 |
2 files changed, 49 insertions, 8 deletions
diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index b2cbb005ae7c..b28fa7cfd475 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -1,16 +1,17 @@ -{ stdenv, pythonPackages, fetchurl, callPackage, nix }: +{ stdenv, pythonPackages, fetchurl, callPackage, nix, ronn }: pythonPackages.buildPythonApplication rec { - name = "${pname}-${version}"; pname = "vulnix"; - version = "1.4.0"; + version = "1.6.1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "19kfqxlrigrgwn74x06m70ar2fhyhic5kfmdanjwjcbaxblha3l8"; + sha256 = "0j6v6phq3naqnpvzxxnynsyv9y7bhig1gzvg594qpknqgyzj16bf"; }; - buildInputs = with pythonPackages; [ flake8 pytest pytestcov ]; + buildInputs = + [ ronn ] ++ + (with pythonPackages; [ freezegun pytest pytestcov ]); propagatedBuildInputs = [ nix @@ -20,14 +21,31 @@ pythonPackages.buildPythonApplication rec { lxml pyyaml requests + toml zodb ]); - postPatch = '' - sed -i -e 's/==\([^=]\+\)/>=\1/g' setup.py + outputs = [ "out" "doc" ]; + + # pytest-flake8 is currently broken + # re-enable after it has been fixed + # https://github.com/NixOS/nixpkgs/issues/39206 + patches = [ ./disable-flake8.patch ]; + + postBuild = '' + make -C doc + ''; + + checkPhase = "py.test src/vulnix"; + + postInstall = '' + install -D -t $out/share/man/man1 doc/vulnix.1 + install -D -t $out/share/man/man5 doc/vulnix-whitelist.5 + install -D -t $doc/share/doc/vulnix README.rst CHANGES.rst + gzip $doc/share/doc/vulnix/*.rst ''; - checkPhase = "py.test"; + dontStrip = true; meta = with stdenv.lib; { description = "NixOS vulnerability scanner"; diff --git a/pkgs/tools/security/vulnix/disable-flake8.patch b/pkgs/tools/security/vulnix/disable-flake8.patch new file mode 100644 index 000000000000..cd165d05ccc1 --- /dev/null +++ b/pkgs/tools/security/vulnix/disable-flake8.patch @@ -0,0 +1,23 @@ +diff --git a/setup.cfg b/setup.cfg +index a9e37ce..41b9886 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -1,5 +1,5 @@ + [tool:pytest] +-addopts = --flake8 --tb=native --cov=src --cov-report=html --junitxml=report.xml -m 'not jenkinsonly' src/vulnix ++addopts = --tb=native --cov=src --cov-report=html --junitxml=report.xml -m 'not jenkinsonly' src/vulnix + 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. + + [aliases] +diff --git a/setup.py b/setup.py +index a9315e5..d14ad59 100644 +--- a/setup.py ++++ b/setup.py +@@ -35,7 +35,6 @@ setup( + 'freezegun>0.3', + 'pytest>=3.2', + 'pytest-cov>=2.5', +- 'pytest-flake8', + 'pytest-runner>=2.11,<3dev', + 'pytest-timeout>=1.2', + 'setuptools_scm>=1.15', |