Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 709baa08c5c1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 17dd592c980f
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Feb 4, 2021

  1. wireshark: 3.4.2 -> 3.4.3 

    https://www.wireshark.org/docs/relnotes/wireshark-3.4.3.html
(cherry picked from commit 22663df)
    @TredwellGit @Ma27
    TredwellGit authored and Ma27 committed Feb 4, 2021
    Copy the full SHA
    17dd592 View commit details
Showing with 3 additions and 9 deletions.
  1. +3 −9 pkgs/applications/networking/sniffers/wireshark/default.nix
12 changes: 3 additions & 9 deletions pkgs/applications/networking/sniffers/wireshark/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ assert withQt -> qt5 != null;
with stdenv.lib;

let
version = "3.4.2";
version = "3.4.3";
variant = if withQt then "qt" else "cli";
pcap = libpcap.override { withBluez = stdenv.isLinux; };

@@ -21,7 +21,7 @@ in stdenv.mkDerivation {

src = fetchurl {
url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
sha256 = "1i548w6zv6ni5n22rs90a12aakyq811493dxmadlcsj2krr6i66y";
sha256 = "0ar6pxzrcpxdriz437d6ziwlhb8k5wlvrkalp3hgqwzwy1vwqrzl";
};

cmakeFlags = [
@@ -46,13 +46,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/
++ stdenv.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