[PATCH 1/2] gnu: gnunet: Add inputs.

[PATCH 1/2] gnu: gnunet: Add inputs.

[ng0]

* gnu/packages/gnunet.scm (gnunet)[inputs]: Add inputs
zlib, perl, jansson, ncurses, nss, gmp, bluez, glib, libogg.
(gnunet)[native-inputs]: Move python-2 from here ...
to (gnunet)[inputs].
---
 gnu/packages/gnunet.scm | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 56a5ea3..e4fd95e 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -34,14 +34,18 @@
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages gnuzilla)
   #:use-module (gnu packages groff)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages libidn)
+  #:use-module (gnu packages linux)
   #:use-module (gnu packages image)
   #:use-module (gnu packages libunistring)
   #:use-module (gnu packages maths)
+  #:use-module (gnu packages multiprecision)
+  #:use-module (gnu packages ncurses)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pulseaudio)
@@ -49,6 +53,7 @@
   #:use-module (gnu packages databases)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages video)
+  #:use-module (gnu packages web)
   #:use-module (gnu packages xiph)
   #:use-module (gnu packages backup)
   #:use-module ((guix licenses) #:prefix license:)
@@ -217,8 +222,9 @@ supports HTTP, HTTPS and GnuTLS.")
       (method url-fetch)
       (uri (string-append "mirror://gnu/gnunet/gnunet-" version
                           ".tar.gz"))
