diff options
Diffstat (limited to 'gnu/packages/networking.scm')
| -rw-r--r-- | gnu/packages/networking.scm | 85 |
1 files changed, 49 insertions, 36 deletions
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 69e27f3113..0eb194f957 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016 Raimon Grau <raimonster@gmail.com> ;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016 John Darrington <jmd@gnu.org> -;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2016-2022 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016, 2017 Nikita <nikita@n0.is> ;;; Copyright © 2016, 2017, 2018 Arun Isaac <arunisaac@systemreboot.net> @@ -47,6 +47,7 @@ ;;; Copyright © 2021 Milkey Mouse <milkeymouse@meme.institute> ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> +;;; Copyright © 2022 Simon South <simon@simonsouth.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1152,7 +1153,7 @@ between different versions of ØMQ.") (define-public cppzmq (package (name "cppzmq") - (version "4.6.0") + (version "4.8.1") (source (origin (method git-fetch) (uri (git-reference @@ -1160,19 +1161,15 @@ between different versions of ØMQ.") (commit (string-append "v" version)))) (sha256 (base32 - "19acx2bzi4n6fdnfgkja1nds7m1bwg8lw5vfcijrx9fv75pa7m8h")) + "0zzq20wzk5grshxfqhqgqqfwb38w3k83r821isvyaxghsglpwks3")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - '(;; FIXME: The test suite requires downloading Catch and custom - ;; CMake targets, and refuses to use the system version. - ;; See <https://github.com/zeromq/cppzmq/issues/334>. - #:tests? #f - #:configure-flags '("-DCPPZMQ_BUILD_TESTS=OFF"))) + `(#:tests? ,(not (%current-target-system)))) ; run unless cross-compiling (native-inputs (list pkg-config)) (inputs - (list zeromq)) + (list catch-framework2 zeromq)) (home-page "https://zeromq.org") (synopsis "C++ bindings for the ØMQ messaging library") (description @@ -1522,14 +1519,14 @@ of the same name.") (define-public wireshark (package (name "wireshark") - (version "3.6.1") + (version "3.6.2") (source (origin (method url-fetch) (uri (string-append "https://www.wireshark.org/download/src/wireshark-" version ".tar.xz")) (sha256 - (base32 "0f2sjbbwmmz9zr8vphxy0panfji5vv8vazm688mqxy3bzflfsd04")))) + (base32 "03n34jh4318y3q14jclxfxi4r7b9l393w9fw9bq57ydff9aim42x")))) (build-system cmake-build-system) (arguments `(#:phases @@ -1597,15 +1594,16 @@ network frames.") (define-public fping (package (name "fping") - (version "5.0") + (version "5.1") (source (origin (method url-fetch) (uri (string-append "https://fping.org/dist/fping-" version ".tar.gz")) (sha256 - (base32 "1f2prmii4fyl44cfykp40hp4jjhicrhddh9v3dfs11j6nsww0f7d")))) + (base32 "1zh9fkyn0bixgn77v9z6ayv446nqwx960hmly9m68xix0s62dr8y")))) (build-system gnu-build-system) + (arguments '(#:configure-flags '("--enable-ipv6"))) (home-page "https://fping.org/") (synopsis "Send ICMP ECHO_REQUEST packets to network hosts") (description @@ -3565,39 +3563,54 @@ powerful route filtering syntax and an easy-to-use configuration interface.") (define-public iwd (package (name "iwd") - (version "1.20") + (version "1.24") (source (origin - ;; FIXME: We're using the bootstrapped sources because - ;; otherwise using an external ell library is impossible. - ;; How to bootstrap with Guix? - (method url-fetch) - (uri (string-append "https://www.kernel.org/pub/linux/network" - "/wireless/iwd-" version ".tar.xz")) + (method git-fetch) + (uri (git-reference + (url "https://git.kernel.org/pub/scm/network/wireless/iwd.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "03q5scahyg86h4bdxqxm32shyssgpmfp5b3183j01ig7mg6f4lbx")))) + "1sdi7008j5jhlg2rqpczh1pzb8zay6mc9dpnjjsmdnsmrcr3v7wi")))) (build-system gnu-build-system) (inputs - (list dbus ell readline)) + (list dbus ell (package-source ell) readline)) (native-inputs - `(("pkgconfig" ,pkg-config) - ("python" ,python) - ("rst2man" ,python-docutils) - ("openssl" ,openssl))) + (list autoconf + automake + libtool + pkg-config + python + python-docutils + openssl)) (arguments `(#:configure-flags - (let ((dbus (assoc-ref %outputs "out"))) - (list "--disable-systemd-service" - "--enable-external-ell" - "--enable-hwsim" - "--enable-tools" - "--enable-wired" - "--localstatedir=/var" - (string-append "--with-dbus-datadir=" dbus "/share/") - (string-append "--with-dbus-busdir=" - dbus "/share/dbus-1/system-services"))) + ,#~(list "--disable-systemd-service" + "--enable-external-ell" + "--enable-hwsim" + "--enable-tools" + "--enable-wired" + "--localstatedir=/var" + (string-append "--with-dbus-datadir=" #$output "/share/") + (string-append "--with-dbus-busdir=" + #$output "/share/dbus-1/system-services")) #:phases (modify-phases %standard-phases + (add-after 'unpack 'copy-ell-header-files + ;; Copy into the source tree two of ell's private header files that + ;; it shares with iwd, as is required to build with the + ;; "--enable-external-ell" configure option. + ;; See the definition of "ell_shared" in iwd's Makefile.am. + (lambda* (#:key inputs #:allow-other-keys) + (let ((ell-header-dir (search-input-directory inputs "/ell")) + (target-dir "ell")) + (mkdir target-dir) + (for-each + (lambda (file-name) + (copy-file (string-append ell-header-dir "/" file-name) + (string-append target-dir "/" file-name))) + '("asn1-private.h" "useful.h"))))) (add-after 'configure 'patch-Makefile (lambda _ (substitute* "Makefile" |