gnu: wireshark: Update to 4.0.0.
* gnu/packages/networking.scm (wireshark): Update to 4.0.0. [arguments]<#:phases>: Skip checks differently, as the previous way doesn't work anymore. [inputs]: Add pcre2.
This commit is contained in:
parent
4459c05af7
commit
fd024ba0f5
1 changed files with 14 additions and 11 deletions
|
@ -1760,27 +1760,29 @@ of the same name.")
|
||||||
(define-public wireshark
|
(define-public wireshark
|
||||||
(package
|
(package
|
||||||
(name "wireshark")
|
(name "wireshark")
|
||||||
(version "3.6.7")
|
(version "4.0.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "https://www.wireshark.org/download/src/wireshark-"
|
(uri (string-append "https://www.wireshark.org/download/src/wireshark-"
|
||||||
version ".tar.xz"))
|
version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "1idpxnh8vrvan3g0ymaa24bd4iyxi19xrr76sdrrpxx2r8shmqfc"))))
|
(base32 "1vddvizywy6kfxg0i3m0627f675i7sdp7k3ld9sjlp78hppjbh9x"))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:phases
|
`(#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
(add-after 'unpack 'remove-failing-test
|
(replace 'check
|
||||||
;; Skip test suite failing with "Program reassemble_test is not
|
(lambda* (#:key tests? #:allow-other-keys)
|
||||||
;; available" and alike errors. Also skip test suite failing with
|
;; Skip test suite failing with "Program reassemble_test is not
|
||||||
;; "AssertionError: Program extcap/sdjournal is not available"
|
;; available" and alike errors. Also skip test suite failing
|
||||||
;; error.'
|
;; with "AssertionError: Program extcap/sdjournal is not
|
||||||
(lambda _
|
;; available" error.'
|
||||||
(substitute* "CMakeLists.txt"
|
(when tests?
|
||||||
(("suite_unittests" all) (string-append "# " all))
|
(invoke "ctest"
|
||||||
(("suite_extcaps" all) (string-append "# " all))))))
|
"-E"
|
||||||
|
(string-join (list "suite_unittests" "suite_extcaps")
|
||||||
|
"|"))))))
|
||||||
;; Build process chokes during `validate-runpath' phase.
|
;; Build process chokes during `validate-runpath' phase.
|
||||||
;;
|
;;
|
||||||
;; Errors are like the following:
|
;; Errors are like the following:
|
||||||
|
@ -1809,6 +1811,7 @@ of the same name.")
|
||||||
mit-krb5
|
mit-krb5
|
||||||
`(,nghttp2 "lib")
|
`(,nghttp2 "lib")
|
||||||
minizip
|
minizip
|
||||||
|
pcre2
|
||||||
qtbase-5
|
qtbase-5
|
||||||
qtmultimedia-5
|
qtmultimedia-5
|
||||||
qtsvg-5
|
qtsvg-5
|
||||||
|
|
Reference in a new issue