gnu: Simplify package inputs.

This commit was obtained by running:

  ./pre-inst-env guix style

without any additional argument.

1 files changed, 809 insertions, 861 deletions

diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index b63f72f071..a2edb13ea6 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -58,30 +58,28 @@
                  "akonadi-not-relocatable.patch"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)
-       ("shared-mime-info" ,shared-mime-info)))
+     (list extra-cmake-modules qttools shared-mime-info))
     (inputs
-     `(("boost" ,boost)
-       ("kconfig" ,kconfig)
-       ("kconfigwidgets" ,kconfigwidgets)
-       ("kcoreaddons" ,kcoreaddons)
-       ("kcrash" ,kcrash)
-       ("ki18n" ,ki18n)
-       ("kiconthemes" ,kiconthemes)
-       ("kio" ,kio)
-       ("kitemmodels" ,kitemmodels)
-       ("kitemviews" ,kitemviews)
-       ("kwidgetsaddons" ,kwidgetsaddons)
-       ("kwindowsystem" ,kwindowsystem)
-       ("kxmlgui" ,kxmlgui)
-       ("libxml2" ,libxml2)
-       ("libxslt" ,libxslt)
-       ;; Do NOT add mysql or postgresql to the inputs. Otherwise the binaries
-       ;; and wrapped files will refer to them, even if the user choices none
-       ;; of these.  Executables are searched on $PATH then.
-       ("qtbase" ,qtbase-5)
-       ("sqlite" ,sqlite)))
+     (list boost
+           kconfig
+           kconfigwidgets
+           kcoreaddons
+           kcrash
+           ki18n
+           kiconthemes
+           kio
+           kitemmodels
+           kitemviews
+           kwidgetsaddons
+           kwindowsystem
+           kxmlgui
+           libxml2
+           libxslt
+           ;; Do NOT add mysql or postgresql to the inputs. Otherwise the binaries
+           ;; and wrapped files will refer to them, even if the user choices none
+           ;; of these.  Executables are searched on $PATH then.
+           qtbase-5
+           sqlite))
     (arguments
      `(#:tests? #f ;; TODO 135/167 tests fail
        #:configure-flags '("-DDATABASE_BACKEND=SQLITE") ; lightweight
@@ -131,28 +129,28 @@ programs.")
         (base32 "1mq76qyd3jcngb2yfanpn7qvklzllza399fxwii0mqppp1vmnb2b"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)))
+     (list extra-cmake-modules))
     (inputs
-     `(("akonadi" ,akonadi)
-       ("akonadi-contacts" ,akonadi-contacts)
-       ("akonadi-mime" ,akonadi-mime)
-       ("boost" ,boost)
-       ("kcalendarcore" ,kcalendarcore)
-       ("kcalutils" ,kcalutils)
-       ("kcodecs" ,kcodecs)
-       ("kcontacts" ,kcontacts)
-       ("ki18n" ,ki18n)
-       ("kiconthemes" ,kiconthemes)
-       ("kidentitymanagement" ,kidentitymanagement)
-       ("kio" ,kio)
-       ("kitemmodels" ,kitemmodels)
-       ("kmailtransport" ,kmailtransport)
-       ("kmime" ,kmime)
-       ("kpimtextedit" ,kpimtextedit)
-       ("ksmtp" ,ksmtp)
-       ("ktextwidgets" ,ktextwidgets)
-       ("kwallet" ,kwallet)
-       ("qtbase" ,qtbase-5)))
+     (list akonadi
+           akonadi-contacts
+           akonadi-mime
+           boost
+           kcalendarcore
+           kcalutils
+           kcodecs
+           kcontacts
+           ki18n
+           kiconthemes
+           kidentitymanagement
+           kio
+           kitemmodels
+           kmailtransport
+           kmime
+           kpimtextedit
+           ksmtp
+           ktextwidgets
+           kwallet
+           qtbase-5))
     (arguments
      `(#:tests? #f))  ;; TODO: 1/1 test fails
     (home-page "https://api.kde.org/kdepim/akonadi/html/index.html")
@@ -174,32 +172,32 @@ collection and item views.")
         (base32 "0igggarnl99s5pl73dgrpha4lf7vnr000iy69vcwmqs5lxb7cyli"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)))
