[PATCH] gnu: gnunet: Update to 0.15.3.

DoneSubmitted by Tanguy Le Carrour.
Details
3 participants
  • Ludovic Courtès
  • Maxim Cournoyer
  • Tanguy Le Carrour
Owner
unassigned
Severity
normal
T
T
Tanguy Le Carrour wrote on 17 Feb 09:03 +0100
(address . guix-patches@gnu.org)(name . Tanguy Le Carrour)(address . tanguy@bioneland.org)
20220217080334.12044-1-tanguy@bioneland.org
Hi Guix,

The lint command reports problems that I don't know how and if I have to fix:

```
[…]/gnu/packages/gnunet.scm:268:4: gnunet@0.15.3: label 'gnutls' does not match package name 'gnutls-dane'
[…]/gnu/packages/gnunet.scm:268:4: gnunet@0.15.3: label 'libidn' does not match package name 'libidn2'
[…]/gnu/packages/gnunet.scm:268:4: gnunet@0.15.3: label 'libjpeg' does not match package name 'libjpeg-turbo'
[…]/gnu/packages/gnunet.scm:360:14: gnunet@0.15.3: permanent redirect from https://gnunet.org/to https://www.gnunet.org/en/
```

Any help welcome!

Tanguy

* gnu/packages/gnunet.scm (gnunet): Update to 0.15.3.
[arguments] Disable failing tests.
---
gnu/packages/gnunet.scm | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)

