[GNUnet-SVN] [gnunet] branch master updated (798535271 -> 091ade136)

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a change to branch master
in repository gnunet.

    from 798535271 doc/Makefile: generate a dummy version.texi
     new 00ad802d1 contrib: bump gnunet guix.
     new 091ade136 doc/Makefile: correct leftovers.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../guix/packages/gnunet/packages/gnunet.scm       | 36 ++++++++++++++++++++--
 doc/Makefile.am                                    |  6 ++--
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/contrib/packages/guix/packages/gnunet/packages/gnunet.scm 
b/contrib/packages/guix/packages/gnunet/packages/gnunet.scm
index ba24ffc51..f9684f677 100644
--- a/contrib/packages/guix/packages/gnunet/packages/gnunet.scm
+++ b/contrib/packages/guix/packages/gnunet/packages/gnunet.scm
@@ -60,8 +60,8 @@
 ;; Explanation for name scheme: UNIXPATH is capped at 108 characters,
 ;; this causes lots of tests to fail.
 (define-public gnunetg
-  (let* ((commit "2909294342ee9c9cdacfbc75ab852c54f34c7bb9")
-         (revision "25"))
+  (let* ((commit "7985352713a5462bc737332d02ddcc870381b56a")
+         (revision "26"))
     (package
       (inherit gnunet)
       (name "gnunetg")
@@ -76,7 +76,7 @@
          (file-name (string-append name "-" version "-checkout"))
          (sha256
           (base32
-           "1nlzwsbj58bgsjnf46zp03f108d7fmcls7qi0l41iyvniyj3hfa5"))))
+           "1xx4vvvrqsbmwk82xnz4wrr9a0jaic823y7mqpy13ibazhliwbqw"))))
       (build-system gnu-build-system)
       (inputs
        `(("glpk" ,glpk)
@@ -165,6 +165,36 @@
     (version (package-version gnunetg))
     (source (package-source gnunetg))
     (build-system gnu-build-system)
+    ;; FIXME: Introduce DOCS_ONLY option for configure script.
+    ;; This should prevent the checks for all required software.
+    (inputs
+     `(("glpk" ,glpk)
+       ("gnurl" ,gnurl)
+       ("gstreamer" ,gstreamer)
+       ("gst-plugins-base" ,gst-plugins-base)
+       ("gnutls" ,gnutls)
+       ("libextractor" ,libextractor)
+       ("libgcrypt" ,libgcrypt)
+       ("libidn" ,libidn)
+       ("libmicrohttpd" ,libmicrohttpd)
+       ("libltdl" ,libltdl)
+       ("libunistring" ,libunistring)
+       ("openssl" ,openssl)
+       ("opus" ,opus)
+       ("pulseaudio" ,pulseaudio)
+       ("sqlite" ,sqlite)
+       ("zlib" ,zlib)
+       ("perl" ,perl)
+       ("python" ,python-2) ; tests and gnunet-qr
+       ("jansson" ,jansson)
+       ("ncurses" ,ncurses)
+       ("nss" ,nss)
+       ("gmp" ,gmp)
+       ("miniupnpc" ,miniupnpc)
+       ("bluez" ,bluez) ; for optional bluetooth feature
+       ("glib" ,glib)
+       ;; ("texlive-minimal" ,texlive-minimal) ; optional.
+       ("libogg" ,libogg)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("autoconf" ,autoconf)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index ebf336dff..8caacb2bd 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -56,13 +56,13 @@ version.texi:
        echo "@set EDITION $(PACKAGE_VERSION)" >> $@
        echo "@set VERSION $(PACKAGE_VERSION)" >> $@ 
 
-doc-pdf: doc/version.texi
+doc-pdf: version.texi
        @makeinfo --pdf --quiet gnunet.texi
 
-doc-html: doc/version.texi
+doc-html: version.texi
        @makeinfo --html gnunet.texi
 
-doc-info: doc/version.texi
+doc-info: version.texi
        @makeinfo --no-split gnunet.texi
 
 # FIXME: rm *.html and *.pdf

-- 
To stop receiving notification emails like this one, please contact
address@hidden