Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d64b173fdf4e
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: de519bc6b90f
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 16, 2019

  1. Merge #54039: wireshark: 2.6.4 -> 2.6.6 

    (cherry picked from commit 2aa190b)

A few security problems were fixed in both of the bumps,
mostly crashes with specific packets:
https://www.wireshark.org/docs/relnotes/wireshark-2.6.5.html
https://www.wireshark.org/docs/relnotes/wireshark-2.6.6.html
    @vcunat
    vcunat committed Jan 16, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    GPG key ID: 5BE487C4D4771D83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    de519bc View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/applications/networking/sniffers/wireshark/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/networking/sniffers/wireshark/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,15 +12,15 @@ assert withQt -> !withGtk && qt5 != null;
with stdenv.lib;

let
version = "2.6.4";
version = "2.6.6";
variant = if withGtk then "gtk" else if withQt then "qt" else "cli";

in stdenv.mkDerivation {
name = "wireshark-${variant}-${version}";

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

cmakeFlags = [