Re: [PATCH 5/5] gnu: Changed many "inputs" which should be "native-inputs".

[John Darrington]

On Sat, Dec 14, 2013 at 10:48:07PM +0100, Ludovic Court??s wrote:
     Thanks for auditing all this!
     
     > --- 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???until it???s superseded by Guile :-)), and not a native input.

OK.  I wasn't sure.
     
     > --- 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)))
     
     ???dbus??? should be in ???inputs???.
OK.
     
     > --- 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???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 preventing 
Gnome from cross compiling
so we'll deal with the issue later, if it arises.
     
     > 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
     >                       
"1g1jly3wl4ks6h8ydkygyl2c4i7v3z91rg42005m6vm70y1d8b3d"))))
     >     (build-system gnu-build-system)
     > -   (inputs `(("perl" ,perl)
     > +   (native-inputs `(("perl" ,perl)
     >               ("python" ,python-wrapper)
     >               ("gpg" ,gnupg)))
     
     What???s going on here?

This is probably erroneous.  I'll revert it.  
     
     > --- a/gnu/packages/groff.scm
     > +++ b/gnu/packages/groff.scm
     > @@ -39,11 +39,12 @@
     >              (sha256 (base32
     >                       
"0xi07nhj5vdgax37rj25mwxzdmsz1ifx50hjgc6hqbkpqkd6821q"))))
     >     (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 ???psutils??? should be ???native-inputs??? (it???s a set of 
programs.)

Ok.  I'll put it back.  (Ghostscript has some big cross-compile issues anyway)
     
     > --- 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 ???inputs???, because it???s for libltdl 
(???libtool??? is a
     multiple-output package, and it???s default output contains just libltdl.)
     
     
     There are several formatting issue.  If you???re using Emacs, make sure it
     honors our .dir-locals.el (which GNU Emacs >= 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 the 
reference mentioned
in HACKING (http://mumble.net/~campbell/scheme/style.txt) regards as 
acceptable, many of the 
styles you wanted changed.  I will however send a patch according to your 
suggestions.

Updated patch forthcomming (hopefully).

J'


-- 
PGP Public key ID: 1024D/2DE827B3 
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.

signature.asc
Description: Digital signature