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

Commits on May 21, 2018

  1. pythonPackages.pypcap: 1.2.0 -> 1.2.2 (#40882)

    @geistesk @dotlambda
    geistesk authored and dotlambda committed May 21, 2018
    Copy the full SHA
    2a5b255 View commit details
Showing with 14 additions and 17 deletions.
  1. +14 −17 pkgs/development/python-modules/pypcap/default.nix
31 changes: 14 additions & 17 deletions pkgs/development/python-modules/pypcap/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
{ stdenv, lib, writeText, buildPythonPackage, fetchPypi, libpcap, dpkt }:
{ lib, writeText, buildPythonPackage, fetchPypi, libpcap, dpkt }:

buildPythonPackage rec {
pname = "pypcap";
version = "1.2.0";
name = "${pname}-${version}";
version = "1.2.2";

src = fetchPypi {
inherit pname version;
sha256 = "0n01xjgg8n5mf1cs9yg9ljsx1kvir8cm6wwrd2069fawjxdbk0b9";
sha256 = "07ww25z4xydp11hb38halh1940gmp5lca11hwfb63zv3bps248x3";
};

patches = [
@@ -17,26 +16,24 @@ buildPythonPackage rec {
''
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,8 @@ def recursive_search(path, target_files):
@@ -28,6 +28,7 @@ def recursive_search(path, target_files):
def get_extension():
# A list of all the possible search directories
- dirs = ['/usr', sys.prefix] + glob.glob('/opt/libpcap*') + \
+ dirs = ['${libpcap}', '/usr', sys.prefix] + \
+ glob.glob('/opt/libpcap*') + \
glob.glob('../libpcap*') + glob.glob('../wpdpack*') + \
glob.glob('/Applications/Xcode.app/Contents/Developer/Platforms/' +
'MacOSX.platform/Developer/SDKs/*')
def find_prefix_and_pcap_h():
prefixes = chain.from_iterable((
+ '${libpcap}',
('/usr', sys.prefix),
glob.glob('/opt/libpcap*'),
glob.glob('../libpcap*'),
'')
];

buildInputs = [ libpcap ];
nativeBuildInputs = [ dpkt ];
checkInputs = [ dpkt ];

meta = {
meta = with lib; {
homepage = https://github.com/pynetwork/pypcap;
description = "Simplified object-oriented Python wrapper for libpcap";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ geistesk ];
license = licenses.bsd3;
maintainers = with maintainers; [ geistesk ];
};
}