+     (list extra-cmake-modules))
     (inputs
-     `(("akonadi" ,akonadi)
-       ("boost" ,boost)
-       ("kauth" ,kauth)
-       ("kcodecs" ,kcodecs)
-       ("kcompletion" ,kcompletion)
-       ("kconfigwidgets" ,kconfigwidgets)
-       ("kcontacts" ,kcontacts)
-       ("kcoreaddons" ,kcoreaddons)
-       ("kdbusaddons" ,kdbusaddons)
-       ("ki18n" ,ki18n)
-       ("kiconthemes" ,kiconthemes)
-       ("kitemmodels" ,kitemmodels)
-       ("kitemviews" ,kitemviews)
-       ("kjobwidgets" ,kjobwidgets)
-       ("kmime" ,kmime)
-       ("kservice" ,kservice)
-       ("ktextwidgets" ,ktextwidgets)
-       ("kwidgetsaddons" ,kwidgetsaddons)
-       ("kxmlgui" ,kxmlgui)
-       ("prison" ,prison)
-       ("kio" ,kio)
-       ("qtbase" ,qtbase-5)
-       ("solid" ,solid)
-       ("sonnet" ,sonnet)))
+     (list akonadi
+           boost
+           kauth
+           kcodecs
+           kcompletion
+           kconfigwidgets
+           kcontacts
+           kcoreaddons
+           kdbusaddons
+           ki18n
+           kiconthemes
+           kitemmodels
+           kitemviews
+           kjobwidgets
+           kmime
+           kservice
+           ktextwidgets
+           kwidgetsaddons
+           kxmlgui
+           prison
+           kio
+           qtbase-5
+           solid
+           sonnet))
     (home-page "https://api.kde.org/kdepim/akonadi/html/index.html")
     (synopsis "Akonadi contacts access library")
     (description "Akonadi Contacts is a library that effectively bridges the
@@ -225,23 +223,22 @@ to list and filter contacts.")
         (base32 "1wd776ia3z22a79biq04y4m83n8xpvfmyg8bcsslr7lmc3avdg8w"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("libxslt" ,libxslt) ;; xslt for generating interface descriptions
-       ("shared-mime-info" ,shared-mime-info)))
+     (list extra-cmake-modules libxslt ;; xslt for generating interface descriptions
+           shared-mime-info))
     (inputs
-     `(("akonadi" ,akonadi)
-       ("boost" ,boost)
-       ("kcodecs" ,kcodecs)
-       ("kconfig" ,kconfig)
-       ("kconfigwidgets" ,kconfigwidgets)
-       ("kdbusaddons" ,kdbusaddons)
-       ("ki18n" ,ki18n)
-       ("kio" ,kio)
-       ("kitemmodels" ,kitemmodels)
-       ("kmime" ,kmime)
-       ("kwidgetsaddons" ,kwidgetsaddons)
-       ("kxmlgui" ,kxmlgui)
-       ("qtbase" ,qtbase-5)))
+     (list akonadi
+           boost
+           kcodecs
+           kconfig
+           kconfigwidgets
+           kdbusaddons
+           ki18n
+           kio
+           kitemmodels
+           kmime
+           kwidgetsaddons
+           kxmlgui
+           qtbase-5))
     (home-page "https://api.kde.org/kdepim/akonadi/html/index.html")
     (arguments
      `(#:phases
@@ -278,13 +275,9 @@ with emails through Akonadi easier.")
         (base32 "04y293kjrmjjcbb7fkjl7hl4vrks4cjjxnvc6ibzyv81rn6cdhh2"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)))
+     (list extra-cmake-modules))
     (inputs
-     `(("akonadi" ,akonadi)
-       ("kcodecs" ,kcodecs)
-       ("ki18n" ,ki18n)
-       ("kmime" ,kmime)
-       ("qtbase" ,qtbase-5)))
+     (list akonadi kcodecs ki18n kmime qtbase-5))
     (home-page "https://api.kde.org/kdepim/akonadi/html/index.html")
     (synopsis "Akonadi notes access library")
     (description "Akonadi Notes is a library that effectively bridges the
@@ -307,27 +300,26 @@ wrapping notes into KMime::Message objects.")
         (base32 "1h5p44y244gzf7ndzw7afrvq9c76ybp8ddvg82p3lzjh02rrvd50"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)
-
-       ;; For tests.
-       ("dbus" ,dbus)))
+     (list extra-cmake-modules
+           ;; For tests.
+           dbus))
     (inputs
-     `(("akonadi" ,akonadi)
-       ("akonadi-mime" ,akonadi-mime)
-       ("boost" ,boost)
-       ("kcalendarcore" ,kcalendarcore)
-       ("kcmutils" ,kcmutils)
-       ("kcontacts" ,kcontacts)
-       ("kcrash" ,kcrash)
-       ("kdbusaddons" ,kdbusaddons)
-       ("ki18n" ,ki18n)
-       ("kio" ,kio)
-       ("kitemmodels" ,kitemmodels)
-       ("kmime" ,kmime)
-       ("krunner" ,krunner)
-       ("kwindowsystem" ,kwindowsystem)
-       ("qtbase" ,qtbase-5)
-       ("xapian" ,xapian)))
+     (list akonadi
+           akonadi-mime
+           boost
+           kcalendarcore
+           kcmutils
+           kcontacts
+           kcrash
+           kdbusaddons
+           ki18n
+           kio
+           kitemmodels
+           kmime
+           krunner
+           kwindowsystem
+           qtbase-5
+           xapian))
     (arguments
      `(#:phases (modify-phases %standard-phases
                   (add-after 'unpack 'disable-failing-test
@@ -364,7 +356,7 @@ Akonadi PIM data server.  It uses Xapian for indexing and querying.")
     (properties `((upstream-name . "incidenceeditor")))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)))
+     (list extra-cmake-modules))
     (inputs
      `(("akonadi" ,akonadi)
        ("akonadi-calendar" ,akonadi-calendar)
@@ -412,42 +404,42 @@ Akonadi PIM data server.  It uses Xapian for indexing and querying.")
         (base32 "1vpdhdj87ai2sxjn2jk3mh6bzfr1n3yzydnkgv7nc8v1m2fdawap"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)))
+     (list extra-cmake-modules))
     (inputs
-     `(("akonadi" ,akonadi)
-       ("akonadi-contacts" ,akonadi-contacts)
-       ("akonadi-mime" ,akonadi-mime)
-       ("akonadi-search" ,akonadi-search)
-       ("boost" ,boost)
-       ("gpgme" ,gpgme)
-       ("grantlee" ,grantlee)
-       ("grantleetheme" ,grantleetheme)
-       ("kcalendarcore" ,kcalendarcore)
-       ("kcmutils" ,kcmutils)
-       ("kcompletion" ,kcompletion)
-       ("kcontacts" ,kcontacts)
-       ("kcrash" ,kcrash)
-       ("kdbusaddons" ,kdbusaddons)
-       ("kdepim-apps-libs" ,kdepim-apps-libs)
-       ("kdoctools" ,kdoctools)
-       ("ki18n" ,ki18n)
-       ("kiconthemes" ,kiconthemes)
-       ("kimap" ,kimap)
-       ("kio" ,kio)
-       ("kitemmodels" ,kitemmodels)
-       ("kmime" ,kmime)
-       ("kontactinterface" ,kontactinterface)
-       ("kparts" ,kparts)
-       ("kpimcommon" ,kpimcommon)
-       ("kpimtextedit" ,kpimtextedit)
-       ("ktextwidgets" ,ktextwidgets)
-       ("kxmlgui" ,kxmlgui)
-       ("libkdepim" ,libkdepim)
-       ("libkleo" ,libkleo)
-       ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests
-       ("prison" ,prison)
-       ("qgpgme" ,qgpgme)
-       ("qtbase" ,qtbase-5)))
+     (list akonadi
+           akonadi-contacts
+           akonadi-mime
+           akonadi-search
+           boost
+           gpgme
+           grantlee
+           grantleetheme
+           kcalendarcore
+           kcmutils
+           kcompletion
+           kcontacts
+           kcrash
+           kdbusaddons
+           kdepim-apps-libs
+           kdoctools
+           ki18n
+           kiconthemes
+           kimap
+           kio
+           kitemmodels
+           kmime
+           kontactinterface
+           kparts
+           kpimcommon
+           kpimtextedit
+           ktextwidgets
+           kxmlgui
+           libkdepim
+           libkleo
+           oxygen-icons ; default icon set, required for tests
+           prison
+           qgpgme
+           qtbase-5))
     (home-page "https://kontact.kde.org/components/kaddressbook.html")
     (synopsis "Address Book application to manage your contacts")
     (description "KAddressBook stores all the personal details of your family,
@@ -469,26 +461,26 @@ CalDAV server.")
         (base32 "0g0bm4zzzcpl2pqqf609349zagwrgj6a4ibxpgg4zf21aacdq8bi"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)))
+     (list extra-cmake-modules))
     (inputs
-     `(("akonadi" ,akonadi)
-       ("boost" ,boost)
-       ("kcalendarcore" ,kcalendarcore)
-       ("kcalutils" ,kcalutils)
-       ("kcompletion" ,kcompletion)
-       ("kconfig" ,kconfig)
-       ("kconfigwidgets" ,kconfigwidgets)
-       ("kcoreaddons" ,kcoreaddons)
-       ("kdbusaddons" ,kdbusaddons)
-       ("kholidays" ,kholidays)
-       ("ki18n" ,ki18n)
-       ("kidentitymanagement" ,kidentitymanagement)
-       ("kio" ,kio)
-       ("kitemmodels" ,kitemmodels)
-       ("kpimtextedit" ,kpimtextedit)
-       ("ktextwidgets" ,ktextwidgets)
-       ("kxmlgui" ,kxmlgui)
-       ("qtbase" ,qtbase-5)))
+     (list akonadi
+           boost
+           kcalendarcore
+           kcalutils
+           kcompletion
+           kconfig
+           kconfigwidgets
+           kcoreaddons
+           kdbusaddons
+           kholidays
+           ki18n
+           kidentitymanagement
+           kio
+           kitemmodels
+           kpimtextedit
+           ktextwidgets
+           kxmlgui
+           qtbase-5))
     (arguments
      `(#:tests? #f)) ;; TODO: TZ setup
     (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
@@ -510,15 +502,15 @@ calendar data.")
         (base32 "0pi3axs58wsz5vq6vyisz73s24q739zplwrblyvkcm16nll4mvhk"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)))
+     (list extra-cmake-modules))
     (inputs
-     `(("kcalendarcore" ,kcalendarcore)
-       ("kcoreaddons" ,kcoreaddons)
-       ("ki18n" ,ki18n)
-       ("kio" ,kio)
-       ("kxmlrpcclient" ,kxmlrpcclient)
-       ("qtbase" ,qtbase-5)
-       ("syndication" ,syndication)))
+     (list kcalendarcore
+           kcoreaddons
+           ki18n
+           kio
+           kxmlrpcclient
+           qtbase-5
+           syndication))
     ;; Note: Some tests take up to 90 sec.
     (home-page "https://invent.kde.org/pim/kblog")
     (synopsis "Client-side support library for web application remote blogging
@@ -545,31 +537,30 @@ one of the APIs mentioned above.")
     (properties `((upstream-name . "calendarsupport")))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)))
+     (list extra-cmake-modules qttools))
     (inputs
-     `(("akonadi" ,akonadi)
-       ("akonadi-calendar" ,akonadi-calendar)
-       ("akonadi-mime" ,akonadi-mime)
-       ("boost" ,boost)
-       ("kcalendarcore" ,kcalendarcore)
-       ("kcalutils" ,kcalutils)
-       ("kcompletion" ,kcompletion)
-       ("kdbusaddons" ,kdbusaddons)
-       ("kdepim-apps-libs" ,kdepim-apps-libs)
-       ("kguiaddons" ,kguiaddons)
-       ("kholidays" ,kholidays)
-       ("ki18n" ,ki18n)
-       ("kiconthemes" ,kiconthemes)
-       ("kidentitymanagement" ,kidentitymanagement)
-       ("kio" ,kio)
-       ("kitemmodels" ,kitemmodels)
-       ("kmime" ,kmime)
-       ("kpimcommon" ,kpimcommon)
-       ("kpimtextedit" ,kpimtextedit)
-       ("ktextwidgets" ,ktextwidgets)
-       ("kxmlgui" ,kxmlgui)
-       ("qtbase" ,qtbase-5)))
+     (list akonadi
+           akonadi-calendar
+           akonadi-mime
+           boost
+           kcalendarcore
+           kcalutils
+           kcompletion
+           kdbusaddons
+           kdepim-apps-libs
+           kguiaddons
+           kholidays
+           ki18n
+           kiconthemes
+           kidentitymanagement
+           kio
+           kitemmodels
+           kmime
+           kpimcommon
+           kpimtextedit
+           ktextwidgets
+           kxmlgui
+           qtbase-5))
     (home-page "https://api.kde.org/stable/calendarsupport/")
     (synopsis "Calendar Support library for KDE PIM")
     (description "The Calendar Support library provides helper utilities for
@@ -590,23 +581,22 @@ calendaring applications.")
         (base32 "0v268w8vhgqxq1nwv9b9cy4h7zqgjrv19r44g3zc9w5j76ivix86"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("libxml2" ,libxml2))) ;; xmllint required for tests
