From c695fb769c94623371c5997da1dc454b0a4f58a8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 16 Mar 2018 16:50:14 +0100 Subject: gnu: Fix common unquote typos. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's easy to mistype ‘("foo" foo)’ as ‘("foo", foo)’ (which also works). Fix such typos for the proper edification of our young. * gnu/packages/android.scm: Move unquotes to their operands. * gnu/packages/bootloaders.scm: Likewise. * gnu/packages/build-tools.scm: Likewise. * gnu/packages/chemistry.scm: Likewise. * gnu/packages/compression.scm: Likewise. * gnu/packages/connman.scm: Likewise. * gnu/packages/django.scm: Likewise. * gnu/packages/emulators.scm: Likewise. * gnu/packages/engineering.scm: Likewise. * gnu/packages/file-systems.scm: Likewise. * gnu/packages/freedesktop.scm: Likewise. * gnu/packages/games.scm: Likewise. * gnu/packages/gimp.scm: Likewise. * gnu/packages/gl.scm: Likewise. * gnu/packages/gnome.scm: Likewise. * gnu/packages/graphics.scm: Likewise. * gnu/packages/haskell.scm: Likewise. * gnu/packages/irc.scm: Likewise. * gnu/packages/julia.scm: Likewise. * gnu/packages/kde-frameworks.scm: Likewise. * gnu/packages/linux.scm: Likewise. * gnu/packages/lua.scm: Likewise. * gnu/packages/mail.scm: Likewise. * gnu/packages/make-bootstrap.scm: Likewise. * gnu/packages/messaging.scm: Likewise. * gnu/packages/music.scm: Likewise. * gnu/packages/networking.scm: Likewise. * gnu/packages/ocaml.scm: Likewise. * gnu/packages/perl.scm: Likewise. * gnu/packages/python.scm: Likewise. * gnu/packages/python-web.scm: Likewise. * gnu/packages/qt.scm: Likewise. * gnu/packages/ratpoison.scm: Likewise. * gnu/packages/sdl.scm: Likewise. * gnu/packages/sml.scm: Likewise. * gnu/packages/terminals.scm: Likewise. * gnu/packages/text-editors.scm: Likewise. * gnu/packages/video.scm: Likewise. * gnu/packages/virtualization.scm: Likewise. * gnu/packages/vulkan.scm: Likewise. * gnu/packages/wget.scm: Likewise. * gnu/packages/wine.scm: Likewise. * gnu/packages/wm.scm: Likewise. * gnu/packages/xdisorg.scm: Likewise. * gnu/packages/xml.scm: Likewise. * gnu/packages/xorg.scm: Likewise. --- gnu/packages/android.scm | 2 +- gnu/packages/bootloaders.scm | 2 +- gnu/packages/build-tools.scm | 2 +- gnu/packages/chemistry.scm | 4 ++-- gnu/packages/compression.scm | 2 +- gnu/packages/connman.scm | 4 ++-- gnu/packages/django.scm | 4 ++-- gnu/packages/emulators.scm | 2 +- gnu/packages/engineering.scm | 2 +- gnu/packages/file-systems.scm | 2 +- gnu/packages/flashing-tools.scm | 2 +- gnu/packages/freedesktop.scm | 2 +- gnu/packages/games.scm | 26 +++++++++++++------------- gnu/packages/gimp.scm | 12 ++++++------ gnu/packages/gl.scm | 2 +- gnu/packages/gnome.scm | 2 +- gnu/packages/graphics.scm | 14 +++++++------- gnu/packages/haskell.scm | 8 ++++---- gnu/packages/irc.scm | 2 +- gnu/packages/kde-frameworks.scm | 36 ++++++++++++++++++------------------ gnu/packages/linux.scm | 24 ++++++++++++------------ gnu/packages/lua.scm | 10 +++++----- gnu/packages/mail.scm | 2 +- gnu/packages/make-bootstrap.scm | 2 +- gnu/packages/messaging.scm | 12 ++++++------ gnu/packages/music.scm | 6 +++--- gnu/packages/networking.scm | 20 ++++++++++---------- gnu/packages/ocaml.scm | 6 +++--- gnu/packages/perl.scm | 2 +- gnu/packages/python-web.scm | 2 +- gnu/packages/python.scm | 8 ++++---- gnu/packages/qt.scm | 2 +- gnu/packages/ratpoison.scm | 2 +- gnu/packages/sdl.scm | 6 +++--- gnu/packages/sml.scm | 2 +- gnu/packages/terminals.scm | 16 ++++++++-------- gnu/packages/text-editors.scm | 8 ++++---- gnu/packages/video.scm | 4 ++-- gnu/packages/virtualization.scm | 2 +- gnu/packages/vulkan.scm | 4 ++-- gnu/packages/web.scm | 8 ++++---- gnu/packages/wget.scm | 28 ++++++++++++++-------------- gnu/packages/wine.scm | 4 ++-- gnu/packages/wm.scm | 2 +- gnu/packages/xdisorg.scm | 6 +++--- gnu/packages/xml.scm | 4 ++-- gnu/packages/xorg.scm | 2 +- 47 files changed, 163 insertions(+), 163 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 6baefbca96..637cda0205 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -457,7 +457,7 @@ def _FindRepo(): ;; TODO: Add git-remote-persistent-https once it is available in guix `(("git" ,git) ("gnupg" ,gnupg) - ("ssh", openssh))) + ("ssh" ,openssh))) (native-inputs `(("nose" ,python2-nose))) (home-page "https://code.google.com/p/git-repo/") diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 9ea8748a5b..582c71cc4a 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -181,7 +181,7 @@ menu to select one of the installed operating systems.") (synopsis "GRand Unified Boot loader (UEFI version)") (inputs `(("efibootmgr" ,efibootmgr) - ("mtools", mtools) + ("mtools" ,mtools) ,@(package-inputs grub))) (arguments `(;; TODO: Tests need a UEFI firmware for qemu. There is one at diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 2abb44fdb8..73eacf7df2 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -81,7 +81,7 @@ makes a few sacrifices to acquire fast full and incremental build times.") (base32 "06r8limj38mv884s5riiz6lpzw37cvhbf9jd0smzcbi7fwmv3yah")))) (build-system python-build-system) - (inputs `(("ninja", ninja))) + (inputs `(("ninja" ,ninja))) (propagated-inputs `(("python" ,python))) (home-page "https://mesonbuild.com/") (synopsis "Build system designed to be fast and user-friendly") diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index ed883072b4..f1359b2cf6 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -73,8 +73,8 @@ only with Python 2 and NumPy < 1.9.") (build-system python-build-system) (inputs `(("python-matplotlib" ,(with-numpy-1.8 python2-matplotlib)) - ("python-scientific", python2-scientific) - ("netcdf", netcdf) + ("python-scientific" ,python2-scientific) + ("netcdf" ,netcdf) ("gv" ,gv))) (propagated-inputs `(("python-mmtk" ,python2-mmtk))) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 05442024f6..f92239d505 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1657,7 +1657,7 @@ speed.") (source (package-source zstd)) (build-system gnu-build-system) (native-inputs - `(("googletest", googletest))) + `(("googletest" ,googletest))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/connman.scm b/gnu/packages/connman.scm index 25756019fd..7e87cd8968 100644 --- a/gnu/packages/connman.scm +++ b/gnu/packages/connman.scm @@ -70,7 +70,7 @@ (string-append "--with-dbusdatadir=" (assoc-ref %outputs "out") "/share")))) (native-inputs - `(("pkg-config", pkg-config) + `(("pkg-config" ,pkg-config) ("python" ,python-2))) (inputs `(("dbus" ,dbus) @@ -84,7 +84,7 @@ ;; TODO: add neard, ofono ("openconnect" ,openconnect) ("openvpn" ,openvpn) - ("ppp", ppp) + ("ppp" ,ppp) ("vpnc" ,vpnc) ("wpa-supplicant" ,wpa-supplicant))) (home-page "https://01.org/connman") diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index a901af6f14..4501b5c745 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -75,7 +75,7 @@ (zero? (system* "python" "tests/runtests.py"))))))) ;; TODO: Install extras/django_bash_completion. (native-inputs - `(("tzdata", tzdata-for-tests) + `(("tzdata" ,tzdata-for-tests) ;; bcrypt and argon2-cffi are extra requirements not yet in guix ;;("python-argon2-cffi" ,python-argon2-cffi) ; >= 16.1.0 ;;("python-bcrypt" ,python-bcrypt) ; not py-bcrypt! @@ -199,7 +199,7 @@ useful tools for testing Django applications and projects.") (native-inputs `(("python-django" ,python-django) ("python-djangorestframework" ,python-djangorestframework) - ("python-django-crispy-forms", python-django-crispy-forms) + ("python-django-crispy-forms" ,python-django-crispy-forms) ("python-mock" ,python-mock))) (home-page "https://django-filter.readthedocs.io/en/latest/") (synopsis "Reusable Django application to filter querysets dynamically") diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 142603b082..9d8e7fa1ae 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1095,7 +1095,7 @@ emulation community. It provides highly accurate emulation.") ("sdl" ,sdl2) ("udev" ,eudev) ("vulkan-icd-loader" ,vulkan-icd-loader) - ("wayland", wayland) + ("wayland" ,wayland) ("zlib" ,zlib))) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 449584f57e..076d4b6094 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -862,7 +862,7 @@ the 'showing the effect of'-style of operation.") (inputs `(("boost" ,boost))) (native-inputs - `(("python-2", python-2) + `(("python-2" ,python-2) ("python2-cheetah" ,python2-cheetah))) (home-page "http://libvolk.org/") (synopsis "Vector-Optimized Library of Kernels") diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 0e65213c72..6522662c4e 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -236,7 +236,7 @@ All of this is accomplished without a centralized metadata server.") (inputs `(("curl" ,curl) ("glib" ,glib) - ("fuse", fuse))) + ("fuse" ,fuse))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "http://curlftpfs.sourceforge.net/") diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index 192f84c36c..51b259a5cf 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -104,7 +104,7 @@ programmer devices.") "1g4032c81wkk37wvbg1dxcqq6mnd76y9x7f2crmzqi6z4q9jcxmj")))) (build-system gnu-build-system) (inputs - `(("libusb",libusb-0.1))) ; doesn't work with libusb-compat + `(("libusb" ,libusb-0.1))) ; doesn't work with libusb-compat (arguments '(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 366fcecea2..f673c4bf34 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -357,7 +357,7 @@ of a the system to know what users are logged in, and where.") ("glib:bin" ,glib "bin"))) (inputs `(("glib" ,glib) - ("bash-completion", bash-completion) + ("bash-completion" ,bash-completion) ("polkit" ,polkit))) (propagated-inputs `(("sqlite" ,sqlite))) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index a33da03ad5..a03e58b0ad 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -234,7 +234,7 @@ settings to tweak as well.") ("libvorbis" ,libvorbis) ("ncurses" ,ncurses) ("sdl2" ,sdl2) - ("sdl2-image", sdl2-image) + ("sdl2-image" ,sdl2-image) ("sdl2-ttf" ,sdl2-ttf) ("sdl2-mixer" ,sdl2-mixer))) (home-page "http://en.cataclysmdda.com/") @@ -2230,19 +2230,19 @@ Transport Tycoon Deluxe.") (substitute* "cmake_install.cmake" (("EXPECTED_HASH SHA1=b587d83de508d0b104d14c599b76f8565900fce0") ""))))))) - (inputs `(("curl", curl) - ("fontconfig", fontconfig) - ("freetype", freetype) - ("jansson", jansson) - ("libpng", libpng) - ("libzip", libzip) - ("mesa", mesa) - ("openssl", openssl) - ("sdl2", sdl2) - ("speexdsp", speexdsp) - ("zlib", zlib))) + (inputs `(("curl" ,curl) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("jansson" ,jansson) + ("libpng" ,libpng) + ("libzip" ,libzip) + ("mesa" ,mesa) + ("openssl" ,openssl) + ("sdl2" ,sdl2) + ("speexdsp" ,speexdsp) + ("zlib" ,zlib))) (native-inputs - `(("pkg-config", pkg-config))) + `(("pkg-config" ,pkg-config))) (home-page "https://github.com/OpenRCT2/OpenRCT2") (synopsis "Free software re-implementation of RollerCoaster Tycoon 2") (description "OpenRCT2 is a free software re-implementation of diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index c98f686d41..2483885c95 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -175,12 +175,12 @@ buffers.") ("libjpeg" ,libjpeg-8) ("atk" ,atk) ("gtk+" ,gtk+-2) - ("exif" ,libexif) ;optional, EXIF + XMP support - ("lcms" ,lcms) ;optional, color management - ("librsvg" ,librsvg) ;optional, SVG support - ("poppler", poppler) ; optional, PDF support - ("python" ,python-2) ;optional, Python support - ("python2-pygtk" ,python2-pygtk) ;optional, Python support + ("exif" ,libexif) ; optional, EXIF + XMP support + ("lcms" ,lcms) ; optional, color management + ("librsvg" ,librsvg) ; optional, SVG support + ("poppler" ,poppler) ; optional, PDF support + ("python" ,python-2) ; optional, Python support + ("python2-pygtk" ,python2-pygtk) ; optional, Python support ("gegl" ,gegl))) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 0e416a9efd..f46c4b4d4b 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -756,7 +756,7 @@ mixed vector/bitmap output.") ("libjpeg-turbo" ,libjpeg-turbo) ("mesa" ,mesa) ("openssl" ,openssl))) - (native-inputs `(("pkg-config", pkg-config))) + (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://www.virtualgl.org") (synopsis "Redirects 3D commands from an OpenGL application onto a 3D graphics card") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 56ee1aa885..8ce36430ee 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -273,7 +273,7 @@ features to enable users to create their discs easily and quickly.") ("gettext" ,gettext-minimal) ("itstool" ,itstool) ("intltool" ,intltool) - ("cmake", cmake))) + ("cmake" ,cmake))) (home-page "https://launchpad.net/deja-dup") (synopsis "Simple backup tool, for regular encrypted backups") (description diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 8504b2f11e..8ea9c74cec 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -435,13 +435,13 @@ visual effects work for film.") (native-inputs `(("unzip" ,unzip))) (inputs - `(("giflib", giflib) - ("jasper", jasper) - ("librsvg", librsvg) - ("pth", pth) - ("qtbase", qtbase) - ("ffmpeg", ffmpeg) - ("mesa", mesa))) + `(("giflib" ,giflib) + ("jasper" ,jasper) + ("librsvg" ,librsvg) + ("pth" ,pth) + ("qtbase" ,qtbase) + ("ffmpeg" ,ffmpeg) + ("mesa" ,mesa))) (synopsis "High performance real-time graphics toolkit") (description "The OpenSceneGraph is a high performance 3D graphics toolkit diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index c5408f8627..9c59f56139 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -7881,7 +7881,7 @@ files in Haskell.") (inputs `(("ghc-mtl" ,ghc-mtl) ("ghc-network" ,ghc-network) - ("ghc-directory", ghc-directory) + ("ghc-directory" ,ghc-directory) ("ghc-old-locale" ,ghc-old-locale))) (native-inputs `(("ghc-hunit" ,ghc-hunit))) @@ -8458,7 +8458,7 @@ that are much lighter weight than IO-threads.") (native-inputs `(("ghc-hunit" ,ghc-hunit) ("ghc-quickcheck" ,ghc-quickcheck) - ("ghc-ieee754", ghc-ieee754) + ("ghc-ieee754" ,ghc-ieee754) ("ghc-test-framework" ,ghc-test-framework) ("ghc-test-framework-hunit" ,ghc-test-framework-hunit) ("ghc-test-framework-quickcheck2" ,ghc-test-framework-quickcheck2))) @@ -8582,7 +8582,7 @@ statically known size.") (build-system haskell-build-system) (inputs `(("ghc-tuple-th" ,ghc-tuple-th) ("ghc-contravariant" ,ghc-contravariant) - ("ghc-base-prelude",ghc-base-prelude))) + ("ghc-base-prelude" ,ghc-base-prelude))) (home-page "https://github.com/nikita-volkov/contravariant-extras") (synopsis "Extras for the @code{ghc-contravariant} Haskell package") (description "This Haskell package provides extras for the @@ -8897,7 +8897,7 @@ and are often as efficient as hand-written folds.") ("ghc-vector-algorithms" ,ghc-vector-algorithms) ("ghc-split" ,ghc-split))) (native-inputs `(("ghc-hspec" ,ghc-hspec) - ("ghc-hunit",ghc-hunit) + ("ghc-hunit" ,ghc-hunit) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-semigroups" ,ghc-semigroups) ("ghc-foldl" ,ghc-foldl))) diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index e59b34417b..bad27dacb6 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -100,7 +100,7 @@ ("qttools" ,qttools))) (inputs `(("qca" ,qca) - ("qtbase", qtbase) + ("qtbase" ,qtbase) ("qtscript" ,qtscript) ("snorenotify" ,snorenotify) ("zlib" ,zlib))) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 246860e3f3..b763a03476 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -157,7 +157,7 @@ common build settings used in software produced by the KDE community.") ;; TODO: Add building the super experimental QML support `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config) - ("qttools", qttools))) + ("qttools" ,qttools))) (inputs `(("qtbase" ,qtbase))) (arguments @@ -1186,7 +1186,7 @@ lower level classes for interaction with the X Windowing System.") ("pkg-config" ,pkg-config))) (propagated-inputs ;; Headers contain #include - `(("modem-manager", modem-manager))) + `(("modem-manager" ,modem-manager))) (inputs `(("qtbase" ,qtbase))) (arguments @@ -1284,7 +1284,7 @@ which are used in DBus communication.") (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs - `(("libdmtx", libdmtx) + `(("libdmtx" ,libdmtx) ("qrencode" ,qrencode) ("qtbase" ,qtbase))) ;; TODO: rethink: nix propagates this (home-page "https://api.kde.org/frameworks/prison/html/index.html") @@ -2209,7 +2209,7 @@ their settings.") ("kwidgetsaddons" ,kwidgetsaddons) ("kwindowsystem" ,kwindowsystem) ("kxmlgui" ,kxmlgui) - ("libepoxy", libepoxy) + ("libepoxy" ,libepoxy) ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) ("solid" ,solid))) @@ -3003,7 +3003,7 @@ types or handled by application specific code.") ("libgit2" ,libgit2) ("perl" ,perl) ("qtbase" ,qtbase) - ("qtdeclarative", qtdeclarative) + ("qtdeclarative" ,qtdeclarative) ("qtscript" ,qtscript) ("qtxmlpatterns" ,qtxmlpatterns) ("solid" ,solid) @@ -3071,7 +3071,7 @@ library.") ("kwidgetsaddons" ,kwidgetsaddons) ("kwindowsystem" ,kwindowsystem) ("qtbase" ,qtbase) - ("qtspeech", qtspeech))) + ("qtspeech" ,qtspeech))) (arguments `(#:phases (modify-phases %standard-phases @@ -3150,7 +3150,7 @@ the passwords on KDE work spaces.") `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs `(("attica" ,attica) - ("kauth", kauth) + ("kauth" ,kauth) ("kcodecs" ,kcodecs) ("kcoreaddons" ,kcoreaddons) ("kglobalaccel" ,kglobalaccel) @@ -3395,7 +3395,7 @@ workspace.") `(("dbus" ,dbus) ("docbook-xml" ,docbook-xml-4.4) ; optional ("extra-cmake-modules" ,extra-cmake-modules) - ("perl", perl) + ("perl" ,perl) ("perl-uri" ,perl-uri) ("pkg-config" ,pkg-config) ("shared-mime-info" ,shared-mime-info) @@ -3421,7 +3421,7 @@ workspace.") ("knotifications" ,knotifications) ("kparts" ,kparts) ("ktextwidgets" ,ktextwidgets) - ("kunitconversion", kunitconversion) + ("kunitconversion" ,kunitconversion) ("kwindowsystem" ,kwindowsystem) ("qtbase" ,qtbase))) (inputs @@ -3434,9 +3434,9 @@ workspace.") ("kservice" ,kservice) ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) - ("libsm", libsm) - ("networkmanager-qt", networkmanager-qt) - ("openssl", openssl) + ("libsm" ,libsm) + ("networkmanager-qt" ,networkmanager-qt) + ("openssl" ,openssl) ("qtsvg" ,qtsvg) ("qttools" ,qttools) ("qtx11extras" ,qtx11extras))) @@ -3507,7 +3507,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.") (build-system cmake-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) - ("perl", perl))) + ("perl" ,perl))) (inputs `(("giflib" ,giflib) ("gperf" ,gperf) @@ -3521,14 +3521,14 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.") ("knotifications" ,knotifications) ("kparts" ,kparts) ("ktextwidgets" ,ktextwidgets) - ("kwallet", kwallet) + ("kwallet" ,kwallet) ("kwidgetsaddons" ,kwidgetsaddons) ("kwindowsystem" ,kwindowsystem) ("kxmlgui" ,kxmlgui) - ("libjpeg", libjpeg) - ("libpng", libpng) - ("openssl", openssl) - ("phonon", phonon) + ("libjpeg" ,libjpeg) + ("libpng" ,libpng) + ("openssl" ,openssl) + ("phonon" ,phonon) ("qtbase" ,qtbase) ("qtx11extras" ,qtx11extras) ("sonnet" ,sonnet))) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index df6d7468ac..a268c4db0d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1778,9 +1778,9 @@ file system is as easy as logging into the server with an SSH client.") (base32 "0v4si1ri6lhnq9q87gkx7fsh6lv6xz4bynknwndqncpvfp5cy1jg")))) (build-system gnu-build-system) - (inputs `(("fuse", fuse) - ("libarchive", libarchive))) - (native-inputs `(("pkg-config", pkg-config))) + (inputs `(("fuse" ,fuse) + ("libarchive" ,libarchive))) + (native-inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.cybernoia.de/software/archivemount") (synopsis "Tool for mounting archive files with FUSE") (description "archivemount is a FUSE-based file system for Unix variants, @@ -2034,7 +2034,7 @@ from the module-init-tools project.") ("docbook-xml" ,docbook-xml-4.2) ("docbook-xsl" ,docbook-xsl) ("libxml2" ,libxml2) ;for $XML_CATALOG_FILES - ("xsltproc", libxslt))) + ("xsltproc" ,libxslt))) (inputs ;; When linked against libblkid, eudev can populate /dev/disk/by-label ;; and similar; it also installs the '60-persistent-storage.rules' file, @@ -3707,7 +3707,7 @@ are exceeded.") (inputs `(("acl" ,acl) ("libuuid" ,util-linux) - ("lzo", lzo) + ("lzo" ,lzo) ("zlib" ,zlib))) (build-system gnu-build-system) (arguments @@ -4137,13 +4137,13 @@ used by nftables.") (base32 "1i1gfy8l7qyhc5vlrpp63s0n5kybmc9pi4dywiq8rmkhrrnddsla")))) (build-system gnu-build-system) - (inputs `(("bison", bison) - ("flex", flex) - ("gmp", gmp) - ("libmnl", libmnl) - ("libnftnl", libnftnl) - ("readline", readline))) - (native-inputs `(("pkg-config", pkg-config))) + (inputs `(("bison" ,bison) + ("flex" ,flex) + ("gmp" ,gmp) + ("libmnl" ,libmnl) + ("libnftnl" ,libnftnl) + ("readline" ,readline))) + (native-inputs `(("pkg-config" ,pkg-config))) (home-page "http://www.nftables.org") (synopsis "Userspace utility for Linux packet filtering") (description "nftables is the project that aims to replace the existing diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 0d4bf12817..69180abeac 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -354,12 +354,12 @@ secure session between the peers.") (inputs `(("gobject-introspection" ,gobject-introspection) ("glib" ,glib) - ("pango", pango) - ("gtk", gtk+-2) + ("pango" ,pango) + ("gtk" ,gtk+-2) ("lua" ,lua) ("cairo" ,cairo) ("libffi" ,libffi) - ("xorg-server", xorg-server))) + ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config) ("dbus" ,dbus))) ;tests use 'dbus-run-session' @@ -397,7 +397,7 @@ Notable examples are GTK+, GStreamer and Webkit.") (string-append out "/share/lua/" lua-version)) #t)))) #:test-target "test")) - (inputs `(("lua", lua))) + (inputs `(("lua" ,lua))) (synopsis "Pattern-matching library for Lua") (description "LPeg is a pattern-matching library for Lua, based on Parsing Expression @@ -436,7 +436,7 @@ Grammars (PEGs).") #:phases (modify-phases %standard-phases (delete 'configure)))) - (inputs `(("lua", lua))) + (inputs `(("lua" ,lua))) (home-page "https://bitop.luajit.org/index.html") (synopsis "Bitwise operations on numbers for Lua") (description diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 7986671e97..1d52b35929 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1812,7 +1812,7 @@ in Perl.") (patch-shebang "mb2md" (list (string-append perl "/bin"))) (chmod "mb2md" #o555)) #t)))) - (native-inputs `(("gzip", gzip))) + (native-inputs `(("gzip" ,gzip))) (inputs `(("perl" ,perl) ("perl-timedate" ,perl-timedate))) (home-page "http://batleth.sapienti-sat.org/projects/mb2md/") diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 779b7ef5aa..99488fb4c4 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -108,7 +108,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ("gcc" ,(package (inherit gcc) (outputs '("out")) ; all in one so libgcc_s is easily found (inputs - `(("libc",(glibc-for-bootstrap)) + `(("libc" ,(glibc-for-bootstrap)) ("libc:static" ,(glibc-for-bootstrap) "static") ,@(package-inputs gcc))))) ,@(fold alist-delete (%final-inputs) '("libc" "gcc"))))) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index ae489e1586..6ce8b258bb 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -144,9 +144,9 @@ keys, no previous conversation is compromised.") #:configure-flags '("-DBUILD_SHARED_LIBS=on" "-DBUILD_TESTING=1"))) (build-system cmake-build-system) (inputs `( ;; Required for tests: - ("check", check) - ("openssl", openssl))) - (native-inputs `(("pkg-config", pkg-config))) + ("check" ,check) + ("openssl" ,openssl))) + (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://github.com/WhisperSystems/libsignal-protocol-c") (synopsis "Implementation of a ratcheting forward secrecy protocol") (description "libsignal-protocol-c is an implementation of a ratcheting @@ -613,8 +613,8 @@ end-to-end encryption support; XML console.") (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (inputs `(("libgee" ,libgee) - ("libsignal-protocol-c", libsignal-protocol-c) - ("libgcrypt", libgcrypt) + ("libsignal-protocol-c" ,libsignal-protocol-c) + ("libgcrypt" ,libgcrypt) ("libsoup" ,libsoup) ("sqlite" ,sqlite) ("gpgme" ,gpgme) @@ -623,7 +623,7 @@ end-to-end encryption support; XML console.") ("gsettings-desktop-schemas" ,gsettings-desktop-schemas))) (native-inputs `(("pkg-config" ,pkg-config) - ("libsignal-protocol-c-source", (package-source libsignal-protocol-c)) + ("libsignal-protocol-c-source" ,(package-source libsignal-protocol-c)) ("glib" ,glib "bin") ("vala" ,vala) ("gettext" ,gettext-minimal))) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 4bd58d9733..c7c4913bf0 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -399,7 +399,7 @@ many input formats and provides a customisable Vi-style user interface.") "Clarinet in Bb.denemo")) #t))))) (native-inputs - `(("glib:bin", glib "bin") ; for gtester + `(("glib:bin" ,glib "bin") ; for gtester ("pkg-config" ,pkg-config))) (inputs `(("alsa-lib" ,alsa-lib) @@ -417,7 +417,7 @@ many input formats and provides a customisable Vi-style user interface.") ("libsndfile" ,libsndfile) ("libtool" ,libtool) ("libxml2" ,libxml2) - ("lilypond", lilypond) + ("lilypond" ,lilypond) ("portaudio" ,portaudio) ("portmidi" ,portmidi) ("rubberband" ,rubberband))) @@ -2518,7 +2518,7 @@ websites such as Libre.fm.") (build-system python-build-system) (propagated-inputs `(("python-requests" ,python-requests) - ("eyed3", eyed3) + ("eyed3" ,eyed3) ("python-beautifulsoup4" ,python-beautifulsoup4) ("youtube-dl" ,youtube-dl))) (arguments diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 395e75afa6..999f0578d7 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1225,11 +1225,11 @@ gone wild and are suddenly taking up your bandwidth.") (assoc-ref %build-inputs "ncurses") "/lib") (string-append "--with-tlslib=GnuTLS")))) (build-system gnu-build-system) - (inputs `(("gnutls", gnutls) - ("libxml2", libxml2) - ("ncurses", ncurses) - ("zlib", zlib))) - (native-inputs `(("pkg-config", pkg-config))) + (inputs `(("gnutls" ,gnutls) + ("libxml2" ,libxml2) + ("ncurses" ,ncurses) + ("zlib" ,zlib))) + (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://github.com/nzbget/nzbget") (synopsis "Usenet binary file downloader") (description @@ -1455,11 +1455,11 @@ does not use SSH and requires a pre-shared symmetric key.") (patches (search-patches "quagga-reproducible-build.patch")))) (build-system gnu-build-system) - (native-inputs `(("pkg-config",pkg-config) - ("perl",perl) - ("dejagnu",dejagnu))) - (inputs `(("readline",readline) - ("c-ares",c-ares))) + (native-inputs `(("pkg-config" ,pkg-config) + ("perl" ,perl) + ("dejagnu" ,dejagnu))) + (inputs `(("readline" ,readline) + ("c-ares" ,c-ares))) (synopsis "Routing Software Suite") (description "Quagga is a routing software suite, providing implementations of OSPFv2, OSPFv3, RIP v1 and v2, RIPng and BGP-4 for Unix platforms. diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 24f402128c..9346012390 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3755,7 +3755,7 @@ sensitive completion, colors, and more.") (delete 'configure)))) (inputs `(("topkg" ,ocaml-topkg) - ("opam", opam))) + ("opam" ,opam))) (synopsis "Various signed and unsigned integer types for OCaml") (description "The ocaml-integers library provides a number of 8-, 16-, 32- and 64-bit signed and unsigned integer types, together with aliases such as @@ -3789,7 +3789,7 @@ long and size_t whose sizes depend on the host platform.") ("integers" ,ocaml-integers) ("lwt" ,ocaml-lwt) ("topkg" ,ocaml-topkg) - ("opam", opam))) + ("opam" ,opam))) (synopsis "Library for binding to C libraries using pure OCaml") (description "Ctypes is a library for binding to C libraries using pure OCaml. The primary aim is to make writing C extensions as straightforward as @@ -3822,7 +3822,7 @@ without writing or generating any C!") (delete 'configure)))) (inputs `(("topkg" ,ocaml-topkg) - ("opam", opam))) + ("opam" ,opam))) (native-inputs `(("astring" ,ocaml-astring))) (synopsis "OCamlbuild plugin for C stubs") diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index e6a656c7b9..0bc4697229 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -5759,7 +5759,7 @@ most specific one) is instantiated.") ("perl-file-configdir" ,perl-file-configdir) ("perl-file-find-rule" ,perl-file-find-rule) ("perl-hash-merge" ,perl-hash-merge) - ("perl-moo", perl-moo) + ("perl-moo" ,perl-moo) ("perl-moox-file-configdir" ,perl-moox-file-configdir) ("perl-namespace-clean" ,perl-namespace-clean))) (home-page "http://search.cpan.org/dist/MooX-ConfigFromFile/") diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 3b907cafcf..7974c005c2 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -823,7 +823,7 @@ internationalized messages within program source text.") '(#:tests? #f)) ; FIXME: Tests can't find zope.event. (propagated-inputs `(("python-zope-event" ,python-zope-event) - ("python-zope-exceptions", python-zope-exceptions) + ("python-zope-exceptions" ,python-zope-exceptions) ("python-zope-interface" ,python-zope-interface))) (native-inputs `(("python-zope-testing" ,python-zope-testing) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index aef63f334b..05d3390604 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11975,7 +11975,7 @@ library.") "08if5yax1xn5yfp8p3765ccjmfcv9di7i4m5jckgnwvdsgznwkbj")))) (build-system python-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("python-cython", python-cython))) + ("python-cython" ,python-cython))) (home-page "https://github.com/aresch/rencode") (synopsis "Serialization of heterogeneous data structures") (description @@ -12158,7 +12158,7 @@ created by running @code{python setup.py develop}).") (build-system python-build-system) (propagated-inputs `(("python-tqdm" ,python-tqdm) - ("python-pkginfo", python-pkginfo) + ("python-pkginfo" ,python-pkginfo) ("python-requests" ,python-requests) ("python-requests-toolbelt" ,python-requests-toolbelt))) (home-page "https://github.com/pypa/twine") @@ -12568,7 +12568,7 @@ is the new Pyro version that is actively developed.") `(("netcdf" ,netcdf))) (propagated-inputs `(("python-numpy" ,python2-numpy-1.8) - ("python-pyro", python2-pyro))) + ("python-pyro" ,python2-pyro))) (arguments ;; ScientificPython is not compatible with Python 3 `(#:python ,python-2 @@ -12915,7 +12915,7 @@ and other tools.") #t))))) (propagated-inputs `(("python-pygments" ,python-pygments) - ("python-requests", python-requests) + ("python-requests" ,python-requests) ("python-babel" ,python-babel) ; optional, for internationalization ("python-curtsies" ,python-curtsies) ; >= 0.1.18 ("python-greenlet" ,python-greenlet) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index a8c2729ee8..d6082bd7a4 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1937,7 +1937,7 @@ different kinds of sliders, and much more.") ("libwebp" ,libwebp) ("sqlite" ,sqlite) ("fontconfig" ,fontconfig) - ("libxrender", libxrender) + ("libxrender" ,libxrender) ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) ("qtmultimedia" ,qtmultimedia) diff --git a/gnu/packages/ratpoison.scm b/gnu/packages/ratpoison.scm index d630c24fd4..19321872c5 100644 --- a/gnu/packages/ratpoison.scm +++ b/gnu/packages/ratpoison.scm @@ -79,7 +79,7 @@ ("readline" ,readline) ("xextproto" ,xextproto))) (native-inputs - `(("perl",perl) + `(("perl" ,perl) ("pkg-config" ,pkg-config) ("ratpoison.desktop" ,ratpoison.desktop))) (home-page "https://www.nongnu.org/ratpoison/") diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 222fd5b6f1..30d18aa1c3 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -122,9 +122,9 @@ joystick, and graphics hardware.") ("fcitx" ,fcitx) ; helps with CJK input ("glib" ,glib) ("ibus" ,ibus) - ("libxkbcommon", libxkbcommon) - ("wayland", wayland) - ("wayland-protocols", wayland-protocols)) + ("libxkbcommon" ,libxkbcommon) + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols)) (package-inputs sdl))) (license bsd-3))) diff --git a/gnu/packages/sml.scm b/gnu/packages/sml.scm index b9bd7a7e82..1d7fd3fb51 100644 --- a/gnu/packages/sml.scm +++ b/gnu/packages/sml.scm @@ -42,7 +42,7 @@ (build-system gnu-build-system) (inputs `(("gmp" ,gmp) - ("lesstif",lesstif) + ("lesstif" ,lesstif) ("libffi" ,libffi) ("libx11" ,libx11) ("libxt" ,libxt))) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index eeae8bea41..6540a9feaf 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -128,9 +128,9 @@ configurable through a graphical wizard.") (string-append "DESTDIR=" (assoc-ref %outputs "out"))))) (inputs - `(("vte", vte-ng) - ("gtk+", gtk+) - ("ncurses", ncurses))) + `(("vte" ,vte-ng) + ("gtk+" ,gtk+) + ("ncurses" ,ncurses))) (native-inputs `(("pkg-config" ,pkg-config))) @@ -292,10 +292,10 @@ multi-seat support, a replacement for @command{mingetty}, and more.") #:phases (modify-phases %standard-phases (delete 'configure)) #:test-target "test")) - (inputs `(("ncurses", ncurses))) - (native-inputs `(("libtool", libtool) + (inputs `(("ncurses" ,ncurses))) + (native-inputs `(("libtool" ,libtool) ("perl-test-harness" ,perl-test-harness) - ("pkg-config", pkg-config))) + ("pkg-config" ,pkg-config))) (synopsis "Keyboard entry processing library for terminal-based programs") (description "Libtermkey handles all the necessary logic to recognise special keys, UTF-8 @@ -692,7 +692,7 @@ terminal or piped input.") (delete-file "tests/test_input_output.py") #t))))) (propagated-inputs - `(("python-wcwidth", python-wcwidth))) + `(("python-wcwidth" ,python-wcwidth))) (native-inputs `(("python-pytest-runner" ,python-pytest-runner) ("python-pytest" ,python-pytest))) @@ -762,7 +762,7 @@ than a terminal.") (invoke "nosetests" "-v")))))) (propagated-inputs `(("python-blessings" ,python-blessings) - ("python-wcwidth", python-wcwidth))) + ("python-wcwidth" ,python-wcwidth))) (native-inputs `(("python-mock" ,python-mock) ("python-pyte" ,python-pyte) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index f1ccab9af9..cbf077cea3 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -81,10 +81,10 @@ (list (search-path-specification (variable "VIS_PATH") (files '("share/vis"))))) - (inputs `(("lua", lua) - ("ncurses", ncurses) - ("libtermkey", libtermkey) - ("lua-lpeg", lua-lpeg) + (inputs `(("lua" ,lua) + ("ncurses" ,ncurses) + ("libtermkey" ,libtermkey) + ("lua-lpeg" ,lua-lpeg) ("tre" ,tre))) (synopsis "Vim-like text editor") (description diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 0979b4f4e7..39354f93ed 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1062,7 +1062,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") ("waf" ,python-waf) ("wayland" ,wayland) ("wayland-protocols" ,wayland-protocols) - ("libxkbcommon", libxkbcommon) + ("libxkbcommon" ,libxkbcommon) ("youtube-dl" ,youtube-dl) ("zlib" ,zlib))) (arguments @@ -2461,7 +2461,7 @@ MPEG-2, MPEG-4, DVD (VOB)... ("libtool" ,libtool) ("pkg-config" ,pkg-config) ("zlib" ,zlib) - ("libmediainfo", libmediainfo) + ("libmediainfo" ,libmediainfo) ("libzen" ,libzen))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 24f7333cd8..55a92eca0d 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -747,7 +747,7 @@ Machine Protocol.") ("sdl2" ,sdl2) ("sdl2-ttf" ,sdl2-ttf) ("spice-protocol" ,spice-protocol))) - (native-inputs `(("pkg-config", pkg-config))) + (native-inputs `(("pkg-config" ,pkg-config))) (arguments `(#:tests? #f ;; No tests are available. #:phases (modify-phases %standard-phases diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index dc73ce3cad..4d981416d0 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -103,7 +103,7 @@ and for the GLSL.std.450 extended instruction set. (assoc-ref %build-inputs "spirv-headers"))))) (inputs `(("spirv-headers" ,spirv-headers))) - (native-inputs `(("pkg-config", pkg-config) + (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python))) (home-page "https://github.com/KhronosGroup/SPIRV-Tools") (synopsis "API and commands for processing SPIR-V modules") @@ -190,7 +190,7 @@ interpretation of the specifications for these languages.") ("mesa" ,mesa) ("spirv-tools" ,spirv-tools) ("wayland" ,wayland))) - (native-inputs `(("pkg-config", pkg-config) + (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python))) (home-page "https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers") diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index ceb7d9b7c7..394fa7b71c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -960,9 +960,9 @@ of people.") ; named 'stubout'". The tests can be run by replacing the check phase with ; the command "python setup.py nosetests --verbosity=3". (native-inputs `(; Required for tests: - ("python-mox3", python-mox3) - ("python-nose", python-nose))) - (propagated-inputs `(("python-numpy", python-numpy))) + ("python-mox3" ,python-mox3) + ("python-nose" ,python-nose))) + (propagated-inputs `(("python-numpy" ,python-numpy))) (home-page "https://github.com/novnc/websockify") (synopsis "WebSockets support for any application/server") (description "Websockify translates WebSockets traffic to normal socket @@ -989,7 +989,7 @@ directions.") #:tests? #f)) ; no test target (native-inputs `(("flex" ,flex))) (inputs `(("gnutls" ,gnutls) - ("libcrypt", libgcrypt))) + ("libcrypt" ,libgcrypt))) (home-page "https://www.gedanken.org.uk/software/wwwoffle/") (synopsis "Caching web proxy optimized for intermittent internet links") (description "WWWOFFLE is a proxy web server that is especially good for diff --git a/gnu/packages/wget.scm b/gnu/packages/wget.scm index c6a319965a..585b8a0342 100644 --- a/gnu/packages/wget.scm +++ b/gnu/packages/wget.scm @@ -152,21 +152,21 @@ online pastebin services.") (zero? (system* "sh" "./bootstrap" "--gnulib-srcdir=gnulib" "--no-git"))))))) - (inputs `(("autoconf", autoconf) - ("automake", automake) - ("doxygen", doxygen) - ("flex", flex) - ("gettext", gettext-minimal) - ("gnutls", gnutls/dane) - ("libiconv", libiconv) - ("libidn2", libidn2) - ("libmicrohttpd", libmicrohttpd) - ("libpsl", libpsl) - ("libtool", libtool) - ("pcre2", pcre2) - ("python", python))) + (inputs `(("autoconf" ,autoconf) + ("automake" ,automake) + ("doxygen" ,doxygen) + ("flex" ,flex) + ("gettext" ,gettext-minimal) + ("gnutls" ,gnutls/dane) + ("libiconv" ,libiconv) + ("libidn2" ,libidn2) + ("libmicrohttpd" ,libmicrohttpd) + ("libpsl" ,libpsl) + ("libtool" ,libtool) + ("pcre2" ,pcre2) + ("python" ,python))) ;; TODO: Add libbrotlidec, libnghttp2. - (native-inputs `(("pkg-config", pkg-config))) + (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://gitlab.com/gnuwget/wget2") (synopsis "Successor of GNU Wget") (description "GNU Wget2 is the successor of GNU Wget, a file and recursive diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 37d36cf922..8496eb3365 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -278,8 +278,8 @@ integrate Windows applications into your desktop.") (base32 "14wf7536rkmhav9ibbvhqqkfqmbk1dckhd2679i5scizr5x290x4")))) (inputs `(("autoconf" ,autoconf) ; for autoreconf - ("gtk+", gtk+) - ("libva", libva) + ("gtk+" ,gtk+) + ("libva" ,libva) ("python" ,python) ("sdl2" ,sdl2) ("util-linux" ,util-linux) ; for hexdump diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index b38b3caa25..9bd3492413 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -710,7 +710,7 @@ experience.") ("libxdg-basedir" ,libxdg-basedir) ("libxkbcommon" ,libxkbcommon) ("lua" ,lua) - ("lua-lgi",lua-lgi) + ("lua-lgi" ,lua-lgi) ("pango" ,pango) ("startup-notification" ,startup-notification) ("xcb-util" ,xcb-util) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 07a9b390fa..4e7f2c207f 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1332,9 +1332,9 @@ XCB util-xrm module provides the following libraries: (install-file "README" doc) ;; Avoid unspecified return value. #t)))))) - (inputs `(("libx11", libx11) - ("libxext", libxext) - ("libxxf86vm", libxxf86vm))) + (inputs `(("libx11" ,libx11) + ("libxext" ,libxext) + ("libxxf86vm" ,libxxf86vm))) (synopsis "Tiny monitor calibration loader for XFree86 (or X.org)") (description "xcalib is a tiny tool to load the content of vcgt-Tags in ICC profiles to the video card's gamma ramp. It does work with most video card diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 729fa56a30..6c1d2a7796 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1415,7 +1415,7 @@ characters into a single event.") (propagated-inputs `(("perl-libxml" ,perl-libxml) ("perl-xml-filter-buffertext" ,perl-xml-filter-buffertext) - ("perl-xml-namespacesupport", perl-xml-namespacesupport) + ("perl-xml-namespacesupport" ,perl-xml-namespacesupport) ("perl-xml-sax-base" ,perl-xml-sax-base))) (home-page "http://search.cpan.org/dist/XML-SAX-Writer/") (synopsis "SAX2 XML Writer") @@ -1472,7 +1472,7 @@ It provides a flexible escaping technique and pretty printing.") ("perl-xml-sax-writer" ,perl-xml-sax-writer) ("perl-xml-simple" ,perl-xml-simple) ("perl-xml-xpathengine" ,perl-xml-xpathengine) - ("perl-test-pod", perl-test-pod) + ("perl-test-pod" ,perl-test-pod) ("perl-tree-xpathengine" ,perl-tree-xpathengine))) (home-page "http://search.cpan.org/dist/XML-Twig/") (synopsis "Perl module for processing huge XML documents in tree mode") diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 46a9a3b85f..1e4835b5c0 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5983,7 +5983,7 @@ basic eye-candy effects.") ("python2-rencode" ,python2-rencode) ("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config) - ("python2-cython", python2-cython))) + ("python2-cython" ,python2-cython))) (arguments `(#:python ,python-2 ;; no full Python 3 support yet #:configure-flags '("--with-tests" -- cgit v1.2.3