From 4f174769f2b9a0d7e048eb2d17835d7db4559d4b Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 13 Jul 2017 17:03:44 +0800 Subject: [PATCH] vulnix: use zope.interface from pythonPackages --- pkgs/tools/security/vulnix/requirements.nix | 25 +++------------------ 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/pkgs/tools/security/vulnix/requirements.nix b/pkgs/tools/security/vulnix/requirements.nix index 280fc2279b47..11faca44ef93 100644 --- a/pkgs/tools/security/vulnix/requirements.nix +++ b/pkgs/tools/security/vulnix/requirements.nix @@ -10,8 +10,7 @@ rec { propagatedBuildInputs = [ persistent transaction - zope_interface - ] ++ (with pythonPackages; [ coverage ]); + ] ++ (with pythonPackages; [ zope_interface coverage ]); meta = with stdenv.lib; { homepage = ""; @@ -62,9 +61,7 @@ rec { url = "https://pypi.python.org/packages/3d/71/3302512282b606ec4d054e09be24c065915518903b29380b6573bff79c24/persistent-4.2.2.tar.gz"; sha256 = "52ececc6dbba5ef572d3435189318b4dff07675bafa9620e32f785e147c6563c"; }; - propagatedBuildInputs = [ - zope_interface - ] ++ (with pythonPackages; [ six wheel ]); + propagatedBuildInputs = with pythonPackages; [ zope_interface six wheel ]; meta = with stdenv.lib; { homepage = ""; license = licenses.zpt21; @@ -78,9 +75,7 @@ rec { url = "https://pypi.python.org/packages/8c/af/3ffafe85bcc93ecb09459f3f2bd8fbe142e9ab34048f9e2774543b470cbd/transaction-2.0.3.tar.gz"; sha256 = "67bfb81309ba9717edbb2ca2e5717c325b78beec0bf19f44e5b4b9410f82df7f"; }; - propagatedBuildInputs = [ - zope_interface - ] ++ (with pythonPackages; [ six wheel ]); + propagatedBuildInputs = with pythonPackages; [ zope_interface six wheel ]; meta = with stdenv.lib; { homepage = ""; license = licenses.zpt21; @@ -115,18 +110,4 @@ rec { description = "Fork of Python 3 pickle module."; }; }; - - zope_interface = pythonPackages.buildPythonPackage { - name = "zope.interface-4.3.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/44/af/cea1e18bc0d3be0e0824762d3236f0e61088eeed75287e7b854d65ec9916/zope.interface-4.3.3.tar.gz"; - sha256 = "8780ef68ca8c3fe1abb30c058a59015129d6e04a6b02c2e56b9c7de6078dfa88"; - }; - propagatedBuildInputs = [ ]; - meta = with stdenv.lib; { - homepage = ""; - license = licenses.zpt21; - description = "Interfaces for Python"; - }; - }; }