diff options
author | adisbladis <adis@blad.is> | 2017-08-09 13:19:39 +0800 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-08-09 14:51:01 +0200 |
commit | 9cd05278a69f0864d2229823e8e1a61f2fb7c7ba (patch) | |
tree | 41914404bae548bc445bb5940822f3f0da50e413 | |
parent | 3ba2300b2d24fd90e97468a605d50b5441c2770f (diff) | |
download | nixlib-9cd05278a69f0864d2229823e8e1a61f2fb7c7ba.tar nixlib-9cd05278a69f0864d2229823e8e1a61f2fb7c7ba.tar.gz nixlib-9cd05278a69f0864d2229823e8e1a61f2fb7c7ba.tar.bz2 nixlib-9cd05278a69f0864d2229823e8e1a61f2fb7c7ba.tar.lz nixlib-9cd05278a69f0864d2229823e8e1a61f2fb7c7ba.tar.xz nixlib-9cd05278a69f0864d2229823e8e1a61f2fb7c7ba.tar.zst nixlib-9cd05278a69f0864d2229823e8e1a61f2fb7c7ba.zip |
vulnix: use zodb from pythonPackages
-rw-r--r-- | pkgs/tools/security/vulnix/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/security/vulnix/requirements.nix | 47 |
2 files changed, 3 insertions, 54 deletions
diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index a058c2ee1a87..1beb2268fc6c 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -1,10 +1,6 @@ -{ stdenv, pythonPackages, fetchurl, callPackage, nix, }: +{ stdenv, pythonPackages, fetchurl, callPackage, nix }: -let - external = callPackage ./requirements.nix { - inherit pythonPackages; - }; -in pythonPackages.buildPythonApplication rec{ +pythonPackages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "vulnix"; version = "1.2.2"; @@ -28,7 +24,7 @@ in pythonPackages.buildPythonApplication rec{ lxml pyyaml requests - external.zodb + zodb ]); checkPhase = "py.test"; diff --git a/pkgs/tools/security/vulnix/requirements.nix b/pkgs/tools/security/vulnix/requirements.nix deleted file mode 100644 index 716b0aac51e7..000000000000 --- a/pkgs/tools/security/vulnix/requirements.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ pythonPackages, fetchurl, stdenv }: - -rec { - zodb = pythonPackages.buildPythonPackage { - name = "ZODB-5.2.0"; - src = fetchurl { - url = "https://pypi.python.org/packages/1e/47/2f17075ca94a4a537ebd8e195c458456ef49aa67355ec805e478b8ad1959/ZODB-5.2.0.tar.gz"; - sha256 = "11l495lyym2fpvalj18yvcqwnsp8gyp18sgv5v575k4s2035lz0x"; - }; - doCheck = false; - propagatedBuildInputs = [ - transaction - ] ++ (with pythonPackages; [ - six - wheel - zope_interface - zodbpickle - zconfig - persistent - zc_lockfile - BTrees - ]); - - meta = with stdenv.lib; { - license = licenses.zpl21; - description = "Zope Object Database: object database and persistence"; - }; - }; - - transaction = pythonPackages.buildPythonPackage { - name = "transaction-2.0.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/8c/af/3ffafe85bcc93ecb09459f3f2bd8fbe142e9ab34048f9e2774543b470cbd/transaction-2.0.3.tar.gz"; - sha256 = "67bfb81309ba9717edbb2ca2e5717c325b78beec0bf19f44e5b4b9410f82df7f"; - }; - propagatedBuildInputs = with pythonPackages; [ - zope_interface - six - wheel - mock - ]; - meta = with stdenv.lib; { - license = licenses.zpl21; - description = "Transaction management for Python"; - }; - }; -} |