aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2018-05-06 16:15:35 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2018-05-06 16:15:35 +0200
commit0b7bef7045abdf0682e1f628c13421ae8a434693 (patch)
tree70e60aa434ae909f56a5544b1dc9fa5ec66e76ce
parent8e020519b45bbdb9403164bd4403f2465bac99ad (diff)
downloadguix-0b7bef7045abdf0682e1f628c13421ae8a434693.tar
guix-0b7bef7045abdf0682e1f628c13421ae8a434693.tar.gz
gnu: wireshark: Update to 2.6.0.
* gnu/packages/networking.scm (wireshark): Update to 2.6.0. [inputs]: Add lz4, qtmultimedia and snappy. Remove openssl. [arguments]: Update configure flags according to changes above.
-rw-r--r--gnu/packages/networking.scm11
1 files changed, 7 insertions, 4 deletions
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index f7e5d236db..9f9f21baaf 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -543,7 +543,7 @@ of the same name.")
(define-public wireshark
(package
(name "wireshark")
- (version "2.4.5")
+ (version "2.6.0")
(source
(origin
(method url-fetch)
@@ -551,7 +551,7 @@ of the same name.")
version ".tar.xz"))
(sha256
(base32
- "1mvgy67rvnwj2kbc43s4il81jvz5ai0bx2j3j2js7x50zclyrcmk"))))
+ "0zqip4ai18iar7sgialc3jmpng1yxxy4i9bphbaig23ss80py73i"))))
(build-system gnu-build-system)
(inputs `(("c-ares" ,c-ares)
("glib" ,glib)
@@ -562,12 +562,14 @@ of the same name.")
("libpcap" ,libpcap)
("libssh" ,libssh)
("libxml2" ,libxml2)
+ ("lz4" ,lz4)
("lua" ,lua-5.2) ;Lua 5.3 unsupported
("krb5" ,mit-krb5)
- ("openssl" ,openssl)
("portaudio" ,portaudio)
("qtbase" ,qtbase)
+ ("qtmultimedia" ,qtmultimedia)
("sbc" ,sbc)
+ ("snappy" ,snappy)
("zlib" ,zlib)))
(native-inputs `(("perl" ,perl)
("pkg-config" ,pkg-config)
@@ -580,11 +582,12 @@ of the same name.")
(string-append "--with-libcap=" (assoc-ref %build-inputs "libcap"))
(string-append "--with-libssh=" (assoc-ref %build-inputs "libssh"))
(string-append "--with-lua=" (assoc-ref %build-inputs "lua"))
+ (string-append "--with-lz4=" (assoc-ref %build-inputs "lz4"))
(string-append "--with-pcap=" (assoc-ref %build-inputs "libpcap"))
(string-append "--with-portaudio="
(assoc-ref %build-inputs "portaudio"))
(string-append "--with-sbc=" (assoc-ref %build-inputs "sbc"))
- (string-append "--with-ssl=" (assoc-ref %build-inputs "openssl"))
+ (string-append "--with-snappy=" (assoc-ref %build-inputs "snappy"))
(string-append "--with-zlib=" (assoc-ref %build-inputs "zlib")))))
(synopsis "Network traffic analyzer")
(description "Wireshark is a network protocol analyzer, or @dfn{packet