[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: Fix misplaced commas (unquote).
|
From: |
Mark H. Weaver |
|
Subject: |
01/01: gnu: Fix misplaced commas (unquote). |
|
Date: |
Sat, 27 Feb 2016 13:51:25 +0000 |
mhw pushed a commit to branch master
in repository guix.
commit b35461748b20d0172744974b39e7d9d033400c51
Author: Mark H Weaver <address@hidden>
Date: Sat Feb 27 08:37:28 2016 -0500
gnu: Fix misplaced commas (unquote).
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).
---
gnu/packages/base.scm | 4 ++--
gnu/packages/bioinformatics.scm | 2 +-
gnu/packages/bittorrent.scm | 2 +-
gnu/packages/compression.scm | 2 +-
gnu/packages/databases.scm | 2 +-
gnu/packages/fonts.scm | 2 +-
gnu/packages/freedesktop.scm | 4 ++--
gnu/packages/games.scm | 2 +-
gnu/packages/gnome.scm | 8 ++++----
gnu/packages/gnunet.scm | 2 +-
gnu/packages/gnuzilla.scm | 4 ++--
gnu/packages/gtk.scm | 4 ++--
gnu/packages/lua.scm | 2 +-
gnu/packages/openstack.scm | 2 +-
gnu/packages/perl.scm | 6 +++---
gnu/packages/polkit.scm | 2 +-
gnu/packages/python.scm | 12 ++++++------
gnu/packages/qt.scm | 2 +-
gnu/packages/ruby.scm | 2 +-
gnu/packages/screen.scm | 2 +-
gnu/packages/ssh.scm | 2 +-
gnu/packages/video.scm | 8 ++++----
gnu/packages/vim.scm | 8 ++++----
gnu/packages/xdisorg.scm | 2 +-
gnu/packages/xfce.scm | 4 ++--
gnu/packages/xnee.scm | 2 +-
gnu/packages/xorg.scm | 4 ++--
gnu/packages/zsh.scm | 8 ++++----
28 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 7cef8bf..e662827 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -173,7 +173,7 @@ standard utility.")
"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 @@ functionality beyond that which is outlined in the POSIX
standard.")
"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
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 8958ec5..7b3838d 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -1790,7 +1790,7 @@ particular, reads spanning multiple exons.")
(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
diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index 15b69cf..ae67988 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -225,7 +225,7 @@ interface, for the Transmission BitTorrent daemon.")
(("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
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 4a31bf7..938d4b8 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -244,7 +244,7 @@ decompression.")
"1vk6065dv3a47p86vmp8hv3n1ygd9hraz0gq89gvzlx7lmcb6fsp"))))
(build-system gnu-build-system)
(inputs
- `(("bzip2", bzip2)))
+ `(("bzip2" ,bzip2)))
(arguments
`(#:tests? #f ; no tests
#:phases (modify-phases %standard-phases
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 7c30208..25c1e6a 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -321,7 +321,7 @@ pictures, sounds, or video.")
(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)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index b9cebdc..69e195d 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -373,7 +373,7 @@ The Liberation Fonts are sponsored by Red Hat.")
`(("pkg-config" ,pkg-config)
("perl" ,perl)
("bdftopcf" ,bdftopcf)
- ("font-util", font-util)
+ ("font-util" ,font-util)
("mkfontdir" ,mkfontdir)))
(arguments
`(#:configure-flags (list
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 6a28379..bfe6e45 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -69,7 +69,7 @@
(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 @@ the freedesktop.org XDG Base Directory specification.")
("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)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 8a0b395..991fa24 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -997,7 +997,7 @@ This game is based on the GPL version of the famous game
TuxRacer.")
(lambda _ (setenv "LIBS" "-lm"))))))
(inputs
`(("glu" ,glu)
- ("mesa", mesa)
+ ("mesa" ,mesa)
("sdl" ,sdl)
("sdl-image" ,sdl-image)
("sdl-mixer" ,sdl-mixer)))
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 578b431..0960b53 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -941,7 +941,7 @@ library.")
(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 @@ Hints specification (EWMH).")
("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 @@ supports playlists, song ratings, and any codecs
installed through gstreamer.")
`(("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 @@ javascript engine and the GObject introspection
framework.")
`(("dconf" ,dconf)))
(native-inputs
`(("intltool" ,intltool)
- ("itstool", itstool)
+ ("itstool" ,itstool)
("gobject-introspection" ,gobject-introspection)
("pkg-config" ,pkg-config)))
(inputs
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index e3f64ef..eb0c4cb 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -224,7 +224,7 @@ supports HTTPS, HTTPS and GnuTLS.")
("libunistring" ,libunistring)
("openssl" ,openssl)
("opus" ,opus)
- ("pulseaudio", pulseaudio)
+ ("pulseaudio" ,pulseaudio)
("sqlite" ,sqlite)
("zlib" ,zlib)))
(native-inputs
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 1d3ebe8..dca461f 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -72,7 +72,7 @@
(("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 @@ in C/C++.")
"01ria9wk6329hxqsy75p9dkxiqkq4nkz0jjzll7hslih3jbi8dil"))))
(build-system gnu-build-system)
(native-inputs
- `(("perl", perl)))
+ `(("perl" ,perl)))
(arguments
`(#:tests? #f ; no check target
#:configure-flags (list "--enable-64bit"
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 452906a..1a10e9b 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -365,7 +365,7 @@ printing and other features typical of a source code
editor.")
(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 @@ highlighting and other features typical of a source code
editor.")
(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
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index d27c024..fcb4183 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -40,7 +40,7 @@
(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)
diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 08a76a3..0fa488f 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -770,7 +770,7 @@ LDAP.")
"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.
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 0c0b8a3..6ca62aa 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -2758,9 +2758,9 @@ versa using either JSON::XS or JSON::PP.")
(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";)
diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm
index 0a4f70f..4f21612 100644
--- a/gnu/packages/polkit.scm
+++ b/gnu/packages/polkit.scm
@@ -144,7 +144,7 @@ for unprivileged applications.")
(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")
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index b67aed0..2441220 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -332,8 +332,8 @@ data types.")
(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 address@hidden such
@@ -2347,7 +2347,7 @@ somewhat intelligeble.")
(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 @@ complexity of Python source code.")
(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 @@ of the SSL peer.")
(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 @@ authenticated session objects providing things like
keep-alive.")
(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
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 363596d..bfd99b6 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -555,7 +555,7 @@ contain over 620 classes.")
(base32 "055mkd4pz6cyff4cw0784wjc1w92m8x223sxi96ph15fr3lplbg6"))))
(build-system cmake-build-system)
(inputs
- `(("qt", qt)))
+ `(("qt" ,qt)))
(arguments
`(#:tests? #f ; No tests included
#:phases
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index fa7c2f7..a1669d4 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -1905,7 +1905,7 @@ to reproduce user environments.")
"/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)
diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm
index fa5235c..088ca55 100644
--- a/gnu/packages/screen.scm
+++ b/gnu/packages/screen.scm
@@ -44,7 +44,7 @@
(native-inputs
`(("makeinfo" ,texinfo)))
(inputs
- `(("ncurses", ncurses)
+ `(("ncurses" ,ncurses)
("perl" ,perl)))
(arguments
`(#:configure-flags
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 3c73e47..081c7cb 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -61,7 +61,7 @@
;; 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
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 865d0e3..7d6c363 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -406,7 +406,7 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and
VC-1/VMW3).")
("speex" ,speex)
("twolame" ,twolame)
("xvid" ,xvid)
- ("zlib", zlib)))
+ ("zlib" ,zlib)))
(native-inputs
`(("bc" ,bc)
("perl" ,perl)
@@ -620,14 +620,14 @@ treaming protocols.")
(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
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index e117fc4..2418963 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -53,10 +53,10 @@
(("/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")
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index f01e17a..d72f9f8 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -701,7 +701,7 @@ the X.Org X Server version 1.7 and later (X11R7.5 or
later).")
`(("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")
diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 7fab650..2aef842 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -282,7 +282,7 @@ management D-Bus specification.")
`(("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 @@ allows you to shutdown the computer from Xfce.")
`(("exo" ,exo)
("garcon" ,garcon)
("libnotify" ,libnotify)
- ("libxcursor", libxcursor)
+ ("libxcursor" ,libxcursor)
("libxi" ,libxi)
("libxklavier" ,libxklavier)
("libxrandr" ,libxrandr)
diff --git a/gnu/packages/xnee.scm b/gnu/packages/xnee.scm
index 4e9135d..84dd85b 100644
--- a/gnu/packages/xnee.scm
+++ b/gnu/packages/xnee.scm
@@ -39,7 +39,7 @@
"04n2lac0vgpv8zsn7nmb50hf3qb56pmj90dmwnivg09gyrf1x92j"))))
(build-system gnu-build-system)
(inputs
- `(("gtk+", gtk+-2)
+ `(("gtk+" ,gtk+-2)
("inputproto" ,inputproto)
("libx11" ,libx11)
("libxext" ,libxext)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 9f7b726..f69661d 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -348,7 +348,7 @@ provided.")
(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 @@ provided.")
(build-system gnu-build-system)
(inputs
`(("bdftopcf" ,bdftopcf)
- ("font-util", font-util)
+ ("font-util" ,font-util)
("mkfontdir" ,mkfontdir)))
(native-inputs
`(("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/zsh.scm b/gnu/packages/zsh.scm
index 6d25fd4..fba7bb1 100644
--- a/gnu/packages/zsh.scm
+++ b/gnu/packages/zsh.scm
@@ -64,10 +64,10 @@
"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