TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: Fix misplaced commas (unquote).

Browse source 
Fix many occurrences of comma (unquote) being placed immediately after the
previous list item, e.g. ("ncurses", ncurses) in the inputs.

* gnu/packages/base.scm (patch, gnu-make),
  gnu/packages/bioinformatics.scm (hmmer),
  gnu/packages/bittorrent.scm (aria2),
  gnu/packages/compression.scm (pbzip2),
  gnu/packages/databases.scm (recutils),
  gnu/packages/fonts.scm (font-terminus),
  gnu/packages/freedesktop.scm (xdg-utils, elogind),
  gnu/packages/games.scm (gnujump),
  gnu/packages/gnome.scm (libidl, gnumeric, eog, gedit),
  gnu/packages/gnunet.scm (gnunet),
  gnu/packages/gnuzilla.scm (mozjs, nspr),
  gnu/packages/gtk.scm (gtksourceview, gdk-pixbuf),
  gnu/packages/lua.scm (lua),
  gnu/packages/openstack.scm (python-swiftclient),
  gnu/packages/perl.scm (perl-json-any),
  gnu/packages/polkit.scm (polkit-qt),
  gnu/packages/python.scm (wrap-python3, python-oauthlib)
  (python-mccabe-0.2.1, python-contextlib2, python2-rauth),
  gnu/packages/qt.scm (qtkeychain),
  gnu/packages/ruby.scm (ruby-nokogiri),
  gnu/packages/screen.scm (screen),
  gnu/packages/ssh.scm (libssh),
  gnu/packages/video.scm (ffmpeg, mplayer),
  gnu/packages/vim.scm (vim),
  gnu/packages/xdisorg.scm (redshift),
  gnu/packages/xfce.scm (xfce4-panel, xfce4-settings),
  gnu/packages/xnee.scm (xnee),
  gnu/packages/xorg.scm (font-adobe100dpi, font-adobe75dpi),
  gnu/packages/zsh.scm (zsh): Fix misplaced commas (unquote).
This commit is contained in:
Mark H Weaver 2016-02-27 08:37:28 -05:00
parent 48766ea85f
commit b35461748b
28 changed files with 53 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnu/packages/base.scm
View file

