From mboxrd@z Thu Jan 1 00:00:00 1970 From: ng0 Subject: Re: [PATCH 1/2] gnu: gnunet: Add inputs. Date: Mon, 19 Sep 2016 15:47:54 +0000 Message-ID: <877fa7nb6d.fsf@we.make.ritual.n0.is> References: <20160916134921.17987-1-ng0@we.make.ritual.n0.is> <87a8f46icy.fsf@we.make.ritual.n0.is> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:51635) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bm0oD-0001my-Rp for guix-devel@gnu.org; Mon, 19 Sep 2016 11:48:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bm0o9-0003oD-NR for guix-devel@gnu.org; Mon, 19 Sep 2016 11:48:40 -0400 Received: from aibo.runbox.com ([91.220.196.211]:38171) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bm0o9-0003o1-C7 for guix-devel@gnu.org; Mon, 19 Sep 2016 11:48:37 -0400 Received: from [10.9.9.212] (helo=mailfront12.runbox.com) by bars.runbox.com with esmtp (Exim 4.71) (envelope-from ) id 1bm0o7-0000j7-Q3 for guix-devel@gnu.org; Mon, 19 Sep 2016 17:48:35 +0200 Received: from x5d83f6f8.dyn.telefonica.de ([93.131.246.248] helo=localhost) by mailfront12.runbox.com with esmtpsa (uid:892961 ) (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) id 1bm0nV-0004of-Dd for guix-devel@gnu.org; Mon, 19 Sep 2016 17:47:57 +0200 In-Reply-To: <87a8f46icy.fsf@we.make.ritual.n0.is> 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 --=-=-= Content-Type: text/plain Removed ncurses, added some descriptions to the dependencies. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-gnunet-Add-inputs.patch >From 78a682020a3a9ec6fa55720f1eff54ca0fd2d1b5 Mon Sep 17 00:00:00 2001 From: ng0 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 --=-=-= Content-Type: text/plain gnunet-gtk patch is waiting for a comment on why this was needed again. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-gnunet-gtk-Add-gsettings-desktop-schemas-to-inpu.patch >From a98a92e183b9244010eaa8df0d0450d2b6c1bdce Mon Sep 17 00:00:00 2001 From: ng0 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 --=-=-= Content-Type: text/plain -- ng0 --=-=-=--