aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/applications/networking/sniffers
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/sniffers')
-rw-r--r--nixpkgs/pkgs/applications/networking/sniffers/ettercap/default.nix4
-rw-r--r--nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix10
2 files changed, 9 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/applications/networking/sniffers/ettercap/default.nix b/nixpkgs/pkgs/applications/networking/sniffers/ettercap/default.nix
index 4af8e526cd2..8489b414cbc 100644
--- a/nixpkgs/pkgs/applications/networking/sniffers/ettercap/default.nix
+++ b/nixpkgs/pkgs/applications/networking/sniffers/ettercap/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "ettercap";
- version = "0.8.3";
+ version = "0.8.3.1";
src = fetchFromGitHub {
owner = "Ettercap";
repo = "ettercap";
rev = "v${version}";
- sha256 = "0m40bmbrv9a8qlg54z3b5f8r541gl9vah5hm0bbqcgyyljpg39bz";
+ sha256 = "1sdf1ssa81ib6k0mc5m2jzbjl4jd1yv6ahv5dwx2x9w4b2pyqg1c";
};
strictDeps = true;
diff --git a/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix b/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix
index 7166ebe93d7..8d4a6d73120 100644
--- a/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -10,8 +10,9 @@ assert withQt -> qt5 != null;
with stdenv.lib;
let
- version = "3.2.4";
+ version = "3.2.5";
variant = if withQt then "qt" else "cli";
+ pcap = libpcap.override { withBluez = stdenv.isLinux; };
in stdenv.mkDerivation {
pname = "wireshark-${variant}";
@@ -20,7 +21,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
- sha256 = "1amqgn94g6h6cfnsccm2zb4c73pfv1qmzi1i6h1hnbcyhhg4czfi";
+ sha256 = "0h69m9maq6w5gik4gamv4kfqrr37hmi4kpwh225y1k36awm0b2dx";
};
cmakeFlags = [
@@ -30,12 +31,15 @@ in stdenv.mkDerivation {
"-DCMAKE_INSTALL_LIBDIR=lib"
];
+ # Avoid referencing -dev paths because of debug assertions.
+ NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ];
+
nativeBuildInputs = [
bison cmake flex pkgconfig
] ++ optional withQt qt5.wrapQtAppsHook;
buildInputs = [
- gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt
+ gettext pcre perl pcap lua5 libssh nghttp2 openssl libgcrypt
libgpgerror gnutls geoip c-ares python3 glib zlib makeWrapper
] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ])
++ optionals stdenv.isLinux [ libcap libnl ]