+     (list extra-cmake-modules libxml2)) ;; xmllint required for tests
     (inputs
-     `(("grantlee" ,grantlee)
-       ("kcalendarcore" ,kcalendarcore)
-       ("kcodecs" ,kcodecs)
-       ("kconfig" ,kconfig)
-       ("kconfigwidgets" ,kconfigwidgets)
-       ("kcoreaddons" ,kcoreaddons)
-       ("ki18n" ,ki18n)
-       ("kiconthemes" ,kiconthemes)
-       ("kidentitymanagement" ,kidentitymanagement)
-       ("kpimtextedit" ,kpimtextedit)
-       ("ktextwidgets" ,ktextwidgets)
-       ("kwidgetsaddons" ,kwidgetsaddons)
-       ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests
-       ("qtbase" ,qtbase-5)))
+     (list grantlee
+           kcalendarcore
+           kcodecs
+           kconfig
+           kconfigwidgets
+           kcoreaddons
+           ki18n
+           kiconthemes
+           kidentitymanagement
+           kpimtextedit
+           ktextwidgets
+           kwidgetsaddons
+           oxygen-icons ; default icon set, required for tests
+           qtbase-5))
     (arguments
      `(#:tests? #f)) ;; TODO: seem to pull in some wrong theme
     (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
@@ -629,13 +619,9 @@ functions for accessing calendar data using the kcalcore API.")
         (base32 "0445gl4xm0h39igkxgb6vmq5iaa04wkgrgbs7nfd0zwngk8xaidn"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)))
+     (list extra-cmake-modules))
     (inputs
-     `(("kcoreaddons" ,kcoreaddons)
-       ("ki18n" ,ki18n)
-       ("kio" ,kio)
-       ("qtbase" ,qtbase-5)
-       ("qtxmlpatterns" ,qtxmlpatterns)))
+     (list kcoreaddons ki18n kio qtbase-5 qtxmlpatterns))
     (home-page "https://invent.kde.org/frameworks/kdav")
     (synopsis "DAV protocol implementation with KJobs")
     (description "This is a DAV protocol implementation with KJobs.  Calendars
@@ -657,30 +643,30 @@ supported using GroupDAV or CardDAV.")
         (base32 "0m9qrfjs97anh9h6ibggx23ddlm1zkxjap2iyf3gf672ip01fvci"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)))
+     (list extra-cmake-modules))
     (inputs
-     `(("akonadi" ,akonadi)
-       ("akonadi-contacts" ,akonadi-contacts)
-       ("boost" ,boost)
-       ("gpgme" ,gpgme)
-       ("grantlee" ,grantlee)
-       ("grantleetheme" ,grantleetheme)
-       ("kconfig" ,kconfig)
-       ("kconfigwidgets" ,kconfigwidgets)
-       ("kcontacts" ,kcontacts)
-       ("kcoreaddons" ,kcoreaddons)
-       ("ki18n" ,ki18n)
-       ("kimap" ,kimap)
-       ("kio" ,kio)
-       ("kitemmodels" ,kitemmodels)
-       ("kmime" ,kmime)
-       ("kpimcommon" ,kpimcommon)
-       ("kservice" ,kservice)
-       ("kwidgetsaddons" ,kwidgetsaddons)
-       ("libkleo" ,libkleo)
-       ("prison" ,prison)
-       ("qgpgme" ,qgpgme)
-       ("qtbase" ,qtbase-5)))
+     (list akonadi
+           akonadi-contacts
+           boost
+           gpgme
+           grantlee
+           grantleetheme
+           kconfig
+           kconfigwidgets
+           kcontacts
+           kcoreaddons
+           ki18n
+           kimap
+           kio
+           kitemmodels
+           kmime
+           kpimcommon
+           kservice
+           kwidgetsaddons
+           libkleo
+           prison
+           qgpgme
+           qtbase-5))
     (home-page "https://invent.kde.org/pim/kdepim-apps-libs")
     (synopsis "KDE PIM mail related libraries and data files")
     (description "This package provides mail related libraries and data files
@@ -701,53 +687,49 @@ for KDE PIM.")
         (base32 "1in4x4wvgclkni72cfkw9jx35d0qd0jmfwybm3ksx5qx5sbki9gg"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("dbus" ,dbus)
-       ("kdoctools" ,kdoctools)
-       ("libxslt" ,libxslt)
-       ("shared-mime-info" ,shared-mime-info)))
+     (list extra-cmake-modules dbus kdoctools libxslt shared-mime-info))
     (inputs
-     `(("akonadi" ,akonadi)
-       ("akonadi-calendar" ,akonadi-calendar)
-       ("akonadi-contacts" ,akonadi-contacts)
-       ("akonadi-mime" ,akonadi-mime)
-       ("akonadi-notes" ,akonadi-notes)
-       ("boost" ,boost)
-       ("cyrus-sasl" ,cyrus-sasl)
-       ("kalarmcal" ,kalarmcal)
-       ("kcalendarcore" ,kcalendarcore)
-       ("kcalutils" ,kcalutils)
-       ("kcodecs" ,kcodecs)
-       ("kconfig" ,kconfig)
-       ("kconfigwidgets" ,kconfigwidgets)
-       ("kcontacts" ,kcontacts)
-       ("kdav" ,kdav)
-       ("kholidays" ,kholidays)
-       ("kidentitymanagement" ,kidentitymanagement)
-       ("kimap" ,kimap)
-       ("kio" ,kio)
-       ("kitemmodels" ,kitemmodels)
-       ("kmailtransport" ,kmailtransport)
-       ("kmbox" ,kmbox)
-       ("kmime" ,kmime)
-       ("knotifications" ,knotifications)
-       ("knotifyconfig" ,knotifyconfig)
-       ("kpimcommon" ,kpimcommon)
-       ("kpimtextedit" ,kpimtextedit)
-       ("kross" ,kross)
-       ("ktextwidgets" ,ktextwidgets)
-       ("kwallet" ,kwallet)
-       ("kwindowsystem" ,kwindowsystem)
-       ("libkgapi" ,libkgapi)
-       ;; TODO: libkolab
-       ("qca" ,qca)
-       ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
-       ("qtnetworkauth" ,qtnetworkauth)
-       ("qtspeech" ,qtspeech)
-       ("qtwebchannel" ,qtwebchannel)
-       ("qtwebengine" ,qtwebengine)
-       ("qtxmlpatterns" ,qtxmlpatterns)))
+     (list akonadi
+           akonadi-calendar
+           akonadi-contacts
+           akonadi-mime
+           akonadi-notes
+           boost
+           cyrus-sasl
+           kalarmcal
+           kcalendarcore
+           kcalutils
+           kcodecs
+           kconfig
+           kconfigwidgets
+           kcontacts
+           kdav
+           kholidays
+           kidentitymanagement
+           kimap
+           kio
+           kitemmodels
+           kmailtransport
+           kmbox
+           kmime
+           knotifications
+           knotifyconfig
+           kpimcommon
+           kpimtextedit
+           kross
+           ktextwidgets
+           kwallet
+           kwindowsystem
+           libkgapi
+           ;; TODO: libkolab
+           qca
+           qtbase-5
+           qtdeclarative
+           qtnetworkauth
+           qtspeech
+           qtwebchannel
+           qtwebengine
+           qtxmlpatterns))
     (arguments
       ;; TODO: 5/45 tests fail for quite different reasons, even with
       ;; "offscreen" and dbus
@@ -787,36 +769,35 @@ package.")
     (properties `((upstream-name . "eventviews")))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)))
