(address . guix-patches@gnu.org)
20190314141958.civrdwctw5iigy4k@uptimegirl
Hi,
here are 5 patches.
1 + 2: in retrospective and experience this makes sense.
3: libextractor
4: gnurl
5: gnunet + gnunet-gtk
Caveat at 5: This is the absolute base of an update.
I can't invest more time for Guix at the
the moment but I can help with answering
questions of the person who'll finish this
patch:
gnunet-gtk doesn't find gnunet, can't link
against it.
gnunet does not pick up on the @PYTHON@
for python3.7 which should be replaced
at build time, which happens in every
other system I tested.
gnunet doesn't run its tests but they
should work now. Note that if tests
fail on guix or guixsd, you should report
them to us, we've started to fix what we
can fix for certain systems.
Cheers!
ng0
From 5424bb3428a9b38ee335fdca0bc6728332f22b50 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@n0.is>
Date: Thu, 14 Mar 2019 09:33:38 +0000
Subject: [PATCH 1/5] mailmap: Adjustment my nick.
---
.mailmap | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
Toggle diff (41 lines)
diff --git a/.mailmap b/.mailmap
index 981decdeef..7de5313923 100644
--- a/.mailmap
+++ b/.mailmap
@@ -43,20 +43,20 @@ Mathieu Lirzin <mthl@gnu.org> <mathieu.lirzin@openmailbox.org>
Mathieu Othacehe <m.othacehe@gmail.com>
Mathieu Othacehe <mathieu.othacehe@parrot.com>
Nikita Karetnikov <nikita@karetnikov.org> <nikita.karetnikov@gmail.com>
-Nils Gillmann <ng0@n0.is> ng0 <ng0@n0.is>
-Nils Gillmann <ng0@n0.is> Nils Gillmann <gillmann@infotropique.org>
-Nils Gillmann <ng0@n0.is> ng0 <ng0@crash.cx>
-Nils Gillmann <ng0@n0.is> ng0 <ng0@crash.cx>
-Nils Gillmann <ng0@n0.is> <ng0@infotropique.org>
-Nils Gillmann <ng0@n0.is> <ng0@no-reply.infotropique.org>
-Nils Gillmann <ng0@n0.is> <ng0@no-reply.pragmatique.xyz>
-Nils Gillmann <ng0@n0.is> <ng0@pragmatique.xyz>
-Nils Gillmann <ng0@n0.is> <contact.ng0@cryptolab.net>
-Nils Gillmann <ng0@n0.is> <ng0@we.make.ritual.n0.is>
-Nils Gillmann <ng0@n0.is> <ngillmann@runbox.com>
-Nils Gillmann <ng0@n0.is> <niasterisk@grrlz.net>
-Nils Gillmann <ng0@n0.is> <ng@niasterisk.space>
-Nils Gillmann <ng0@n0.is> <ng0@libertad.pw>
+ng0 <ng0@n0.is> Nils Gillmann <ng0@n0.is>
+ng0 <ng0@n0.is> Nils Gillmann <gillmann@infotropique.org>
+ng0 <ng0@n0.is> ng0 <ng0@crash.cx>
+ng0 <ng0@n0.is> ng0 <ng0@crash.cx>
+ng0 <ng0@n0.is> <ng0@infotropique.org>
+ng0 <ng0@n0.is> <ng0@no-reply.infotropique.org>
+ng0 <ng0@n0.is> <ng0@no-reply.pragmatique.xyz>
+ng0 <ng0@n0.is> <ng0@pragmatique.xyz>
+ng0 <ng0@n0.is> <contact.ng0@cryptolab.net>
+ng0 <ng0@n0.is> <ng0@we.make.ritual.n0.is>
+ng0 <ng0@n0.is> <ngillmann@runbox.com>
+ng0 <ng0@n0.is> <niasterisk@grrlz.net>
+ng0 <ng0@n0.is> <ng@niasterisk.space>
+ng0 <ng0@n0.is> <ng0@libertad.pw>
Pierre Neidhardt <mail@ambrevar.xyz>
Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
Pjotr Prins <pjotr.guix@thebird.nl> <pjotr.public01@thebird.nl>
--
2.21.0
From 11fa7272b33f65be915214c28d48fddf7bfbd4ff Mon Sep 17 00:00:00 2001
From: ng0 <ng0@n0.is>
Date: Thu, 14 Mar 2019 10:48:08 +0000
Subject: [PATCH 4/5] gnu: gnurl: Update to 7.64.0.
* gnu/packages/gnunet.scm (gnurl): Update to 7.64.0.
---
gnu/packages/gnunet.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Toggle diff (22 lines)
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 19e99644dd..029e174a79 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -175,13 +175,13 @@ authentication and support for SSL3 and TLS.")
(define-public gnurl
(package
(name "gnurl")
- (version "7.63.0")
+ (version "7.64.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/gnunet/" name "-" version ".tar.Z"))
(sha256
(base32
- "021b3pdfnqywk5q07y48kxyz7g4jjg35dk3cv0ps0x50qjr4ix33"))))
+ "095y0ic34ahrlsdylzvn29yg3zglz3jz9mmhymav2svc6knilwgf"))))
(build-system gnu-build-system)
(outputs '("out"
"doc")) ; 1.7 MiB of man3 pages
--
2.21.0
From d051cd918f92039122bbe89414801c5e669ed149 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@n0.is>
Date: Thu, 14 Mar 2019 11:19:47 +0000
Subject: [PATCH 5/5] gnu: gnunet: Update to 0.11.0.
* gnu/packages/gnunet.scm (gnunet): Update to 0.11.0.
[inputs]: Replace libidn with libidn2, remove perl,
remove python-2, remove glpk (only used when compiled
--with-experimental), add which.
[native-inputs]: remove pkg-config (pc files provided
but pkg-config is not used), add python.
[arguments]: Remove configure flags, --with-nssdir no
longer exists.
[license]: switch to agpl3+.
(gnunet-gtk)[source]: Update checksum.
---
gnu/packages/gnunet.scm | 35 +++++++++++++++++++----------------
1 file changed, 19 insertions(+), 16 deletions(-)
Toggle diff (103 lines)
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 029e174a79..94c8016175 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -29,6 +29,7 @@
#:use-module (gnu packages file)
#:use-module (gnu packages aidc)
#:use-module (gnu packages autotools)
+ #:use-module (gnu packages base)
#:use-module (gnu packages compression)
#:use-module (gnu packages curl)
#:use-module (gnu packages gettext)
@@ -53,6 +54,7 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-xyz)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages tls)
#:use-module (gnu packages video)
@@ -231,7 +233,7 @@ supports HTTP, HTTPS and GnuTLS.")
(define-public gnunet
(package
(name "gnunet")
- (version "0.10.1")
+ (version "0.11.0")
(source
(origin
(method url-fetch)
@@ -239,39 +241,40 @@ supports HTTP, HTTPS and GnuTLS.")
".tar.gz"))
(sha256
(base32
- "04wxzm3wkgqbn42b8ksr4cx6m5cckyig5cls1adh0nwdczwvnp7n"))))
+ "16kydkrjlf2vxflgls46bwaf9kjczf621p456q0qlphd7cy7lixp"))))
(build-system gnu-build-system)
+ ;; python2.7 is optionally detected at runtime in $PATH of user,
+ ;; no longer required in 0.11.1 released (gnunet-qr C rewrite).
(inputs
- `(("glpk" ,glpk)
- ("gnurl" ,gnurl)
+ `(("gnurl" ,gnurl)
("gstreamer" ,gstreamer)
("gst-plugins-base" ,gst-plugins-base)
("gnutls" ,gnutls/dane)
("libextractor" ,libextractor)
("libgcrypt" ,libgcrypt)
- ("libidn" ,libidn)
+ ("libidn2" ,libidn2)
("libmicrohttpd" ,libmicrohttpd) ; hostlist, pt, contrib, and more
("libltdl" ,libltdl)
("libunistring" ,libunistring) ; fs and more
("openssl" ,openssl) ; transport, certificate creation, contribs
- ("opus" ,opus) ; gnunet-conversation
- ("pulseaudio" ,pulseaudio) ; conversation
+ ("opus" ,opus) ;conversation
+ ("pulseaudio" ,pulseaudio) ;conversation
("sqlite" ,sqlite) ; sqlite bindings, *store
("zlib" ,zlib)
- ("perl" ,perl) ; doxygen and more
("jansson" ,jansson) ; identity, taler (external), gnunet-json, gns
("nss" ,nss) ; gns
("gmp" ,gmp) ; util
("bluez" ,bluez) ; gnunet-transport
("glib" ,glib)
- ("libogg" ,libogg) ; gnunet-conversation
- ("python-2" ,python-2))) ; tests, gnunet-qr
+ ("libogg" ,libogg)
+ ;; https://bugs.gnunet.org/view.php?id=5614
+ ("which" ,which)))
(native-inputs
- `(("pkg-config" ,pkg-config)))
+ `(("python" ,python)
+ ;; Will be removed in 0.11.1:
+ ("python-future" ,python-future)))
(arguments
- '(#:configure-flags
- (list (string-append "--with-nssdir=" %output "/lib"))
- #:parallel-tests? #f
+ '(#:parallel-tests? #f
;; test_gnunet_service_arm fails; reported upstream
#:tests? #f
#:phases
@@ -294,7 +297,7 @@ global, distributed network that provides security and privacy. GNUnet in
that sense aims to replace the current internet protocol stack. Along with
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:gpl3+)
+ (license license:agpl3+)
(home-page "https://gnunet.org/")))
(define-public guile-gnunet ;GSoC 2015!
@@ -339,7 +342,7 @@ services.")
version ".tar.gz"))
(sha256
(base32
- "1p38k1s6a2fmcfc9a7cf1zrdycm9h06kqdyand4s3k500nj6mb4g"))))
+ "1vr9iyji25r87ym1jw033l9xyqfj4971anamfvz810rl65jjhb6z"))))
(arguments
`(#:configure-flags
(list "--with-libunique"
--
2.21.0