Toggle diff (60 lines)
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 1c09c9047b..34c6efddcb 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.15.3")
    (source
     (origin
       (method url-fetch)
@@ -262,7 +262,7 @@ (define-public gnunet
                           ".tar.gz"))
       (sha256
        (base32
-        "15jnca5zxng7r6m3qzq9lr73xxq0v6mvcp0lny3zrlkz5s2nmmq3"))))
+        "1iafi1rzx62lf26awmwk17ih3y7kyhr7mrqc4am8w1qyyjl6j9nn"))))
    (build-system gnu-build-system)
    (inputs
     `(("bluez" ,bluez)
@@ -301,6 +301,8 @@ (define-public gnunet
               (("test_transport_api_manipulation_cfg\\$\\(EXEEXT\\) \\\\\n") "")
               (("test_transport_api_udp_nat\\$\\(EXEEXT\\) \\\\\n") "")
               (("test_transport_blacklisting_multiple_plugins\\$\\(EXEEXT\\) \\\\\n") ""))
+            (substitute* "src/cadet/Makefile"
+              (("test_cadet_2_speed_reliable\\$\\(EXEEXT\\) \\\\\n") ""))
             (substitute* "src/testbed/Makefile"
               (("test_testbed_api_2peers_1controller\\$\\(EXEEXT\\) \\\\\n") "")
               (("test_testbed_api_statistics\\$\\(EXEEXT\\) \\\\\n") "")
@@ -308,13 +310,24 @@ (define-public gnunet
               (("test_testbed_api_test_timeout\\$\\(EXEEXT\\) \\\\\n") "")
               (("test_testbed_api_topology\\$\\(EXEEXT\\) \\\\\n") "")
               (("test_testbed_api_topology_clique\\$\\(EXEEXT\\) \\\\\n") ""))
+            (substitute* "src/testing/Makefile"
+              (("test_testing_api_cmd_netjail\\$\\(EXEEXT\\) \\\\\n") "")
+              (("test_testing_peerstartup\\$\\(EXEEXT\\) \\\\\n") "")
+              (("test_testing_peerstartup2\\$\\(EXEEXT\\) \\\\\n") ""))
             (substitute* "src/topology/Makefile"
               (("^check_PROGRAMS.*") "\n")
               (("test_gnunet_daemon_topology\\$\\(EXEEXT\\)\n") ""))
             (substitute* "src/namestore/Makefile"
-              (("\\$\\(am__append_2\\)") ""))
+              (("\\$\\(am__append_2\\)") "")
+              ((" test_namestore_lookup\\.sh ") " "))
+            (substitute* "src/fs/Makefile"
+              (("test_fs_search_with_and\\$\\(EXEEXT\\) \\\\\n") ""))
             (substitute* "src/gns/Makefile"
-              (("\\$\\(am__append_4\\)") ""))
+              (("\\$\\(am__append_4\\)") "")
+              (("test_gns_caa_lookup.sh test_gns_mx_lookup.sh") "test_gns_caa_lookup.sh"))
+            (substitute* "src/revocation/Makefile"
+              (("^check_SCRIPTS.*") "")
+              (("  test_local_revocation.py\n") ""))
             (substitute* "contrib/Makefile"
               (("^check_PROGRAMS.*") "\n"))
             ;; 'test' from coreutils doesn't behave as the test expects.
-- 
2.34.0
M
M
Maxim Cournoyer wrote on 21 Feb 22:23 +0100
(name . Tanguy Le Carrour)(address . tanguy@bioneland.org)
87mtijoqwf.fsf@gmail.com
tags 54036 moreinfo
thanks

Hi Tanguy,

Tanguy Le Carrour <tanguy@bioneland.org> writes:

Toggle quote (11 lines)
> Hi Guix,
>
> The lint command reports problems that I don't know how and if I have to fix:
>
> ```
> […]/gnu/packages/gnunet.scm:268:4: gnunet@0.15.3: label 'gnutls' does not match package name 'gnutls-dane'
> […]/gnu/packages/gnunet.scm:268:4: gnunet@0.15.3: label 'libidn' does not match package name 'libidn2'
> […]/gnu/packages/gnunet.scm:268:4: gnunet@0.15.3: label 'libjpeg' does not match package name 'libjpeg-turbo'
> […]/gnu/packages/gnunet.scm:360:14: gnunet@0.15.3: permanent redirect from https://gnunet.org/ to https://www.gnunet.org/en/
> ```

Running './pre-inst-env guix style gnunet' should take care of the first
3. For the last one, I'd use the new suggested URL.

Toggle quote (69 lines)
> Any help welcome!
>
> Tanguy
>
> * gnu/packages/gnunet.scm (gnunet): Update to 0.15.3.
> [arguments] Disable failing tests.
> ---
> gnu/packages/gnunet.scm | 21 +++++++++++++++++----
> 1 file changed, 17 insertions(+), 4 deletions(-)
>
> diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
> index 1c09c9047b..34c6efddcb 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.15.3")
> (source
> (origin
> (method url-fetch)
> @@ -262,7 +262,7 @@ (define-public gnunet
> ".tar.gz"))
> (sha256
> (base32
> - "15jnca5zxng7r6m3qzq9lr73xxq0v6mvcp0lny3zrlkz5s2nmmq3"))))
> + "1iafi1rzx62lf26awmwk17ih3y7kyhr7mrqc4am8w1qyyjl6j9nn"))))
> (build-system gnu-build-system)
> (inputs
> `(("bluez" ,bluez)
> @@ -301,6 +301,8 @@ (define-public gnunet
> (("test_transport_api_manipulation_cfg\\$\\(EXEEXT\\) \\\\\n") "")
> (("test_transport_api_udp_nat\\$\\(EXEEXT\\) \\\\\n") "")
> (("test_transport_blacklisting_multiple_plugins\\$\\(EXEEXT\\) \\\\\n") ""))
> + (substitute* "src/cadet/Makefile"
> + (("test_cadet_2_speed_reliable\\$\\(EXEEXT\\) \\\\\n") ""))
> (substitute* "src/testbed/Makefile"
> (("test_testbed_api_2peers_1controller\\$\\(EXEEXT\\) \\\\\n") "")
> (("test_testbed_api_statistics\\$\\(EXEEXT\\) \\\\\n") "")
> @@ -308,13 +310,24 @@ (define-public gnunet
> (("test_testbed_api_test_timeout\\$\\(EXEEXT\\) \\\\\n") "")
> (("test_testbed_api_topology\\$\\(EXEEXT\\) \\\\\n") "")
> (("test_testbed_api_topology_clique\\$\\(EXEEXT\\) \\\\\n") ""))
> + (substitute* "src/testing/Makefile"
> + (("test_testing_api_cmd_netjail\\$\\(EXEEXT\\) \\\\\n") "")
> + (("test_testing_peerstartup\\$\\(EXEEXT\\) \\\\\n") "")
> + (("test_testing_peerstartup2\\$\\(EXEEXT\\) \\\\\n") ""))
> (substitute* "src/topology/Makefile"
> (("^check_PROGRAMS.*") "\n")
> (("test_gnunet_daemon_topology\\$\\(EXEEXT\\)\n") ""))
> (substitute* "src/namestore/Makefile"
> - (("\\$\\(am__append_2\\)") ""))
> + (("\\$\\(am__append_2\\)") "")
> + ((" test_namestore_lookup\\.sh ") " "))
> + (substitute* "src/fs/Makefile"
> + (("test_fs_search_with_and\\$\\(EXEEXT\\) \\\\\n") ""))
> (substitute* "src/gns/Makefile"
> - (("\\$\\(am__append_4\\)") ""))
> + (("\\$\\(am__append_4\\)") "")
> + (("test_gns_caa_lookup.sh test_gns_mx_lookup.sh") "test_gns_caa_lookup.sh"))
> + (substitute* "src/revocation/Makefile"
> + (("^check_SCRIPTS.*") "")
> + ((" test_local_revocation.py\n") ""))
> (substitute* "contrib/Makefile"
> (("^check_PROGRAMS.*") "\n"))
> ;; 'test' from coreutils doesn't behave as the test expects.

These needs to be commented to show that we understand why they fail and
why it's OK/expected in our build environment. If we don't understand
why we need to investigate more/seek support from the GNUnet authors so
that they can help us figure it out or fix real problems on their end.

Thank you,

Maxim
T
T
Tanguy LE CARROUR wrote on 22 Feb 12:43 +0100
(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
164553022414.20167.8025650442220259702@localhost
Hi Maxim,

Thanks for taking some time to review!


Quoting Maxim Cournoyer (2022-02-21 22:23:28)
Toggle quote (2 lines)
> tags 54036 moreinfo

"moreinfo" indeed! ^_^'


Toggle quote (12 lines)
> Tanguy Le Carrour <tanguy@bioneland.org> writes:
> > The lint command reports problems that I don't know how and if I have to fix:
> >
> > ```
> > […]/gnu/packages/gnunet.scm:268:4: gnunet@0.15.3: label 'gnutls' does not match package name 'gnutls-dane'
> > […]/gnu/packages/gnunet.scm:268:4: gnunet@0.15.3: label 'libidn' does not match package name 'libidn2'
> > […]/gnu/packages/gnunet.scm:268:4: gnunet@0.15.3: label 'libjpeg' does not match package name 'libjpeg-turbo'
> > […]/gnu/packages/gnunet.scm:360:14: gnunet@0.15.3: permanent redirect from https://gnunet.org/ to https://www.gnunet.org/en/
> > ```
>
> Running './pre-inst-env guix style gnunet' should take care of the first 3.

It didn't scream `style` to me, but OK. I'll do that.


Toggle quote (2 lines)
> For the last one, I'd use the new suggested URL.

Oh, this one was an easy one I was supposed to fix myself! Sorry for the noise!


Toggle quote (70 lines)
> > * gnu/packages/gnunet.scm (gnunet): Update to 0.15.3.
> > [arguments] Disable failing tests.
> > ---
> > gnu/packages/gnunet.scm | 21 +++++++++++++++++----
> > 1 file changed, 17 insertions(+), 4 deletions(-)
> >
> > diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
> > index 1c09c9047b..34c6efddcb 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.15.3")
> > (source
> > (origin
> > (method url-fetch)
> > @@ -262,7 +262,7 @@ (define-public gnunet
> > ".tar.gz"))
> > (sha256
> > (base32
> > - "15jnca5zxng7r6m3qzq9lr73xxq0v6mvcp0lny3zrlkz5s2nmmq3"))))
> > + "1iafi1rzx62lf26awmwk17ih3y7kyhr7mrqc4am8w1qyyjl6j9nn"))))
> > (build-system gnu-build-system)
> > (inputs
> > `(("bluez" ,bluez)
> > @@ -301,6 +301,8 @@ (define-public gnunet
> > (("test_transport_api_manipulation_cfg\\$\\(EXEEXT\\) \\\\\n") "")
> > (("test_transport_api_udp_nat\\$\\(EXEEXT\\) \\\\\n") "")
> > (("test_transport_blacklisting_multiple_plugins\\$\\(EXEEXT\\) \\\\\n") ""))
> > + (substitute* "src/cadet/Makefile"
> > + (("test_cadet_2_speed_reliable\\$\\(EXEEXT\\) \\\\\n") ""))
> > (substitute* "src/testbed/Makefile"
> > (("test_testbed_api_2peers_1controller\\$\\(EXEEXT\\) \\\\\n") "")
> > (("test_testbed_api_statistics\\$\\(EXEEXT\\) \\\\\n") "")
> > @@ -308,13 +310,24 @@ (define-public gnunet
> > (("test_testbed_api_test_timeout\\$\\(EXEEXT\\) \\\\\n") "")
> > (("test_testbed_api_topology\\$\\(EXEEXT\\) \\\\\n") "")
> > (("test_testbed_api_topology_clique\\$\\(EXEEXT\\) \\\\\n") ""))
> > + (substitute* "src/testing/Makefile"
> > + (("test_testing_api_cmd_netjail\\$\\(EXEEXT\\) \\\\\n") "")
> > + (("test_testing_peerstartup\\$\\(EXEEXT\\) \\\\\n") "")
> > + (("test_testing_peerstartup2\\$\\(EXEEXT\\) \\\\\n") ""))
> > (substitute* "src/topology/Makefile"
> > (("^check_PROGRAMS.*") "\n")
> > (("test_gnunet_daemon_topology\\$\\(EXEEXT\\)\n") ""))
> > (substitute* "src/namestore/Makefile"
> > - (("\\$\\(am__append_2\\)") ""))
> > + (("\\$\\(am__append_2\\)") "")
> > + ((" test_namestore_lookup\\.sh ") " "))
> > + (substitute* "src/fs/Makefile"
> > + (("test_fs_search_with_and\\$\\(EXEEXT\\) \\\\\n") ""))
> > (substitute* "src/gns/Makefile"
> > - (("\\$\\(am__append_4\\)") ""))
> > + (("\\$\\(am__append_4\\)") "")
> > + (("test_gns_caa_lookup.sh test_gns_mx_lookup.sh") "test_gns_caa_lookup.sh"))
> > + (substitute* "src/revocation/Makefile"
> > + (("^check_SCRIPTS.*") "")
> > + ((" test_local_revocation.py\n") ""))
> > (substitute* "contrib/Makefile"
> > (("^check_PROGRAMS.*") "\n"))
> > ;; 'test' from coreutils doesn't behave as the test expects.
>
> These needs to be commented to show that we understand why they fail and
> why it's OK/expected in our build environment. If we don't understand
> why we need to investigate more/seek support from the GNUnet authors so
> that they can help us figure it out or fix real problems on their end.

Actually, I had a ticket [1] open for the upgrade to 0.12.2 a year ago.


I'll have to update it and mention it in our package definition.

Actually, I should try to enable the previously disabled tests see if
they now pass, but… running GNUnet's tests is sooooo long!!!

I'll keep you posted when I send the new patch!

Regards,

--
Tanguy
M
M
Maxim Cournoyer wrote on 22 Feb 19:30 +0100
(name . Tanguy LE CARROUR)(address . tanguy@bioneland.org)(address . 54036@debbugs.gnu.org)
87a6eioism.fsf@gmail.com
Hi Tanguy,

Tanguy LE CARROUR <tanguy@bioneland.org> writes:

Toggle quote (25 lines)
> Hi Maxim,
>
> Thanks for taking some time to review!
>
>
> Quoting Maxim Cournoyer (2022-02-21 22:23:28)
>> tags 54036 moreinfo
>
> "moreinfo" indeed! ^_^'
>
>
>> Tanguy Le Carrour <tanguy@bioneland.org> writes:
>> > The lint command reports problems that I don't know how and if I have to fix:
>> >
>> > ```
>> > […]/gnu/packages/gnunet.scm:268:4: gnunet@0.15.3: label 'gnutls' does not match package name 'gnutls-dane'
>> > […]/gnu/packages/gnunet.scm:268:4: gnunet@0.15.3: label 'libidn' does not match package name 'libidn2'
>> > […]/gnu/packages/gnunet.scm:268:4: gnunet@0.15.3: label 'libjpeg' does not match package name 'libjpeg-turbo'
>> > […]/gnu/packages/gnunet.scm:360:14: gnunet@0.15.3: permanent redirect from https://gnunet.org/ to https://www.gnunet.org/en/
>> > ```
>>
>> Running './pre-inst-env guix style gnunet' should take care of the first 3.
>
> It didn't scream `style` to me, but OK. I'll do that.

You'll find out that it doesn't rewrite the inputs as I'd hope, but you
could do so by hand (see:
care of the lint warnings.

[...]

Toggle quote (53 lines)
>> > @@ -301,6 +301,8 @@ (define-public gnunet
>> > (("test_transport_api_manipulation_cfg\\$\\(EXEEXT\\) \\\\\n") "")
>> > (("test_transport_api_udp_nat\\$\\(EXEEXT\\) \\\\\n") "")
>> > (("test_transport_blacklisting_multiple_plugins\\$\\(EXEEXT\\) \\\\\n") ""))
>> > + (substitute* "src/cadet/Makefile"
>> > + (("test_cadet_2_speed_reliable\\$\\(EXEEXT\\) \\\\\n") ""))
>> > (substitute* "src/testbed/Makefile"
>> > (("test_testbed_api_2peers_1controller\\$\\(EXEEXT\\) \\\\\n") "")
>> > (("test_testbed_api_statistics\\$\\(EXEEXT\\) \\\\\n") "")
>> > @@ -308,13 +310,24 @@ (define-public gnunet
>> > (("test_testbed_api_test_timeout\\$\\(EXEEXT\\) \\\\\n") "")
>> > (("test_testbed_api_topology\\$\\(EXEEXT\\) \\\\\n") "")
>> > (("test_testbed_api_topology_clique\\$\\(EXEEXT\\) \\\\\n") ""))
>> > + (substitute* "src/testing/Makefile"
>> > + (("test_testing_api_cmd_netjail\\$\\(EXEEXT\\) \\\\\n") "")
>> > + (("test_testing_peerstartup\\$\\(EXEEXT\\) \\\\\n") "")
>> > + (("test_testing_peerstartup2\\$\\(EXEEXT\\) \\\\\n") ""))
>> > (substitute* "src/topology/Makefile"
>> > (("^check_PROGRAMS.*") "\n")
>> > (("test_gnunet_daemon_topology\\$\\(EXEEXT\\)\n") ""))
>> > (substitute* "src/namestore/Makefile"
>> > - (("\\$\\(am__append_2\\)") ""))
>> > + (("\\$\\(am__append_2\\)") "")
>> > + ((" test_namestore_lookup\\.sh ") " "))
>> > + (substitute* "src/fs/Makefile"
>> > + (("test_fs_search_with_and\\$\\(EXEEXT\\) \\\\\n") ""))
>> > (substitute* "src/gns/Makefile"
>> > - (("\\$\\(am__append_4\\)") ""))
>> > + (("\\$\\(am__append_4\\)") "")
>> > + (("test_gns_caa_lookup.sh test_gns_mx_lookup.sh") "test_gns_caa_lookup.sh"))
>> > + (substitute* "src/revocation/Makefile"
>> > + (("^check_SCRIPTS.*") "")
>> > + ((" test_local_revocation.py\n") ""))
>> > (substitute* "contrib/Makefile"
>> > (("^check_PROGRAMS.*") "\n"))
>> > ;; 'test' from coreutils doesn't behave as the test expects.
>>
>> These needs to be commented to show that we understand why they fail and
>> why it's OK/expected in our build environment. If we don't understand
>> why we need to investigate more/seek support from the GNUnet authors so
>> that they can help us figure it out or fix real problems on their end.
>
> Actually, I had a ticket [1] open for the upgrade to 0.12.2 a year ago.
>
> [1]: https://bugs.gnunet.org/view.php?id=6114
>
> I'll have to update it and mention it in our package definition.
>
> Actually, I should try to enable the previously disabled tests see if
> they now pass, but… running GNUnet's tests is sooooo long!!!
>
> I'll keep you posted when I send the new patch!

*If* the reason these tests fail is because they rely on network, it'd
be best if upstream (the GNUnet team) could provide an easy way to opt
out of network-relying tests; we could open a ticket with them for that.

Thanks,

Maxim
T
T
Tanguy LE CARROUR wrote on 28 Feb 16:36 +0100
(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)(address . 54036@debbugs.gnu.org)
164606256792.30879.5346064647814960085@localhost
Hi Maxim,

A **lot** has changed since I submitted this patch: version 0.16.0 is out!

So I decided to remove the `substitute` for all the failing tests and give it
a try, and… a lot of them seem to have been fixed!
But, even though I have no failing tests in the log, the check phase fails
with the following error message:

```
error: in phase 'check': uncaught exception:
%exception #<&invoke-error program: "make" arguments: ("check") exit-status: 2 term-signal: #f stop-signal: #f>
phase `check' failed after 4846.7 seconds
command "make" "check" failed with status 2
```

I don't know on which side is the problem, Guix or GNUnet?
My only guess is that `make` is supposed to return 0, but it
actually returns 2, which could mean "some tests have been skipped."
But it's just a random guess.
Any idea what could be wrong?!

I'm anyway submitting the latest version of my patch.

The last failing test that is disabled, `test_transport_api_https`, I
can probably fix.

The good news is, if I `guix package --without-tests=gnunet gnunet` I
get a for-what-I-can-tell working GNUnet! \o/

Best regards,

--
Tanguy
T
T
Tanguy Le Carrour wrote on 1 Mar 09:05 +0100
[PATCH v2] gnu: gnunet: Update to 0.16.0.
(address . 54036@debbugs.gnu.org)
20220301080516.5758-1-tanguy@bioneland.org
* gnu/packages/gnunet.scm (gnunet): Update to 0.16.0.
[arguments] Disable failing tests.
[inputs] Use new style. [home-page] Update URL.
---
gnu/packages/gnunet.scm | 75 +++++++++++++++--------------------------
1 file changed, 27 insertions(+), 48 deletions(-)

Toggle diff (111 lines)
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")
-- 
2.34.0
M
M
Maxim Cournoyer wrote on 1 Mar 20:30 +0100
(name . Tanguy Le Carrour)(address . tanguy@bioneland.org)(address . 54036@debbugs.gnu.org)
87zgm9jwsd.fsf@gmail.com
Hello!

Tanguy Le Carrour <tanguy@bioneland.org> writes:

Toggle quote (4 lines)
> * 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.

Toggle quote (114 lines)
> ---
> 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
T
T
Tanguy Le Carrour wrote on 2 Mar 17:35 +0100
[PATCH v3] gnu: gnunet: Update to 0.16.0.
(name . Tanguy Le Carrour)(address . tanguy@bioneland.org)
20220302163503.5467-1-tanguy@bioneland.org
Hi Maxim,

Unfortunately, this is still a WIP.

I've reported the make-status-code problem upstream [1]. If it's a
problem on GNUnet's side, I'll try to fix it. If returning 2 is the
expected behaviour, I'll probably need some help to figure out what has
to be done on our side.


Regards,


* gnu/packages/gnunet.scm (gnunet): Update to 0.16.0.
[arguments] Enable all the tests that were disabled.
[inputs] Use new style. [home-page] Update URL.
---
gnu/packages/gnunet.scm | 78 ++++++++++++++---------------------------
1 file changed, 27 insertions(+), 51 deletions(-)

Toggle diff (115 lines)
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 1c09c9047b..9454407bfc 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,32 +262,32 @@ (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
+    (list curl openssl pkg-config python xxd
           (@ (gnu packages base) which)))
    (arguments
     '(#:parallel-tests? #f ; Parallel tests aren't supported.
@@ -296,32 +296,8 @@ (define-public gnunet
         (add-after 'configure 'remove-failing-tests
           ;; 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"))
-            #t))
+            (substitute* "src/dht/test_dht_tools.py"
+              (("/usr/bin/python") (which "python3")))))
         (add-before 'check 'set-env-var-for-tests
           (lambda _
             (setenv "LANG" "en_US.UTF-8")))
@@ -344,7 +320,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")
-- 
2.34.0
L
L
Ludovic Courtès wrote on 6 Mar 22:21 +0100
Re: bug#54036: [PATCH] gnu: gnunet: Update to 0.15.3.
(name . Tanguy Le Carrour)(address . tanguy@bioneland.org)
87ee3ekcae.fsf_-_@gnu.org
Hi,

Tanguy Le Carrour <tanguy@bioneland.org> skribis:

Toggle quote (7 lines)
> Unfortunately, this is still a WIP.
>
> I've reported the make-status-code problem upstream [1]. If it's a
> problem on GNUnet's side, I'll try to fix it. If returning 2 is the
> expected behaviour, I'll probably need some help to figure out what has
> to be done on our side.

I think 0.16.1 was released; does it help?

Thanks,
Ludo’.
T
T
Tanguy LE CARROUR wrote on 7 Mar 14:28 +0100
(name . Ludovic Courtès)(address . ludo@gnu.org)
164665970750.6428.4707042791074208453@localhost
Hi,


Quoting Ludovic Courtès (2022-03-06 22:21:13)
Toggle quote (11 lines)
> Tanguy Le Carrour <tanguy@bioneland.org> skribis:
>
> > Unfortunately, this is still a WIP.
> >
> > I've reported the make-status-code problem upstream [1]. If it's a
> > problem on GNUnet's side, I'll try to fix it. If returning 2 is the
> > expected behaviour, I'll probably need some help to figure out what has
> > to be done on our side.
>
> I think 0.16.1 was released; does it help?

Nope! Unfortunately, a file is missing from the archive. :-(
Upstream provided me with a not-officially-published-version-0.16.1-3-g1f240bd13
to try out. It's building…

As I know which file is missing, I can write a package definition for 0.16.1
and create the file on the fly before running the checks, or…
We could also decide to wait for the 0.16.2 that will fix the problem.

--
Tanguy
T
T
Tanguy Le Carrour wrote on 21 Mar 10:46 +0100
[PATCH v4] [WIP] gnu: gnunet: Update to 0.16.2.
(address . 54036@debbugs.gnu.org)(name . Tanguy Le Carrour)(address . tanguy@bioneland.org)
20220321094646.9361-1-tanguy@bioneland.org
Hi Guix,

I've updated the package definition following the release of version 0.16.2.
Unfortunately, build still fails! :-(

I reported the problem upstream: https://bugs.gnunet.org/view.php?id=7201.

I'll keep you posted.

--
Tanguy


* gnu/packages/gnunet.scm (gnunet): Update to 0.16.2.
[arguments]: Enable all the tests that were disabled.
[inputs]: Use new style. [native-inputs]: Add openssl.
[home-page]: Update URL.
---
gnu/packages/gnunet.scm | 79 +++++++++++++----------------------------
1 file changed, 25 insertions(+), 54 deletions(-)

Toggle diff (114 lines)
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 1c09c9047b..afd95998e1 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.2")
    (source
     (origin
       (method url-fetch)
@@ -262,66 +262,37 @@ (define-public gnunet
                           ".tar.gz"))
       (sha256
        (base32
-        "15jnca5zxng7r6m3qzq9lr73xxq0v6mvcp0lny3zrlkz5s2nmmq3"))))
+        "16plw09ls6jqjfylpgkmbaxfmvhvzl8xr6qdbhfvf2b5hcrqi1dm"))))
    (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
+    (list curl openssl pkg-config python xxd
           (@ (gnu packages base) which)))
    (arguments
     '(#:parallel-tests? #f ; Parallel tests aren't supported.
       #:phases
       (modify-phases %standard-phases
-        (add-after 'configure 'remove-failing-tests
-          ;; 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"))
-            #t))
         (add-before 'check 'set-env-var-for-tests
           (lambda _
             (setenv "LANG" "en_US.UTF-8")))
@@ -344,7 +315,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")
-- 
2.34.0
T
T
Tanguy Le Carrour wrote on 30 Mar 10:36 +0200
[PATCH v5] gnu: gnunet: Update to 0.16.3.
(address . 54036@debbugs.gnu.org)
20220330083650.17446-1-tanguy@bioneland.org
Hi Guix,

It's alive!! Upstream released a new patch version. It builds!

Regards,

--
Tanguy


* gnu/packages/gnunet.scm (gnunet): Update to 0.16.3.
[arguments]: Enable all the tests that were disabled.
[inputs]: Use new style. [native-inputs]: Add openssl.
[home-page]: Update URL.
---
gnu/packages/gnunet.scm | 79 +++++++++++++----------------------------
1 file changed, 25 insertions(+), 54 deletions(-)

Toggle diff (114 lines)
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 1c09c9047b..41e8f3b80f 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.3")
    (source
     (origin
       (method url-fetch)
@@ -262,66 +262,37 @@ (define-public gnunet
                           ".tar.gz"))
       (sha256
        (base32
-        "15jnca5zxng7r6m3qzq9lr73xxq0v6mvcp0lny3zrlkz5s2nmmq3"))))
+        "12n33r9nnkl5xwx8pwf571l2zvnvfllc8vm6mamrlyjk2cphaf9j"))))
    (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
+    (list curl openssl pkg-config python xxd
           (@ (gnu packages base) which)))
    (arguments
     '(#:parallel-tests? #f ; Parallel tests aren't supported.
       #:phases
       (modify-phases %standard-phases
-        (add-after 'configure 'remove-failing-tests
-          ;; 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"))
-            #t))
         (add-before 'check 'set-env-var-for-tests
           (lambda _
             (setenv "LANG" "en_US.UTF-8")))
@@ -344,7 +315,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")
-- 
2.34.0
L
L
Ludovic Courtès wrote on 1 Apr 18:02 +0200
(name . Tanguy Le Carrour)(address . tanguy@bioneland.org)
87pmm0n667.fsf@gnu.org
Hi!

Tanguy Le Carrour <tanguy@bioneland.org> skribis:

Toggle quote (5 lines)
> * gnu/packages/gnunet.scm (gnunet): Update to 0.16.3.
> [arguments]: Enable all the tests that were disabled.
> [inputs]: Use new style. [native-inputs]: Add openssl.
> [home-page]: Update URL.

Woohoo! Applied, thanks!

Ludo’.
Closed
T
T
Tanguy LE CARROUR wrote on 1 Apr 18:49 +0200
(name . Ludovic Courtès)(address . ludo@gnu.org)
164883178226.634.11191733749757072106@localhost
Hi Ludo’,


Quoting Ludovic Courtès (2022-04-01 18:02:08)
Toggle quote (9 lines)
> Tanguy Le Carrour <tanguy@bioneland.org> skribis:
>
> > * gnu/packages/gnunet.scm (gnunet): Update to 0.16.3.
> > [arguments]: Enable all the tests that were disabled.
> > [inputs]: Use new style. [native-inputs]: Add openssl.
> > [home-page]: Update URL.
>
> Woohoo! Applied, thanks!

Thanks!

Now, I "just" have to make sure that it works as expected! ^_^'

I might also try to make it build from source instead of
relying on the release archive!?

Cheers,

--
Tanguy
Closed
M
M
Maxim Cournoyer wrote on 4 Apr 04:32 +0200
(name . Tanguy LE CARROUR)(address . tanguy@bioneland.org)
874k3937eu.fsf@gmail.com
Hi,

Tanguy LE CARROUR <tanguy@bioneland.org> writes:

Toggle quote (17 lines)
> Hi Ludo’,
>
>
> Quoting Ludovic Courtès (2022-04-01 18:02:08)
>> Tanguy Le Carrour <tanguy@bioneland.org> skribis:
>>
>> > * gnu/packages/gnunet.scm (gnunet): Update to 0.16.3.
>> > [arguments]: Enable all the tests that were disabled.
>> > [inputs]: Use new style. [native-inputs]: Add openssl.
>> > [home-page]: Update URL.
>>
>> Woohoo! Applied, thanks!
>
> Thanks!
>
> Now, I "just" have to make sure that it works as expected! ^_^'

That's usually something we do *before* sending patches, but if given
the test suite passes without disabling much (anything?) anymore, I'm
confident it will :-).

Toggle quote (3 lines)
> I might also try to make it build from source instead of
> relying on the release archive!?

I usually prefer the release archive when it exists and is signed by the
project's maintainer PGP key (which I believe must be the case here,
given it's part of the GNU project).

Thanks for working on keeping our GNUnet package up to date!

Maxim
Closed
T
T
Tanguy LE CARROUR wrote on 4 Apr 09:00 +0200
(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
164905562544.15440.12203366072448727652@localhost
Hi Maxim,


Quoting Maxim Cournoyer (2022-04-04 04:32:25)
Toggle quote (19 lines)
> Tanguy LE CARROUR <tanguy@bioneland.org> writes:
> > Quoting Ludovic Courtès (2022-04-01 18:02:08)
> >> Tanguy Le Carrour <tanguy@bioneland.org> skribis:
> >>
> >> > * gnu/packages/gnunet.scm (gnunet): Update to 0.16.3.
> >> > [arguments]: Enable all the tests that were disabled.
> >> > [inputs]: Use new style. [native-inputs]: Add openssl.
> >> > [home-page]: Update URL.
> >>
> >> Woohoo! Applied, thanks!
> >
> > Thanks!
> >
> > Now, I "just" have to make sure that it works as expected! ^_^'
>
> That's usually something we do *before* sending patches, but if given
> the test suite passes without disabling much (anything?) anymore, I'm
> confident it will :-).

You're right! :-)
Actually, I tested it before sending the patch.
But by "tested", I mean I only started the node and ran `gnunet-core`
to see if it was connected.

When I wrote "make sure that it works" I meant running another node, defining
records in GNS, resolving it from the other node, using the VPN,
trying re:claimID…


Toggle quote (7 lines)
> > I might also try to make it build from source instead of
> > relying on the release archive!?
>
> I usually prefer the release archive when it exists and is signed by the
> project's maintainer PGP key (which I believe must be the case here,
> given it's part of the GNU project).

+1!

I tried to build from source, but found out that the bootstrap phase was
cloning another repo (gana) and copying files over. :-(

So, if you're happy with the release archive… so am I! :-)


Toggle quote (2 lines)
> Thanks for working on keeping our GNUnet package up to date!

My pleasure!


--
Tanguy
Closed
M
M
Maxim Cournoyer wrote on 4 Apr 15:05 +0200
(name . Tanguy LE CARROUR)(address . tanguy@bioneland.org)
87zgl1yp68.fsf@gmail.com
Hi Tanguy,

Tanguy LE CARROUR <tanguy@bioneland.org> writes:

Toggle quote (32 lines)
> Hi Maxim,
>
>
> Quoting Maxim Cournoyer (2022-04-04 04:32:25)
>> Tanguy LE CARROUR <tanguy@bioneland.org> writes:
>> > Quoting Ludovic Courtès (2022-04-01 18:02:08)
>> >> Tanguy Le Carrour <tanguy@bioneland.org> skribis:
>> >>
>> >> > * gnu/packages/gnunet.scm (gnunet): Update to 0.16.3.
>> >> > [arguments]: Enable all the tests that were disabled.
>> >> > [inputs]: Use new style. [native-inputs]: Add openssl.
>> >> > [home-page]: Update URL.
>> >>
>> >> Woohoo! Applied, thanks!
>> >
>> > Thanks!
>> >
>> > Now, I "just" have to make sure that it works as expected! ^_^'
>>
>> That's usually something we do *before* sending patches, but if given
>> the test suite passes without disabling much (anything?) anymore, I'm
>> confident it will :-).
>
> You're right! :-)
> Actually, I tested it before sending the patch.
> But by "tested", I mean I only started the node and ran `gnunet-core`
> to see if it was connected.
>
> When I wrote "make sure that it works" I meant running another node, defining
> records in GNS, resolving it from the other node, using the VPN,
> trying re:claimID…

I see, thanks for explaining :-).

Toggle quote (12 lines)
>> > I might also try to make it build from source instead of
>> > relying on the release archive!?
>>
>> I usually prefer the release archive when it exists and is signed by the
>> project's maintainer PGP key (which I believe must be the case here,
>> given it's part of the GNU project).
>
> +1!
>
> I tried to build from source, but found out that the bootstrap phase was
> cloning another repo (gana) and copying files over. :-(

Oh! So these source files are probably in the tarball. If gana is a
3rd party project we could add as a TODO to un-bundle it (there's no
'gana' package in Guix as of now).

Thank you,

Maxim
Closed
T
T
Tanguy LE CARROUR wrote on 5 Apr 09:10 +0200
(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
164914265065.8030.10535363126881025859@localhost
Hi Maxim,


Quoting Maxim Cournoyer (2022-04-04 15:05:19)
Toggle quote (19 lines)
> Tanguy LE CARROUR <tanguy@bioneland.org> writes:
> > Quoting Maxim Cournoyer (2022-04-04 04:32:25)
> >> Tanguy LE CARROUR <tanguy@bioneland.org> writes:
> >> > I might also try to make it build from source instead of
> >> > relying on the release archive!?
> >>
> >> I usually prefer the release archive when it exists and is signed by the
> >> project's maintainer PGP key (which I believe must be the case here,
> >> given it's part of the GNU project).
> >
> > +1!
> >
> > I tried to build from source, but found out that the bootstrap phase was
> > cloning another repo (gana) and copying files over. :-(
>
> Oh! So these source files are probably in the tarball. If gana is a
> 3rd party project we could add as a TODO to un-bundle it (there's no
> 'gana' package in Guix as of now).

Yes, gana lives in another repository: https://git.gnunet.org/gana.git

The bootstrap phase, which is ran prior to building the release archive,
clones it and copy some files over to the gnunet directory

I'll try to write a package definition for gana, make it an (native-)input
for gnunet, skip the bootstrap script and see how it goes!

Regards,

--
Tanguy
Closed
?
Your comment

This issue is archived.

To comment on this conversation send email to 54036@debbugs.gnu.org