From mboxrd@z Thu Jan 1 00:00:00 1970 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Re: [PATCH 5/5] gnu: Changed many "inputs" which should be "native-inputs". Date: Sat, 14 Dec 2013 22:48:07 +0100 Message-ID: <87bo0jqf3c.fsf@gnu.org> References: <1387043002-6138-1-git-send-email-john@darrington.wattle.id.au> <1387043002-6138-5-git-send-email-john@darrington.wattle.id.au> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39502) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vrx4K-0002p4-0H for guix-devel@gnu.org; Sat, 14 Dec 2013 16:48:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vrx4E-00083n-Fm for guix-devel@gnu.org; Sat, 14 Dec 2013 16:48:15 -0500 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:54925) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vrx4E-00083f-1r for guix-devel@gnu.org; Sat, 14 Dec 2013 16:48:10 -0500 In-Reply-To: <1387043002-6138-5-git-send-email-john@darrington.wattle.id.au> (John Darrington's message of "Sat, 14 Dec 2013 18:43:22 +0100") 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: John Darrington Cc: guix-devel@gnu.org Thanks for auditing all this! John Darrington skribis: > * gnu/packages/avahi.scm : Moved dependencies from "inputs" to "native-= inputs" > * gnu/packages/cdrom.scm : Moved dependencies from "inputs" to "native-= inputs" Please use standard notation, like: * gnu/packages/avahi.scm, gnu/packages/cdrom.scm: Move some build-time dependencies from =E2=80=98inputs=E2=80=99 to =E2=80=98native-inputs=E2= =80=99. Comments inline. This is OK unless otherwise specified. > --- a/gnu/packages/avahi.scm > +++ b/gnu/packages/avahi.scm > @@ -56,10 +56,11 @@ > `(("expat" ,expat) > ("glib" ,glib) > ("dbus" ,dbus) > - ("libdaemon" ,libdaemon) > - ("intltool" ,intltool) > - ("pkg-config" ,pkg-config) > - ("gdbm" ,gdbm))) > + ("gdbm" ,gdbm) > + ("libdaemon" ,libdaemon))) > + (native-inputs > + `(("intltool" ,intltool) > + ("pkg-config" ,pkg-config))) ^ Incorrect alignment here. > --- 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))) Python must really be an input (GDB can use it as its extension language=E2=80=93until it=E2=80=99s superseded by Guile :-)), and not a nat= ive input. > --- a/gnu/packages/geeqie.scm > +++ b/gnu/packages/geeqie.scm > @@ -72,11 +72,12 @@ and XMP metadata of images in various formats.") > (build-system gnu-build-system) > (inputs > `(;; ("libchamplain" ,libchamplain) > - ("intltool" ,intltool) > ("lcms" ,lcms) > ("exiv2" ,exiv2) > ("libpng" ,libpng) > - ("gtk+" ,gtk+-2) > + ("gtk+" ,gtk+-2))) > + (native-inputs > + `(("intltool" ,intltool) > ("pkg-config" ,pkg-config))) Alignment. > --- a/gnu/packages/glib.scm > +++ b/gnu/packages/glib.scm > @@ -123,16 +123,16 @@ shared NFS home directories.") > "doc")) ; 20 MiB of GTK-Doc reference > (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 tests > - ("dbus" ,dbus) ; for GDBus tests > - ("bash" ,bash) > - ("tzdata" ,tzdata) ; for tests/gdatetime.c > - )) > + ("bash" ,bash))) =E2=80=98dbus=E2=80=99 should be in =E2=80=98inputs=E2=80=99. Alignment issue. > --- a/gnu/packages/gnome.scm > +++ b/gnu/packages/gnome.scm > @@ -84,9 +85,10 @@ features to enable users to create their discs easily = 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 Running: guix gc --references $(guix build gnome-doc-utils) doesn=E2=80=99t show libxml2 and libxslt, so I think they are used for their binaries (xsltproc, etc.) at build time. Thus, they should be in =E2=80=98native-inputs=E2=80=99. > 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 > "1g1jly3wl4ks6h8ydkygyl2c4i7v3z91rg42005m6vm70y1d8b= 3d")))) > (build-system gnu-build-system) > - (inputs `(("perl" ,perl) > + (native-inputs `(("perl" ,perl) > ("python" ,python-wrapper) > ("gpg" ,gnupg))) What=E2=80=99s going on here? > --- a/gnu/packages/graphviz.scm > +++ b/gnu/packages/graphviz.scm > @@ -71,11 +71,12 @@ > ("fontconfig" ,fontconfig) > ("freetype" ,freetype) > ("libltdl" ,libtool) > - ("bison" ,bison) > ("libXaw" ,libxaw) > ("expat" ,expat) > ("libjpeg" ,libjpeg) > - ("libpng" ,libpng) > + ("libpng" ,libpng))) > + (native-inputs > + `(("bison" ,bison) > ("pkg-config" ,pkg-config))) Alignment. > --- a/gnu/packages/groff.scm > +++ b/gnu/packages/groff.scm > @@ -39,11 +39,12 @@ > (sha256 (base32 > "0xi07nhj5vdgax37rj25mwxzdmsz1ifx50hjgc6hqbkpqkd682= 1q")))) > (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))) I think =E2=80=98psutils=E2=80=99 should be =E2=80=98native-inputs=E2=80=99= (it=E2=80=99s a set of programs.) Alignment issue. > --- 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))) Libtool should be in =E2=80=98inputs=E2=80=99, because it=E2=80=99s for lib= ltdl (=E2=80=98libtool=E2=80=99 is a multiple-output package, and it=E2=80=99s default output contains just libl= tdl.) > --- a/gnu/packages/linux.scm > +++ b/gnu/packages/linux.scm > @@ -315,7 +315,9 @@ providing the system administrator with some help in = common tasks.") > %standard-phases))) > (inputs `(("zlib" ,guix:zlib) > ("ncurses" ,ncurses) > - ("perl" ,perl))) > + )) > + (native-inputs > + `(("perl" ,perl))) Alignment. > @@ -395,7 +397,9 @@ slabtop, and skill.") > "03pd57vv8c6x0hgjqcbrxnzi14h8hcghmapg89p8k5zpwpkvbdfr")))) > (build-system gnu-build-system) > (inputs > - `(("libusb" ,libusb) ("pkg-config" ,pkg-config))) > + `(("libusb" ,libusb))) > + (native-inputs > + `(("pkg-config" ,pkg-config))) Alignment. > @@ -801,10 +806,11 @@ configuration and monitoring interfaces.") > (inputs > ;; TODO: Add pciutils. > `(("zlib" ,guix:zlib) > - ("pkg-config" ,pkg-config) > ;; ("pciutils" ,pciutils) > ("ncurses" ,ncurses) > ("libnl" ,libnl))) > + (native-inputs > + `(("pkg-config" ,pkg-config))) Alignment. > --- a/gnu/packages/slim.scm > +++ b/gnu/packages/slim.scm > @@ -50,11 +50,12 @@ > ("libxrender" ,libxrender) > ("freetype" ,freetype) > ("fontconfig" ,fontconfig) > - ("pkg-config" ,pkg-config) > - ("libx11" ,libx11) > + ("libx11" ,libx11) Alignment. > --- a/gnu/packages/texlive.scm > +++ b/gnu/packages/texlive.scm > @@ -75,18 +75,19 @@ > ("libpng" ,libpng) > ("libxaw" ,libxaw) > ("libxt" ,libxt) > - ("perl" ,perl) > ("pixman" ,pixman) > ("poppler" ,poppler) > - ("pkg-config" ,pkg-config) > ;; FIXME: Add interpreters fontforge and ruby, > ;; once they are available. > - ("python" ,python-2) ; incompatible with Python 3 (print sy= ntax) > - ("tcsh" ,tcsh) > ("teckit" ,teckit) > ("t1lib" ,t1lib) > ("zlib" ,zlib) > ("zziplib" ,zziplib))) > + (native-inputs > + `(("perl" ,perl) > + ("pkg-config" ,pkg-config) Alignment. > --- a/gnu/packages/version-control.scm > +++ b/gnu/packages/version-control.scm > @@ -98,6 +98,8 @@ as well as the classic centralized workflow.") > ;; For 'git gui', 'gitk', and 'git citool'. > ("tcl" ,tcl) > ("tk" ,tk))) > + > + Unneeded. > --- a/gnu/packages/xml.scm > +++ b/gnu/packages/xml.scm > @@ -20,6 +20,7 @@ > (define-module (gnu packages xml) > #:use-module (gnu packages) > #:use-module (gnu packages compression) > + #:use-module (gnu packages base) Unneeded. > @@ -66,9 +67,9 @@ things the parser might find in the XML document (like = start tags).") > (build-system gnu-build-system) > (home-page "http://www.xmlsoft.org/") > (synopsis "libxml2, a C parser for XML") > - (inputs `(("perl" ,perl) > - ("python" ,python-2) ; incompatible with Python 3 (print s= yntax) > - ("zlib" ,zlib))) > + (inputs `(("zlib" ,zlib))) > + (native-inputs `(("perl" ,perl) > + ("python" ,python-2))) ; incompatible with Python 3 (print= syntax) Alignment. xorg.scm: > + (native-inputs > + `(("pkg-config" ,pkg-config) > + ("flex" ,flex)=09 > + ("bison" ,bison) > + ("python" ,python-2) ; incompatible with Python 3 (print syntax) > + )) Alignment; hanging parens. > --- a/gnu/packages/zip.scm > +++ b/gnu/packages/zip.scm > @@ -118,12 +118,13 @@ UnZip recreates the stored directory structure by d= efault.") > (base32 > "0nsjqxw017hiyp524p9316283jlf5piixc1091gkimhz38zh7f51")))) > (build-system gnu-build-system) > - (inputs `(("perl" ,perl) ; for the documentation > + (inputs > + `(("zlib" ,zlib))) > + (native-inputs `(("perl" ,perl) ; for the documentation > ("pkg-config" ,pkg-config) > ("python" ,python-2) ; for the documentation; Python 3 not= supported, > ; http://forums.gentoo.org/viewtopic-t-863161-start-0.ht= ml > - ("zip" ,zip) ; to create test files > - ("zlib" ,zlib))) > + ("zip" ,zip))) ; to create test files Alignment. There are several formatting issue. If you=E2=80=99re using Emacs, make su= re it honors our .dir-locals.el (which GNU Emacs >=3D 23 normally does) and that you=E2=80=99re in scheme-mode when editing. If you=E2=80=99re using another editor, then it=E2=80=99d be great to provi= de a setup file that does the right thing wrt. to formatting. Could you send an updated patch? Thank you for the long and tedious work! Ludo=E2=80=99.