+     (list extra-cmake-modules qttools))
     (inputs
-     `(("akonadi" ,akonadi)
-       ("akonadi-calendar" ,akonadi-calendar)
-       ("akonadi-contacts" ,akonadi-contacts)
-       ("boost" ,boost)
-       ("kcalendarcore" ,kcalendarcore)
-       ("kcalendarsupport" ,kcalendarsupport)
-       ("kcalutils" ,kcalutils)
-       ("kcodecs" ,kcodecs)
-       ("kcompletion" ,kcompletion)
-       ("kconfigwidgets" ,kconfigwidgets)
-       ("kcontacts" ,kcontacts)
-       ("kdbusaddons" ,kdbusaddons)
-       ("kdiagram" ,kdiagram)
-       ("kguiaddons" ,kguiaddons)
-       ("kholidays" ,kholidays)
-       ("ki18n" ,ki18n)
-       ("kiconthemes" ,kiconthemes)
-       ("kidentitymanagement" ,kidentitymanagement)
-       ("kio" ,kio)
-       ("kitemmodels" ,kitemmodels)
-       ("kmime" ,kmime)
-       ("kpimtextedit" ,kpimtextedit)
-       ("kservice" ,kservice)
-       ("ktextwidgets" ,ktextwidgets)
-       ("kxmlgui" ,kxmlgui)
-       ("libkdepim" ,libkdepim)
-       ("qtbase" ,qtbase-5)))
+     (list akonadi
+           akonadi-calendar
+           akonadi-contacts
+           boost
+           kcalendarcore
+           kcalendarsupport
+           kcalutils
+           kcodecs
+           kcompletion
+           kconfigwidgets
+           kcontacts
+           kdbusaddons
+           kdiagram
+           kguiaddons
+           kholidays
+           ki18n
+           kiconthemes
+           kidentitymanagement
+           kio
+           kitemmodels
+           kmime
+           kpimtextedit
+           kservice
+           ktextwidgets
+           kxmlgui
+           libkdepim
+           qtbase-5))
     (home-page "https://invent.kde.org/pim/eventviews")
     (synopsis "KDE PIM library for creating events")
     (description "This library provides an event creator for KDE PIM.")
@@ -836,33 +817,32 @@ package.")
         (base32 "03d3gsbara7ga2cyrhafkw11qq9cj804h9vpvxl4wd2a9c90snkh"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("gnupg" ,gnupg)  ;; TODO: Remove after gpgme uses fixed path
-       ("kdoctools" ,kdoctools)))
+     (list extra-cmake-modules gnupg ;; TODO: Remove after gpgme uses fixed path
+           kdoctools))
     (inputs
-     `(("akonadi" ,akonadi)
-       ("akonadi-contacts" ,akonadi-contacts)
-       ("boost" ,boost)
-       ("gpgme" ,gpgme)
-       ("karchive" ,karchive)
-       ("kcodecs" ,kcodecs)
-       ("kcontacts" ,kcontacts)
-       ("kcoreaddons" ,kcoreaddons)
-       ("kcrash" ,kcrash)
-       ("kdbusaddons" ,kdbusaddons)
-       ("ki18n" ,ki18n)
-       ("kiconthemes" ,kiconthemes)
-       ("kio" ,kio)
-       ("kitemmodels" ,kitemmodels)
-       ("kjobwidgets" ,kjobwidgets)
-       ("knotifications" ,knotifications)
-       ("kservice" ,kservice)
-       ("ktextwidgets" ,ktextwidgets)
-       ("kwidgetsaddons" ,kwidgetsaddons)
-       ("kwindowsystem" ,kwindowsystem)
-       ("kxmlgui" ,kxmlgui)
-       ("oxygen-icons" ,oxygen-icons) ;; default icon set
-       ("qtbase" ,qtbase-5)))
+     (list akonadi
+           akonadi-contacts
+           boost
+           gpgme
+           karchive
+           kcodecs
+           kcontacts
+           kcoreaddons
+           kcrash
+           kdbusaddons
+           ki18n
+           kiconthemes
+           kio
+           kitemmodels
+           kjobwidgets
+           knotifications
+           kservice
+           ktextwidgets
+           kwidgetsaddons
+           kwindowsystem
+           kxmlgui
+           oxygen-icons ;; default icon set
+           qtbase-5))
     (home-page "https://kde.org/applications/utilities/org.kde.kgpg")
     (synopsis "Graphical front end for GNU Privacy Guard")
     (description "Kgpg manages cryptographic keys for the GNU Privacy Guard,
@@ -884,19 +864,19 @@ cryptography to the contents of the clipboard.")
         (base32 "0flp9p9hlr1zfgvsy5i1nq55p7bvnhqxkxbif1lyw0cq6iblxhgr"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)))
