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: 3a5735ca068b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ebc712f2b1a3
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 13, 2017

  1. vulnix: use zope.interface from pythonPackages

    @adisbladis
    adisbladis committed Jul 13, 2017
    Copy the full SHA
    4f17476 View commit details

Commits on Jul 19, 2017

  1. Merge pull request #27352 from adisbladis/vulnix-py36 

    vulnix: use zope.interface from pythonPackages
    @FRidh
    FRidh authored Jul 19, 2017
    Copy the full SHA
    ebc712f View commit details
Showing with 3 additions and 22 deletions.
  1. +3 −22 pkgs/tools/security/vulnix/requirements.nix
25 changes: 3 additions & 22 deletions pkgs/tools/security/vulnix/requirements.nix
View file
Original file line number Diff line number Diff line change
@@ -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";
};
};
}