diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2017-10-30 07:51:09 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-10-30 07:51:09 +0100 |
commit | 6d41ae55dd8697dd79022891ba8b1d77696c7bb0 (patch) | |
tree | a3505c16c67da6f9aff22500b8758856869c7963 /pkgs/tools | |
parent | d0d0308876cd47696b3d7b5606e83dec69a9be8a (diff) | |
parent | ff40e1b2a41c55ddfcd9eab0ef64ff714523b428 (diff) | |
download | nixlib-6d41ae55dd8697dd79022891ba8b1d77696c7bb0.tar nixlib-6d41ae55dd8697dd79022891ba8b1d77696c7bb0.tar.gz nixlib-6d41ae55dd8697dd79022891ba8b1d77696c7bb0.tar.bz2 nixlib-6d41ae55dd8697dd79022891ba8b1d77696c7bb0.tar.lz nixlib-6d41ae55dd8697dd79022891ba8b1d77696c7bb0.tar.xz nixlib-6d41ae55dd8697dd79022891ba8b1d77696c7bb0.tar.zst nixlib-6d41ae55dd8697dd79022891ba8b1d77696c7bb0.zip |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/misc/vdirsyncer/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/security/vulnix/default.nix | 14 |
2 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 731a194cc6a2..17798057ec3d 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -18,6 +18,7 @@ pythonPackages.buildPythonApplication rec { click click-log click-threading requests_toolbelt requests + requests_oauthlib # required for google oauth sync atomicwrites ]; diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index 1beb2268fc6c..c86891d8ccd8 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -3,19 +3,15 @@ pythonPackages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "vulnix"; - version = "1.2.2"; + version = "1.3.4"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1ia9plziwach0bxnlcd33q30kcsf8sv0nf2jc78gsmrqnxjabr12"; + sha256 = "1js1i86pgkkqc9yzp1rck7rmaz79klv4048r9z7v56fam0a6sg05"; }; buildInputs = with pythonPackages; [ flake8 pytest pytestcov ]; - postPatch = '' - sed -i -e 's/==\([^=]\+\)/>=\1/g' setup.py - ''; - propagatedBuildInputs = [ nix ] ++ (with pythonPackages; [ @@ -27,12 +23,16 @@ pythonPackages.buildPythonApplication rec { zodb ]); + postPatch = '' + sed -i -e 's/==\([^=]\+\)/>=\1/g' setup.py + ''; + checkPhase = "py.test"; meta = with stdenv.lib; { description = "NixOS vulnerability scanner"; homepage = https://github.com/flyingcircusio/vulnix; license = licenses.bsd2; - maintainers = with maintainers; [ plumps ]; + maintainers = with maintainers; [ ckauhaus plumps ]; }; } |