From mboxrd@z Thu Jan 1 00:00:00 1970 From: ng0 Subject: [PATCH 1/2] gnu: gnunet: Add inputs. Date: Fri, 16 Sep 2016 13:49:20 +0000 Message-ID: <20160916134921.17987-1-ng0@we.make.ritual.n0.is> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55975) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bktWK-0002I7-MQ for guix-devel@gnu.org; Fri, 16 Sep 2016 09:49:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bktWJ-00009p-MM for guix-devel@gnu.org; Fri, 16 Sep 2016 09:49:36 -0400 Received: from aibo.runbox.com ([91.220.196.211]:46179) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bktWJ-00009M-Fw for guix-devel@gnu.org; Fri, 16 Sep 2016 09:49:35 -0400 Received: from [10.9.9.211] (helo=mailfront11.runbox.com) by bars.runbox.com with esmtp (Exim 4.71) (envelope-from ) id 1bktWI-0003dC-Qi for guix-devel@gnu.org; Fri, 16 Sep 2016 15:49:34 +0200 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * 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