From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Darrington Subject: Re: [PATCH 5/5] gnu: Changed many "inputs" which should be "native-inputs". Date: Sun, 15 Dec 2013 11:36:52 +0100 Message-ID: <20131215103652.GA5807@intra> References: <1387043002-6138-1-git-send-email-john@darrington.wattle.id.au> <1387043002-6138-5-git-send-email-john@darrington.wattle.id.au> <87bo0jqf3c.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="EVF5PPMfhYS0aIcm" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57732) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vs94I-0005tB-27 for guix-devel@gnu.org; Sun, 15 Dec 2013 05:37:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vs94D-0000k4-Sm for guix-devel@gnu.org; Sun, 15 Dec 2013 05:37:01 -0500 Content-Disposition: inline In-Reply-To: <87bo0jqf3c.fsf@gnu.org> 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-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Ludovic Court??s Cc: guix-devel@gnu.org --EVF5PPMfhYS0aIcm Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Dec 14, 2013 at 10:48:07PM +0100, Ludovic Court??s wrote: Thanks for auditing all this! =20 > --- a/gnu/packages/gdb.scm > +++ b/gnu/packages/gdb.scm > @@ -56,9 +56,10 @@ > ("gmp" ,gmp) > ("readline" ,readline) > ("ncurses" ,ncurses) > - ("python" ,python-wrapper) > - ("texinfo" ,texinfo) > ("dejagnu" ,dejagnu))) > + (native-inputs > + `(("python" ,python-wrapper) > + ("texinfo" ,texinfo))) =20 Python must really be an input (GDB can use it as its extension language???until it???s superseded by Guile :-)), and not a native inp= ut. OK. I wasn't sure. =20 > --- a/gnu/packages/glib.scm > +++ b/gnu/packages/glib.scm > @@ -123,16 +123,16 @@ shared NFS home directories.") > "doc")) ; 20 MiB of GTK-Doc refe= rence > (inputs > `(("coreutils" ,coreutils) > - ("gettext" ,gnu-gettext) > ("libffi" ,libffi) > + ("zlib" ,zlib) > + ("tzdata" ,tzdata))) ; for tests/gdatetime.c > + (native-inputs > + `(("gettext" ,gnu-gettext) > + ("dbus" ,dbus) ; for GDBus tests > ("pkg-config" ,pkg-config) > ("python" ,python-wrapper) > - ("zlib" ,zlib) > ("perl" ,perl) ; needed by GIO t= ests > - ("dbus" ,dbus) ; for GDBus tests > - ("bash" ,bash) > - ("tzdata" ,tzdata) ; for tests/gdate= time.c > - )) > + ("bash" ,bash))) =20 ???dbus??? should be in ???inputs???. OK. =20 > --- a/gnu/packages/gnome.scm > +++ b/gnu/packages/gnome.scm > @@ -84,9 +85,10 @@ features to enable users to create their discs ea= sily and quickly.") > "19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb")))) > (build-system gnu-build-system) > (inputs > + `(("libxml2" ,libxml2) > + ("libxslt" ,libxslt))) > + (native-inputs > `(("intltool" ,intltool) > - ("libxml2" ,libxml2) > - ("libxslt" ,libxslt) > ("pkg-config" ,pkg-config) > ("python-2" ,python-2))) > (arguments =20 Running: =20 guix gc --references $(guix build gnome-doc-utils) =20 doesn???t show libxml2 and libxslt, so I think they are used for their binaries (xsltproc, etc.) at build time. Thus, they should be in ???native-inputs???. OK. I'll put them back for now. There are a lot of other issues preventi= ng Gnome from cross compiling so we'll deal with the issue later, if it arises. =20 > diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm > index 8d26688..b756313 100644 > --- a/gnu/packages/gnupg.scm > +++ b/gnu/packages/gnupg.scm > @@ -20,6 +20,7 @@ > (define-module (gnu packages gnupg) > #:use-module (guix licenses) > #:use-module (gnu packages curl) > + #:use-module (gnu packages base) > #:use-module (gnu packages openldap) > #:use-module (gnu packages perl) > #:use-module (gnu packages pth) > @@ -235,7 +236,7 @@ and every application benefits from this.") > (sha256 (base32 > "1g1jly3wl4ks6h8ydkygyl2c4i7v3z91rg42005m6vm70= y1d8b3d")))) > (build-system gnu-build-system) > - (inputs `(("perl" ,perl) > + (native-inputs `(("perl" ,perl) > ("python" ,python-wrapper) > ("gpg" ,gnupg))) =20 What???s going on here? This is probably erroneous. I'll revert it. =20 =20 > --- a/gnu/packages/groff.scm > +++ b/gnu/packages/groff.scm > @@ -39,11 +39,12 @@ > (sha256 (base32 > "0xi07nhj5vdgax37rj25mwxzdmsz1ifx50hjgc6hqbkpq= kd6821q")))) > (build-system gnu-build-system) > - (inputs `(("bison" ,bison) > - ("ghostscript" ,ghostscript) > + (inputs `(("ghostscript" ,ghostscript) > + ("netpbm" ,netpbm) > + ("psutils" ,psutils))) > + (native-inputs `(("bison" ,bison) > ("netpbm" ,netpbm) > ("perl" ,perl) > - ("psutils" ,psutils) > ("texinfo" ,texinfo))) =20 I think ???psutils??? should be ???native-inputs??? (it???s a set of p= rograms.) Ok. I'll put it back. (Ghostscript has some big cross-compile issues anyw= ay) =20 > --- a/gnu/packages/libcanberra.scm > +++ b/gnu/packages/libcanberra.scm > @@ -46,9 +46,10 @@ > `(("alsa-lib" ,alsa-lib) > ("gstreamer" ,gstreamer) > ("gtk+" ,gtk+) > - ("libtool" ,libtool) > - ("libvorbis" ,libvorbis) > - ("pkg-config" ,pkg-config))) > + ("libvorbis" ,libvorbis))) > + (native-inputs > + `(("libtool" ,libtool) > + ("pkg-config" ,pkg-config))) =20 Libtool should be in ???inputs???, because it???s for libltdl (???libt= ool??? is a multiple-output package, and it???s default output contains just liblt= dl.) =20 =20 There are several formatting issue. If you???re using Emacs, make sur= e it honors our .dir-locals.el (which GNU Emacs >=3D 23 normally does) and = that you???re in scheme-mode when editing. I was indeed using Emacs (23.4.1) in scheme mode. Please also note that th= e reference mentioned in HACKING (http://mumble.net/~campbell/scheme/style.txt) regards as accept= able, many of the=20 styles you wanted changed. I will however send a patch according to your s= uggestions. Updated patch forthcomming (hopefully). J' --=20 PGP Public key ID: 1024D/2DE827B3=20 fingerprint =3D 8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3 See http://sks-keyservers.net or any PGP keyserver for public key. --EVF5PPMfhYS0aIcm Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEARECAAYFAlKthkMACgkQimdxnC3oJ7MukwCfWN/cJIoLBCj+jX2ist5xiCLM tywAn1SDqN+hnF8wBBQRtNpLz2CKZ9TM =fH3P -----END PGP SIGNATURE----- --EVF5PPMfhYS0aIcm--