diff options
author | Thomas Danckaert <thomas.danckaert@gmail.com> | 2017-10-16 19:52:30 +0200 |
---|---|---|
committer | Thomas Danckaert <thomas.danckaert@gmail.com> | 2017-10-16 19:52:30 +0200 |
commit | 8cff2e7aed888b3d0e4dcfcda151bc8af68fa1bb (patch) | |
tree | 7177d90f3a8f0ba34630e78b5516dbda68ff0570 /gnu/packages/networking.scm | |
parent | 404e3d8b1bcd92ad934711fe759feb220f4d1c60 (diff) | |
parent | 484a72a036e6a8af43f517d6547446f3de344a07 (diff) | |
download | guix-8cff2e7aed888b3d0e4dcfcda151bc8af68fa1bb.tar guix-8cff2e7aed888b3d0e4dcfcda151bc8af68fa1bb.tar.gz |
Merge 'master' into core-updates
Diffstat (limited to 'gnu/packages/networking.scm')
-rw-r--r-- | gnu/packages/networking.scm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index b39f2875e8..633b8ca43e 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -486,7 +486,7 @@ which can be used to encrypt a password with @code{crypt(3)}.") (define-public wireshark (package (name "wireshark") - (version "2.4.1") + (version "2.4.2") (source (origin (method url-fetch) @@ -494,7 +494,7 @@ which can be used to encrypt a password with @code{crypt(3)}.") version ".tar.xz")) (sha256 (base32 - "1k8zj44pkb2ny2x46f100y7cxddm1kh0zh7f6qggm78gn7wvrp82")))) + "0zglapd3sz08p2z9x8a5va3jnz17b3n5a1bskf7f2dgx6m3v5b6i")))) (build-system gnu-build-system) (inputs `(("c-ares" ,c-ares) ("glib" ,glib) @@ -510,12 +510,12 @@ which can be used to encrypt a password with @code{crypt(3)}.") ("openssl" ,openssl) ("portaudio" ,portaudio) ("qtbase" ,qtbase) - ("qttools" ,qttools) ("sbc" ,sbc) ("zlib" ,zlib))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) - ("python" ,python-wrapper))) + ("python" ,python-wrapper) + ("qttools" ,qttools))) (arguments `(#:configure-flags (list (string-append "--with-c-ares=" (assoc-ref %build-inputs "c-ares")) @@ -529,7 +529,6 @@ which can be used to encrypt a password with @code{crypt(3)}.") (string-append "--with-sbc=" (assoc-ref %build-inputs "sbc")) (string-append "--with-ssl=" (assoc-ref %build-inputs "openssl")) (string-append "--with-zlib=" (assoc-ref %build-inputs "zlib"))))) - (home-page "https://www.wireshark.org/") (synopsis "Network traffic analyzer") (description "Wireshark is a network protocol analyzer, or @dfn{packet sniffer}, that lets you capture and interactively browse the contents of |