| Message ID | 20220330083650.17446-1-tanguy@bioneland.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [bug#54036,v5] gnu: gnunet: Update to 0.16.3. | expand |
Hi! 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! Ludo’.
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! ^_^' I might also try to make it build from source instead of relying on the release archive!? Cheers,
Hi, Tanguy LE CARROUR <tanguy@bioneland.org> writes: > 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 :-). > 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
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 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! :-) > Thanks for working on keeping our GNUnet package up to date! My pleasure!
Hi Tanguy, Tanguy LE CARROUR <tanguy@bioneland.org> writes: > 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 :-). >> > 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
Hi Maxim, Quoting Maxim Cournoyer (2022-04-04 15:05:19) > 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 (see <https://git.gnunet.org/gnunet.git/tree/bootstrap#n114>). 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,
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")