diff options
| author | TredwellGit <tredwell@tutanota.com> | 2021-02-04 13:29:44 +0000 |
|---|---|---|
| committer | TredwellGit <tredwell@tutanota.com> | 2021-02-04 13:29:44 +0000 |
| commit | 22663dfe5328ae24c7e06e85e61d85d71cfc6f34 (patch) | |
| tree | 37e7c7ecca2ff435acf4fbc22233e7b0fe78ebb5 /pkgs/applications/networking/sniffers | |
| parent | a130a0a0d26cadd3269e8a21db5fc106c3d4c199 (diff) | |
wireshark: 3.4.2 -> 3.4.3
https://www.wireshark.org/docs/relnotes/wireshark-3.4.3.html
Diffstat (limited to 'pkgs/applications/networking/sniffers')
| -rw-r--r-- | pkgs/applications/networking/sniffers/wireshark/default.nix | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 55789401c143c..5c5bb1ff96e15 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,7 +10,7 @@ assert withQt -> qt5 != null; with lib; let - version = "3.4.2"; + version = "3.4.3"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "1i548w6zv6ni5n22rs90a12aakyq811493dxmadlcsj2krr6i66y"; + sha256 = "0ar6pxzrcpxdriz437d6ziwlhb8k5wlvrkalp3hgqwzwy1vwqrzl"; }; cmakeFlags = [ @@ -45,13 +45,7 @@ in stdenv.mkDerivation { ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ] ++ optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]); - patches = [ ./wireshark-lookup-dumpcap-in-path.patch ] - # https://code.wireshark.org/review/#/c/23728/ - ++ lib.optional stdenv.hostPlatform.isMusl (fetchpatch { - name = "fix-timeout.patch"; - url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commitdiff_plain;h=8b5b843fcbc3e03e0fc45f3caf8cf5fc477e8613;hp=94af9724d140fd132896b650d10c4d060788e4f0"; - sha256 = "1g2dm7lwsnanwp68b9xr9swspx7hfj4v3z44sz3yrfmynygk8zlv"; - }); + patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; postPatch = '' sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt |