From 5771888f4e5e87cdaaf6d80d2d5da4973a3e3ed8 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 12 Nov 2013 09:04:20 +0100 Subject: [PATCH] wireshark: upgrade to 1.10.3 - cleaned up dependencies - python support is deprecated (upstream) in favor of pyreshark --- .../networking/sniffers/wireshark/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 7e5fdc6ccd36..a5ca5e7b488f 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,25 +1,21 @@ -{ stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison -, gnutls, libgcrypt, glib, zlib, libxml2, libxslt, adns, geoip -, heimdal, python, lynx, lua5 -, makeDesktopItem +{ stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares, gnutls, libgcrypt +, geoip, heimdal, lua5, gtk, makeDesktopItem }: -let version = "1.8.11"; in +let version = "1.10.3"; in stdenv.mkDerivation { name = "wireshark-${version}"; src = fetchurl { url = "mirror://sourceforge/wireshark/wireshark-${version}.tar.bz2"; - sha256 = "1nwgizs9z1dalicpp2fd9pqafidy49j0v3d1rml0spfqrkbjpfpw"; + sha256 = "1329zph63z5mcij9lp111bh6b2w88z3d40gvjld2rjmhmqv1nr61"; }; buildInputs = - [ perl pkgconfig gtk libpcap flex bison gnutls libgcrypt - glib zlib libxml2 libxslt adns geoip heimdal python lynx lua5 - ]; + [ bison flex perl pkgconfig libpcap lua5 heimdal libgcrypt gnutls geoip libnl c-ares gtk ]; - configureFlags = "--disable-usr-local --with-ssl --enable-threads --enable-packet-editor"; + configureFlags = "--disable-usr-local --enable-packet-editor --with-ssl"; desktopItem = makeDesktopItem { name = "Wireshark";