+     (list extra-cmake-modules))
     (inputs
-     `(("kcodecs" ,kcodecs)
-       ("kcompletion" ,kcompletion)
-       ("kconfig" ,kconfig)
-       ("kcoreaddons" ,kcoreaddons)
-       ("kemoticons" ,kemoticons)
-       ("kiconthemes" ,kiconthemes)
-       ("kio" ,kio)
-       ("kpimtextedit" ,kpimtextedit)
-       ("ktextwidgets" ,ktextwidgets)
-       ("kxmlgui" ,kxmlgui)
-       ("qtbase" ,qtbase-5)))
+     (list kcodecs
+           kcompletion
+           kconfig
+           kcoreaddons
+           kemoticons
+           kiconthemes
+           kio
+           kpimtextedit
+           ktextwidgets
+           kxmlgui
+           qtbase-5))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -923,14 +903,14 @@ cryptography to the contents of the clipboard.")
         (base32 "1x22wfzqp92mn1fy2xl89k9yjfk2vgcva0fd30i9rrqj4aw2rsma"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)))
+     (list extra-cmake-modules))
     (inputs
-     `(("cyrus-sasl" ,cyrus-sasl)
-       ("kcoreaddons" ,kcoreaddons)
-       ("ki18n" ,ki18n)
-       ("kio" ,kio)
-       ("kmime" ,kmime)
-       ("qtbase" ,qtbase-5)))
+     (list cyrus-sasl
+           kcoreaddons
+           ki18n
+           kio
+           kmime
+           qtbase-5))
     (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
     (synopsis "Library for handling IMAP")
     (description "This library provides a job-based API for interacting with
@@ -954,16 +934,11 @@ easier to do so.")
         (base32 "0whlp586ycsx0qf0nr81avwscpq62w5js46z7vayy0dxkhrhfayr"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("kdoctools" ,kdoctools)))
+     (list extra-cmake-modules kdoctools))
     (inputs
-     `(("ki18n" ,ki18n)
-       ("kio" ,kio)
-       ("kwidgetsaddons" ,kwidgetsaddons)
-       ("qtbase" ,qtbase-5)))
+     (list ki18n kio kwidgetsaddons qtbase-5))
     (propagated-inputs
-     `(("cyrus-sasl" ,cyrus-sasl)
-       ("openldap" ,openldap)))
+     (list cyrus-sasl openldap))
     (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
     (synopsis "Library for accessing LDAP")
     (description " This is a library for accessing LDAP with a convenient Qt
@@ -984,34 +959,32 @@ protocol for querying and modifying directory services running over TCP/IP. ")
         (base32 "1m50nzb2m27fkb8z3k34cv4zi2akr0fx8zn7lk5swhg49sgrip6n"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("dbus" ,dbus)
-       ("extra-cmake-modules" ,extra-cmake-modules)
-       ("gnupg" ,gnupg)  ;; TODO: Remove after gpgme uses fixed path
-       ("kdoctools" ,kdoctools)))
+     (list dbus extra-cmake-modules gnupg ;; TODO: Remove after gpgme uses fixed path
+           kdoctools))
     (inputs
-     `(("boost" ,boost)
-       ("gpgme" ,gpgme)
-       ("kcmutils" ,kcmutils)
-       ("kcodecs" ,kcodecs)
-       ("kconfig" ,kconfig)
-       ("kconfigwidgets" ,kconfigwidgets)
-       ("kcoreaddons" ,kcoreaddons)
-       ("kcrash" ,kcrash)
-       ("kdbusaddons" ,kdbusaddons)
-       ("ki18n" ,ki18n)
-       ("kiconthemes" ,kiconthemes)
-       ("kitemmodels" ,kitemmodels)
-       ("kmime" ,kmime)
-       ("knotifications" ,knotifications)
-       ("ktextwidgets" ,ktextwidgets)
-       ("kwidgetsaddons" ,kwidgetsaddons)
-       ("kwindowsystem" ,kwindowsystem)
-       ("kxmlgui" ,kxmlgui)
-       ("libassuan" ,libassuan)
-       ("libkleo" ,libkleo)
-       ("oxygen-icons" ,oxygen-icons) ;; default icon set
-       ("qgpgme" ,qgpgme)
-       ("qtbase" ,qtbase-5)))
+     (list boost
+           gpgme
+           kcmutils
+           kcodecs
+           kconfig
+           kconfigwidgets
+           kcoreaddons
+           kcrash
+           kdbusaddons
+           ki18n
+           kiconthemes
+           kitemmodels
+           kmime
+           knotifications
+           ktextwidgets
+           kwidgetsaddons
+           kwindowsystem
+           kxmlgui
+           libassuan
+           libkleo
+           oxygen-icons ;; default icon set
+           qgpgme
+           qtbase-5))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -1042,67 +1015,65 @@ and retrieving certificates from LDAP servers.")
        (patches (search-patches "kmail-Fix-missing-link-libraries.patch"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("dbus" ,dbus)
-       ("kdoctools" ,kdoctools)))
+     (list extra-cmake-modules dbus kdoctools))
     (inputs
-     `(("akonadi" ,akonadi)
-       ("akonadi-contacts" ,akonadi-contacts)
-       ("akonadi-mime" ,akonadi-mime)
-       ("akonadi-search" ,akonadi-search)
-       ("boost" ,boost)
-       ("gpgme" ,gpgme)
-       ("kbookmarks" ,kbookmarks)
-       ("kcalendarcore" ,kcalendarcore)
-       ("kcalutils" ,kcalutils)
-       ("kcmutils" ,kcmutils)
-       ("kcodecs" ,kcodecs)
-       ("kconfig" ,kconfig)
-       ("kconfigwidgets" ,kconfigwidgets)
-       ("kcontacts" ,kcontacts)
-       ("kcrash" ,kcrash)
-       ("kdbusaddons" ,kdbusaddons)
-       ("kdepim-apps-libs" ,kdepim-apps-libs)
-       ("kguiaddons" ,kguiaddons)
-       ("ki18n" ,ki18n)
-       ("kiconthemes" ,kiconthemes)
-       ("kidentitymanagement" ,kidentitymanagement)
-       ("kimap" ,kimap)
-       ("kio" ,kio)
-       ("kitemmodels" ,kitemmodels)
-       ("kitemviews" ,kitemviews)
-       ("kjobwidgets" ,kjobwidgets)
-       ("kldap" ,kldap)
-       ("kmailcommon" ,kmailcommon)
-       ("kmailtransport" ,kmailtransport)
-       ("kmessagelib" ,kmessagelib)
-       ("kmime" ,kmime)
-       ("kmime" ,kmime)
-       ("knotifications" ,knotifications)
-       ("knotifyconfig" ,knotifyconfig)
-       ("kontactinterface" ,kontactinterface)
-       ("kparts" ,kparts)
-       ("kpimcommon" ,kpimcommon)
-       ("kpimtextedit" ,kpimtextedit)
-       ("kservice" ,kservice)
-       ("ksyntaxhighlighting" ,ksyntaxhighlighting)
-       ("ktextwidgets" ,ktextwidgets)
-       ("ktnef" ,ktnef)
-       ("kwallet" ,kwallet)
-       ("kwidgetsaddons" ,kwidgetsaddons)
-       ("kwindowsystem" ,kwindowsystem)
-       ("kxmlgui" ,kxmlgui)
-       ("libgravatar" ,libgravatar)
-       ("libkdepim" ,libkdepim)
-       ("libkleo" ,libkleo)
-       ("libksieve" ,libksieve)
-       ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests
-       ("qgpgme" ,qgpgme)
-       ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
-       ("qtwebchannel" ,qtwebchannel)
-       ("qtwebengine" ,qtwebengine)
-       ("sonnet" ,sonnet)))
+     (list akonadi
+           akonadi-contacts
+           akonadi-mime
+           akonadi-search
+           boost
+           gpgme
+           kbookmarks
+           kcalendarcore
+           kcalutils
+           kcmutils
+           kcodecs
+           kconfig
+           kconfigwidgets
+           kcontacts
+           kcrash
+           kdbusaddons
+           kdepim-apps-libs
+           kguiaddons
+           ki18n
+           kiconthemes
+           kidentitymanagement
+           kimap
+           kio
+           kitemmodels
+           kitemviews
+           kjobwidgets
+           kldap
+           kmailcommon
+           kmailtransport
+           kmessagelib
+           kmime
+           kmime
+           knotifications
+           knotifyconfig
+           kontactinterface
+           kparts
+           kpimcommon
+           kpimtextedit
+           kservice
+           ksyntaxhighlighting
+           ktextwidgets
+           ktnef
+           kwallet
+           kwidgetsaddons
+           kwindowsystem
+           kxmlgui
+           libgravatar
+           libkdepim
+           libkleo
+           libksieve
+           oxygen-icons ; default icon set, required for tests
+           qgpgme
+           qtbase-5
+           qtdeclarative
+           qtwebchannel
+           qtwebengine
+           sonnet))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -1137,50 +1108,47 @@ manager from KDE.")
     (properties `((upstream-name . "mailcommon")))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("dbus" ,dbus)
-       ("gnupg" ,gnupg)
-       ("qttools" ,qttools)))
+     (list extra-cmake-modules dbus gnupg qttools))
     (inputs
-     `(("akonadi" ,akonadi)
-       ("akonadi-contacts" ,akonadi-contacts)
-       ("akonadi-mime" ,akonadi-mime)
-       ("boost" ,boost)
-       ("gpgme" ,gpgme)
-       ("karchive" ,karchive)
-       ("kcodecs" ,kcodecs)
-       ("kcompletion" ,kcompletion)
-       ("kconfig" ,kconfig)
-       ("kconfigwidgets" ,kconfigwidgets)
-       ("kcontacts" ,kcontacts)
-       ("kdbusaddons" ,kdbusaddons)
-       ("kdesignerplugin" ,kdesignerplugin)
-       ("ki18n" ,ki18n)
-       ("kiconthemes" ,kiconthemes)
-       ("kidentitymanagement" ,kidentitymanagement)
-       ("kimap" ,kimap)
-       ("kio" ,kio)
-       ("kitemmodels" ,kitemmodels)
-       ("kitemviews" ,kitemviews)
-       ("kldap" ,kldap)
-       ("kmailimporter" ,kmailimporter)
-       ("kmailtransport" ,kmailtransport)
-       ("kmessagelib" ,kmessagelib)
-       ("kmime" ,kmime)
-       ("kpimcommon" ,kpimcommon)
-       ("kpimtextedit" ,kpimtextedit)
-       ("ksyntaxhighlighting" ,ksyntaxhighlighting)
-       ("ktextwidgets" ,ktextwidgets)
-       ("kwallet" ,kwallet)
-       ("kwidgetsaddons" ,kwidgetsaddons)
-       ("kwindowsystem" ,kwindowsystem)
-       ("kxmlgui" ,kxmlgui)
-       ("libkdepim" ,libkdepim)
-       ("libkleo" ,libkleo)
-       ("libxslt" ,libxslt)
-       ("phonon" ,phonon)
-       ("qgpgme" ,qgpgme)
-       ("qtbase" ,qtbase-5)))
+     (list akonadi
+           akonadi-contacts
+           akonadi-mime
+           boost
+           gpgme
+           karchive
+           kcodecs
+           kcompletion
+           kconfig
+           kconfigwidgets
+           kcontacts
+           kdbusaddons
+           kdesignerplugin
+           ki18n
+           kiconthemes
+           kidentitymanagement
+           kimap
+           kio
+           kitemmodels
+           kitemviews
+           kldap
+           kmailimporter
+           kmailtransport
+           kmessagelib
+           kmime
+           kpimcommon
+           kpimtextedit
+           ksyntaxhighlighting
+           ktextwidgets
+           kwallet
+           kwidgetsaddons
+           kwindowsystem
+           kxmlgui
+           libkdepim
+           libkleo
+           libxslt
+           phonon
+           qgpgme
+           qtbase-5))
     (arguments
      `(#:tests? #f))  ;; TODO: 4/56 tests fail, even with "offscreen" and dbus
     (home-page "https://invent.kde.org/pim/mailcommon")
@@ -1204,24 +1172,24 @@ dealing with email.")
     (properties `((upstream-name . "mailimporter")))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)))
