pyrox.dev
wireshark: 3.4.3 -> 3.4.4 (#116018)
https://www.wireshark.org/docs/relnotes/wireshark-3.4.4.html
authored by TredwellGit and committed by GitHub f03cfcaf d02b1cc8
+6
-8
pkgs/applications/networking/sniffers/wireshark/default.nix
+6
-8
pkgs/applications/networking/sniffers/wireshark/default.nix
···
1
1
{ lib, stdenv, fetchurl, pkg-config, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
2
2
, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib
3
-
, libssh, nghttp2, zlib, cmake, fetchpatch, makeWrapper
3
+
, libssh, nghttp2, zlib, cmake, makeWrapper
4
4
, withQt ? true, qt5 ? null
5
5
, ApplicationServices, SystemConfiguration, gmp
6
6
}:
···
10
10
with lib;
11
11
12
12
let
13
-
version = "3.4.3";
13
+
version = "3.4.4";
14
14
variant = if withQt then "qt" else "cli";
15
15
16
16
in stdenv.mkDerivation {
···
20
20
21
21
src = fetchurl {
22
22
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
23
-
sha256 = "0ar6pxzrcpxdriz437d6ziwlhb8k5wlvrkalp3hgqwzwy1vwqrzl";
23
+
sha256 = "0aad3m8nh4i75dgjs68217135bzqmhmlgjklmpjh1ihmjwgd373j";
24
24
};
25
25
26
26
cmakeFlags = [
···
33
33
# Avoid referencing -dev paths because of debug assertions.
34
34
NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ];
35
35
36
-
nativeBuildInputs = [
37
-
bison cmake flex pkg-config
38
-
] ++ optional withQt qt5.wrapQtAppsHook;
36
+
nativeBuildInputs = [ bison cmake flex makeWrapper pkg-config ] ++ optional withQt qt5.wrapQtAppsHook;
39
37
40
38
buildInputs = [
41
39
gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt
42
-
libgpgerror gnutls geoip c-ares python3 glib zlib makeWrapper
40
+
libgpgerror gnutls geoip c-ares python3 glib zlib
43
41
] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ])
44
42
++ optionals stdenv.isLinux [ libcap libnl ]
45
43
++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]
···
96
94
meta = with lib; {
97
95
homepage = "https://www.wireshark.org/";
98
96
description = "Powerful network protocol analyzer";
99
-
license = licenses.gpl2;
97
+
license = licenses.gpl2Plus;
100
98
101
99
longDescription = ''
102
100
Wireshark (formerly known as "Ethereal") is a powerful network