Message ID | 20220301080516.5758-1-tanguy@bioneland.org |
---|---|
State | Accepted |
Headers | show |
Series | [bug#54036,v2] gnu: gnunet: Update to 0.16.0. | expand |
Context | Check | Description |
---|---|---|
cbaines/comparison | success | View comparision |
cbaines/git branch | success | View Git branch |
cbaines/applying patch | success | View Laminar job |
cbaines/issue | success | View issue |
Hello! Tanguy Le Carrour <tanguy@bioneland.org> writes: > * gnu/packages/gnunet.scm (gnunet): Update to 0.16.0. > [arguments] Disable failing tests. > [inputs] Use new style. [home-page] Update URL. Could you update this changelog, please? :-). E.g., mention whether the removed substitutions are reinstating tests or simply no longer exist. > --- > gnu/packages/gnunet.scm | 75 +++++++++++++++-------------------------- > 1 file changed, 27 insertions(+), 48 deletions(-) > > diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm > index 1c09c9047b..2fd3301897 100644 > --- a/gnu/packages/gnunet.scm > +++ b/gnu/packages/gnunet.scm > @@ -254,7 +254,7 @@ (define-public gnurl > (define-public gnunet > (package > (name "gnunet") > - (version "0.13.1") > + (version "0.16.0") > (source > (origin > (method url-fetch) > @@ -262,30 +262,30 @@ (define-public gnunet > ".tar.gz")) > (sha256 > (base32 > - "15jnca5zxng7r6m3qzq9lr73xxq0v6mvcp0lny3zrlkz5s2nmmq3")))) > + "0s006sdcczx7w1h9h1pnwwnnvxz9g47yl6apa9q8dkgi7zqscbfk")))) > (build-system gnu-build-system) > (inputs > - `(("bluez" ,bluez) > - ("glpk" ,glpk) > - ("gnurl" ,gnurl) > - ("gnutls" ,gnutls/dane) > - ("gstreamer" ,gstreamer) > - ("jansson" ,jansson) > - ("libextractor" ,libextractor) > - ("libidn" ,libidn2) > - ("libgcrypt" ,libgcrypt) > - ("libjpeg" ,libjpeg-turbo) > - ("libltdl" ,libltdl) > - ("libmicrohttpd" ,libmicrohttpd) > - ("libogg" ,libogg) > - ("libsodium" ,libsodium) > - ("libunistring" ,libunistring) > - ("miniupnpc" ,miniupnpc) > - ("opus" ,opus) > - ("pulseaudio" ,pulseaudio) > - ("sqlite" ,sqlite) > - ("zbar" ,zbar) > - ("zlib" ,zlib))) > + (list bluez > + glpk > + gnurl > + gnutls/dane > + gstreamer > + jansson > + libextractor > + libidn2 > + libgcrypt > + libjpeg-turbo > + libltdl > + libmicrohttpd > + libogg > + libsodium > + libunistring > + miniupnpc > + opus > + pulseaudio > + sqlite > + zbar > + zlib)) > (native-inputs > (list curl pkg-config python xxd > (@ (gnu packages base) which))) > @@ -297,30 +297,9 @@ (define-public gnunet > ;; These tests fail in Guix's building environment. > (lambda _ > (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_blacklisting_multiple_plugins\\$\\(EXEEXT\\) \\\\\n") "")) > - (substitute* "src/testbed/Makefile" > - (("test_testbed_api_2peers_1controller\\$\\(EXEEXT\\) \\\\\n") "") > - (("test_testbed_api_statistics\\$\\(EXEEXT\\) \\\\\n") "") > - (("test_testbed_api_test\\$\\(EXEEXT\\) \\\\\n") "") > - (("test_testbed_api_test_timeout\\$\\(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") "")) > - (substitute* "src/namestore/Makefile" > - (("\\$\\(am__append_2\\)") "")) > - (substitute* "src/gns/Makefile" > - (("\\$\\(am__append_4\\)") "")) > - (substitute* "contrib/Makefile" > - (("^check_PROGRAMS.*") "\n")) > - ;; 'test' from coreutils doesn't behave as the test expects. > - (substitute* '("src/gns/gnunet-gns-proxy-setup-ca.in" > - "src/transport/gnunet-transport-certificate-creation.in") > - (("gnutls-certtool") "certtool")) > + (("\\$\\(am__EXEEXT_15\\)") "")) ; test_transport_api_https > + (substitute* "src/dht/test_dht_tools.py" > + (("/usr/bin/python") (which "python3"))) > #t)) > (add-before 'check 'set-env-var-for-tests > (lambda _ > @@ -344,7 +323,7 @@ (define-public gnunet > an application for secure publication of files, it has grown to include all > kinds of basic applications for the foundation of a GNU internet.") > (license license:agpl3+) > - (home-page "https://gnunet.org/"))) > + (home-page "https://gnunet.org/en/"))) > > (define-public guile-gnunet ;GSoC 2015! > (let ((commit "d12167ab3c8d7d6caffd9c606e389ef043760602") That's a very welcome cleanup of the disabled tests! Thank you! With the updated changelog, it'll be good to push. Thanks, Maxim
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 1c09c9047b..2fd3301897 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -254,7 +254,7 @@ (define-public gnurl (define-public gnunet (package (name "gnunet") - (version "0.13.1") + (version "0.16.0") (source (origin (method url-fetch) @@ -262,30 +262,30 @@ (define-public gnunet ".tar.gz")) (sha256 (base32 - "15jnca5zxng7r6m3qzq9lr73xxq0v6mvcp0lny3zrlkz5s2nmmq3")))) + "0s006sdcczx7w1h9h1pnwwnnvxz9g47yl6apa9q8dkgi7zqscbfk")))) (build-system gnu-build-system) (inputs - `(("bluez" ,bluez) - ("glpk" ,glpk) - ("gnurl" ,gnurl) - ("gnutls" ,gnutls/dane) - ("gstreamer" ,gstreamer) - ("jansson" ,jansson) - ("libextractor" ,libextractor) - ("libidn" ,libidn2) - ("libgcrypt" ,libgcrypt) - ("libjpeg" ,libjpeg-turbo) - ("libltdl" ,libltdl) - ("libmicrohttpd" ,libmicrohttpd) - ("libogg" ,libogg) - ("libsodium" ,libsodium) - ("libunistring" ,libunistring) - ("miniupnpc" ,miniupnpc) - ("opus" ,opus) - ("pulseaudio" ,pulseaudio) - ("sqlite" ,sqlite) - ("zbar" ,zbar) - ("zlib" ,zlib))) + (list bluez + glpk + gnurl + gnutls/dane + gstreamer + jansson + libextractor + libidn2 + libgcrypt + libjpeg-turbo + libltdl + libmicrohttpd + libogg + libsodium + libunistring + miniupnpc + opus + pulseaudio + sqlite + zbar + zlib)) (native-inputs (list curl pkg-config python xxd (@ (gnu packages base) which))) @@ -297,30 +297,9 @@ (define-public gnunet ;; These tests fail in Guix's building environment. (lambda _ (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_blacklisting_multiple_plugins\\$\\(EXEEXT\\) \\\\\n") "")) - (substitute* "src/testbed/Makefile" - (("test_testbed_api_2peers_1controller\\$\\(EXEEXT\\) \\\\\n") "") - (("test_testbed_api_statistics\\$\\(EXEEXT\\) \\\\\n") "") - (("test_testbed_api_test\\$\\(EXEEXT\\) \\\\\n") "") - (("test_testbed_api_test_timeout\\$\\(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") "")) - (substitute* "src/namestore/Makefile" - (("\\$\\(am__append_2\\)") "")) - (substitute* "src/gns/Makefile" - (("\\$\\(am__append_4\\)") "")) - (substitute* "contrib/Makefile" - (("^check_PROGRAMS.*") "\n")) - ;; 'test' from coreutils doesn't behave as the test expects. - (substitute* '("src/gns/gnunet-gns-proxy-setup-ca.in" - "src/transport/gnunet-transport-certificate-creation.in") - (("gnutls-certtool") "certtool")) + (("\\$\\(am__EXEEXT_15\\)") "")) ; test_transport_api_https + (substitute* "src/dht/test_dht_tools.py" + (("/usr/bin/python") (which "python3"))) #t)) (add-before 'check 'set-env-var-for-tests (lambda _ @@ -344,7 +323,7 @@ (define-public gnunet an application for secure publication of files, it has grown to include all kinds of basic applications for the foundation of a GNU internet.") (license license:agpl3+) - (home-page "https://gnunet.org/"))) + (home-page "https://gnunet.org/en/"))) (define-public guile-gnunet ;GSoC 2015! (let ((commit "d12167ab3c8d7d6caffd9c606e389ef043760602")