From d22cf3a3f23c084bcf59191febd7d58a6f652bf7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 17 Mar 2023 10:27:23 +0100 Subject: gnu: wireshark: Update to 4.0.4. * gnu/packages/networking.scm (wireshark): Update to 4.0.4. [arguments]<#:phases>: Re-introduce a now succeeding test and enable parallel tests. Update comment. Signed-off-by: Maxim Cournoyer Co-authored-by: Maxim Cournoyer --- gnu/packages/networking.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'gnu/packages/networking.scm') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 3fac05c411..0c55f14077 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1758,29 +1758,29 @@ of the same name.") (define-public wireshark (package (name "wireshark") - (version "4.0.3") + (version "4.0.4") (source (origin (method url-fetch) (uri (string-append "https://www.wireshark.org/download/src/wireshark-" version ".tar.xz")) (sha256 - (base32 "04cmgvmkyvxdpfy08adxf3smklgzakrvyvb89rrr7yqaridy2lbc")))) + (base32 "0jz76ra86gy7r4wwb174lggnl5y29nn68l7ydw1kj1phcijrz854")))) (build-system cmake-build-system) (arguments `(#:phases (modify-phases %standard-phases (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - ;; Skip test suite failing with "Program reassemble_test is not - ;; available" and alike errors. Also skip test suite failing - ;; with "AssertionError: Program extcap/sdjournal is not - ;; available" error.' + (lambda* (#:key parallel-tests? tests? #:allow-other-keys) (when tests? - (invoke "ctest" - "-E" - (string-join (list "suite_unittests" "suite_extcaps") - "|")))))) + (invoke "ctest" "-VV" + "-j" (if parallel-tests? + (number->string (parallel-job-count)) + "1") + ;; Skip the suite_extcaps.case_extcaps.test_sdjournal + ;; test as it requires sdjournal (from systemd) and + ;; fails. + "-E" "suite_extcaps"))))) ;; Build process chokes during `validate-runpath' phase. ;; ;; Errors are like the following: -- cgit v1.2.3 From 19af6d94340ce3b5655dab30eaa295661dbe4e89 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 22 Mar 2023 09:31:20 -0400 Subject: gnu: wireshark: Re-instate the validate-runpath phase. * gnu/packages/networking.scm (wireshark) [arguments]: Use gexps. Add the CMAKE_MODULE_LINKER_FLAGS CMake variable to the configure flags. --- gnu/packages/networking.scm | 46 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 26 deletions(-) (limited to 'gnu/packages/networking.scm') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 0c55f14077..26451c91a9 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2018, 2020-2022 Marius Bakke ;;; Copyright © 2018, 2020, 2021, 2022 Oleg Pykhalov ;;; Copyright © 2018 Pierre Neidhardt -;;; Copyright © 2019, 2020, 2021, 2022 Maxim Cournoyer +;;; Copyright © 2019, 2020, 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2019 Vasile Dumitrascu ;;; Copyright © 2019 Julien Lepiller ;;; Copyright © 2019 Timotej Lazar @@ -1768,31 +1768,25 @@ of the same name.") (base32 "0jz76ra86gy7r4wwb174lggnl5y29nn68l7ydw1kj1phcijrz854")))) (build-system cmake-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key parallel-tests? tests? #:allow-other-keys) - (when tests? - (invoke "ctest" "-VV" - "-j" (if parallel-tests? - (number->string (parallel-job-count)) - "1") - ;; Skip the suite_extcaps.case_extcaps.test_sdjournal - ;; test as it requires sdjournal (from systemd) and - ;; fails. - "-E" "suite_extcaps"))))) - ;; Build process chokes during `validate-runpath' phase. - ;; - ;; Errors are like the following: - ;; "/gnu/store/...wireshark-3.0.0/lib/wireshark/plugins/3.0/epan/ethercat.so: - ;; error: depends on 'libwireshark.so.12', which cannot be found in - ;; RUNPATH". That is, "/gnu/store/...wireshark-3.0.0./lib" doesn't - ;; belong to RUNPATH. - ;; - ;; That’s not a problem in practice because "ethercat.so" is a plugin, - ;; so it’s dlopen’d by a process that already provides "libwireshark". - ;; For now, we disable this phase. - #:validate-runpath? #f)) + (list + ;; This causes the plugins to register runpaths for the wireshark + ;; libraries, which would otherwise cause the validate-runpath phase to + ;; fail. + #:configure-flags #~(list (string-append "-DCMAKE_MODULE_LINKER_FLAGS=" + "-Wl,-rpath=" #$output "/lib")) + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key parallel-tests? tests? #:allow-other-keys) + (when tests? + (invoke "ctest" "-VV" + "-j" (if parallel-tests? + (number->string (parallel-job-count)) + "1") + ;; Skip the suite_extcaps.case_extcaps.test_sdjournal + ;; test as it requires sdjournal (from systemd) and + ;; fails. + "-E" "suite_extcaps"))))))) (inputs (list c-ares glib -- cgit v1.2.3 From 4f8a13b9fbfd0efcb94ee8da46b09c6dbe84ac4b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 22 Mar 2023 09:41:31 -0400 Subject: gnu: wireshark: Update dependencies, use Qt 6. * gnu/packages/networking.scm (wireshark) [arguments] <#:configure-flags>: Add -DUSE_qt6=ON. [inputs]: Replace lua-5.2 with lua, qtbase-5 with qtbase, qtmultimedia-5 with qtmultimedia, qtsvg-5 with qtsvg. Add qt5compat. [native-inputs]: replace qttools-5 with qttools. --- gnu/packages/networking.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu/packages/networking.scm') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 26451c91a9..ecb1d16615 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1773,7 +1773,8 @@ of the same name.") ;; libraries, which would otherwise cause the validate-runpath phase to ;; fail. #:configure-flags #~(list (string-append "-DCMAKE_MODULE_LINKER_FLAGS=" - "-Wl,-rpath=" #$output "/lib")) + "-Wl,-rpath=" #$output "/lib") + "-DUSE_qt6=ON") #:phases #~(modify-phases %standard-phases (replace 'check @@ -1799,14 +1800,15 @@ of the same name.") libssh libxml2 lz4 - lua-5.2 ;Lua 5.3 unsupported + lua mit-krb5 `(,nghttp2 "lib") minizip pcre2 - qtbase-5 - qtmultimedia-5 - qtsvg-5 + qt5compat + qtbase + qtmultimedia + qtsvg sbc snappy zlib @@ -1819,7 +1821,7 @@ of the same name.") perl pkg-config python-wrapper - qttools-5)) + qttools)) (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 -- cgit v1.2.3 From fa715278bcb62874580d4b72ad3b0545e8a686e5 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 17 Mar 2023 22:03:56 +0000 Subject: gnu: haproxy: Update to 2.7.5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/networking.scm (haproxy): Update to 2.7.4. [arguments]: Use Gexp. : Add extra build options 'USE_PCRE2_JIT' enables JIT for faster regex on libpcre2, 'USE_PROMEX' enables the Prometheus exporter. Set CC to use cc-for-target, point 'LUA_INC' and 'LUA_LIB' to corresponded '/include' and '/lib' outputs of Lua. Replace 'USE_PCRE_2' by correct option 'USE_PCRE2'. Signed-off-by: Ludovic Courtès --- gnu/packages/networking.scm | 50 +++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 22 deletions(-) (limited to 'gnu/packages/networking.scm') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index ecb1d16615..7d4a928ad7 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4239,30 +4239,36 @@ cables.") (define-public haproxy (package (name "haproxy") - (version "2.1.7") - (source (origin - (method url-fetch) - (uri (string-append "https://www.haproxy.org/download/" - (version-major+minor version) - "/src/haproxy-" version ".tar.gz")) - (sha256 - (base32 - "0fd3c1znid5a9w3gcf77b85hm2a2558w9s02c4b7xzkmivqnqbir")))) + (version "2.7.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.haproxy.org/download/" + (version-major+minor version) + "/src/haproxy-" version ".tar.gz")) + (sha256 + (base32 "00j5lwvrf8lgfid3108gclxbd46v3mnd4lh0lw4l0nn3f0rf9ip2")))) (build-system gnu-build-system) (arguments - `(#:make-flags - (let* ((out (assoc-ref %outputs "out"))) - (list (string-append "PREFIX=" out) - (string-append "DOCDIR=" out "/share/" ,name) - "TARGET=linux-glibc" - "USE_LUA=1" - "USE_OPENSSL=1" - "USE_ZLIB=1" - "USE_PCRE_2=1")) - #:tests? #f ; there are only regression tests, using varnishtest - #:phases - (modify-phases %standard-phases - (delete 'configure)))) + (list + #:tests? #f ; there are only regression tests, using varnishtest + #:make-flags + #~(list "LUA_LIB_NAME=lua" + "TARGET=linux-glibc" + "USE_LUA=1" + "USE_OPENSSL=1" + "USE_PCRE2=1" + "USE_PCRE2_JIT=1" + "USE_PROMEX=1" + "USE_ZLIB=1" + (string-append "CC=" #$(cc-for-target)) + (string-append "DOCDIR=" #$output "/share/" #$name) + (string-append "LUA_INC=" #$(this-package-input "lua") "/include") + (string-append "LUA_LIB=" #$(this-package-input "lua") "/lib") + (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure)))) (inputs (list lua openssl pcre2 zlib)) (home-page "https://www.haproxy.org/") -- cgit v1.2.3 From c06b6ce2572410eb6b904d5ade219b5023143517 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 17 Mar 2023 22:03:57 +0000 Subject: gnu: haproxy: Move to (gnu packages high-availability). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Copyright records were synchronized based on commit history. * gnu/packages/networking.scm (haproxy): Move this variable from here... * gnu/packages/high-availability.scm (haproxy): ...to here. Signed-off-by: Ludovic Courtès --- gnu/packages/high-availability.scm | 53 +++++++++++++++++++++++++++++++++++++- gnu/packages/networking.scm | 48 +--------------------------------- 2 files changed, 53 insertions(+), 48 deletions(-) (limited to 'gnu/packages/networking.scm') diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm index 108ea553ef..ad6db537e5 100644 --- a/gnu/packages/high-availability.scm +++ b/gnu/packages/high-availability.scm @@ -1,4 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2020, 2022 Tobias Geerinckx-Rice ;;; Copyright © 2022 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. @@ -34,8 +36,10 @@ #:use-module (gnu packages glib) #:use-module (gnu packages hardware) #:use-module (gnu packages linux) + #:use-module (gnu packages lua) #:use-module (gnu packages networking) #:use-module (gnu packages nss) + #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages rsync) @@ -45,13 +49,60 @@ #:use-module (gnu packages xml) #:use-module (gnu packages) #:use-module (guix build-system gnu) - #:use-module (guix gexp) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix packages) + #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:)) +(define-public haproxy + (package + (name "haproxy") + (version "2.7.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.haproxy.org/download/" + (version-major+minor version) + "/src/haproxy-" version ".tar.gz")) + (sha256 + (base32 "00j5lwvrf8lgfid3108gclxbd46v3mnd4lh0lw4l0nn3f0rf9ip2")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ; there are only regression tests, using varnishtest + #:make-flags + #~(list "LUA_LIB_NAME=lua" + "TARGET=linux-glibc" + "USE_LUA=1" + "USE_OPENSSL=1" + "USE_PCRE2=1" + "USE_PCRE2_JIT=1" + "USE_PROMEX=1" + "USE_ZLIB=1" + (string-append "CC=" #$(cc-for-target)) + (string-append "DOCDIR=" #$output "/share/" #$name) + (string-append "LUA_INC=" #$(this-package-input "lua") "/include") + (string-append "LUA_LIB=" #$(this-package-input "lua") "/lib") + (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure)))) + (inputs + (list lua openssl pcre2 zlib)) + (home-page "https://www.haproxy.org/") + (synopsis "Reliable, high performance TCP/HTTP load balancer") + (description "HAProxy offers @acronym{HA, high availability}, load +balancing, and proxying for TCP and HTTP-based applications. It is particularly +suited to Web sites crawling under very high loads while needing persistence or +Layer 7 processing. Supporting tens of thousands of connections is clearly +realistic with today's hardware.") + (license (list license:gpl2+ + license:lgpl2.1 + license:lgpl2.1+)))) + (define-public libqb (package (name "libqb") diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 7d4a928ad7..ae26105c2c 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -30,7 +30,7 @@ ;;; Copyright © 2019 Vasile Dumitrascu ;;; Copyright © 2019 Julien Lepiller ;;; Copyright © 2019 Timotej Lazar -;;; Copyright © 2019, 2020, 2021 Brice Waegeneire +;;; Copyright © 2019, 2021 Brice Waegeneire ;;; Copyright © 2019, 2020 Alex Griffin ;;; Copyright © 2019, 2020 Jan Wielkiewicz ;;; Copyright © 2019 Daniel Schaefer @@ -4236,52 +4236,6 @@ cables.") "file://COPYING.slirpvde" "See COPYING.slirpvde in the distribution.")))))) -(define-public haproxy - (package - (name "haproxy") - (version "2.7.5") - (source - (origin - (method url-fetch) - (uri (string-append "https://www.haproxy.org/download/" - (version-major+minor version) - "/src/haproxy-" version ".tar.gz")) - (sha256 - (base32 "00j5lwvrf8lgfid3108gclxbd46v3mnd4lh0lw4l0nn3f0rf9ip2")))) - (build-system gnu-build-system) - (arguments - (list - #:tests? #f ; there are only regression tests, using varnishtest - #:make-flags - #~(list "LUA_LIB_NAME=lua" - "TARGET=linux-glibc" - "USE_LUA=1" - "USE_OPENSSL=1" - "USE_PCRE2=1" - "USE_PCRE2_JIT=1" - "USE_PROMEX=1" - "USE_ZLIB=1" - (string-append "CC=" #$(cc-for-target)) - (string-append "DOCDIR=" #$output "/share/" #$name) - (string-append "LUA_INC=" #$(this-package-input "lua") "/include") - (string-append "LUA_LIB=" #$(this-package-input "lua") "/lib") - (string-append "PREFIX=" #$output)) - #:phases - #~(modify-phases %standard-phases - (delete 'configure)))) - (inputs - (list lua openssl pcre2 zlib)) - (home-page "https://www.haproxy.org/") - (synopsis "Reliable, high performance TCP/HTTP load balancer") - (description "HAProxy offers @acronym{HA, high availability}, load -balancing, and proxying for TCP and HTTP-based applications. It is particularly -suited to Web sites crawling under very high loads while needing persistence or -Layer 7 processing. Supporting tens of thousands of connections is clearly -realistic with today's hardware.") - (license (list license:gpl2+ - license:lgpl2.1 - license:lgpl2.1+)))) - (define-public lldpd (package (name "lldpd") -- cgit v1.2.3 From d6c629088a9c3a920aea5638d61ed8d5a8690e9b Mon Sep 17 00:00:00 2001 From: Yovan Naumovski Date: Thu, 9 Mar 2023 21:52:13 +0200 Subject: gnu: arp-scan: Update to 1.10.0. * gnu/packages/networking.scm (arp-scan): Update to 1.10.0. Signed-off-by: Christopher Baines --- gnu/packages/networking.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/networking.scm') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index ae26105c2c..adf3f25bee 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -58,6 +58,7 @@ ;;; Copyright © 2023 Andreas Enge ;;; Copyright © 2023 Sharlatan Hellseher ;;; Copyright © 2023 Bruno Victal +;;; Copyright © 2023 Yovan Naumovski ;;; ;;; This file is part of GNU Guix. ;;; @@ -200,7 +201,7 @@ runs on top of IP or UDP, and supports both v4 and v6 versions.") (define-public arp-scan (package (name "arp-scan") - (version "1.9.8") + (version "1.10.0") (source (origin (method git-fetch) @@ -210,7 +211,7 @@ runs on top of IP or UDP, and supports both v4 and v6 versions.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "18pck3hi7caykpkry5ri16w4w8m11g8gvh3qx5rhwsc6d9xa2a6d")))) + (base32 "1d603by2v7gj6bdxn1d23l425q115dk5qfk3ywbj6wbsjysqhbq5")))) (build-system gnu-build-system) (inputs (list libpcap)) -- cgit v1.2.3 From 38e7813c0358a829616c1748c975d1ebf709258d Mon Sep 17 00:00:00 2001 From: Felix Lechner Date: Mon, 20 Mar 2023 21:25:40 -0700 Subject: gnu: Add atftp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/networking.scm (atftp): New variable. Thanks to Josselin Poiret and Bruno Victal for their generous and detailed reviews of this item! Signed-off-by: Ludovic Courtès --- gnu/packages/networking.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages/networking.scm') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index adf3f25bee..e7ad1c5599 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2913,6 +2913,39 @@ networks.") speedtest.net.") (license license:asl2.0))) +(define-public atftp + (package + (name "atftp") + (version "0.8.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.code.sf.net/p/atftp/code") + (commit (string-append "v" version)))) + (sha256 + (base32 + "019qrh2wpvr577ksvs3s82q6kiqm5i6869aj7qba326b59lhkxrc")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + (list #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'autoreconf + (lambda _ + (invoke "autoreconf" "-vif")))))) + (native-inputs (list autoconf automake perl pkg-config)) + (inputs (list pcre2 procps readline tcp-wrappers)) + (home-page "https://sourceforge.net/projects/atftp/") + (synopsis "Advanced TFTP server and client") + (description + "This package provides a multi-threaded TFTP server that implements all +options, including all extensions, as specified in RFC 1350, RFC 2090, RFC +2347, RFC 2348, RFC 2349 and RFC7440. Atftpd also supports a multicast +protocol known as mtftp, which was defined in the PXE specification. + +The server is socket activated by default but supports being started from +@command{inetd} as well as in daemon mode.") + (license license:gpl2+))) + (define-public tftp-hpa (package (name "tftp-hpa") -- cgit v1.2.3 From ef807e48d411e598c1b5e043d3ca5f3d9a1778dc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 10 Apr 2023 23:31:47 -0400 Subject: gnu: restinio: Update to 0.6.18-0.eda471e and enable tests. * gnu/packages/networking.scm (restinio): Update to 0.6.18-0.eda471e. [version]: Use git-version. [arguments]: Enable tests, removing #:tests? argument. --- gnu/packages/networking.scm | 95 +++++++++++++++++++++++---------------------- 1 file changed, 48 insertions(+), 47 deletions(-) (limited to 'gnu/packages/networking.scm') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index e7ad1c5599..1ba6c5300d 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3709,55 +3709,56 @@ communication over HTTP.") (license license:agpl3+))) (define-public restinio - (package - (name "restinio") - (version "0.6.17") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Stiffstream/restinio") - (commit (string-append "v." version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1jpvfa2sjkihbkcc1q6c9zb1vry9mkkhbz2jrl831bqslpq9la3p")))) - (build-system cmake-build-system) - (arguments - (list - ;; Multiple tests fail to run in the build container due to host name - ;; resolution (see: https://github.com/Stiffstream/restinio/issues/172). - #:tests? #f - #:configure-flags #~(list "-DRESTINIO_FIND_DEPS=ON" - "-DRESTINIO_INSTALL=ON" - "-DRESTINIO_TEST=ON" - "-DRESTINIO_USE_EXTERNAL_HTTP_PARSER=ON" - "-DRESTINIO_USE_EXTERNAL_SOBJECTIZER=ON") - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'change-directory - (lambda _ - (chdir "dev")))))) - (native-inputs - (list catch2 - clara - json-dto)) - (inputs - (list openssl - sobjectizer)) - (propagated-inputs - ;; These are all #include'd by restinio's .hpp header files. - (list asio - fmt - http-parser - pcre - pcre2 - zlib)) - (home-page "https://stiffstream.com/en/products/restinio.html") - (synopsis "C++14 library that gives you an embedded HTTP/Websocket server") - (description "RESTinio is a header-only C++14 library that gives you an embedded + ;; Temporarily use an unreleased commit, which includes fixes to be able to + ;; run the test suite in the resolver-less Guix build environment. + (let ((revision "0") + (commit "eda471ec3a2815965ca02ec93a1124a342b7601d")) + (package + (name "restinio") + (version (git-version "0.6.18" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Stiffstream/restinio") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0f4w7714r0ic7csgxydw2vzfh35ssk34pns9jycmc08dzc3r7whb")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DRESTINIO_FIND_DEPS=ON" + "-DRESTINIO_INSTALL=ON" + "-DRESTINIO_TEST=ON" + "-DRESTINIO_USE_EXTERNAL_HTTP_PARSER=ON" + "-DRESTINIO_USE_EXTERNAL_SOBJECTIZER=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'change-directory + (lambda _ + (chdir "dev")))))) + (native-inputs + (list catch2 + clara + json-dto)) + (inputs + (list openssl + sobjectizer)) + (propagated-inputs + ;; These are all #include'd by restinio's .hpp header files. + (list asio + fmt + http-parser + pcre + pcre2 + zlib)) + (home-page "https://stiffstream.com/en/products/restinio.html") + (synopsis "C++14 library that gives you an embedded HTTP/Websocket server") + (description "RESTinio is a header-only C++14 library that gives you an embedded HTTP/Websocket server. It is based on standalone version of ASIO and targeted primarily for asynchronous processing of HTTP-requests.") - (license license:bsd-3))) + (license license:bsd-3)))) (define-public opendht (package -- cgit v1.2.3 From 31534f4e4dd95d65584b4334fae8b9444a369065 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 10 Apr 2023 23:34:11 -0400 Subject: gnu: opendht: Update to 2.5.2. * gnu/packages/networking.scm (opendht): Update to 2.5.2. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/networking.scm') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 1ba6c5300d..e78811c1e9 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3763,7 +3763,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (define-public opendht (package (name "opendht") - (version "2.4.12") + (version "2.5.2") (source (origin (method git-fetch) (uri (git-reference @@ -3772,7 +3772,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (file-name (git-file-name name version)) (sha256 (base32 - "0yji5pziqxfvyfizk3fn9j59bqlfdwfa1a0y9jjfknb2mmlwwb9w")))) + "1lxiblwx3bah9rawarq41kb0c7z7lx4bsh7svkri306kyydd64kb")))) (outputs '("out" "python" "tools" "debug")) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From ac180c65e5204d1c5f2a34d2e218906cd28f9359 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 10 Apr 2023 23:38:12 -0400 Subject: Revert "gnu: opendht: Update to 2.5.2." This reverts commit 31534f4e4dd95d65584b4334fae8b9444a369065. It broke libjami. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/networking.scm') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index e78811c1e9..1ba6c5300d 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3763,7 +3763,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (define-public opendht (package (name "opendht") - (version "2.5.2") + (version "2.4.12") (source (origin (method git-fetch) (uri (git-reference @@ -3772,7 +3772,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (file-name (git-file-name name version)) (sha256 (base32 - "1lxiblwx3bah9rawarq41kb0c7z7lx4bsh7svkri306kyydd64kb")))) + "0yji5pziqxfvyfizk3fn9j59bqlfdwfa1a0y9jjfknb2mmlwwb9w")))) (outputs '("out" "python" "tools" "debug")) (build-system gnu-build-system) (arguments -- cgit v1.2.3