Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1b97770dcf75
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ce9b83b8fee9
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 9, 2019

  1. Merge pull request #57132 from ckauhaus/vulnix-1.8.0 

    vulnix: 1.7.1 -> 1.8.0
(cherry picked from commit 1f8aa8b)
    @7c6f434c
    7c6f434c committed Mar 9, 2019
    Copy the full SHA
    ce9b83b View commit details
Showing with 5 additions and 6 deletions.
  1. +5 −6 pkgs/tools/security/vulnix/default.nix
11 changes: 5 additions & 6 deletions pkgs/tools/security/vulnix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,14 @@

pythonPackages.buildPythonApplication rec {
pname = "vulnix";
version = "1.7.1";
version = "1.8.0";

src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "15c32976sgb5clixngi6z1fk5h02v1kn1a89h8rkbkvyhfnjgg8m";
sha256 = "15j8zz7qmf6c6vhim08yn1knn0qhwypmc7bxw608zg5nf50vghyb";
};

outputs = [ "out" "doc" "man" ];
nativeBuildInputs = [ ronn ];

checkInputs = with pythonPackages; [
@@ -30,17 +31,15 @@ pythonPackages.buildPythonApplication rec {
zodb
]);

outputs = [ "out" "doc" ];

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
install -D -t $man/share/man/man1 doc/vulnix.1
install -D -t $man/share/man/man5 doc/vulnix-whitelist.5
'';

dontStrip = true;