+     (list extra-cmake-modules))
     (inputs
-     `(("akonadi" ,akonadi)
-       ("akonadi-mime" ,akonadi-mime)
-       ("boost" ,boost)
-       ("karchive" ,karchive)
-       ("kcompletion" ,kcompletion)
-       ("kconfig" ,kconfig)
-       ("kconfigwidgets" ,kconfigwidgets)
-       ("kcoreaddons" ,kcoreaddons)
-       ("kdbusaddons" ,kdbusaddons)
-       ("ki18n" ,ki18n)
-       ("kio" ,kio)
-       ("kitemmodels" ,kitemmodels)
-       ("kmime" ,kmime)
-       ("kxmlgui" ,kxmlgui)
-       ("libkdepim" ,libkdepim)
-       ("qtbase" ,qtbase-5)))
+     (list akonadi
+           akonadi-mime
+           boost
+           karchive
+           kcompletion
+           kconfig
+           kconfigwidgets
+           kcoreaddons
+           kdbusaddons
+           ki18n
+           kio
+           kitemmodels
+           kmime
+           kxmlgui
+           libkdepim
+           qtbase-5))
     (home-page "https://invent.kde.org/pim/mailimporter")
     (synopsis "KDE mail importer library")
     (description "This package provides libraries for importing mails other
@@ -1242,27 +1210,26 @@ e-mail client programs into KMail and KDE PIM.")
         (base32 "1swqlgzxzlqffm119sbhszy9lr93m8lzwygr0q4raa660b6yiavm"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("kdoctools" ,kdoctools)))
+     (list extra-cmake-modules kdoctools))
     (inputs
-     `(("akonadi" ,akonadi)
-       ("akonadi-mime" ,akonadi-mime)
-       ("boost" ,boost)
-       ("cyrus-sasl" ,cyrus-sasl)
-       ("kcalendarcore" ,kcalendarcore)
-       ("kcmutils" ,kcmutils)
-       ("kcontacts" ,kcontacts)
-       ("kdbusaddons" ,kdbusaddons)
-       ("kconfigwidgets" ,kconfigwidgets)
-       ("ki18n" ,ki18n)
-       ("kitemmodels" ,kitemmodels)
-       ("kio" ,kio)
-       ("kmime" ,kmime)
-       ("ksmtp" ,ksmtp)
-       ("ktextwidgets" ,ktextwidgets)
-       ("kwallet" ,kwallet)
-       ("libkgapi" ,libkgapi)
-       ("qtbase" ,qtbase-5)))
+     (list akonadi
+           akonadi-mime
+           boost
+           cyrus-sasl
+           kcalendarcore
+           kcmutils
+           kcontacts
+           kdbusaddons
+           kconfigwidgets
+           ki18n
+           kitemmodels
+           kio
+           kmime
+           ksmtp
+           ktextwidgets
+           kwallet
+           libkgapi
+           qtbase-5))
     (arguments
      `(#:tests? #f)) ;; TODO - 3/3 tests fail, require drkonqi
     (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
@@ -1284,11 +1251,9 @@ mail transport.")
         (base32 "03cny38v4y1lmcrs6d34hbj9assqgf51rqryf5rdzkiaq79c1krc"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)))
+     (list extra-cmake-modules))
     (inputs
-     `(("kcodecs" ,kcodecs)
-       ("kmime" ,kmime)
-       ("qtbase" ,qtbase-5)))
+     (list kcodecs kmime qtbase-5))
     (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
     (synopsis "Library for handling mbox mailboxes")
     (description "This is a library for handling mailboxes in mbox format,
@@ -1309,61 +1274,59 @@ using a Qt/KMime C++ API.")
     (properties `((upstream-name . "messagelib")))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("gnupg" ,gnupg)
-       ("libxml2" ,libxml2)))
+     (list extra-cmake-modules gnupg libxml2))
     (inputs
-     `(("akonadi" ,akonadi)
-       ("akonadi-contacts" ,akonadi-contacts)
-       ("akonadi-mime" ,akonadi-mime)
-       ("akonadi-notes" ,akonadi-notes)
-       ("akonadi-search" ,akonadi-search)
-       ("boost" ,boost)
-       ("gpgme" ,gpgme)
-       ("grantlee" ,grantlee)
-       ("grantleetheme" ,grantleetheme)
-       ("karchive" ,karchive)
-       ("kcalendarcore" ,kcalendarcore)
-       ("kcodecs" ,kcodecs)
-       ("kcompletion" ,kcompletion)
-       ("kconfig" ,kconfig)
-       ("kconfigwidgets" ,kconfigwidgets)
-       ("kcontacts" ,kcontacts)
-       ("kdbusaddons" ,kdbusaddons)
-       ("kdepim-apps-libs" ,kdepim-apps-libs)
-       ("ki18n" ,ki18n)
-       ("kiconthemes" ,kiconthemes)
-       ("kidentitymanagement" ,kidentitymanagement)
-       ("kimap" ,kimap)
-       ("kio" ,kio)
-       ("kitemmodels" ,kitemmodels)
-       ("kitemviews" ,kitemviews)
-       ("kjobwidgets" ,kjobwidgets)
-       ("kldap" ,kldap)
-       ("kmailtransport" ,kmailtransport)
-       ("kmbox" ,kmbox)
-       ("kmime" ,kmime)
-       ("knewstuff" ,knewstuff)
-       ("kpimcommon" ,kpimcommon)
-       ("kpimtextedit" ,kpimtextedit)
-       ("kservice" ,kservice)
-       ("ksyntaxhighlighting" ,ksyntaxhighlighting)
-       ("ktextwidgets" ,ktextwidgets)
-       ("kwallet" ,kwallet)
-       ("kwidgetsaddons" ,kwidgetsaddons)
-       ("kwindowsystem" ,kwindowsystem)
-       ("kxmlgui" ,kxmlgui)
-       ("libgravatar" ,libgravatar)
-       ("libkdepim" ,libkdepim)
-       ("libkleo" ,libkleo)
-       ("qca" ,qca)
-       ("qgpgme" ,qgpgme)
-       ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
-       ("qtwebchannel" ,qtwebchannel)
-       ("qtwebengine" ,qtwebengine)
-       ("qtwebkit" ,qtwebkit)
-       ("sonnet" ,sonnet)))
+     (list akonadi
+           akonadi-contacts
+           akonadi-mime
+           akonadi-notes
+           akonadi-search
+           boost
+           gpgme
+           grantlee
+           grantleetheme
+           karchive
+           kcalendarcore
+           kcodecs
+           kcompletion
+           kconfig
+           kconfigwidgets
+           kcontacts
+           kdbusaddons
+           kdepim-apps-libs
+           ki18n
+           kiconthemes
+           kidentitymanagement
+           kimap
+           kio
+           kitemmodels
+           kitemviews
+           kjobwidgets
+           kldap
+           kmailtransport
+           kmbox
+           kmime
+           knewstuff
+           kpimcommon
+           kpimtextedit
+           kservice
+           ksyntaxhighlighting
+           ktextwidgets
+           kwallet
+           kwidgetsaddons
+           kwindowsystem
+           kxmlgui
+           libgravatar
+           libkdepim
+           libkleo
+           qca
+           qgpgme
+           qtbase-5
+           qtdeclarative
+           qtwebchannel
+           qtwebengine
+           qtwebkit
+           sonnet))
     (arguments
      `(#:tests? #f     ;TODO many test fail for quite different reasons
        #:phases (modify-phases %standard-phases
@@ -1396,11 +1359,9 @@ kwebengineviewer.")
         (base32 "1dkdxfr1ry10qyql5sp1ai4li11f0ncf9hipg27j59y70mlyrl2r"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)))
+     (list extra-cmake-modules))
     (inputs
-     `(("kcodecs" ,kcodecs)
-       ("ki18n" ,ki18n)
-       ("qtbase" ,qtbase-5)))
+     (list kcodecs ki18n qtbase-5))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -1434,51 +1395,50 @@ information in non-ASCII character sets.")
         (base32 "13h4n7fb5p6g1f5kmw6pblpd76j904psm30s3a5d3kykni57dijx"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("libxslt" ,libxslt)))