@ -173,7 +173,7 @@ (define-public patch
"16d2r9kpivaak948mxzc0bai45mqfw73m113wrkmbffnalv1b5gx"))
(patches (list (search-patch "patch-hurd-path-max.patch")))))
(build-system gnu-build-system)
(native-inputs `(("ed", ed)))
(native-inputs `(("ed" ,ed)))
(synopsis "Apply differences to originals, with optional backups")
(description
"Patch is a program that applies changes to files based on differences
@ -327,7 +327,7 @@ (define-public gnu-make
"19gwwhik3wdwn0r42b7xcihkbxvjl9r2bdal8nifc3k5i4rn3iqb"))
(patches (list (search-patch "make-impure-dirs.patch")))))
(build-system gnu-build-system)
(native-inputs `(("pkg-config", pkg-config))) ; to detect Guile
(native-inputs `(("pkg-config" ,pkg-config))) ; to detect Guile
(inputs `(("guile" ,guile-2.0)))
(outputs '("out" "debug"))
(arguments

2
gnu/packages/bioinformatics.scm
View file

@ -1790,7 +1790,7 @@ (define-public hmmer
(base32
"0djmgc0pfli0jilfx8hql1axhwhqxqb8rxg2r5rg07aw73sfs5nx"))))
(build-system gnu-build-system)
(native-inputs `(("perl", perl)))
(native-inputs `(("perl" ,perl)))
(home-page "http://hmmer.janelia.org")
(synopsis "Biosequence analysis using profile hidden Markov models")
(description

2
gnu/packages/bittorrent.scm
View file

@ -225,7 +225,7 @@ (define-public aria2
(("CPPUNIT_TEST_SUITE_REGISTRATION\\(LpdMessageReceiverTest\\);" text)
(string-append "// " text))))))))
(native-inputs
`(("pkg-config", pkg-config)))
`(("pkg-config" ,pkg-config)))
(inputs
`(("c-ares" ,c-ares)
("cppunit" ,cppunit) ; for the tests

2
gnu/packages/compression.scm
View file

@ -244,7 +244,7 @@ (define-public pbzip2
"1vk6065dv3a47p86vmp8hv3n1ygd9hraz0gq89gvzlx7lmcb6fsp"))))
(build-system gnu-build-system)
(inputs
`(("bzip2", bzip2)))
`(("bzip2" ,bzip2)))
(arguments
`(#:tests? #f ; no tests
#:phases (modify-phases %standard-phases

2
gnu/packages/databases.scm
View file

@ -321,7 +321,7 @@ (define-public recutils
(native-inputs `(("emacs" ,emacs-no-x)
("bc" ,bc)
("bash:include" ,bash "include")
("libuuid", util-linux)))
("libuuid" ,util-linux)))
;; TODO: Add more optional inputs.
(inputs `(("curl" ,curl)

2
gnu/packages/fonts.scm
View file

@ -373,7 +373,7 @@ (define-public font-terminus
`(("pkg-config" ,pkg-config)
("perl" ,perl)
("bdftopcf" ,bdftopcf)
("font-util", font-util)
("font-util" ,font-util)
("mkfontdir" ,mkfontdir)))
(arguments
`(#:configure-flags (list

4
gnu/packages/freedesktop.scm
View file

@ -69,7 +69,7 @@ (define-public xdg-utils
(build-system gnu-build-system)
(propagated-inputs
`(("xprop" ,xprop) ; for Xfce detecting
("xset", xset))) ; for xdg-screensaver
("xset" ,xset))) ; for xdg-screensaver
(arguments
`(#:tests? #f)) ; no check target
(home-page "http://portland.freedesktop.org/")
@ -178,7 +178,7 @@ (define-public elogind
("xsltproc" ,libxslt)
("m4" ,m4)
("libxml2" ,libxml2) ;for XML_CATALOG_FILES
("pkg-config", pkg-config)
("pkg-config" ,pkg-config)
("gperf" ,gperf)))
(inputs
`(("linux-pam" ,linux-pam)

2
gnu/packages/games.scm
View file

@ -997,7 +997,7 @@ (define-public gnujump
(lambda _ (setenv "LIBS" "-lm"))))))
(inputs
`(("glu" ,glu)
("mesa", mesa)
("mesa" ,mesa)
("sdl" ,sdl)
("sdl-image" ,sdl-image)
("sdl-mixer" ,sdl-mixer)))

8
gnu/packages/gnome.scm
View file

@ -941,7 +941,7 @@ (define-public libidl
(inputs `(("glib" ,glib)))
(native-inputs
`(("pkg-config" ,pkg-config)
("flex", flex)
("flex" ,flex)
("bison" ,bison)))
(home-page "http://freecode.com/projects/libidl")
(synopsis "Create trees of CORBA Interface Definition Language files")
@ -1585,7 +1585,7 @@ (define-public gnumeric
("libxml2" ,libxml2)
("libxslt" ,libxslt)
("python" ,python-2)
("python2-pygobject", python2-pygobject-2)
("python2-pygobject" ,python2-pygobject-2)
("zlib" ,zlib)))
(native-inputs
`(("intltool" ,intltool)
@ -3230,7 +3230,7 @@ (define-public eog
`(("dconf" ,dconf)))
(native-inputs
`(("intltool" ,intltool)
("itstool", itstool)
("itstool" ,itstool)
("glib" ,glib "bin")
("gobject-introspection" ,gobject-introspection)
("pkg-config" ,pkg-config)
@ -3881,7 +3881,7 @@ (define-public gedit
`(("dconf" ,dconf)))
(native-inputs
`(("intltool" ,intltool)
("itstool", itstool)
("itstool" ,itstool)
("gobject-introspection" ,gobject-introspection)
("pkg-config" ,pkg-config)))
(inputs

2
gnu/packages/gnunet.scm
View file

@ -224,7 +224,7 @@ (define-public gnunet
("libunistring" ,libunistring)
("openssl" ,openssl)
("opus" ,opus)
("pulseaudio", pulseaudio)
("pulseaudio" ,pulseaudio)
("sqlite" ,sqlite)
("zlib" ,zlib)))
(native-inputs

4
gnu/packages/gnuzilla.scm
View file

@ -72,7 +72,7 @@ (define-public mozjs
(("defined\\(@TEMPLATE_FILE)") "@TEMPLATE_FILE")))))
(build-system gnu-build-system)
(native-inputs
`(("perl", perl)
`(("perl" ,perl)
("python" ,python-2)))
(arguments
`(#:phases
@ -154,7 +154,7 @@ (define-public nspr
"01ria9wk6329hxqsy75p9dkxiqkq4nkz0jjzll7hslih3jbi8dil"))))
(build-system gnu-build-system)
(native-inputs
`(("perl", perl)))
`(("perl" ,perl)))
(arguments
`(#:tests? #f ; no check target
#:configure-flags (list "--enable-64bit"

4
gnu/packages/gtk.scm
View file

@ -365,7 +365,7 @@ (define-public gtksourceview
(native-inputs
`(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc.
("intltool" ,intltool)
("itstool", itstool)
("itstool" ,itstool)
("gobject-introspection" ,gobject-introspection)
("pkg-config" ,pkg-config)
("vala" ,vala)
@ -425,7 +425,7 @@ (define-public gdk-pixbuf
(native-inputs
`(("pkg-config" ,pkg-config)
("glib" ,glib "bin") ; glib-mkenums, etc.
("gobject-introspection", gobject-introspection))) ; g-ir-compiler, etc.
("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc.
(synopsis "GNOME image loading and manipulation library")
(description
"GdkPixbuf is a library for image loading and manipulation developed

2
gnu/packages/lua.scm
View file

@ -40,7 +40,7 @@ (define-public lua
(patches (list (search-patch "lua-pkgconfig.patch")
(search-patch "lua52-liblua-so.patch")))))
(build-system gnu-build-system)
(inputs `(("readline", readline)))
(inputs `(("readline" ,readline)))
(arguments
'(#:modules ((guix build gnu-build-system)
(guix build utils)

2
gnu/packages/openstack.scm
View file

@ -770,7 +770,7 @@ (define-public python-swiftclient
"1j33l4z9vqh0scfncl4fxg01zr1hgqxhhai6gvcih1gccqm4nd7p"))))
(build-system python-build-system)
(native-inputs
`(("python-pbr", python-pbr)
`(("python-pbr" ,python-pbr)
("python-setuptools" ,python-setuptools)
("python-sphinx" ,python-sphinx)
;; The folloing packages are needed for the tests.

6
gnu/packages/perl.scm
View file

@ -2758,9 +2758,9 @@ (define-public perl-json-any
(build-system perl-build-system)
(native-inputs
`(("perl-test-fatal" ,perl-test-fatal)
("perl-test-requires", perl-test-requires)
("perl-test-warnings", perl-test-warnings)
("perl-test-without-module", perl-test-without-module)))
("perl-test-requires" ,perl-test-requires)
("perl-test-warnings" ,perl-test-warnings)
("perl-test-without-module" ,perl-test-without-module)))
(propagated-inputs
`(("perl-namespace-clean" ,perl-namespace-clean)))
(home-page "http://search.cpan.org/dist/JSON-Any")

2
gnu/packages/polkit.scm
View file

@ -144,7 +144,7 @@ (define-public polkit-qt
(propagated-inputs
`(("qt" ,qt))) ; qt-4 according to the pkg-config files
(native-inputs
`(("pkg-config", pkg-config)))
`(("pkg-config" ,pkg-config)))
(arguments
`(#:configure-flags (list (string-append "-DCMAKE_INSTALL_RPATH="
(assoc-ref %outputs "out")

12
gnu/packages/python.scm
View file

@ -332,8 +332,8 @@ (define* (wrap-python3 python
(lambda (old new)
(symlink (string-append python old)
(string-append bin "/" new)))
`("python3", "pydoc3", "idle3")
`("python", "pydoc", "idle"))))))
`("python3" ,"pydoc3" ,"idle3")
`("python" ,"pydoc" ,"idle"))))))
(synopsis "Wrapper for the Python 3 commands")
(description
"This package provides wrappers for the commands of Python@tie{}3.x such
@ -2347,7 +2347,7 @@ (define-public python-oauthlib
(build-system python-build-system)
(native-inputs
`(("python-setuptools" ,python-setuptools)
("python-coverage", python-coverage)
("python-coverage" ,python-coverage)
("python-nose" ,python-nose)
("python-mock" ,python-mock)))
(inputs
@ -5142,7 +5142,7 @@ (define-public python-mccabe-0.2.1
(sha256
(base32
"0fi4a81kr5bcv5p4xgibqr595hyj5dafkqgsmfk96mfy8w71fajs"))))
(inputs `(("python-setuptools", python-setuptools)))))
(inputs `(("python-setuptools" ,python-setuptools)))))
(define-public python2-mccabe-0.2.1
(package-with-python2 python-mccabe-0.2.1))
@ -6753,7 +6753,7 @@ (define-public python-contextlib2
(replace 'check
(lambda _ (zero?
(system*
"python" "test_contextlib2.py", "-v")))))))
"python" "test_contextlib2.py" "-v")))))))
(home-page "http://contextlib2.readthedocs.org/")
(synopsis "Tools for decorators and context managers")
(description "This module is primarily a backport of the Python
@ -7247,7 +7247,7 @@ (define-public python2-rauth
(package (inherit rauth)
(propagated-inputs `(("python2-requests" ,python2-requests)))
(native-inputs
`(("python2-unittest2", python2-unittest2)
`(("python2-unittest2" ,python2-unittest2)
,@(package-native-inputs rauth))))))
(define-public python2-functools32

2
gnu/packages/qt.scm
View file

@ -555,7 +555,7 @@ (define-public qtkeychain
(base32 "055mkd4pz6cyff4cw0784wjc1w92m8x223sxi96ph15fr3lplbg6"))))
(build-system cmake-build-system)
(inputs
`(("qt", qt)))
`(("qt" ,qt)))
(arguments
`(#:tests? #f ; No tests included
#:phases

2
gnu/packages/ruby.scm
View file

@ -1905,7 +1905,7 @@ (define-public ruby-nokogiri
"/include/libxml2" ))))
(native-inputs
`(("ruby-hoe" ,ruby-hoe)
("ruby-rake-compiler", ruby-rake-compiler)))
("ruby-rake-compiler" ,ruby-rake-compiler)))
(inputs
`(("zlib" ,zlib)
("libxml2" ,libxml2)

2
gnu/packages/screen.scm
View file

@ -44,7 +44,7 @@ (define-public screen
(native-inputs
`(("makeinfo" ,texinfo)))
(inputs
`(("ncurses", ncurses)
`(("ncurses" ,ncurses)
("perl" ,perl)))
(arguments
`(#:configure-flags

2
gnu/packages/ssh.scm
View file

@ -61,7 +61,7 @@ (define-public libssh
;; TODO: Add 'CMockery' and '-DWITH_TESTING=ON' for the test suite.
#:tests? #f))
(inputs `(("zlib" ,zlib)
("libgcrypt", libgcrypt)))
("libgcrypt" ,libgcrypt)))
(synopsis "SSH client library")
(description
"libssh is a C library implementing the SSHv2 and SSHv1 protocol for

8
gnu/packages/video.scm
View file

@ -406,7 +406,7 @@ (define-public ffmpeg
("speex" ,speex)
("twolame" ,twolame)
("xvid" ,xvid)
("zlib", zlib)))
("zlib" ,zlib)))
(native-inputs
`(("bc" ,bc)
("perl" ,perl)
@ -620,14 +620,14 @@ (define-public mplayer
(inputs
`(("alsa-lib" ,alsa-lib)
("cdparanoia" ,cdparanoia)
("ffmpeg", ffmpeg)
("ffmpeg" ,ffmpeg)
("fontconfig" ,fontconfig)
("freetype" ,freetype)
;; ("giflib" ,giflib) ; uses QuantizeBuffer, requires version >= 5
("lame" ,lame)
("libass" ,libass)
("libdvdcss", libdvdcss)
("libdvdnav", libdvdnav)
("libdvdcss" ,libdvdcss)
("libdvdnav" ,libdvdnav)
("libjpeg" ,libjpeg)
("libmpeg2" ,libmpeg2)
("libmpg123" ,mpg123) ; audio codec for MP3

8
gnu/packages/vim.scm
View file

@ -53,10 +53,10 @@ (define-public vim
(("/bin/sh") (which "sh"))))
%standard-phases)))
(inputs
`(("gawk", gawk)
("inetutils", inetutils)
("ncurses", ncurses)
("perl", perl)
`(("gawk" ,gawk)
("inetutils" ,inetutils)
("ncurses" ,ncurses)
("perl" ,perl)
("tcsh" ,tcsh))) ; For runtime/tools/vim32
(home-page "http://www.vim.org/")
(synopsis "Text editor based on vi")

