wireshark: 4.4.9 -> 4.6.0 (#454907)

pkgs/applications/networking/compactor/default.nix

@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   asciidoctor,
   autoreconfHook,
   pkg-config,
@@ -42,6 +43,12 @@ stdenv.mkDerivation rec {
 
     # https://github.com/dns-stats/compactor/pull/91
     ./patches/update-golden-cbor2diag-output.patch
+
+    # https://github.com/dns-stats/compactor/commit/f7deaf89f55a12c586b6662a3a7d04b10a4c7bcb
+    (fetchpatch {
+      url = "https://github.com/dns-stats/compactor/commit/f7deaf89f55a12c586b6662a3a7d04b10a4c7bcb.patch";
+      hash = "sha256-eEaVS5rfrLkRGc668PwVfb/xw3n1SoCm30xEf1NjbeY=";
+    })
   ];
 
   nativeBuildInputs = [

pkgs/applications/networking/sniffers/wireshark/default.nix

@@ -25,6 +25,7 @@
   libpcap,
   libsmi,
   libssh,
+  libxml2,
   lua5_4,
   lz4,
   makeWrapper,
@@ -56,7 +57,7 @@ assert withQt -> qt6 != null;
 
 stdenv.mkDerivation rec {
   pname = "wireshark-${if withQt then "qt" else "cli"}";
-  version = "4.4.9";
+  version = "4.6.0";
 
   outputs = [
     "out"
@@ -67,7 +68,7 @@ stdenv.mkDerivation rec {
     repo = "wireshark";
     owner = "wireshark";
     rev = "v${version}";
-    hash = "sha256-0+uPXSNabsYNGn+4753WNoUBe9lJ2EH3i3J36lqI4Ak=";
+    hash = "sha256-XkHcVN3xCYwnS69nJ4/AT76Iaggt1GXA6JWi+IG15IM=";
   };
 
   patches = [
@@ -111,6 +112,7 @@ stdenv.mkDerivation rec {
     libpcap
     libsmi
     libssh
+    libxml2
     lua5_4
     lz4
     minizip

pkgs/development/python-modules/pyshark/default.nix

@@ -35,6 +35,12 @@ buildPythonPackage rec {
       url = "https://github.com/KimiNewt/pyshark/commit/7142c5bf88abcd4c65c81052a00226d6155dda42.patch";
       hash = "sha256-Ti7cwRyYSbF4a4pEEV9FntNevkV/JVXNqACQWzoma7g=";
     })
+    # fixes tests that failed related to elastic-mapping
+    # remove fix if this is ever merged upstream
+    (fetchpatch {
+      url = "https://github.com/KimiNewt/pyshark/commit/0e1d8d0e06108f2887c3147c93049de63b475f8a.patch";
+      hash = "sha256-fpgiBHcfS/TGYIB65ioZJrWUuDIrLxxXqGVJ9y18b2w=";
+    })
     (replaceVars ./hardcode-tshark-path.patch {
       tshark = lib.getExe' wireshark-cli "tshark";
     })