From 7e43554acea1ca700844e95598cea5ad13dea0a0 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Sat, 12 Apr 2008 12:44:56 +0000 Subject: [PATCH] Updated wireshark (used all-versions/ url now so if version changes url will still be valid in the future) - is this good or bad? svn path=/nixpkgs/trunk/; revision=11610 --- .../networking/sniffers/wireshark/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 67318531371f..f9078cfa8b59 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,10 +1,10 @@ -{stdenv, fetchurl, perl, pkgconfig, gtk, libpcap}: +{stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison}: stdenv.mkDerivation { name = "wireshark-0.99.7"; src = fetchurl { - url = http://www.wireshark.org/download/src/wireshark-0.99.7.tar.bz2; - sha256 = "10pb2mn6p40gsq2nbnqdzihrpa078jdgxqh8l4zs33bxa1h37frc"; + url = http://www.wireshark.org/download/src/all-versions/wireshark-1.0.0.tar.bz2; + sha256 = "1l4zrmxf3i2i8a5f953pbbpy1c44d1q3r79hbzq7q9x78vhi6ixm"; }; - buildInputs = [perl pkgconfig gtk libpcap]; + buildInputs = [perl pkgconfig gtk libpcap flex bison]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d114779594b..d6f2fbb15985 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5108,7 +5108,7 @@ let pkgs = rec { }; wireshark = import ../applications/networking/sniffers/wireshark { - inherit fetchurl stdenv perl pkgconfig libpcap; + inherit fetchurl stdenv perl pkgconfig libpcap flex bison; inherit (gtkLibs) gtk; };