+     (list extra-cmake-modules libxslt))
     (inputs
-     `(("akonadi" ,akonadi)
-       ("akonadi-contacts" ,akonadi-contacts)
-       ("akonadi-mime" ,akonadi-mime)
-       ("akonadi-notes" ,akonadi-notes)
-       ("akonadi-search" ,akonadi-search)
-       ("boost" ,boost)
-       ("grantlee" ,grantlee)
-       ("grantleetheme" ,grantleetheme)
-       ("kcalendarcore" ,kcalendarcore)
-       ("kcalutils" ,kcalutils)
-       ("kcmutils" ,kcmutils)
-       ("kcompletion" ,kcompletion)
-       ("kconfig" ,kconfig)
-       ("kconfigwidgets" ,kconfigwidgets)
-       ("kcontacts" ,kcontacts)
-       ("kcoreaddons" ,kcoreaddons)
-       ("kcrash" ,kcrash)
-       ("kdnssd" ,kdnssd)
-       ("kdoctools" ,kdoctools)
-       ("kglobalaccel" ,kglobalaccel)
-       ("kiconthemes" ,kiconthemes)
-       ("kimap" ,kimap)
-       ("kitemmodels" ,kitemmodels)
-       ("kitemviews" ,kitemviews)
-       ("kmime" ,kmime)
-       ("kmime" ,kmime)
-       ("knewstuff" ,knewstuff)
-       ("knotifications" ,knotifications)
-       ("knotifyconfig" ,knotifyconfig)
-       ("kontactinterface" ,kontactinterface)
-       ("kparts" ,kparts)
-       ("kpimcommon" ,kpimcommon)
-       ("kpimtextedit" ,kpimtextedit)
-       ("ktextwidgets" ,ktextwidgets)
-       ("kwidgetsaddons" ,kwidgetsaddons)
-       ("kwindowsystem" ,kwindowsystem)
-       ("kxmlgui" ,kxmlgui)
-       ("kxmlgui" ,kxmlgui)
-       ("libkdepim" ,libkdepim)
-       ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests
-       ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)))
+     (list akonadi
+           akonadi-contacts
+           akonadi-mime
+           akonadi-notes
+           akonadi-search
+           boost
+           grantlee
+           grantleetheme
+           kcalendarcore
+           kcalutils
+           kcmutils
+           kcompletion
+           kconfig
+           kconfigwidgets
+           kcontacts
+           kcoreaddons
+           kcrash
+           kdnssd
+           kdoctools
+           kglobalaccel
+           kiconthemes
+           kimap
+           kitemmodels
+           kitemviews
+           kmime
+           kmime
+           knewstuff
+           knotifications
+           knotifyconfig
+           kontactinterface
+           kparts
+           kpimcommon
+           kpimtextedit
+           ktextwidgets
+           kwidgetsaddons
+           kwindowsystem
+           kxmlgui
+           kxmlgui
+           libkdepim
+           oxygen-icons ; default icon set, required for tests
+           qtbase-5
+           qtx11extras))
     (home-page "https://kontact.kde.org/components/knotes.html")
     (synopsis "Note-taking utility")
     (description "KNotes lets you write the computer equivalent of sticky
@@ -1507,15 +1467,15 @@ Features:
         (base32 "0s1qm1wjkvbb1film94r7g88d8vgh26bm0hm6gpyqv5bazw5qx3j"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)))
+     (list extra-cmake-modules))
     (inputs
-     `(("kcoreaddons" ,kcoreaddons)
-       ("ki18n" ,ki18n)
-       ("kiconthemes" ,kiconthemes)
-       ("kparts" ,kparts)
-       ("kwindowsystem" ,kwindowsystem)
-       ("kxmlgui" ,kxmlgui)
-       ("qtbase" ,qtbase-5)))
+     (list kcoreaddons
+           ki18n
+           kiconthemes
+           kparts
+           kwindowsystem
+           kxmlgui
+           qtbase-5))
     (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
     (synopsis "Kontact interface library")
     (description " This library provides the glue necessary for
@@ -1535,58 +1495,55 @@ application \"Parts\" to be embedded as a Kontact component (or plugin).")
         (base32 "04lz3ldrr0lpy9zpsg9ja1i9gxzlcjpqcwn3g7l4jjdky4frcr2r"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("dbus" ,dbus)
-       ("qttools" ,qttools)
-       ("kdoctools" ,kdoctools)))
+     (list extra-cmake-modules dbus qttools kdoctools))
     (inputs
-     `(("akonadi" ,akonadi)
-       ("akonadi-calendar" ,akonadi-calendar)
-       ("akonadi-contacts" ,akonadi-contacts)
-       ("akonadi-mime" ,akonadi-mime)
-       ("akonadi-notes" ,akonadi-notes)
-       ("akonadi-search" ,akonadi-search)
-       ("boost" ,boost)
-       ("kcalendarcore" ,kcalendarcore)
-       ("kcalendarsupport" ,kcalendarsupport)
-       ("kcalutils" ,kcalutils)
-       ("kcmutils" ,kcmutils)
-       ("kcodecs" ,kcodecs)
-       ("kcompletion" ,kcompletion)
-       ("kconfig" ,kconfig)
-       ("kconfigwidgets" ,kconfigwidgets)
-       ("kcontacts" ,kcontacts)
-       ("kcoreaddons" ,kcoreaddons)
-       ("kcrash" ,kcrash)
-       ("kdbusaddons" ,kdbusaddons)
-       ("kdepim-apps-libs" ,kdepim-apps-libs)
-       ("keventviews" ,keventviews)
-       ("kholidays" ,kholidays)
-       ("kiconthemes" ,kiconthemes)
-       ("kidentitymanagement" ,kidentitymanagement)
-       ("kimap" ,kimap)
-       ("kincidenceeditor" ,kincidenceeditor)
-       ("kitemmodels" ,kitemmodels)
-       ("kitemviews" ,kitemviews)
-       ("kjobwidgets" ,kjobwidgets)
-       ("kldap" ,kldap)
-       ("kmailtransport" ,kmailtransport)
-       ("kmime" ,kmime)
-       ("knewstuff" ,knewstuff)
-       ("knotifications" ,knotifications)
-       ("kontactinterface" ,kontactinterface)
-       ("kparts" ,kparts)
-       ("kpimcommon" ,kpimcommon)
-       ("kpimtextedit" ,kpimtextedit)
-       ("kservice" ,kservice)
-       ("kwallet" ,kwallet)
-       ("kwidgetsaddons" ,kwidgetsaddons)
-       ("kwindowsystem" ,kwindowsystem)
-       ("kxmlgui" ,kxmlgui)
-       ("libkdepim" ,libkdepim)
-       ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests
-       ("phonon" ,phonon)
-       ("qtbase" ,qtbase-5)))
+     (list akonadi
+           akonadi-calendar
+           akonadi-contacts
+           akonadi-mime
+           akonadi-notes
+           akonadi-search
+           boost
+           kcalendarcore
+           kcalendarsupport
+           kcalutils
+           kcmutils
+           kcodecs
+           kcompletion
+           kconfig
+           kconfigwidgets
+           kcontacts
+           kcoreaddons
+           kcrash
+           kdbusaddons
+           kdepim-apps-libs
+           keventviews
+           kholidays
+           kiconthemes
+           kidentitymanagement
+           kimap
+           kincidenceeditor
+           kitemmodels
+           kitemviews
+           kjobwidgets
+           kldap
+           kmailtransport
+           kmime
+           knewstuff
+           knotifications
+           kontactinterface
+           kparts
+           kpimcommon
+           kpimtextedit
+           kservice
+           kwallet
+           kwidgetsaddons
+           kwindowsystem
+           kxmlgui
+           libkdepim
+           oxygen-icons ; default icon set, required for tests
+           phonon
+           qtbase-5))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -1638,11 +1595,9 @@ and exchanging calendar data, vCalendar and iCalendar.")
                       (setenv "HOME" "/tmp")
                       #t)))))
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)))
+     (list extra-cmake-modules))
     (inputs
-     `(("kcontacts" ,kcontacts)
-       ("kpeople" ,kpeople)
-       ("qtbase" ,qtbase-5)))
+     (list kcontacts kpeople qtbase-5))
     (home-page "https://invent.kde.org/pim/kpeoplevcard")
     (synopsis "Expose vCard contacts to KPeople")
     (description
@@ -1664,44 +1619,43 @@ Virtual Contact File}) files to the KPeople contact management library.")
     (properties `((upstream-name . "pimcommon")))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)))
+     (list extra-cmake-modules qttools))
     (inputs
-     `(("karchive" ,karchive)
-       ("akonadi" ,akonadi)
-       ("akonadi-contacts" ,akonadi-contacts)
-       ("akonadi-mime" ,akonadi-mime)
-       ("boost" ,boost)
-       ("grantlee" ,grantlee)
-       ;; TODO: ("kaccounts" ,kaccounts)
-       ("kcodecs" ,kcodecs)
-       ("kconfig" ,kconfig)
-       ("kconfigwidgets" ,kconfigwidgets)
-       ("kcontacts" ,kcontacts)
-       ("kcoreaddons" ,kcoreaddons)
-       ("kdesignerplugin" ,kdesignerplugin)
-       ("ki18n" ,ki18n)
-       ("kiconthemes" ,kiconthemes)
-       ("kimap" ,kimap)
-       ("kio" ,kio)
-       ("kirigami" ,kirigami) ;; run-time dependency
-       ("kitemmodels" ,kitemmodels)
-       ("kitemviews" ,kitemviews)
-       ("kjobwidgets" ,kjobwidgets)
-       ("kmime" ,kmime)
-       ("knewstuff" ,knewstuff)
-       ("kpimtextedit" ,kpimtextedit)
-       ("kservice" ,kservice)
-       ("ktextwidgets" ,ktextwidgets)
-       ("kwallet" ,kwallet)
-       ("kwidgetsaddons" ,kwidgetsaddons)
-       ("kwindowsystem" ,kwindowsystem)
-       ("kxmlgui" ,kxmlgui)
-       ("libkdepim" ,libkdepim)
-       ("libxslt" ,libxslt)
-       ("purpose" ,purpose)
-       ("qtbase" ,qtbase-5)
-       ("qtwebengine" ,qtwebengine)))
+     (list karchive
+           akonadi
+           akonadi-contacts
+           akonadi-mime
+           boost
+           grantlee
+           ;; TODO: ("kaccounts" ,kaccounts)
+           kcodecs
+           kconfig
+           kconfigwidgets
+           kcontacts
+           kcoreaddons
+           kdesignerplugin
+           ki18n
+           kiconthemes
+           kimap
+           kio
+           kirigami ;; run-time dependency
+           kitemmodels
+           kitemviews
+           kjobwidgets
+           kmime
+           knewstuff
+           kpimtextedit
+           kservice
+           ktextwidgets
+           kwallet
+           kwidgetsaddons
+           kwindowsystem
+           kxmlgui
+           libkdepim
+           libxslt
+           purpose
+           qtbase-5
+           qtwebengine))
     (arguments
      `(#:tests? #f)) ;; TODO tests hang
     (home-page "https://invent.kde.org/pim/pimcommon")
@@ -1723,25 +1677,24 @@ Virtual Contact File}) files to the KPeople contact management library.")
         (base32 "0j6d4sv405c3x0ww75qsww94apidsb8aaqf59akhv96zmv0vx5wy"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)))
+     (list extra-cmake-modules qttools))
     (inputs
-     `(("grantlee" ,grantlee)
-       ("kcodecs" ,kcodecs)
-       ("kconfigwidgets" ,kconfigwidgets)
-       ("kcoreaddons" ,kcoreaddons)
-       ("kdesignerplugin" ,kdesignerplugin)
-       ("kemoticons" ,kemoticons)
-       ("ki18n" ,ki18n)
-       ("kiconthemes" ,kiconthemes)
-       ("kio" ,kio)
-       ("ksyntaxhighlighting" ,ksyntaxhighlighting)
-       ("ktextwidgets" ,ktextwidgets)
-       ("kwidgetsaddons" ,kwidgetsaddons)
-       ("kxmlgui" ,kxmlgui)
-       ("qtbase" ,qtbase-5)
-       ("qtspeech" ,qtspeech)
-       ("sonnet" ,sonnet)))
+     (list grantlee
+           kcodecs
+           kconfigwidgets
+           kcoreaddons
+           kdesignerplugin
+           kemoticons
+           ki18n
+           kiconthemes
+           kio
+           ksyntaxhighlighting
+           ktextwidgets
+           kwidgetsaddons
+           kxmlgui
+           qtbase-5
+           qtspeech
+           sonnet))
     (arguments
      `(#:tests? #f)) ;; TODO - test suite hangs
     (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/")
@@ -1765,15 +1718,15 @@ text in the text edit to all kinds of markup, like HTML or BBCODE.")
         (base32 "1xyaahibm0dc3qdwiak5yqa66szxaxnylvqxi6k21ayvzn2vxbhx"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)))
+     (list extra-cmake-modules))
     (inputs
-     `(("cyrus-sasl" ,cyrus-sasl)
-       ("kcodecs" ,kcodecs)
-       ("kconfig" ,kconfig)
-       ("kcoreaddons" ,kcoreaddons)
-       ("ki18n" ,ki18n)
-       ("kio" ,kio)
-       ("qtbase" ,qtbase-5)))
+     (list cyrus-sasl
+           kcodecs
+           kconfig
+           kcoreaddons
+           ki18n
+           kio
+           qtbase-5))
     (arguments
      `(#:tests? #f ;; TODO: does not find sasl mechs
        #:phases
@@ -1805,16 +1758,16 @@ standard protocols for e-mail transmission.")
         (base32 "0cn5p32w2kas56yyc15c22kll4hd02lvvxz2n6cz1wda8alspj19"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)))
+     (list extra-cmake-modules))
     (inputs
-     `(("kcalendarcore" ,kcalendarcore)
-       ("kcalutils" ,kcalutils)
-       ("kcodecs" ,kcodecs)
-       ("kconfig" ,kconfig)
-       ("kcontacts" ,kcontacts)
-       ("kcoreaddons" ,kcoreaddons)
-       ("ki18n" ,ki18n)
-       ("qtbase" ,qtbase-5)))
+     (list kcalendarcore
+           kcalutils
+           kcodecs
+           kconfig
+           kcontacts
+           kcoreaddons
+           ki18n
+           qtbase-5))
     (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/ktnef/html/")
     (synopsis "Library for handling mail attachments using TNEF format")
     (description "Ktnef is a library for handling data in the TNEF
@@ -1837,35 +1790,34 @@ and allows one to view/extract message formatted text in Rich Text Format.")
         (base32 "0bask561laxgkgm3rxfpyxqs6jx1l9xjk058lhycq0pik6vwhdha"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)))
