From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:54180) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4MSa-00009g-Hv for guix-patches@gnu.org; Wed, 19 Feb 2020 05:20:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4MSY-00085O-Cn for guix-patches@gnu.org; Wed, 19 Feb 2020 05:20:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35685) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j4MSY-00085G-9b for guix-patches@gnu.org; Wed, 19 Feb 2020 05:20:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j4MSY-0007Er-4Y for guix-patches@gnu.org; Wed, 19 Feb 2020 05:20:02 -0500 Subject: [bug#39673] [PATCH 1/2] gnu: gnunet: Update to 0.12.2. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:54051) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4MRj-0006iz-R0 for guix-patches@gnu.org; Wed, 19 Feb 2020 05:19:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4MRi-0007Vv-Ib for guix-patches@gnu.org; Wed, 19 Feb 2020 05:19:11 -0500 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:45833) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j4MRi-0007S0-9F for guix-patches@gnu.org; Wed, 19 Feb 2020 05:19:10 -0500 From: Tanguy Le Carrour Date: Wed, 19 Feb 2020 11:18:53 +0100 Message-Id: <20200219101853.7452-1-tanguy@bioneland.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39673@debbugs.gnu.org Cc: Tanguy Le Carrour * gnu/packages/gnunet.scm (gnunet): Update to 0.12.2. [inputs]: Add libjpeg. [arguments]: Deactivate more tests, set LANG env variable. --- gnu/packages/gnunet.scm | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index f9b71a2f3a..1bcff1bf66 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2019 Brett Gilio +;;; Copyright © 2020 Tanguy Le Carrour ;;; ;;; This file is part of GNU Guix. ;;; @@ -249,7 +250,7 @@ supports HTTP, HTTPS and GnuTLS.") (define-public gnunet (package (name "gnunet") - (version "0.11.8") + (version "0.12.2") (source (origin (method url-fetch) @@ -257,7 +258,7 @@ supports HTTP, HTTPS and GnuTLS.") ".tar.gz")) (sha256 (base32 - "1zkmcq75sfr3iyg8rgxp9dbl7fwsvc1a71rc0vgisghcbrx1n7yj")))) + "1mwcy7fj1rpd39w7j7k3jdwlil5s889b2qlhfdggqmhigl28na5c")))) (build-system gnu-build-system) (inputs `(("bluez" ,bluez) @@ -269,6 +270,7 @@ supports HTTP, HTTPS and GnuTLS.") ("libextractor" ,libextractor) ("libidn" ,libidn2) ("libgcrypt" ,libgcrypt) + ("libjpeg" ,libjpeg) ("libltdl" ,libltdl) ("libmicrohttpd" ,libmicrohttpd) ("libogg" ,libogg) @@ -289,11 +291,30 @@ supports HTTP, HTTPS and GnuTLS.") #:phases (modify-phases %standard-phases (add-after 'configure 'remove-failing-tests - ;; These tests fail in Guix's building envrionment. + ;; These tests fail in Guix's building environment. (lambda _ + (substitute* "src/cadet/Makefile" + (("test_cadet_2_reopen\\$\\(EXEEXT\\) \\\\\n") "test_cadet_2_reopen$(EXEEXT)") + (("test_cadet_5_forward\\$\\(EXEEXT\\) \\\\\n") "") + (("test_cadet_5_signal\\$\\(EXEEXT\\) \\\\\n") "") + (("test_cadet_5_keepalive\\$\\(EXEEXT\\) \\\\\n") "") + (("test_cadet_5_speed\\$\\(EXEEXT\\) \\\\\n") "") + (("test_cadet_5_speed_ack\\$\\(EXEEXT\\) \\\\\n") "") + (("test_cadet_5_speed_reliable\\$\\(EXEEXT\\) \\\\\n") "") + (("test_cadet_5_speed_reliable_backwards\\$\\(EXEEXT\\) \\\\\n") "") + (("test_cadet_5_speed_backwards\\$\\(EXEEXT\\) \\\\\n") "") + (("test_cadet_5_reopen\\$\\(EXEEXT\\)") "")) (substitute* "src/transport/Makefile" + (("\\$\\(am__EXEEXT_15\\)") "") ; test_transport_api_https + (("test_transport_api_manipulation_cfg\\$\\(EXEEXT\\) \\\\\n") "") (("test_transport_api_udp_nat\\$\\(EXEEXT\\) \\\\\n") "") - (("test_transport_api_manipulation_cfg\\$\\(EXEEXT\\) \\\\\n") "")) + (("test_transport_blacklisting_multiple_plugins\\$\\(EXEEXT\\) \\\\\n") "")) + (substitute* "src/testbed/Makefile" + (("test_testbed_api_2peers_1controller\\$\\(EXEEXT\\) \\\\\n") "") + (("test_testbed_api_test\\$\\(EXEEXT\\) \\\\\n") "") + (("test_testbed_api_statistics\\$\\(EXEEXT\\) \\\\\n") "") + (("test_testbed_api_topology\\$\\(EXEEXT\\) \\\\\n") "") + (("test_testbed_api_topology_clique\\$\\(EXEEXT\\) \\\\\n") "")) (substitute* "src/topology/Makefile" (("^check_PROGRAMS.*") "\n") (("test_gnunet_daemon_topology\\$\\(EXEEXT\\)\n") "")) @@ -308,6 +329,9 @@ supports HTTP, HTTPS and GnuTLS.") "src/transport/gnunet-transport-certificate-creation.in") (("gnutls-certtool") "certtool")) #t)) + (add-before 'check 'set-env-var-for-tests + (lambda _ + (setenv "LANG" "en_US.UTF-8"))) ;; Swap 'check and 'install phases and add installed binaries to $PATH. (add-before 'check 'set-path-for-check (lambda* (#:key outputs #:allow-other-keys) -- 2.25.0