public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wireshark: 3.4.3 -> 3.4.4 (#116018)

Browse Source 
https://www.wireshark.org/docs/relnotes/wireshark-3.4.4.html
This commit is contained in:
TredwellGit
2021-03-12 07:03:16 +01:00
committed by GitHub
parent d02b1cc8ed
commit f03cfcafbf
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/sniffers/wireshark/default.nix
+6 -8
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, pkg-config, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares { lib, stdenv, fetchurl, pkg-config, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib
, libssh, nghttp2, zlib, cmake, fetchpatch, makeWrapper , libssh, nghttp2, zlib, cmake, makeWrapper
, withQt ? true, qt5 ? null , withQt ? true, qt5 ? null
, ApplicationServices, SystemConfiguration, gmp , ApplicationServices, SystemConfiguration, gmp
}: }:
@@ -10,7 +10,7 @@ assert withQt -> qt5 != null;
with lib; with lib;
let let
version = "3.4.3"; version = "3.4.4";
variant = if withQt then "qt" else "cli"; variant = if withQt then "qt" else "cli";
in stdenv.mkDerivation { in stdenv.mkDerivation {
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
sha256 = "0ar6pxzrcpxdriz437d6ziwlhb8k5wlvrkalp3hgqwzwy1vwqrzl"; sha256 = "0aad3m8nh4i75dgjs68217135bzqmhmlgjklmpjh1ihmjwgd373j";
}; };
cmakeFlags = [ cmakeFlags = [
@@ -33,13 +33,11 @@ in stdenv.mkDerivation {
# Avoid referencing -dev paths because of debug assertions. # Avoid referencing -dev paths because of debug assertions.
NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ];
nativeBuildInputs = [ nativeBuildInputs = [ bison cmake flex makeWrapper pkg-config ] ++ optional withQt qt5.wrapQtAppsHook;
bison cmake flex pkg-config
] ++ optional withQt qt5.wrapQtAppsHook;
buildInputs = [ buildInputs = [
gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt
libgpgerror gnutls geoip c-ares python3 glib zlib makeWrapper libgpgerror gnutls geoip c-ares python3 glib zlib
] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ])
++ optionals stdenv.isLinux [ libcap libnl ] ++ optionals stdenv.isLinux [ libcap libnl ]
++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ] ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]
@@ -96,7 +94,7 @@ in stdenv.mkDerivation {
meta = with lib; { meta = with lib; {
homepage = "https://www.wireshark.org/"; homepage = "https://www.wireshark.org/";
description = "Powerful network protocol analyzer"; description = "Powerful network protocol analyzer";
license = licenses.gpl2; license = licenses.gpl2Plus;
longDescription = '' longDescription = ''
Wireshark (formerly known as "Ethereal") is a powerful network Wireshark (formerly known as "Ethereal") is a powerful network