+     (list extra-cmake-modules qttools))
     (inputs
-     `(("akonadi" ,akonadi)
-       ("akonadi-contacts" ,akonadi-contacts)
-       ("akonadi-mime" ,akonadi-mime)
-       ("akonadi-search" ,akonadi-search)
-       ("boost" ,boost)
-       ("kcmutils" ,kcmutils)
-       ("kcodecs" ,kcodecs)
-       ("kcalendarcore" ,kcalendarcore)
-       ("kcompletion" ,kcompletion)
-       ("kconfig" ,kconfig)
-       ("kconfigwidgets" ,kconfigwidgets)
-       ("kcontacts" ,kcontacts)
-       ("kcoreaddons" ,kcoreaddons)
-       ("kdbusaddons" ,kdbusaddons)
-       ("kdesignerplugin" ,kdesignerplugin)
-       ("ki18n" ,ki18n)
-       ("kiconthemes" ,kiconthemes)
-       ("kio" ,kio)
-       ("kitemmodels" ,kitemmodels)
-       ("kitemviews" ,kitemviews)
-       ("kjobwidgets" ,kjobwidgets)
-       ("kldap" ,kldap)
-       ("kmime" ,kmime)
-       ("kwallet" ,kwallet)
-       ("kwidgetsaddons" ,kwidgetsaddons)
-       ("qtbase" ,qtbase-5)))
+     (list akonadi
+           akonadi-contacts
+           akonadi-mime
+           akonadi-search
+           boost
+           kcmutils
+           kcodecs
+           kcalendarcore
+           kcompletion
+           kconfig
+           kconfigwidgets
+           kcontacts
+           kcoreaddons
+           kdbusaddons
+           kdesignerplugin
+           ki18n
+           kiconthemes
+           kio
+           kitemmodels
+           kitemviews
+           kjobwidgets
+           kldap
+           kmime
+           kwallet
+           kwidgetsaddons
+           qtbase-5))
     (home-page "https://invent.kde.org/pim/libkdepim")
     (synopsis "Libraries for common KDE PIM apps")
     (description "This package provided libraries for common KDE PIM apps.")
@@ -1885,20 +1837,19 @@ and allows one to view/extract message formatted text in Rich Text Format.")
         (base32 "0nvd5fqrvyb7c3g7rf1lxbbv38q9sqnhd6irgx7awwgw92inxky4"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)))
+     (list extra-cmake-modules qttools))
     (inputs
-     `(("cyrus-sasl" ,cyrus-sasl)
-       ("ki18n" ,ki18n)
-       ("kcontacts" ,kcontacts)
-       ("kcalendarcore" ,kcalendarcore)
-       ("kio" ,kio)
-       ("kwallet" ,kwallet)
-       ("kwindowsystem" ,kwindowsystem)
-       ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
-       ("qtwebchannel" ,qtwebchannel)
-       ("qtwebengine" ,qtwebengine)))
+     (list cyrus-sasl
+           ki18n
+           kcontacts
+           kcalendarcore
+           kio
+           kwallet
+           kwindowsystem
+           qtbase-5
+           qtdeclarative
+           qtwebchannel
+           qtwebengine))
     (arguments
      `(#:tests? #f)) ;; TODO 6/48 tests fail
     (home-page "https://invent.kde.org/pim/libkgapi")
@@ -1921,24 +1872,22 @@ various Google services.")
         (base32 "0rijpmqyx4mrr7csik3vkfcra7kfywk6yz548fmq3ha8wa9ax8fv"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("kdoctools" ,kdoctools)
-       ("qttools" ,qttools)))
+     (list extra-cmake-modules kdoctools qttools))
     (inputs
-     `(("boost" ,boost)
-       ("gpgme" ,gpgme)
-       ("kcodecs" ,kcodecs)
-       ("kcompletion" ,kcompletion)
-       ("kconfig" ,kconfig)
-       ("kcoreaddons" ,kcoreaddons)
-       ("kcrash" ,kcrash)
-       ("ki18n" ,ki18n)
-       ("kitemmodels" ,kitemmodels)
-       ("kwidgetsaddons" ,kwidgetsaddons)
-       ("kwindowsystem" ,kwindowsystem)
-       ("kpimtextedit" ,kpimtextedit)
-       ("qgpgme" ,qgpgme)
-       ("qtbase" ,qtbase-5)))
+     (list boost
+           gpgme
+           kcodecs
+           kcompletion
+           kconfig
+           kcoreaddons
+           kcrash
+           ki18n
+           kitemmodels
+           kwidgetsaddons
+           kwindowsystem
+           kpimtextedit
+           qgpgme
+           qtbase-5))
     (home-page "https://invent.kde.org/pim/libkleo")
     (synopsis "KDE PIM cryptographic library")
     (description "@code{libkleo} is a library for Kleopatra and other parts of
@@ -1960,31 +1909,30 @@ KDE using certificate-based crypto.")
        (patches (search-patches "libksieve-Fix-missing-link-libraries.patch"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("kdoctools" ,kdoctools)))
+     (list extra-cmake-modules kdoctools))
     (inputs
-     `(("akonadi" ,akonadi)
-       ("cyrus-sasl" ,cyrus-sasl)
-       ("karchive" ,karchive)
-       ("ki18n" ,ki18n)
-       ("kiconthemes" ,kiconthemes)
-       ("kidentitymanagement" ,kidentitymanagement)
-       ("kimap" ,kimap)
-       ("kio" ,kio)
-       ("kmailtransport" ,kmailtransport)
-       ("kmime" ,kmime)
-       ("knewstuff" ,knewstuff)
-       ("kpimcommon" ,kpimcommon)
-       ("kpimtextedit" ,kpimtextedit)
-       ("ksyntaxhighlighting" ,ksyntaxhighlighting)
-       ("ktextwidgets" ,ktextwidgets)
-       ("kwallet" ,kwallet)
-       ("kwindowsystem" ,kwindowsystem)
-       ("libkdepim" ,libkdepim)
-       ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
-       ("qtwebchannel" ,qtwebchannel)
-       ("qtwebengine" ,qtwebengine)))
+     (list akonadi
+           cyrus-sasl
+           karchive
+           ki18n
+           kiconthemes
+           kidentitymanagement
+           kimap
+           kio
+           kmailtransport
+           kmime
+           knewstuff
+           kpimcommon
+           kpimtextedit
+           ksyntaxhighlighting
+           ktextwidgets
+           kwallet
+           kwindowsystem
+           libkdepim
+           qtbase-5
+           qtdeclarative
+           qtwebchannel
+           qtwebengine))
     (arguments
      `(#:phases
        (modify-phases %standard-phases