-      (sha256 (base32
-               "04wxzm3wkgqbn42b8ksr4cx6m5cckyig5cls1adh0nwdczwvnp7n"))))
+      (sha256
+       (base32
+        "04wxzm3wkgqbn42b8ksr4cx6m5cckyig5cls1adh0nwdczwvnp7n"))))
    (build-system gnu-build-system)
    (inputs
     `(("glpk" ,glpk)
@@ -236,10 +242,18 @@ supports HTTP, HTTPS and GnuTLS.")
       ("opus" ,opus)
       ("pulseaudio" ,pulseaudio)
       ("sqlite" ,sqlite)
-      ("zlib" ,zlib)))
+      ("zlib" ,zlib)
+      ("perl" ,perl)
+      ("jansson" ,jansson)
+      ("ncurses" ,ncurses)
+      ("nss" ,nss)
+      ("gmp" ,gmp)
+      ("bluez" ,bluez)
+      ("glib" ,glib)
+      ("libogg" ,libogg)
+      ("python-2" ,python-2))) ; tests and gnunet-qr
    (native-inputs
-    `(("pkg-config" ,pkg-config)
-      ("python" ,python-2)))
+    `(("pkg-config" ,pkg-config)))
    (arguments
     '(#:configure-flags
       (list (string-append "--with-nssdir=" %output "/lib"))
-- 
2.10.0

[PATCH 2/2] gnu: gnunet-gtk: Add gsettings-desktop-schemas to inputs.

[ng0]

* gnu/packages/gnunet.scm (gnunet-gtk)[inputs]: Add gsettings-desktop-schemas.
---
 gnu/packages/gnunet.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index e4fd95e..a75d1ad 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -338,6 +338,7 @@ services.")
                             (assoc-ref %build-inputs "gnunet")))))
     (inputs
      `(("gnunet" ,gnunet)
+       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("libgcrypt" ,libgcrypt)
        ("gtk+" ,gtk+)
        ("libextractor" ,libextractor)
-- 
2.10.0

Re: [PATCH 2/2] gnu: gnunet-gtk: Add gsettings-desktop-schemas to inputs.

[Ricardo Wurmus]

ng0 <ng0@we.make.ritual.n0.is> writes:

> * gnu/packages/gnunet.scm (gnunet-gtk)[inputs]: Add gsettings-desktop-schemas.
> ---
>  gnu/packages/gnunet.scm | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
> index e4fd95e..a75d1ad 100644
> --- a/gnu/packages/gnunet.scm
> +++ b/gnu/packages/gnunet.scm
> @@ -338,6 +338,7 @@ services.")
>                              (assoc-ref %build-inputs "gnunet")))))
>      (inputs
>       `(("gnunet" ,gnunet)
> +       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
>         ("libgcrypt" ,libgcrypt)
>         ("gtk+" ,gtk+)
>         ("libextractor" ,libextractor)

I’m curious: why is this needed?  What does it change?

~~ Ricardo

Re: [PATCH 2/2] gnu: gnunet-gtk: Add gsettings-desktop-schemas to inputs.

[ng0]

Ricardo Wurmus <rekado@elephly.net> writes:

> ng0 <ng0@we.make.ritual.n0.is> writes:
>
>> * gnu/packages/gnunet.scm (gnunet-gtk)[inputs]: Add gsettings-desktop-schemas.
>> ---
>>  gnu/packages/gnunet.scm | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
>> index e4fd95e..a75d1ad 100644
>> --- a/gnu/packages/gnunet.scm
>> +++ b/gnu/packages/gnunet.scm
>> @@ -338,6 +338,7 @@ services.")
>>                              (assoc-ref %build-inputs "gnunet")))))
>>      (inputs
>>       `(("gnunet" ,gnunet)
>> +       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
>>         ("libgcrypt" ,libgcrypt)
>>         ("gtk+" ,gtk+)
>>         ("libextractor" ,libextractor)
>
> I’m curious: why is this needed?  What does it change?
>
> ~~ Ricardo

Can you tell me what gsettings-desktop-schemas is again? As I wrote in
the previous message I just added things which were found out over the
last 1.2 years and added and corrected over time. If there was a reason
for gsettings, I don't know which one. Something X desktop related?

-- 
              ng0

Re: [PATCH 1/2] gnu: gnunet: Add inputs.

[Ricardo Wurmus]

ng0 <ng0@we.make.ritual.n0.is> writes:

> * gnu/packages/gnunet.scm (gnunet)[inputs]: Add inputs
> zlib, perl, jansson, ncurses, nss, gmp, bluez, glib, libogg.
> (gnunet)[native-inputs]: Move python-2 from here ...
> to (gnunet)[inputs].

Have you checked that the resulting build artifacts retain references to
all these new inputs?

Is adding “bluez” and “libogg” really needed?  They seem a little
unusual for networking software.

~~ Ricardo

Re: [PATCH 1/2] gnu: gnunet: Add inputs.

[ng0]

Ricardo Wurmus <rekado@elephly.net> writes:

> ng0 <ng0@we.make.ritual.n0.is> writes:
>
>> * gnu/packages/gnunet.scm (gnunet)[inputs]: Add inputs
>> zlib, perl, jansson, ncurses, nss, gmp, bluez, glib, libogg.
>> (gnunet)[native-inputs]: Move python-2 from here ...
>> to (gnunet)[inputs].
>
> Have you checked that the resulting build artifacts retain references to
> all these new inputs?

With the assumption that currently our gnunet usage is limited because
we ship out 0.10.1 which is no longer compatible to HEAD but a release
will happen soon, I don't know if all of this is featured in the very
old version 0.10.1, but iirc there weren't many changes in dependencies,
so they should be used.
Could be that I need to pass some switches. I'll send an updated patch
later and document which dependency is needed for which part.

> Is adding “bluez” and “libogg” really needed?  They seem a little
> unusual for networking software.

It is not just networking software.
It's been to long since I found out all these dependencies, I just
decided to add them to guix master now. Bluez is for bluetooth support
of whatever feature (look it up in either documentation or the
Makefile), libogg is needed for audio playback I think. I could be wrong
about this one. You know, the longer you work on something the more you
find and without comments it all gets obscure. But I really think libogg
in addition to libopus is for something audio related.
If you think comments are needed because someone in the future could
decide to cut down the "bloat", I can comment all the dependencies with
which part of GNUnet needs them.

https://gnunet.org/bugs/view.php?id=4618 I could also add tex, but I
will add a variant of gnunet later which adds tex as a dependency.

> ~~ Ricardo
>
>

-- 
              ng0

Re: [PATCH 1/2] gnu: gnunet: Add inputs.

[Ricardo Wurmus]

ng0 <ng0@we.make.ritual.n0.is> writes:

>> Is adding “bluez” and “libogg” really needed?  They seem a little
>> unusual for networking software.
>
> It is not just networking software.
> It's been to long since I found out all these dependencies, I just
> decided to add them to guix master now. Bluez is for bluetooth support
> of whatever feature (look it up in either documentation or the
> Makefile), libogg is needed for audio playback I think. I could be wrong
> about this one. You know, the longer you work on something the more you
> find and without comments it all gets obscure. But I really think libogg
> in addition to libopus is for something audio related.

Well, that’s why I’m asking as I don’t have time to investigate the
reasons for the suggested changes myself.  I know what “bluez” and
“libogg” do, but it’s a bit odd to have them as dependencies of GNUnet.

GNUnet doesn’t encode/decode ogg audio files, does it?

> If you think comments are needed because someone in the future could
> decide to cut down the "bloat", I can comment all the dependencies with
> which part of GNUnet needs them.

Commenting unusual inputs should be enough.

~~ Ricardo

Re: [PATCH 1/2] gnu: gnunet: Add inputs.

[ng0]

Ricardo Wurmus <rekado@elephly.net> writes:

> ng0 <ng0@we.make.ritual.n0.is> writes:
>
>>> Is adding “bluez” and “libogg” really needed?  They seem a little
>>> unusual for networking software.
>>
>> It is not just networking software.
>> It's been to long since I found out all these dependencies, I just
>> decided to add them to guix master now. Bluez is for bluetooth support
>> of whatever feature (look it up in either documentation or the
>> Makefile), libogg is needed for audio playback I think. I could be wrong
>> about this one. You know, the longer you work on something the more you
>> find and without comments it all gets obscure. But I really think libogg
>> in addition to libopus is for something audio related.
>
> Well, that’s why I’m asking as I don’t have time to investigate the
> reasons for the suggested changes myself.  I know what “bluez” and
> “libogg” do, but it’s a bit odd to have them as dependencies of GNUnet.

GNUnet has the ability to create an adhoc meshnetwork over bluetooth if
I remember correctly. I'll ask christian again, I never used this part.

greping gets you this:

ABOUT-NLS:157:     bluez-pin          | []             []                                |
ABOUT-NLS:341:     bluez-pin          |     [] []  []  []                [] []          |
ABOUT-NLS:525:     bluez-pin          | []  []  []                [] [] []  []    []       |
ABOUT-NLS:709:     bluez-pin          |    [] []    [] []             []              |
ABOUT-NLS:893:     bluez-pin          | []           []         []   [] []    [] []    [] |
ABOUT-NLS:1077:     bluez-pin          | []              [] [] [] []  []  []          []   | 37
src/transport/gnunet-helper-transport-bluetooth.c:100: * In bluez library, the maximum name length of a device is 8

Which is why I have to ask about this.

>
> GNUnet doesn’t encode/decode ogg audio files, does it?

It has this telephony feature (gnunet-conversation, despite the README
it no longer is experimental) and gnunet-helper-audio-record-gst
references ogg.
src/conversation/gnunet-helper-audio-record.c:41:#include <ogg/ogg.h>

configure.ac:424:# libogg
configure.ac:425:AC_CHECK_LIB(ogg, ogg_stream_flush_fill,
configure.ac:426:        [AC_CHECK_HEADERS([ogg/ogg.h],
configure.ac:428:          ogg=1
configure.ac:429:          AC_DEFINE(HAVE_OGG,1,[Have ogg]),
configure.ac:431:          ogg=0
configure.ac:432:          AC_DEFINE(HAVE_OGG,0,[lacking ogg]))],
configure.ac:434:        ogg=0)


>> If you think comments are needed because someone in the future could
>> decide to cut down the "bloat", I can comment all the dependencies with
>> which part of GNUnet needs them.
>
> Commenting unusual inputs should be enough.
>
> ~~ Ricardo
>
>

-- 
              ng0

Re: [PATCH 1/2] gnu: gnunet: Add inputs.

[Ricardo Wurmus]

ng0 <ng0@we.make.ritual.n0.is> writes:

>> GNUnet doesn’t encode/decode ogg audio files, does it?
>
> It has this telephony feature (gnunet-conversation, despite the README
> it no longer is experimental) and gnunet-helper-audio-record-gst
> references ogg.
> src/conversation/gnunet-helper-audio-record.c:41:#include <ogg/ogg.h>
>
> configure.ac:424:# libogg
> configure.ac:425:AC_CHECK_LIB(ogg, ogg_stream_flush_fill,
> configure.ac:426:        [AC_CHECK_HEADERS([ogg/ogg.h],
> configure.ac:428:          ogg=1
> configure.ac:429:          AC_DEFINE(HAVE_OGG,1,[Have ogg]),
> configure.ac:431:          ogg=0
> configure.ac:432:          AC_DEFINE(HAVE_OGG,0,[lacking ogg]))],
> configure.ac:434:        ogg=0)

Ah, thanks.  This makes sense.  I wonder if it were possible to split
the applications.  Not now but in the future.  Would be nice to be able
install these things separately.

~~ Ricardo

Re: [PATCH 1/2] gnu: gnunet: Add inputs.

[Hartmut Goebel]

[-- Attachment #1.1: Type: text/plain, Size: 969 bytes --]

Am 19.09.2016 um 17:21 schrieb Ricardo Wurmus:
> Ah, thanks.  This makes sense.  I wonder if it were possible to split
> the applications.  Not now but in the future.  Would be nice to be able
> install these things separately.

I'm afraid this would require larger changes to gnunet - which I do not
expect to happen anytime soon. They even added an option `--with-taler`
(AFAIR) to compile only the parts relevant for the taler payment. This
sound like gnunet being a huge pile of software which is hard to split. :-(

-- 
Schönen Gruß
Hartmut Goebel
Dipl.-Informatiker (univ), CISSP, CSSLP, ISO 27001 Lead Implementer
Information Security Management, Security Governance, Secure Software
Development

Goebel Consult, Landshut
http://www.goebel-consult.de

Blog:
http://www.goebel-consult.de/blog/vorratsdatenspeicherung-jetzt-verfassungsbeschwerde-unterschreiben

Kolumne: http://www.cissp-gefluester.de/2010-06-adobe-und-der-maiszunsler


[-- Attachment #1.2: Type: text/html, Size: 2126 bytes --]

[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 2430 bytes --]

Re: [PATCH 1/2] gnu: gnunet: Add inputs.

[ng0]

Hartmut Goebel <h.goebel@goebel-consult.de> writes:

> [ Unknown signature status ]
> Am 19.09.2016 um 17:21 schrieb Ricardo Wurmus:
>> Ah, thanks.  This makes sense.  I wonder if it were possible to split
>> the applications.  Not now but in the future.  Would be nice to be able
>> install these things separately.
>
> I'm afraid this would require larger changes to gnunet - which I do not
> expect to happen anytime soon. They even added an option `--with-taler`
> (AFAIR) to compile only the parts relevant for the taler payment. This
> sound like gnunet being a huge pile of software which is hard to split. :-(

I don't know about taler-payment. I just package merchant and that other
part which requires building, the rest does not need packaging.

About a huge piece of software, I don't see this. I see modules, and at
the rootlevel svn it has many individual pieces, one of them being
gnunet. I have no access to the roadmap, but I can ask for a further
splitup / makefile options to be added. Makefiles are not so much my
domain and I wiuld like to add this, but I focus on other things.

-- 
              ng0

Re: [PATCH 1/2] gnu: gnunet: Add inputs.

[ng0]

Ricardo Wurmus <rekado@elephly.net> writes:

> ng0 <ng0@we.make.ritual.n0.is> writes:
>
>>> GNUnet doesn’t encode/decode ogg audio files, does it?
>>
>> It has this telephony feature (gnunet-conversation, despite the README
>> it no longer is experimental) and gnunet-helper-audio-record-gst
>> references ogg.
>> src/conversation/gnunet-helper-audio-record.c:41:#include <ogg/ogg.h>
>>
>> configure.ac:424:# libogg
>> configure.ac:425:AC_CHECK_LIB(ogg, ogg_stream_flush_fill,
>> configure.ac:426:        [AC_CHECK_HEADERS([ogg/ogg.h],
>> configure.ac:428:          ogg=1
>> configure.ac:429:          AC_DEFINE(HAVE_OGG,1,[Have ogg]),
>> configure.ac:431:          ogg=0
>> configure.ac:432:          AC_DEFINE(HAVE_OGG,0,[lacking ogg]))],
>> configure.ac:434:        ogg=0)
>
> Ah, thanks.  This makes sense.  I wonder if it were possible to split
> the applications.  Not now but in the future.  Would be nice to be able
> install these things separately.

Maybe.. I think this needs some work on the build system, and I don't
feel up to doing that now (or anyone else I know of), higher priority is
also a change in some part of the build system so that releases can
happen more regulary.

What I did for taler preparation packaging for Guix is that I inherited
gnunet-svn and created a gnunet with postgresql bindings instead of
wateversql is our default again. If taler once a release candidate is
out will remain postgresql only, I will have to move this gnunet-variant
over to guix master.

> ~~ Ricardo
>
>

-- 
              ng0

Re: [PATCH 1/2] gnu: gnunet: Add inputs.

[ng0]

Ricardo Wurmus <rekado@elephly.net> writes:

> ng0 <ng0@we.make.ritual.n0.is> writes:
>
>>> GNUnet doesn’t encode/decode ogg audio files, does it?
>>
>> It has this telephony feature (gnunet-conversation, despite the README
>> it no longer is experimental) and gnunet-helper-audio-record-gst
>> references ogg.
>> src/conversation/gnunet-helper-audio-record.c:41:#include <ogg/ogg.h>
>>
>> configure.ac:424:# libogg
>> configure.ac:425:AC_CHECK_LIB(ogg, ogg_stream_flush_fill,
>> configure.ac:426:        [AC_CHECK_HEADERS([ogg/ogg.h],
>> configure.ac:428:          ogg=1
>> configure.ac:429:          AC_DEFINE(HAVE_OGG,1,[Have ogg]),
>> configure.ac:431:          ogg=0
>> configure.ac:432:          AC_DEFINE(HAVE_OGG,0,[lacking ogg]))],
>> configure.ac:434:        ogg=0)
>
> Ah, thanks.  This makes sense.  I wonder if it were possible to split
> the applications.  Not now but in the future.  Would be nice to be able
> install these things separately.
>
> ~~ Ricardo

We continued this discussion for various reasons outside of the list.

On topic, this is not possible at the moment, however you can build all
databases at once into gnunet core.

I think it would be enough to apply the changes I suggested for the
moment, as time goes by there'll be according patches by myself and
other contributors of gnunet to the gnunet related parts in guix to
address the needs of applications which require gnunet.
-- 
              ng0

Re: [PATCH 1/2] gnu: gnunet: Add inputs.

[ng0]

ng0 <ng0@we.make.ritual.n0.is> writes:

> * gnu/packages/gnunet.scm (gnunet)[inputs]: Add inputs
> zlib, perl, jansson, ncurses, nss, gmp, bluez, glib, libogg.
> (gnunet)[native-inputs]: Move python-2 from here ...
> to (gnunet)[inputs].
> ---
>  gnu/packages/gnunet.scm | 24 +++++++++++++++++++-----
>  1 file changed, 19 insertions(+), 5 deletions(-)
>
> diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
> index 56a5ea3..e4fd95e 100644
> --- a/gnu/packages/gnunet.scm
> +++ b/gnu/packages/gnunet.scm
> @@ -34,14 +34,18 @@
>    #:use-module (gnu packages glib)
>    #:use-module (gnu packages gnome)
>    #:use-module (gnu packages gnupg)
> +  #:use-module (gnu packages gnuzilla)
>    #:use-module (gnu packages groff)
>    #:use-module (gnu packages gtk)
>    #:use-module (gnu packages guile)
>    #:use-module (gnu packages gstreamer)
>    #:use-module (gnu packages libidn)
> +  #:use-module (gnu packages linux)
>    #:use-module (gnu packages image)
>    #:use-module (gnu packages libunistring)
>    #:use-module (gnu packages maths)
> +  #:use-module (gnu packages multiprecision)
> +  #:use-module (gnu packages ncurses)
>    #:use-module (gnu packages pkg-config)
>    #:use-module (gnu packages perl)
>    #:use-module (gnu packages pulseaudio)
> @@ -49,6 +53,7 @@
>    #:use-module (gnu packages databases)
>    #:use-module (gnu packages tls)
>    #:use-module (gnu packages video)
> +  #:use-module (gnu packages web)
>    #:use-module (gnu packages xiph)
>    #:use-module (gnu packages backup)
>    #:use-module ((guix licenses) #:prefix license:)
> @@ -217,8 +222,9 @@ supports HTTP, HTTPS and GnuTLS.")
>        (method url-fetch)
>        (uri (string-append "mirror://gnu/gnunet/gnunet-" version
>                            ".tar.gz"))
> -      (sha256 (base32
> -               "04wxzm3wkgqbn42b8ksr4cx6m5cckyig5cls1adh0nwdczwvnp7n"))))
> +      (sha256
> +       (base32
> +        "04wxzm3wkgqbn42b8ksr4cx6m5cckyig5cls1adh0nwdczwvnp7n"))))
>     (build-system gnu-build-system)
>     (inputs
>      `(("glpk" ,glpk)
> @@ -236,10 +242,18 @@ supports HTTP, HTTPS and GnuTLS.")
>        ("opus" ,opus)
>        ("pulseaudio" ,pulseaudio)
>        ("sqlite" ,sqlite)
> -      ("zlib" ,zlib)))
> +      ("zlib" ,zlib)
> +      ("perl" ,perl)
> +      ("jansson" ,jansson)
> +      ("ncurses" ,ncurses)

I just grepped the code for curses and ncurses and contacted the
translators where the only source of this is. There's no single
curses/ncurses reference in svn/gnunet/. They write something about
"wizard-curses", a text interface based configuration... well I'd like
to have that one, because at the moment the config is either textfile or
X desktop.

> +      ("nss" ,nss)
> +      ("gmp" ,gmp)
> +      ("bluez" ,bluez)
> +      ("glib" ,glib)
> +      ("libogg" ,libogg)
> +      ("python-2" ,python-2))) ; tests and gnunet-qr
>     (native-inputs
> -    `(("pkg-config" ,pkg-config)
> -      ("python" ,python-2)))
> +    `(("pkg-config" ,pkg-config)))
>     (arguments
>      '(#:configure-flags
>        (list (string-append "--with-nssdir=" %output "/lib"))
> -- 
> 2.10.0
>
>

-- 
              ng0

Re: [PATCH 1/2] gnu: gnunet: Add inputs.

[ng0]

[-- Attachment #1: Type: text/plain, Size: 64 bytes --]


Removed ncurses, added some descriptions to the dependencies.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-gnunet-Add-inputs.patch --]
[-- Type: text/x-patch, Size: 3435 bytes --]

From 78a682020a3a9ec6fa55720f1eff54ca0fd2d1b5 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Fri, 16 Sep 2016 13:28:01 +0000
Subject: [PATCH 1/2] gnu: gnunet: Add inputs.

* gnu/packages/gnunet.scm (gnunet)[inputs]: Add inputs
zlib, perl, jansson, nss, gmp, bluez, glib, libogg.
(gnunet)[native-inputs]: Move python-2 from here ...
to (gnunet)[inputs].
---
 gnu/packages/gnunet.scm | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 56a5ea3..6d9c3c8 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -34,14 +34,18 @@
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
+  #:use-module (gnu packages gnuzilla)
   #:use-module (gnu packages groff)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages libidn)
+  #:use-module (gnu packages linux)
   #:use-module (gnu packages image)
   #:use-module (gnu packages libunistring)
   #:use-module (gnu packages maths)
+  #:use-module (gnu packages multiprecision)
+  #:use-module (gnu packages ncurses)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pulseaudio)
@@ -49,6 +53,7 @@
   #:use-module (gnu packages databases)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages video)
+  #:use-module (gnu packages web)
   #:use-module (gnu packages xiph)
   #:use-module (gnu packages backup)
   #:use-module ((guix licenses) #:prefix license:)
@@ -217,8 +222,9 @@ supports HTTP, HTTPS and GnuTLS.")
       (method url-fetch)
       (uri (string-append "mirror://gnu/gnunet/gnunet-" version
                           ".tar.gz"))
-      (sha256 (base32
-               "04wxzm3wkgqbn42b8ksr4cx6m5cckyig5cls1adh0nwdczwvnp7n"))))
+      (sha256
+       (base32
+        "04wxzm3wkgqbn42b8ksr4cx6m5cckyig5cls1adh0nwdczwvnp7n"))))
    (build-system gnu-build-system)
    (inputs
     `(("glpk" ,glpk)
@@ -229,17 +235,24 @@ supports HTTP, HTTPS and GnuTLS.")
       ("libextractor" ,libextractor)
       ("libgcrypt" ,libgcrypt)
       ("libidn" ,libidn)
-      ("libmicrohttpd" ,libmicrohttpd)
+      ("libmicrohttpd" ,libmicrohttpd) ; hostlist, pt, contrib, and more
       ("libltdl" ,libltdl)
-      ("libunistring" ,libunistring)
-      ("openssl" ,openssl)
-      ("opus" ,opus)
-      ("pulseaudio" ,pulseaudio)
-      ("sqlite" ,sqlite)
-      ("zlib" ,zlib)))
+      ("libunistring" ,libunistring) ; fs and more
+      ("openssl" ,openssl) ; transport, certificate creation, contribs
+      ("opus" ,opus) ; gnunet-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
    (native-inputs
-    `(("pkg-config" ,pkg-config)
-      ("python" ,python-2)))
+    `(("pkg-config" ,pkg-config)))
    (arguments
     '(#:configure-flags
       (list (string-append "--with-nssdir=" %output "/lib"))
-- 
2.10.0


[-- Attachment #3: Type: text/plain, Size: 74 bytes --]


gnunet-gtk patch is waiting for a comment on why this was needed again.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0002-gnu-gnunet-gtk-Add-gsettings-desktop-schemas-to-inpu.patch --]
[-- Type: text/x-patch, Size: 838 bytes --]

From a98a92e183b9244010eaa8df0d0450d2b6c1bdce Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Fri, 16 Sep 2016 13:42:42 +0000
Subject: [PATCH 2/2] gnu: gnunet-gtk: Add gsettings-desktop-schemas to inputs.

* gnu/packages/gnunet.scm (gnunet-gtk)[inputs]: Add gsettings-desktop-schemas.
---
 gnu/packages/gnunet.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 6d9c3c8..a484dbf 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -337,6 +337,7 @@ services.")
                             (assoc-ref %build-inputs "gnunet")))))
     (inputs
      `(("gnunet" ,gnunet)
+       ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("libgcrypt" ,libgcrypt)
        ("gtk+" ,gtk+)
        ("libextractor" ,libextractor)
-- 
2.10.0


[-- Attachment #5: Type: text/plain, Size: 24 bytes --]



-- 
              ng0