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: fe13e4fa6f58
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 90bc79c7cf5d
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 3, 2021

  1. wireshark-*: pass in overridden libpcap in all-packages.nix 

    This allows building wireshark-* with a explicitly disabled bluezSupport
in an overlay.
    @Izorkin @flokli
    Izorkin authored and flokli committed Jan 3, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    rickie Rick Ossendrijver
    GPG key ID: A2237828CE7F76B2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    131e617 View commit details

  2. Merge pull request #96950 from Izorkin/wireshark-cli 

    wireshark-*: pass in overridden libpcap in all-packages.nix
    @flokli
    flokli authored Jan 3, 2021
    Copy the full SHA
    90bc79c View commit details
Showing with 6 additions and 3 deletions.
  1. +1 −2 pkgs/applications/networking/sniffers/wireshark/default.nix
  2. +5 −1 pkgs/top-level/all-packages.nix
3 changes: 1 addition & 2 deletions pkgs/applications/networking/sniffers/wireshark/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,6 @@ with stdenv.lib;
let
version = "3.4.2";
variant = if withQt then "qt" else "cli";
pcap = libpcap.override { withBluez = stdenv.isLinux; };

in stdenv.mkDerivation {
pname = "wireshark-${variant}";
@@ -39,7 +38,7 @@ in stdenv.mkDerivation {
] ++ optional withQt qt5.wrapQtAppsHook;

buildInputs = [
gettext pcre perl pcap lua5 libssh nghttp2 openssl libgcrypt
gettext pcre perl libpcap 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 ]
6 changes: 5 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -21668,12 +21668,16 @@ in

wireshark = callPackage ../applications/networking/sniffers/wireshark {
inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration;
libpcap = libpcap.override { withBluez = stdenv.isLinux; };
};
wireshark-qt = wireshark;

# The GTK UI is deprecated by upstream. You probably want the QT version.
wireshark-gtk = throw "wireshark-gtk is not supported anymore. Use wireshark-qt or wireshark-cli instead.";
wireshark-cli = wireshark.override { withQt = false; };
wireshark-cli = wireshark.override {
withQt = false;
libpcap = libpcap.override { withBluez = stdenv.isLinux; };
};

sngrep = callPackage ../applications/networking/sniffers/sngrep {};