2
gnu/packages/xdisorg.scm
View file

@ -701,7 +701,7 @@ (define-public redshift
`(("libdrm" ,libdrm)
("libx11" ,libx11)
("libxcb" ,libxcb)
("libxxf86vm", libxxf86vm)
("libxxf86vm" ,libxxf86vm)
("glib" ,glib))) ;for Geoclue2 support
(home-page "https://github.com/jonls/redshift")
(synopsis "Adjust the color temperature of your screen")

4
gnu/packages/xfce.scm
View file

@ -282,7 +282,7 @@ (define-public xfce4-panel
`(("libxfce4util" ,libxfce4util))) ; required by libxfce4panel-1.0.pc
(inputs
`(("exo" ,exo)
("garcon", garcon)
("garcon" ,garcon)
("libwnck" ,libwnck-1)
("libxfce4ui" ,libxfce4ui)))
(native-search-paths
@ -519,7 +519,7 @@ (define-public xfce4-settings
`(("exo" ,exo)
("garcon" ,garcon)
("libnotify" ,libnotify)
("libxcursor", libxcursor)
("libxcursor" ,libxcursor)
("libxi" ,libxi)
("libxklavier" ,libxklavier)
("libxrandr" ,libxrandr)

2
gnu/packages/xnee.scm
View file

@ -39,7 +39,7 @@ (define-public xnee
"04n2lac0vgpv8zsn7nmb50hf3qb56pmj90dmwnivg09gyrf1x92j"))))
(build-system gnu-build-system)
(inputs
`(("gtk+", gtk+-2)
`(("gtk+" ,gtk+-2)
("inputproto" ,inputproto)
("libx11" ,libx11)
("libxext" ,libxext)

4
gnu/packages/xorg.scm
View file

@ -348,7 +348,7 @@ (define-public font-adobe100dpi
(build-system gnu-build-system)
(inputs
`(("bdftopcf" ,bdftopcf)
("font-util", font-util)
("font-util" ,font-util)
("mkfontdir" ,mkfontdir)))
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -380,7 +380,7 @@ (define-public font-adobe75dpi
(build-system gnu-build-system)
(inputs
`(("bdftopcf" ,bdftopcf)
("font-util", font-util)
("font-util" ,font-util)
("mkfontdir" ,mkfontdir)))
(native-inputs
`(("pkg-config" ,pkg-config)))

8
gnu/packages/zsh.scm
View file

@ -64,10 +64,10 @@ (define-public zsh
"Util/preconfig")
(("/bin/sh") (which "sh")))))
%standard-phases)))
(native-inputs `(("autoconf", autoconf)))
(inputs `(("ncurses", ncurses)
("pcre", pcre)
("perl", perl)))
(native-inputs `(("autoconf" ,autoconf)))
(inputs `(("ncurses" ,ncurses)
("pcre" ,pcre)
("perl" ,perl)))
(synopsis "Powerful shell for interactive use and scripting")
(description "The Z shell (zsh) is a Unix shell that can be used
as an interactive login shell and as a powerful command interpreter