wireshark: move to by-name, modernize

pkgs/by-name/wi/wireshark/package.nix

@@ -50,14 +50,14 @@
   brotli,
 
   withQt ? true,
-  qt6 ? null,
+  qt6,
+  libpcap' ? libpcap.override { withBluez = stdenv.hostPlatform.isLinux; },
 }:
 let
   isAppBundle = withQt && stdenv.hostPlatform.isDarwin;
 in
-assert withQt -> qt6 != null;
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "wireshark-${if withQt then "qt" else "cli"}";
   version = "4.6.3";
 
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitLab {
     repo = "wireshark";
     owner = "wireshark";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-DthYkAW6UYnsDLQf2h3jgJB8RZoasjREWV1NTtZv7PQ=";
   };
 
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
     libkrb5
     libmaxminddb
     libopus
-    libpcap
+    libpcap'
     libsmi
     libssh
     libxml2
@@ -226,7 +226,7 @@ stdenv.mkDerivation rec {
       experts. It runs on UNIX, macOS and Windows.
     '';
     homepage = "https://www.wireshark.org";
-    changelog = "https://www.wireshark.org/docs/relnotes/wireshark-${version}.html";
+    changelog = "https://www.wireshark.org/docs/relnotes/wireshark-${finalAttrs.src.tag}.html";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     maintainers = with lib.maintainers; [
@@ -235,4 +235,4 @@ stdenv.mkDerivation rec {
     ];
     mainProgram = if withQt then "wireshark" else "tshark";
   };
-}
+})

pkgs/top-level/all-packages.nix

@@ -10121,17 +10121,10 @@ with pkgs;
     fftw = fftwSinglePrec;
   };
 
-  wireshark = qt6Packages.callPackage ../applications/networking/sniffers/wireshark {
-    libpcap = libpcap.override { withBluez = stdenv.hostPlatform.isLinux; };
-  };
-
   qtwirediff = qt6Packages.callPackage ../applications/networking/sniffers/qtwirediff { };
 
   tshark = wireshark-cli;
-  wireshark-cli = wireshark.override {
-    withQt = false;
-    libpcap = libpcap.override { withBluez = stdenv.hostPlatform.isLinux; };
-  };
+  wireshark-cli = wireshark.override { withQt = false; };
 
   buildMozillaMach =
     opts: callPackage (import ../build-support/build-mozilla-mach/default.nix opts) { };