From 5b3bd93bab9c4403b578fd29939783a80bc7ffc3 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 20 Sep 2024 08:54:48 +0300 Subject: [PATCH] kdePackages: nixfmt --- pkgs/kde/default.nix | 139 ++--- pkgs/kde/frameworks/attica/default.nix | 2 +- pkgs/kde/frameworks/baloo/default.nix | 5 +- pkgs/kde/frameworks/bluez-qt/default.nix | 2 +- pkgs/kde/frameworks/breeze-icons/default.nix | 2 +- pkgs/kde/frameworks/default.nix | 147 ++--- .../extra-cmake-modules/default.nix | 5 +- .../frameworkintegration/default.nix | 4 +- pkgs/kde/frameworks/kapidox/default.nix | 2 +- pkgs/kde/frameworks/karchive/default.nix | 7 +- pkgs/kde/frameworks/kauth/default.nix | 4 +- pkgs/kde/frameworks/kbookmarks/default.nix | 2 +- pkgs/kde/frameworks/kcalendarcore/default.nix | 5 +- pkgs/kde/frameworks/kcmutils/default.nix | 2 +- pkgs/kde/frameworks/kcodecs/default.nix | 5 +- pkgs/kde/frameworks/kcolorscheme/default.nix | 2 +- pkgs/kde/frameworks/kcompletion/default.nix | 2 +- pkgs/kde/frameworks/kconfig/default.nix | 4 +- .../kde/frameworks/kconfigwidgets/default.nix | 2 +- pkgs/kde/frameworks/kcontacts/default.nix | 2 +- pkgs/kde/frameworks/kcoreaddons/default.nix | 7 +- pkgs/kde/frameworks/kcrash/default.nix | 2 +- pkgs/kde/frameworks/kdav/default.nix | 2 +- pkgs/kde/frameworks/kdbusaddons/default.nix | 2 +- pkgs/kde/frameworks/kdeclarative/default.nix | 4 +- pkgs/kde/frameworks/kded/default.nix | 2 +- pkgs/kde/frameworks/kdesu/default.nix | 4 +- pkgs/kde/frameworks/kdnssd/default.nix | 4 +- pkgs/kde/frameworks/kdoctools/default.nix | 16 +- pkgs/kde/frameworks/kfilemetadata/default.nix | 14 +- pkgs/kde/frameworks/kglobalaccel/default.nix | 2 +- pkgs/kde/frameworks/kguiaddons/default.nix | 4 +- pkgs/kde/frameworks/kholidays/default.nix | 4 +- pkgs/kde/frameworks/ki18n/default.nix | 6 +- pkgs/kde/frameworks/kidletime/default.nix | 7 +- pkgs/kde/frameworks/kimageformats/default.nix | 12 +- pkgs/kde/frameworks/kio/default.nix | 7 +- pkgs/kde/frameworks/kirigami/default.nix | 21 +- pkgs/kde/frameworks/kitemmodels/default.nix | 2 +- pkgs/kde/frameworks/kitemviews/default.nix | 2 +- pkgs/kde/frameworks/kjobwidgets/default.nix | 2 +- pkgs/kde/frameworks/knewstuff/default.nix | 9 +- .../kde/frameworks/knotifications/default.nix | 7 +- pkgs/kde/frameworks/knotifyconfig/default.nix | 2 +- pkgs/kde/frameworks/kpackage/default.nix | 4 +- pkgs/kde/frameworks/kparts/default.nix | 2 +- pkgs/kde/frameworks/kpeople/default.nix | 2 +- pkgs/kde/frameworks/kplotting/default.nix | 2 +- pkgs/kde/frameworks/kpty/default.nix | 2 +- pkgs/kde/frameworks/kquickcharts/default.nix | 2 +- pkgs/kde/frameworks/krunner/default.nix | 2 +- pkgs/kde/frameworks/kservice/default.nix | 2 +- .../kstatusnotifieritem/default.nix | 2 +- pkgs/kde/frameworks/ksvg/default.nix | 5 +- pkgs/kde/frameworks/ktexteditor/default.nix | 6 +- pkgs/kde/frameworks/ktexttemplate/default.nix | 2 +- .../frameworks/kunitconversion/default.nix | 2 +- pkgs/kde/frameworks/kuserfeedback/default.nix | 10 +- pkgs/kde/frameworks/kwallet/default.nix | 6 +- .../kde/frameworks/kwidgetsaddons/default.nix | 2 +- pkgs/kde/frameworks/kwindowsystem/default.nix | 10 +- pkgs/kde/frameworks/kxmlgui/default.nix | 2 +- .../frameworks/modemmanager-qt/default.nix | 4 +- .../frameworks/networkmanager-qt/default.nix | 6 +- pkgs/kde/frameworks/prison/default.nix | 7 +- pkgs/kde/frameworks/purpose/default.nix | 8 +- .../frameworks/qqc2-desktop-style/default.nix | 9 +- pkgs/kde/frameworks/solid/default.nix | 8 +- pkgs/kde/frameworks/sonnet/default.nix | 11 +- pkgs/kde/frameworks/syndication/default.nix | 2 +- .../syntax-highlighting/default.nix | 7 +- pkgs/kde/frameworks/threadweaver/default.nix | 2 +- .../gear/accessibility-inspector/default.nix | 2 +- .../gear/akonadi-calendar-tools/default.nix | 2 +- pkgs/kde/gear/akonadi-calendar/default.nix | 2 +- pkgs/kde/gear/akonadi-contacts/default.nix | 2 +- .../gear/akonadi-import-wizard/default.nix | 2 +- pkgs/kde/gear/akonadi-mime/default.nix | 5 +- pkgs/kde/gear/akonadi-notes/default.nix | 2 +- pkgs/kde/gear/akonadi-search/default.nix | 5 +- pkgs/kde/gear/akonadi/default.nix | 12 +- pkgs/kde/gear/akonadiconsole/default.nix | 2 +- pkgs/kde/gear/akregator/default.nix | 2 +- pkgs/kde/gear/alligator/default.nix | 2 +- pkgs/kde/gear/analitza/default.nix | 11 +- pkgs/kde/gear/angelfish/default.nix | 7 +- pkgs/kde/gear/ark/default.nix | 5 +- pkgs/kde/gear/artikulate/default.nix | 2 +- pkgs/kde/gear/audex/default.nix | 5 +- pkgs/kde/gear/audiocd-kio/default.nix | 7 +- pkgs/kde/gear/audiotube/default.nix | 55 +- pkgs/kde/gear/baloo-widgets/default.nix | 2 +- pkgs/kde/gear/blinken/default.nix | 2 +- pkgs/kde/gear/bomber/default.nix | 2 +- pkgs/kde/gear/bovo/default.nix | 4 +- pkgs/kde/gear/calendarsupport/default.nix | 2 +- pkgs/kde/gear/calindori/default.nix | 2 +- pkgs/kde/gear/cantor/default.nix | 2 +- pkgs/kde/gear/cervisia/default.nix | 2 +- pkgs/kde/gear/colord-kde/default.nix | 7 +- pkgs/kde/gear/default.nix | 503 +++++++++--------- pkgs/kde/gear/dolphin-plugins/default.nix | 2 +- pkgs/kde/gear/dolphin/default.nix | 2 +- pkgs/kde/gear/dragon/default.nix | 2 +- pkgs/kde/gear/elisa/default.nix | 5 +- pkgs/kde/gear/eventviews/default.nix | 2 +- pkgs/kde/gear/falkon/default.nix | 13 +- pkgs/kde/gear/ffmpegthumbs/default.nix | 2 +- pkgs/kde/gear/francis/default.nix | 5 +- pkgs/kde/gear/granatier/default.nix | 4 +- pkgs/kde/gear/grantlee-editor/default.nix | 2 +- pkgs/kde/gear/grantleetheme/default.nix | 2 +- pkgs/kde/gear/gwenview/default.nix | 2 +- pkgs/kde/gear/incidenceeditor/default.nix | 2 +- pkgs/kde/gear/isoimagewriter/default.nix | 2 +- pkgs/kde/gear/itinerary/default.nix | 13 +- pkgs/kde/gear/juk/default.nix | 5 +- pkgs/kde/gear/k3b/default.nix | 36 +- .../gear/kaccounts-integration/default.nix | 2 +- pkgs/kde/gear/kaccounts-providers/default.nix | 7 +- pkgs/kde/gear/kaddressbook/default.nix | 2 +- pkgs/kde/gear/kajongg/default.nix | 6 +- pkgs/kde/gear/kalarm/default.nix | 5 +- pkgs/kde/gear/kalgebra/default.nix | 7 +- pkgs/kde/gear/kalk/default.nix | 6 +- pkgs/kde/gear/kalm/default.nix | 2 +- pkgs/kde/gear/kalzium/default.nix | 12 +- pkgs/kde/gear/kamera/default.nix | 4 +- pkgs/kde/gear/kamoso/default.nix | 2 +- pkgs/kde/gear/kanagram/default.nix | 2 +- pkgs/kde/gear/kapman/default.nix | 4 +- pkgs/kde/gear/kapptemplate/default.nix | 2 +- pkgs/kde/gear/kasts/default.nix | 2 +- pkgs/kde/gear/kate/default.nix | 2 +- pkgs/kde/gear/katomic/default.nix | 4 +- pkgs/kde/gear/kbackup/default.nix | 7 +- pkgs/kde/gear/kblackbox/default.nix | 4 +- pkgs/kde/gear/kblocks/default.nix | 2 +- pkgs/kde/gear/kbounce/default.nix | 4 +- pkgs/kde/gear/kbreakout/default.nix | 2 +- pkgs/kde/gear/kbruch/default.nix | 2 +- pkgs/kde/gear/kcachegrind/default.nix | 2 +- pkgs/kde/gear/kcalc/default.nix | 7 +- pkgs/kde/gear/kcalutils/default.nix | 2 +- pkgs/kde/gear/kcharselect/default.nix | 2 +- pkgs/kde/gear/kclock/default.nix | 5 +- pkgs/kde/gear/kcolorchooser/default.nix | 2 +- pkgs/kde/gear/kcron/default.nix | 2 +- pkgs/kde/gear/kde-dev-scripts/default.nix | 2 +- pkgs/kde/gear/kde-dev-utils/default.nix | 2 +- pkgs/kde/gear/kde-inotify-survey/default.nix | 2 +- pkgs/kde/gear/kdebugsettings/default.nix | 2 +- pkgs/kde/gear/kdeconnect-kde/default.nix | 11 +- pkgs/kde/gear/kdeedu-data/default.nix | 2 +- .../gear/kdegraphics-mobipocket/default.nix | 2 +- .../gear/kdenetwork-filesharing/default.nix | 6 +- pkgs/kde/gear/kdenlive/default.nix | 12 +- pkgs/kde/gear/kdepim-addons/default.nix | 6 +- pkgs/kde/gear/kdepim-runtime/default.nix | 21 +- pkgs/kde/gear/kdesdk-kio/default.nix | 2 +- pkgs/kde/gear/kdesdk-thumbnailers/default.nix | 2 +- pkgs/kde/gear/kdev-php/default.nix | 2 +- pkgs/kde/gear/kdev-python/default.nix | 2 +- pkgs/kde/gear/kdf/default.nix | 2 +- pkgs/kde/gear/kdialog/default.nix | 2 +- pkgs/kde/gear/kdiamond/default.nix | 2 +- pkgs/kde/gear/keditbookmarks/default.nix | 2 +- pkgs/kde/gear/keysmith/default.nix | 7 +- pkgs/kde/gear/kfind/default.nix | 2 +- pkgs/kde/gear/kfourinline/default.nix | 4 +- pkgs/kde/gear/kgeography/default.nix | 2 +- pkgs/kde/gear/kget/default.nix | 5 +- pkgs/kde/gear/kgoldrunner/default.nix | 2 +- pkgs/kde/gear/kgpg/default.nix | 4 +- pkgs/kde/gear/kgraphviewer/default.nix | 7 +- pkgs/kde/gear/khangman/default.nix | 2 +- pkgs/kde/gear/khealthcertificate/default.nix | 2 +- pkgs/kde/gear/khelpcenter/default.nix | 5 +- pkgs/kde/gear/kidentitymanagement/default.nix | 2 +- pkgs/kde/gear/kig/default.nix | 2 +- pkgs/kde/gear/kigo/default.nix | 4 +- pkgs/kde/gear/killbots/default.nix | 2 +- pkgs/kde/gear/kimagemapeditor/default.nix | 2 +- pkgs/kde/gear/kimap/default.nix | 2 +- pkgs/kde/gear/kio-admin/default.nix | 2 +- pkgs/kde/gear/kio-extras/default.nix | 6 +- pkgs/kde/gear/kio-gdrive/default.nix | 2 +- pkgs/kde/gear/kio-zeroconf/default.nix | 2 +- pkgs/kde/gear/kirigami-gallery/default.nix | 5 +- pkgs/kde/gear/kiriki/default.nix | 2 +- pkgs/kde/gear/kiten/default.nix | 2 +- pkgs/kde/gear/kitinerary/default.nix | 2 +- pkgs/kde/gear/kjournald/default.nix | 7 +- pkgs/kde/gear/kjumpingcube/default.nix | 4 +- pkgs/kde/gear/kldap/default.nix | 5 +- pkgs/kde/gear/kleopatra/default.nix | 4 +- pkgs/kde/gear/klettres/default.nix | 2 +- pkgs/kde/gear/klickety/default.nix | 2 +- pkgs/kde/gear/klines/default.nix | 2 +- pkgs/kde/gear/kmag/default.nix | 2 +- pkgs/kde/gear/kmahjongg/default.nix | 7 +- .../kde/gear/kmail-account-wizard/default.nix | 2 +- pkgs/kde/gear/kmail/default.nix | 2 +- pkgs/kde/gear/kmailtransport/default.nix | 2 +- pkgs/kde/gear/kmbox/default.nix | 2 +- pkgs/kde/gear/kmime/default.nix | 4 +- pkgs/kde/gear/kmines/default.nix | 2 +- pkgs/kde/gear/kmix/default.nix | 2 +- pkgs/kde/gear/kmousetool/default.nix | 5 +- pkgs/kde/gear/kmouth/default.nix | 2 +- pkgs/kde/gear/kmplot/default.nix | 2 +- pkgs/kde/gear/knavalbattle/default.nix | 2 +- pkgs/kde/gear/knetwalk/default.nix | 2 +- pkgs/kde/gear/knights/default.nix | 7 +- pkgs/kde/gear/koko/default.nix | 37 +- pkgs/kde/gear/kolf/default.nix | 2 +- pkgs/kde/gear/kollision/default.nix | 2 +- pkgs/kde/gear/kolourpaint/default.nix | 2 +- pkgs/kde/gear/kompare/default.nix | 2 +- pkgs/kde/gear/kongress/default.nix | 6 +- pkgs/kde/gear/konqueror/default.nix | 4 +- pkgs/kde/gear/konquest/default.nix | 5 +- pkgs/kde/gear/konsole/default.nix | 5 +- pkgs/kde/gear/kontactinterface/default.nix | 2 +- pkgs/kde/gear/kontrast/default.nix | 5 +- pkgs/kde/gear/konversation/default.nix | 7 +- pkgs/kde/gear/kopeninghours/default.nix | 5 +- pkgs/kde/gear/korganizer/default.nix | 2 +- pkgs/kde/gear/kosmindoormap/default.nix | 7 +- pkgs/kde/gear/kpat/default.nix | 7 +- pkgs/kde/gear/kpimtextedit/default.nix | 2 +- pkgs/kde/gear/kpkpass/default.nix | 2 +- pkgs/kde/gear/kpmcore/default.nix | 33 +- pkgs/kde/gear/kpublictransport/default.nix | 4 +- pkgs/kde/gear/kqtquickcharts/default.nix | 2 +- pkgs/kde/gear/krdc/default.nix | 9 +- pkgs/kde/gear/krecorder/default.nix | 2 +- pkgs/kde/gear/kreversi/default.nix | 4 +- pkgs/kde/gear/krfb/default.nix | 9 +- pkgs/kde/gear/kross-interpreters/default.nix | 2 +- pkgs/kde/gear/kruler/default.nix | 2 +- pkgs/kde/gear/ksanecore/default.nix | 2 +- pkgs/kde/gear/kshisen/default.nix | 2 +- pkgs/kde/gear/ksirk/default.nix | 2 +- pkgs/kde/gear/ksmtp/default.nix | 5 +- pkgs/kde/gear/ksnakeduel/default.nix | 2 +- pkgs/kde/gear/kspaceduel/default.nix | 2 +- pkgs/kde/gear/ksquares/default.nix | 2 +- pkgs/kde/gear/ksudoku/default.nix | 4 +- pkgs/kde/gear/ksystemlog/default.nix | 7 +- pkgs/kde/gear/kteatime/default.nix | 2 +- pkgs/kde/gear/ktimer/default.nix | 2 +- pkgs/kde/gear/ktnef/default.nix | 2 +- pkgs/kde/gear/ktorrent/default.nix | 6 +- pkgs/kde/gear/ktouch/default.nix | 2 +- pkgs/kde/gear/ktrip/default.nix | 2 +- pkgs/kde/gear/ktuberling/default.nix | 2 +- pkgs/kde/gear/kturtle/default.nix | 2 +- pkgs/kde/gear/kubrick/default.nix | 7 +- pkgs/kde/gear/kwalletmanager/default.nix | 2 +- pkgs/kde/gear/kwave/default.nix | 2 +- pkgs/kde/gear/kweather/default.nix | 6 +- pkgs/kde/gear/libgravatar/default.nix | 2 +- pkgs/kde/gear/libkcddb/default.nix | 2 +- pkgs/kde/gear/libkcompactdisc/default.nix | 2 +- pkgs/kde/gear/libkdcraw/default.nix | 4 +- pkgs/kde/gear/libkdegames/default.nix | 12 +- pkgs/kde/gear/libkdepim/default.nix | 2 +- pkgs/kde/gear/libkeduvocdocument/default.nix | 2 +- pkgs/kde/gear/libkexiv2/default.nix | 7 +- pkgs/kde/gear/libkgapi/default.nix | 5 +- pkgs/kde/gear/libkleo/default.nix | 7 +- pkgs/kde/gear/libkmahjongg/default.nix | 7 +- pkgs/kde/gear/libkomparediff2/default.nix | 2 +- pkgs/kde/gear/libksane/default.nix | 2 +- pkgs/kde/gear/libksieve/default.nix | 5 +- pkgs/kde/gear/libktorrent/default.nix | 10 +- pkgs/kde/gear/lokalize/default.nix | 4 +- pkgs/kde/gear/lskat/default.nix | 4 +- pkgs/kde/gear/mailcommon/default.nix | 7 +- pkgs/kde/gear/mailimporter/default.nix | 2 +- pkgs/kde/gear/marble/default.nix | 2 +- pkgs/kde/gear/markdownpart/default.nix | 2 +- pkgs/kde/gear/massif-visualizer/default.nix | 5 +- pkgs/kde/gear/mbox-importer/default.nix | 2 +- pkgs/kde/gear/merkuro/default.nix | 5 +- pkgs/kde/gear/messagelib/default.nix | 2 +- pkgs/kde/gear/mimetreeparser/default.nix | 6 +- pkgs/kde/gear/minuet/default.nix | 6 +- pkgs/kde/gear/neochat/default.nix | 6 +- pkgs/kde/gear/okular/default.nix | 2 +- pkgs/kde/gear/palapeli/default.nix | 4 +- pkgs/kde/gear/parley/default.nix | 6 +- pkgs/kde/gear/partitionmanager/default.nix | 2 +- pkgs/kde/gear/picmi/default.nix | 4 +- pkgs/kde/gear/pim-data-exporter/default.nix | 2 +- pkgs/kde/gear/pim-sieve-editor/default.nix | 2 +- pkgs/kde/gear/pimcommon/default.nix | 4 +- pkgs/kde/gear/plasmatube/default.nix | 15 +- pkgs/kde/gear/poxml/default.nix | 2 +- pkgs/kde/gear/qmlkonsole/default.nix | 2 +- pkgs/kde/gear/rocs/default.nix | 2 +- .../gear/signon-kwallet-extension/default.nix | 6 +- pkgs/kde/gear/skanlite/default.nix | 2 +- pkgs/kde/gear/skanpage/default.nix | 4 +- pkgs/kde/gear/skladnik/default.nix | 2 +- pkgs/kde/gear/spectacle/default.nix | 9 +- pkgs/kde/gear/step/default.nix | 13 +- pkgs/kde/gear/svgpart/default.nix | 2 +- pkgs/kde/gear/sweeper/default.nix | 2 +- pkgs/kde/gear/telly-skout/default.nix | 2 +- pkgs/kde/gear/tokodon/default.nix | 11 +- pkgs/kde/gear/umbrello/default.nix | 2 +- pkgs/kde/gear/yakuake/default.nix | 2 +- pkgs/kde/gear/zanshin/default.nix | 2 +- pkgs/kde/lib/mk-kde-derivation.nix | 148 +++--- pkgs/kde/misc/kdevelop-pg-qt/default.nix | 7 +- pkgs/kde/misc/kdiagram/default.nix | 7 +- .../kdsoap-ws-discovery-client/default.nix | 4 +- pkgs/kde/misc/kio-fuse/default.nix | 6 +- pkgs/kde/misc/kirigami-addons/default.nix | 4 +- pkgs/kde/misc/ktextaddons/default.nix | 6 +- pkgs/kde/misc/kunifiedpush/default.nix | 13 +- pkgs/kde/misc/kup/default.nix | 9 +- pkgs/kde/misc/mpvqt/default.nix | 15 +- pkgs/kde/misc/oxygen-icons/default.nix | 2 +- pkgs/kde/misc/phonon-vlc/default.nix | 11 +- pkgs/kde/misc/phonon/default.nix | 10 +- pkgs/kde/misc/polkit-qt-1/default.nix | 15 +- pkgs/kde/misc/pulseaudio-qt/default.nix | 9 +- pkgs/kde/plasma/bluedevil/default.nix | 2 +- pkgs/kde/plasma/breeze-grub/default.nix | 8 +- pkgs/kde/plasma/breeze-gtk/default.nix | 8 +- pkgs/kde/plasma/breeze-plymouth/default.nix | 79 +-- pkgs/kde/plasma/breeze/default.nix | 6 +- pkgs/kde/plasma/default.nix | 131 ++--- pkgs/kde/plasma/discover/default.nix | 11 +- pkgs/kde/plasma/drkonqi/default.nix | 33 +- pkgs/kde/plasma/flatpak-kcm/default.nix | 7 +- pkgs/kde/plasma/kactivitymanagerd/default.nix | 5 +- pkgs/kde/plasma/kde-cli-tools/default.nix | 2 +- pkgs/kde/plasma/kde-gtk-config/default.nix | 22 +- pkgs/kde/plasma/kdecoration/default.nix | 2 +- pkgs/kde/plasma/kdeplasma-addons/default.nix | 2 +- pkgs/kde/plasma/kgamma/default.nix | 2 +- pkgs/kde/plasma/kglobalacceld/default.nix | 2 +- pkgs/kde/plasma/kinfocenter/default.nix | 11 +- pkgs/kde/plasma/kmenuedit/default.nix | 2 +- pkgs/kde/plasma/kpipewire/default.nix | 10 +- pkgs/kde/plasma/krdp/default.nix | 2 +- pkgs/kde/plasma/kscreen/default.nix | 2 +- pkgs/kde/plasma/kscreenlocker/default.nix | 7 +- pkgs/kde/plasma/ksshaskpass/default.nix | 2 +- pkgs/kde/plasma/ksystemstats/default.nix | 12 +- pkgs/kde/plasma/kwallet-pam/default.nix | 7 +- .../plasma/kwayland-integration/default.nix | 2 +- pkgs/kde/plasma/kwayland/default.nix | 4 +- pkgs/kde/plasma/kwin/default.nix | 5 +- pkgs/kde/plasma/kwrited/default.nix | 2 +- pkgs/kde/plasma/layer-shell-qt/default.nix | 4 +- pkgs/kde/plasma/libkscreen/default.nix | 9 +- pkgs/kde/plasma/libksysguard/default.nix | 9 +- pkgs/kde/plasma/libplasma/default.nix | 8 +- .../plasma/lightdm-greeter-kde/default.nix | 2 +- pkgs/kde/plasma/milou/default.nix | 2 +- pkgs/kde/plasma/ocean-sound-theme/default.nix | 2 +- pkgs/kde/plasma/oxygen-sounds/default.nix | 2 +- pkgs/kde/plasma/oxygen/default.nix | 6 +- .../plasma-activities-stats/default.nix | 2 +- pkgs/kde/plasma/plasma-activities/default.nix | 5 +- .../plasma-browser-integration/default.nix | 2 +- pkgs/kde/plasma/plasma-desktop/default.nix | 79 +-- pkgs/kde/plasma/plasma-firewall/default.nix | 2 +- .../kde/plasma/plasma-integration/default.nix | 13 +- pkgs/kde/plasma/plasma-mobile/default.nix | 4 +- pkgs/kde/plasma/plasma-nano/default.nix | 2 +- pkgs/kde/plasma/plasma-nm/default.nix | 2 +- pkgs/kde/plasma/plasma-pa/default.nix | 7 +- pkgs/kde/plasma/plasma-sdk/default.nix | 2 +- .../plasma/plasma-systemmonitor/default.nix | 2 +- .../kde/plasma/plasma-thunderbolt/default.nix | 2 +- pkgs/kde/plasma/plasma-vault/default.nix | 2 +- pkgs/kde/plasma/plasma-welcome/default.nix | 2 +- .../plasma-workspace-wallpapers/default.nix | 2 +- pkgs/kde/plasma/plasma-workspace/default.nix | 10 +- pkgs/kde/plasma/plasma5support/default.nix | 2 +- pkgs/kde/plasma/plymouth-kcm/default.nix | 4 +- .../kde/plasma/polkit-kde-agent-1/default.nix | 2 +- pkgs/kde/plasma/powerdevil/default.nix | 4 +- pkgs/kde/plasma/print-manager/default.nix | 2 +- pkgs/kde/plasma/qqc2-breeze-style/default.nix | 2 +- pkgs/kde/plasma/sddm-kcm/default.nix | 2 +- pkgs/kde/plasma/systemsettings/default.nix | 2 +- pkgs/kde/plasma/wacomtablet/default.nix | 7 +- .../plasma/xdg-desktop-portal-kde/default.nix | 7 +- .../applet-window-buttons6/default.nix | 19 +- 396 files changed, 1845 insertions(+), 1241 deletions(-) diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix index 8019e64ea588..7d855dae05eb 100644 --- a/pkgs/kde/default.nix +++ b/pkgs/kde/default.nix @@ -11,78 +11,89 @@ wayland-protocols, wayland, zxing-cpp, -}: let - allPackages = self: let - frameworks = import ./frameworks {inherit (self) callPackage;}; - gear = import ./gear {inherit (self) callPackage;}; - plasma = import ./plasma {inherit (self) callPackage;}; +}: +let + allPackages = + self: + let + frameworks = import ./frameworks { inherit (self) callPackage; }; + gear = import ./gear { inherit (self) callPackage; }; + plasma = import ./plasma { inherit (self) callPackage; }; - sets = ["gear" "frameworks" "plasma"]; + sets = [ + "gear" + "frameworks" + "plasma" + ]; - loadUrls = set: lib.importJSON (./generated/sources + "/${set}.json"); - allUrls = lib.attrsets.mergeAttrsList (map loadUrls sets); + loadUrls = set: lib.importJSON (./generated/sources + "/${set}.json"); + allUrls = lib.attrsets.mergeAttrsList (map loadUrls sets); - sources = lib.mapAttrs (_: v: - (fetchurl { - inherit (v) url hash; - }) - // {inherit (v) version;}) - allUrls; - in ( - qt6Packages - // frameworks - // gear - // plasma - // { - inherit sources; + sources = lib.mapAttrs ( + _: v: + (fetchurl { + inherit (v) url hash; + }) + // { + inherit (v) version; + } + ) allUrls; + in + ( + qt6Packages + // frameworks + // gear + // plasma + // { + inherit sources; - mkKdeDerivation = self.callPackage (import ./lib/mk-kde-derivation.nix self) {}; + mkKdeDerivation = self.callPackage (import ./lib/mk-kde-derivation.nix self) { }; - # THIRD PARTY - inherit - cmark - gpgme - taglib - wayland - wayland-protocols - zxing-cpp - ; + # THIRD PARTY + inherit + cmark + gpgme + taglib + wayland + wayland-protocols + zxing-cpp + ; - # Alias to match metadata - kquickimageeditor = self.kquickimageedit; + # Alias to match metadata + kquickimageeditor = self.kquickimageedit; - # Alias because it's just data - plasma-wayland-protocols = libsForQt5.plasma-wayland-protocols; + # Alias because it's just data + plasma-wayland-protocols = libsForQt5.plasma-wayland-protocols; - selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub + selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub - alpaka = self.callPackage ./misc/alpaka {}; - kdiagram = self.callPackage ./misc/kdiagram {}; - kdevelop-pg-qt = self.callPackage ./misc/kdevelop-pg-qt {}; - kdsoap-ws-discovery-client = self.callPackage ./misc/kdsoap-ws-discovery-client {}; - kirigami-addons = self.callPackage ./misc/kirigami-addons {}; - kio-extras-kf5 = self.callPackage ./misc/kio-extras-kf5 {}; - kio-fuse = self.callPackage ./misc/kio-fuse {}; - klevernotes = self.callPackage ./misc/klevernotes {}; - ktextaddons = self.callPackage ./misc/ktextaddons {}; - kunifiedpush = self.callPackage ./misc/kunifiedpush {}; - kup = self.callPackage ./misc/kup {}; - marknote = self.callPackage ./misc/marknote {}; - mpvqt = self.callPackage ./misc/mpvqt {}; - oxygen-icons = self.callPackage ./misc/oxygen-icons {}; - phonon = self.callPackage ./misc/phonon {}; - phonon-vlc = self.callPackage ./misc/phonon-vlc {}; - polkit-qt-1 = self.callPackage ./misc/polkit-qt-1 {}; - pulseaudio-qt = self.callPackage ./misc/pulseaudio-qt {}; + alpaka = self.callPackage ./misc/alpaka { }; + kdiagram = self.callPackage ./misc/kdiagram { }; + kdevelop-pg-qt = self.callPackage ./misc/kdevelop-pg-qt { }; + kdsoap-ws-discovery-client = self.callPackage ./misc/kdsoap-ws-discovery-client { }; + kirigami-addons = self.callPackage ./misc/kirigami-addons { }; + kio-extras-kf5 = self.callPackage ./misc/kio-extras-kf5 { }; + kio-fuse = self.callPackage ./misc/kio-fuse { }; + klevernotes = self.callPackage ./misc/klevernotes { }; + ktextaddons = self.callPackage ./misc/ktextaddons { }; + kunifiedpush = self.callPackage ./misc/kunifiedpush { }; + kup = self.callPackage ./misc/kup { }; + marknote = self.callPackage ./misc/marknote { }; + mpvqt = self.callPackage ./misc/mpvqt { }; + oxygen-icons = self.callPackage ./misc/oxygen-icons { }; + phonon = self.callPackage ./misc/phonon { }; + phonon-vlc = self.callPackage ./misc/phonon-vlc { }; + polkit-qt-1 = self.callPackage ./misc/polkit-qt-1 { }; + pulseaudio-qt = self.callPackage ./misc/pulseaudio-qt { }; - applet-window-buttons6 = self.callPackage ./third-party/applet-window-buttons6 {}; - karousel = self.callPackage ./third-party/karousel {}; - krohnkite = self.callPackage ./third-party/krohnkite {}; - kzones = self.callPackage ./third-party/kzones {}; - } - ); + applet-window-buttons6 = self.callPackage ./third-party/applet-window-buttons6 { }; + karousel = self.callPackage ./third-party/karousel { }; + krohnkite = self.callPackage ./third-party/krohnkite { }; + kzones = self.callPackage ./third-party/kzones { }; + } + ); in - makeScopeWithSplicing' { - otherSplices = generateSplicesForMkScope "kdePackages"; - f = allPackages; - } +makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "kdePackages"; + f = allPackages; +} diff --git a/pkgs/kde/frameworks/attica/default.nix b/pkgs/kde/frameworks/attica/default.nix index 05b5c1e59be9..c2d8a5315778 100644 --- a/pkgs/kde/frameworks/attica/default.nix +++ b/pkgs/kde/frameworks/attica/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "attica"; } diff --git a/pkgs/kde/frameworks/baloo/default.nix b/pkgs/kde/frameworks/baloo/default.nix index 40ab00ebd193..dc05d254dfd5 100644 --- a/pkgs/kde/frameworks/baloo/default.nix +++ b/pkgs/kde/frameworks/baloo/default.nix @@ -11,5 +11,8 @@ mkKdeDerivation { substituteInPlace src/file/kde-baloo.service.in --replace-fail @KDE_INSTALL_FULL_BINDIR@/kde-systemd-start-condition /run/current-system/sw/bin/kde-systemd-start-condition ''; - extraBuildInputs = [qtdeclarative lmdb]; + extraBuildInputs = [ + qtdeclarative + lmdb + ]; } diff --git a/pkgs/kde/frameworks/bluez-qt/default.nix b/pkgs/kde/frameworks/bluez-qt/default.nix index 3bccb4309af7..24814d0d8d38 100644 --- a/pkgs/kde/frameworks/bluez-qt/default.nix +++ b/pkgs/kde/frameworks/bluez-qt/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "bluez-qt"; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/breeze-icons/default.nix b/pkgs/kde/frameworks/breeze-icons/default.nix index 103903c04cb4..e7c75aad85fb 100644 --- a/pkgs/kde/frameworks/breeze-icons/default.nix +++ b/pkgs/kde/frameworks/breeze-icons/default.nix @@ -7,7 +7,7 @@ mkKdeDerivation { pname = "breeze-icons"; extraNativeBuildInputs = [ - (python3.withPackages (ps: [ps.lxml])) + (python3.withPackages (ps: [ ps.lxml ])) libxml2 ]; diff --git a/pkgs/kde/frameworks/default.nix b/pkgs/kde/frameworks/default.nix index 302be8ad3eba..148c6a3d9895 100644 --- a/pkgs/kde/frameworks/default.nix +++ b/pkgs/kde/frameworks/default.nix @@ -1,74 +1,75 @@ -{callPackage}: { - attica = callPackage ./attica {}; - baloo = callPackage ./baloo {}; - bluez-qt = callPackage ./bluez-qt {}; - breeze-icons = callPackage ./breeze-icons {}; - extra-cmake-modules = callPackage ./extra-cmake-modules {}; - frameworkintegration = callPackage ./frameworkintegration {}; - kapidox = callPackage ./kapidox {}; - karchive = callPackage ./karchive {}; - kauth = callPackage ./kauth {}; - kbookmarks = callPackage ./kbookmarks {}; - kcalendarcore = callPackage ./kcalendarcore {}; - kcmutils = callPackage ./kcmutils {}; - kcodecs = callPackage ./kcodecs {}; - kcolorscheme = callPackage ./kcolorscheme {}; - kcompletion = callPackage ./kcompletion {}; - kconfig = callPackage ./kconfig {}; - kconfigwidgets = callPackage ./kconfigwidgets {}; - kcontacts = callPackage ./kcontacts {}; - kcoreaddons = callPackage ./kcoreaddons {}; - kcrash = callPackage ./kcrash {}; - kdav = callPackage ./kdav {}; - kdbusaddons = callPackage ./kdbusaddons {}; - kdeclarative = callPackage ./kdeclarative {}; - kded = callPackage ./kded {}; - kdesu = callPackage ./kdesu {}; - kdnssd = callPackage ./kdnssd {}; - kdoctools = callPackage ./kdoctools {}; - kfilemetadata = callPackage ./kfilemetadata {}; - kglobalaccel = callPackage ./kglobalaccel {}; - kguiaddons = callPackage ./kguiaddons {}; - kholidays = callPackage ./kholidays {}; - ki18n = callPackage ./ki18n {}; - kiconthemes = callPackage ./kiconthemes {}; - kidletime = callPackage ./kidletime {}; - kimageformats = callPackage ./kimageformats {}; - kio = callPackage ./kio {}; - kirigami = callPackage ./kirigami {}; - kitemmodels = callPackage ./kitemmodels {}; - kitemviews = callPackage ./kitemviews {}; - kjobwidgets = callPackage ./kjobwidgets {}; - knewstuff = callPackage ./knewstuff {}; - knotifications = callPackage ./knotifications {}; - knotifyconfig = callPackage ./knotifyconfig {}; - kpackage = callPackage ./kpackage {}; - kparts = callPackage ./kparts {}; - kpeople = callPackage ./kpeople {}; - kplotting = callPackage ./kplotting {}; - kpty = callPackage ./kpty {}; - kquickcharts = callPackage ./kquickcharts {}; - krunner = callPackage ./krunner {}; - kservice = callPackage ./kservice {}; - kstatusnotifieritem = callPackage ./kstatusnotifieritem {}; - ksvg = callPackage ./ksvg {}; - ktexteditor = callPackage ./ktexteditor {}; - ktexttemplate = callPackage ./ktexttemplate {}; - ktextwidgets = callPackage ./ktextwidgets {}; - kunitconversion = callPackage ./kunitconversion {}; - kuserfeedback = callPackage ./kuserfeedback {}; - kwallet = callPackage ./kwallet {}; - kwidgetsaddons = callPackage ./kwidgetsaddons {}; - kwindowsystem = callPackage ./kwindowsystem {}; - kxmlgui = callPackage ./kxmlgui {}; - modemmanager-qt = callPackage ./modemmanager-qt {}; - networkmanager-qt = callPackage ./networkmanager-qt {}; - prison = callPackage ./prison {}; - purpose = callPackage ./purpose {}; - qqc2-desktop-style = callPackage ./qqc2-desktop-style {}; - solid = callPackage ./solid {}; - sonnet = callPackage ./sonnet {}; - syndication = callPackage ./syndication {}; - syntax-highlighting = callPackage ./syntax-highlighting {}; - threadweaver = callPackage ./threadweaver {}; +{ callPackage }: +{ + attica = callPackage ./attica { }; + baloo = callPackage ./baloo { }; + bluez-qt = callPackage ./bluez-qt { }; + breeze-icons = callPackage ./breeze-icons { }; + extra-cmake-modules = callPackage ./extra-cmake-modules { }; + frameworkintegration = callPackage ./frameworkintegration { }; + kapidox = callPackage ./kapidox { }; + karchive = callPackage ./karchive { }; + kauth = callPackage ./kauth { }; + kbookmarks = callPackage ./kbookmarks { }; + kcalendarcore = callPackage ./kcalendarcore { }; + kcmutils = callPackage ./kcmutils { }; + kcodecs = callPackage ./kcodecs { }; + kcolorscheme = callPackage ./kcolorscheme { }; + kcompletion = callPackage ./kcompletion { }; + kconfig = callPackage ./kconfig { }; + kconfigwidgets = callPackage ./kconfigwidgets { }; + kcontacts = callPackage ./kcontacts { }; + kcoreaddons = callPackage ./kcoreaddons { }; + kcrash = callPackage ./kcrash { }; + kdav = callPackage ./kdav { }; + kdbusaddons = callPackage ./kdbusaddons { }; + kdeclarative = callPackage ./kdeclarative { }; + kded = callPackage ./kded { }; + kdesu = callPackage ./kdesu { }; + kdnssd = callPackage ./kdnssd { }; + kdoctools = callPackage ./kdoctools { }; + kfilemetadata = callPackage ./kfilemetadata { }; + kglobalaccel = callPackage ./kglobalaccel { }; + kguiaddons = callPackage ./kguiaddons { }; + kholidays = callPackage ./kholidays { }; + ki18n = callPackage ./ki18n { }; + kiconthemes = callPackage ./kiconthemes { }; + kidletime = callPackage ./kidletime { }; + kimageformats = callPackage ./kimageformats { }; + kio = callPackage ./kio { }; + kirigami = callPackage ./kirigami { }; + kitemmodels = callPackage ./kitemmodels { }; + kitemviews = callPackage ./kitemviews { }; + kjobwidgets = callPackage ./kjobwidgets { }; + knewstuff = callPackage ./knewstuff { }; + knotifications = callPackage ./knotifications { }; + knotifyconfig = callPackage ./knotifyconfig { }; + kpackage = callPackage ./kpackage { }; + kparts = callPackage ./kparts { }; + kpeople = callPackage ./kpeople { }; + kplotting = callPackage ./kplotting { }; + kpty = callPackage ./kpty { }; + kquickcharts = callPackage ./kquickcharts { }; + krunner = callPackage ./krunner { }; + kservice = callPackage ./kservice { }; + kstatusnotifieritem = callPackage ./kstatusnotifieritem { }; + ksvg = callPackage ./ksvg { }; + ktexteditor = callPackage ./ktexteditor { }; + ktexttemplate = callPackage ./ktexttemplate { }; + ktextwidgets = callPackage ./ktextwidgets { }; + kunitconversion = callPackage ./kunitconversion { }; + kuserfeedback = callPackage ./kuserfeedback { }; + kwallet = callPackage ./kwallet { }; + kwidgetsaddons = callPackage ./kwidgetsaddons { }; + kwindowsystem = callPackage ./kwindowsystem { }; + kxmlgui = callPackage ./kxmlgui { }; + modemmanager-qt = callPackage ./modemmanager-qt { }; + networkmanager-qt = callPackage ./networkmanager-qt { }; + prison = callPackage ./prison { }; + purpose = callPackage ./purpose { }; + qqc2-desktop-style = callPackage ./qqc2-desktop-style { }; + solid = callPackage ./solid { }; + sonnet = callPackage ./sonnet { }; + syndication = callPackage ./syndication { }; + syntax-highlighting = callPackage ./syntax-highlighting { }; + threadweaver = callPackage ./threadweaver { }; } diff --git a/pkgs/kde/frameworks/extra-cmake-modules/default.nix b/pkgs/kde/frameworks/extra-cmake-modules/default.nix index b7dc85d277a3..d0b5c09a101d 100644 --- a/pkgs/kde/frameworks/extra-cmake-modules/default.nix +++ b/pkgs/kde/frameworks/extra-cmake-modules/default.nix @@ -1,5 +1,6 @@ -{ mkKdeDerivation -, python3 +{ + mkKdeDerivation, + python3, }: mkKdeDerivation { pname = "extra-cmake-modules"; diff --git a/pkgs/kde/frameworks/frameworkintegration/default.nix b/pkgs/kde/frameworks/frameworkintegration/default.nix index 3607c115c301..938ed4e1c081 100644 --- a/pkgs/kde/frameworks/frameworkintegration/default.nix +++ b/pkgs/kde/frameworks/frameworkintegration/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "frameworkintegration"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [packagekit-qt]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ packagekit-qt ]; } diff --git a/pkgs/kde/frameworks/kapidox/default.nix b/pkgs/kde/frameworks/kapidox/default.nix index 2544e7921f87..8a79a0dde1fc 100644 --- a/pkgs/kde/frameworks/kapidox/default.nix +++ b/pkgs/kde/frameworks/kapidox/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kapidox"; } diff --git a/pkgs/kde/frameworks/karchive/default.nix b/pkgs/kde/frameworks/karchive/default.nix index fe124e1187d1..d9d15c9592a8 100644 --- a/pkgs/kde/frameworks/karchive/default.nix +++ b/pkgs/kde/frameworks/karchive/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "karchive"; - extraNativeBuildInputs = [qttools pkg-config]; - extraBuildInputs = [xz]; + extraNativeBuildInputs = [ + qttools + pkg-config + ]; + extraBuildInputs = [ xz ]; } diff --git a/pkgs/kde/frameworks/kauth/default.nix b/pkgs/kde/frameworks/kauth/default.nix index df033770a303..4ed23d29fd1c 100644 --- a/pkgs/kde/frameworks/kauth/default.nix +++ b/pkgs/kde/frameworks/kauth/default.nix @@ -7,7 +7,7 @@ mkKdeDerivation { # Late resolve paths so things end up in their own prefix # FIXME(later): discuss with upstream - patches = [./fix-paths.patch]; + patches = [ ./fix-paths.patch ]; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kbookmarks/default.nix b/pkgs/kde/frameworks/kbookmarks/default.nix index ac9255e6f83d..e52786637ff1 100644 --- a/pkgs/kde/frameworks/kbookmarks/default.nix +++ b/pkgs/kde/frameworks/kbookmarks/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kbookmarks"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kcalendarcore/default.nix b/pkgs/kde/frameworks/kcalendarcore/default.nix index 0e9802e5aa22..05f1023a9b61 100644 --- a/pkgs/kde/frameworks/kcalendarcore/default.nix +++ b/pkgs/kde/frameworks/kcalendarcore/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "kcalendarcore"; - extraBuildInputs = [qtdeclarative libical]; + extraBuildInputs = [ + qtdeclarative + libical + ]; } diff --git a/pkgs/kde/frameworks/kcmutils/default.nix b/pkgs/kde/frameworks/kcmutils/default.nix index 617fb5978d11..62c80823df21 100644 --- a/pkgs/kde/frameworks/kcmutils/default.nix +++ b/pkgs/kde/frameworks/kcmutils/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kcmutils"; - extraPropagatedBuildInputs = [qtdeclarative]; + extraPropagatedBuildInputs = [ qtdeclarative ]; meta.mainProgram = "kcmshell6"; } diff --git a/pkgs/kde/frameworks/kcodecs/default.nix b/pkgs/kde/frameworks/kcodecs/default.nix index be9126712055..c2649fe03dec 100644 --- a/pkgs/kde/frameworks/kcodecs/default.nix +++ b/pkgs/kde/frameworks/kcodecs/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "kcodecs"; - extraNativeBuildInputs = [qttools gperf]; + extraNativeBuildInputs = [ + qttools + gperf + ]; } diff --git a/pkgs/kde/frameworks/kcolorscheme/default.nix b/pkgs/kde/frameworks/kcolorscheme/default.nix index 05f32ce574f3..eb682a4e563c 100644 --- a/pkgs/kde/frameworks/kcolorscheme/default.nix +++ b/pkgs/kde/frameworks/kcolorscheme/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kcolorscheme"; } diff --git a/pkgs/kde/frameworks/kcompletion/default.nix b/pkgs/kde/frameworks/kcompletion/default.nix index c07f274e08ee..922182e9280b 100644 --- a/pkgs/kde/frameworks/kcompletion/default.nix +++ b/pkgs/kde/frameworks/kcompletion/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kcompletion"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kconfig/default.nix b/pkgs/kde/frameworks/kconfig/default.nix index b29a081524c7..451ec7db5d28 100644 --- a/pkgs/kde/frameworks/kconfig/default.nix +++ b/pkgs/kde/frameworks/kconfig/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kconfig"; - extraNativeBuildInputs = [qttools]; - extraPropagatedBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [ qttools ]; + extraPropagatedBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/kconfigwidgets/default.nix b/pkgs/kde/frameworks/kconfigwidgets/default.nix index 354972d005ae..7f026b34a152 100644 --- a/pkgs/kde/frameworks/kconfigwidgets/default.nix +++ b/pkgs/kde/frameworks/kconfigwidgets/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kconfigwidgets"; - extraBuildInputs = [qttools]; + extraBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kcontacts/default.nix b/pkgs/kde/frameworks/kcontacts/default.nix index 57e35a90a9ae..fa8e1429fa80 100644 --- a/pkgs/kde/frameworks/kcontacts/default.nix +++ b/pkgs/kde/frameworks/kcontacts/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kcontacts"; } diff --git a/pkgs/kde/frameworks/kcoreaddons/default.nix b/pkgs/kde/frameworks/kcoreaddons/default.nix index 12c6ae5d770b..55189f9f544f 100644 --- a/pkgs/kde/frameworks/kcoreaddons/default.nix +++ b/pkgs/kde/frameworks/kcoreaddons/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "kcoreaddons"; - extraNativeBuildInputs = [qttools shared-mime-info]; - extraBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [ + qttools + shared-mime-info + ]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/kcrash/default.nix b/pkgs/kde/frameworks/kcrash/default.nix index b3ade8fd6763..ae389456e51a 100644 --- a/pkgs/kde/frameworks/kcrash/default.nix +++ b/pkgs/kde/frameworks/kcrash/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kcrash"; } diff --git a/pkgs/kde/frameworks/kdav/default.nix b/pkgs/kde/frameworks/kdav/default.nix index d53562fc9038..04e27a481894 100644 --- a/pkgs/kde/frameworks/kdav/default.nix +++ b/pkgs/kde/frameworks/kdav/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdav"; } diff --git a/pkgs/kde/frameworks/kdbusaddons/default.nix b/pkgs/kde/frameworks/kdbusaddons/default.nix index 6803331b1e36..c75df4132c0b 100644 --- a/pkgs/kde/frameworks/kdbusaddons/default.nix +++ b/pkgs/kde/frameworks/kdbusaddons/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kdbusaddons"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; meta.mainProgram = "kquitapp6"; } diff --git a/pkgs/kde/frameworks/kdeclarative/default.nix b/pkgs/kde/frameworks/kdeclarative/default.nix index 8b05ec66b0f4..a1a0bb4089b8 100644 --- a/pkgs/kde/frameworks/kdeclarative/default.nix +++ b/pkgs/kde/frameworks/kdeclarative/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kdeclarative"; - extraNativeBuildInputs = [spirv-tools]; - extraBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [ spirv-tools ]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/kded/default.nix b/pkgs/kde/frameworks/kded/default.nix index aa2ec5fc5ac2..2eecc23ab836 100644 --- a/pkgs/kde/frameworks/kded/default.nix +++ b/pkgs/kde/frameworks/kded/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kded"; meta.mainProgram = "kded6"; diff --git a/pkgs/kde/frameworks/kdesu/default.nix b/pkgs/kde/frameworks/kdesu/default.nix index ae7ed3a33c38..479c7cc6a4af 100644 --- a/pkgs/kde/frameworks/kdesu/default.nix +++ b/pkgs/kde/frameworks/kdesu/default.nix @@ -1,7 +1,7 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdesu"; # Look for NixOS SUID wrapper first - patches = [./kdesu-search-for-wrapped-daemon-first.patch]; + patches = [ ./kdesu-search-for-wrapped-daemon-first.patch ]; } diff --git a/pkgs/kde/frameworks/kdnssd/default.nix b/pkgs/kde/frameworks/kdnssd/default.nix index 3241dcf9c2fb..ce22856035e3 100644 --- a/pkgs/kde/frameworks/kdnssd/default.nix +++ b/pkgs/kde/frameworks/kdnssd/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kdnssd"; - extraNativeBuildInputs = [qttools]; - extraBuildInputs = [avahi]; + extraNativeBuildInputs = [ qttools ]; + extraBuildInputs = [ avahi ]; } diff --git a/pkgs/kde/frameworks/kdoctools/default.nix b/pkgs/kde/frameworks/kdoctools/default.nix index 2de9ed21d9c8..ee5115c9f469 100644 --- a/pkgs/kde/frameworks/kdoctools/default.nix +++ b/pkgs/kde/frameworks/kdoctools/default.nix @@ -10,7 +10,17 @@ mkKdeDerivation { pname = "kdoctools"; # Perl could be used both at build time and at runtime. - extraNativeBuildInputs = [perl perlPackages.URI libxml2]; - extraBuildInputs = [docbook_xml_dtd_45 docbook-xsl-nons]; - extraPropagatedBuildInputs = [perl perlPackages.URI]; + extraNativeBuildInputs = [ + perl + perlPackages.URI + libxml2 + ]; + extraBuildInputs = [ + docbook_xml_dtd_45 + docbook-xsl-nons + ]; + extraPropagatedBuildInputs = [ + perl + perlPackages.URI + ]; } diff --git a/pkgs/kde/frameworks/kfilemetadata/default.nix b/pkgs/kde/frameworks/kfilemetadata/default.nix index 0e9fd5489e7e..9bd377380c18 100644 --- a/pkgs/kde/frameworks/kfilemetadata/default.nix +++ b/pkgs/kde/frameworks/kfilemetadata/default.nix @@ -14,8 +14,16 @@ mkKdeDerivation { # Fix installing cmake files into wrong directory # FIXME(later): upstream - patches = [./cmake-install-paths.patch]; + patches = [ ./cmake-install-paths.patch ]; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [attr ebook_tools exiv2 ffmpeg kconfig kdegraphics-mobipocket libappimage]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + attr + ebook_tools + exiv2 + ffmpeg + kconfig + kdegraphics-mobipocket + libappimage + ]; } diff --git a/pkgs/kde/frameworks/kglobalaccel/default.nix b/pkgs/kde/frameworks/kglobalaccel/default.nix index b7d5e627d64f..10d40753ae30 100644 --- a/pkgs/kde/frameworks/kglobalaccel/default.nix +++ b/pkgs/kde/frameworks/kglobalaccel/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kglobalaccel"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kguiaddons/default.nix b/pkgs/kde/frameworks/kguiaddons/default.nix index 3aa8bcdf29f5..e4cf58bbb36f 100644 --- a/pkgs/kde/frameworks/kguiaddons/default.nix +++ b/pkgs/kde/frameworks/kguiaddons/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "kguiaddons"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ qtwayland ]; meta.mainProgram = "kde-geo-uri-handler"; } diff --git a/pkgs/kde/frameworks/kholidays/default.nix b/pkgs/kde/frameworks/kholidays/default.nix index 07702734a06b..966ca350c6fd 100644 --- a/pkgs/kde/frameworks/kholidays/default.nix +++ b/pkgs/kde/frameworks/kholidays/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kholidays"; - extraNativeBuildInputs = [qttools]; - extraBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [ qttools ]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/ki18n/default.nix b/pkgs/kde/frameworks/ki18n/default.nix index 9c3bef785298..0e50c345f550 100644 --- a/pkgs/kde/frameworks/ki18n/default.nix +++ b/pkgs/kde/frameworks/ki18n/default.nix @@ -7,7 +7,7 @@ mkKdeDerivation { pname = "ki18n"; - extraNativeBuildInputs = [python3]; - propagatedNativeBuildInputs = [gettext]; - extraBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [ python3 ]; + propagatedNativeBuildInputs = [ gettext ]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/kidletime/default.nix b/pkgs/kde/frameworks/kidletime/default.nix index 7171822ec1da..1fc517f20585 100644 --- a/pkgs/kde/frameworks/kidletime/default.nix +++ b/pkgs/kde/frameworks/kidletime/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "kidletime"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland xorg.libXScrnSaver]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtwayland + xorg.libXScrnSaver + ]; } diff --git a/pkgs/kde/frameworks/kimageformats/default.nix b/pkgs/kde/frameworks/kimageformats/default.nix index 21c84cb56992..0b3d049dc185 100644 --- a/pkgs/kde/frameworks/kimageformats/default.nix +++ b/pkgs/kde/frameworks/kimageformats/default.nix @@ -10,7 +10,13 @@ mkKdeDerivation { pname = "kimageformats"; - extraCmakeFlags = ["-DKIMAGEFORMATS_HEIF=1"]; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [libheif libjxl libavif libraw openexr_3]; + extraCmakeFlags = [ "-DKIMAGEFORMATS_HEIF=1" ]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + libheif + libjxl + libavif + libraw + openexr_3 + ]; } diff --git a/pkgs/kde/frameworks/kio/default.nix b/pkgs/kde/frameworks/kio/default.nix index 98d7a12f00b7..45f448692baa 100644 --- a/pkgs/kde/frameworks/kio/default.nix +++ b/pkgs/kde/frameworks/kio/default.nix @@ -13,5 +13,10 @@ mkKdeDerivation { ./0001-Remove-impure-smbd-search-path.patch ]; - extraBuildInputs = [qt5compat qttools acl attr]; + extraBuildInputs = [ + qt5compat + qttools + acl + attr + ]; } diff --git a/pkgs/kde/frameworks/kirigami/default.nix b/pkgs/kde/frameworks/kirigami/default.nix index cf82923596a0..83edf8c52654 100644 --- a/pkgs/kde/frameworks/kirigami/default.nix +++ b/pkgs/kde/frameworks/kirigami/default.nix @@ -17,18 +17,27 @@ let unwrapped = mkKdeDerivation { pname = "kirigami"; - extraNativeBuildInputs = [qtsvg qttools]; - extraBuildInputs = [qtdeclarative]; - extraPropagatedBuildInputs = [qt5compat]; + extraNativeBuildInputs = [ + qtsvg + qttools + ]; + extraBuildInputs = [ qtdeclarative ]; + extraPropagatedBuildInputs = [ qt5compat ]; }; -in stdenv.mkDerivation { +in +stdenv.mkDerivation { pname = "kirigami-wrapped"; inherit (unwrapped) version; - propagatedBuildInputs = [ unwrapped qqc2-desktop-style ]; + propagatedBuildInputs = [ + unwrapped + qqc2-desktop-style + ]; dontUnpack = true; dontWrapQtApps = true; - passthru = { inherit unwrapped; }; + passthru = { + inherit unwrapped; + }; } diff --git a/pkgs/kde/frameworks/kitemmodels/default.nix b/pkgs/kde/frameworks/kitemmodels/default.nix index 22476d21c4e4..9e818457334c 100644 --- a/pkgs/kde/frameworks/kitemmodels/default.nix +++ b/pkgs/kde/frameworks/kitemmodels/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kitemmodels"; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/kitemviews/default.nix b/pkgs/kde/frameworks/kitemviews/default.nix index b9831f05ea99..487d63092c00 100644 --- a/pkgs/kde/frameworks/kitemviews/default.nix +++ b/pkgs/kde/frameworks/kitemviews/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kitemviews"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kjobwidgets/default.nix b/pkgs/kde/frameworks/kjobwidgets/default.nix index 27e9720d84e1..b8b494310f45 100644 --- a/pkgs/kde/frameworks/kjobwidgets/default.nix +++ b/pkgs/kde/frameworks/kjobwidgets/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kjobwidgets"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/knewstuff/default.nix b/pkgs/kde/frameworks/knewstuff/default.nix index 26e3207764e7..8bbc171f2408 100644 --- a/pkgs/kde/frameworks/knewstuff/default.nix +++ b/pkgs/kde/frameworks/knewstuff/default.nix @@ -9,9 +9,12 @@ mkKdeDerivation { # Late resolve knsrcdir so other things install to their own prefix # FIXME(later): upstream - patches = [./delay-resolving-knsrcdir.patch]; + patches = [ ./delay-resolving-knsrcdir.patch ]; - extraBuildInputs = [qtdeclarative qttools]; - extraPropagatedBuildInputs = [kcmutils]; + extraBuildInputs = [ + qtdeclarative + qttools + ]; + extraPropagatedBuildInputs = [ kcmutils ]; meta.mainProgram = "knewstuff-dialog6"; } diff --git a/pkgs/kde/frameworks/knotifications/default.nix b/pkgs/kde/frameworks/knotifications/default.nix index 232d4469f0e6..08b8decea8f0 100644 --- a/pkgs/kde/frameworks/knotifications/default.nix +++ b/pkgs/kde/frameworks/knotifications/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "knotifications"; - extraNativeBuildInputs = [qttools]; - extraBuildInputs = [qtdeclarative libcanberra]; + extraNativeBuildInputs = [ qttools ]; + extraBuildInputs = [ + qtdeclarative + libcanberra + ]; } diff --git a/pkgs/kde/frameworks/knotifyconfig/default.nix b/pkgs/kde/frameworks/knotifyconfig/default.nix index 9c778a322b67..c0fb343c16fe 100644 --- a/pkgs/kde/frameworks/knotifyconfig/default.nix +++ b/pkgs/kde/frameworks/knotifyconfig/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "knotifyconfig"; - extraBuildInputs = [libcanberra]; + extraBuildInputs = [ libcanberra ]; } diff --git a/pkgs/kde/frameworks/kpackage/default.nix b/pkgs/kde/frameworks/kpackage/default.nix index 19e4d7932a56..f18b43d42d53 100644 --- a/pkgs/kde/frameworks/kpackage/default.nix +++ b/pkgs/kde/frameworks/kpackage/default.nix @@ -1,9 +1,9 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kpackage"; # Follow symlinks when resolving packages # FIXME(later): upstream - patches = [./follow-symlinks.patch]; + patches = [ ./follow-symlinks.patch ]; meta.mainProgram = "kpackagetool6"; } diff --git a/pkgs/kde/frameworks/kparts/default.nix b/pkgs/kde/frameworks/kparts/default.nix index 547e8b1b016e..f3ae2c79ca77 100644 --- a/pkgs/kde/frameworks/kparts/default.nix +++ b/pkgs/kde/frameworks/kparts/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kparts"; } diff --git a/pkgs/kde/frameworks/kpeople/default.nix b/pkgs/kde/frameworks/kpeople/default.nix index 18d56704c2d8..5f9ce156b1f8 100644 --- a/pkgs/kde/frameworks/kpeople/default.nix +++ b/pkgs/kde/frameworks/kpeople/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kpeople"; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/kplotting/default.nix b/pkgs/kde/frameworks/kplotting/default.nix index b23c198fd879..27284e0006b7 100644 --- a/pkgs/kde/frameworks/kplotting/default.nix +++ b/pkgs/kde/frameworks/kplotting/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kplotting"; - extraBuildInputs = [qttools]; + extraBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kpty/default.nix b/pkgs/kde/frameworks/kpty/default.nix index d60c2a5665f2..e0ba42a271f9 100644 --- a/pkgs/kde/frameworks/kpty/default.nix +++ b/pkgs/kde/frameworks/kpty/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kpty"; } diff --git a/pkgs/kde/frameworks/kquickcharts/default.nix b/pkgs/kde/frameworks/kquickcharts/default.nix index 305df6000403..736f06510336 100644 --- a/pkgs/kde/frameworks/kquickcharts/default.nix +++ b/pkgs/kde/frameworks/kquickcharts/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kquickcharts"; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/krunner/default.nix b/pkgs/kde/frameworks/krunner/default.nix index f817c1560c26..fcdc91e68e85 100644 --- a/pkgs/kde/frameworks/krunner/default.nix +++ b/pkgs/kde/frameworks/krunner/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "krunner"; - extraBuildInputs = [plasma-activities]; + extraBuildInputs = [ plasma-activities ]; } diff --git a/pkgs/kde/frameworks/kservice/default.nix b/pkgs/kde/frameworks/kservice/default.nix index c21bab7c8346..5a7bb7a5884a 100644 --- a/pkgs/kde/frameworks/kservice/default.nix +++ b/pkgs/kde/frameworks/kservice/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kservice"; diff --git a/pkgs/kde/frameworks/kstatusnotifieritem/default.nix b/pkgs/kde/frameworks/kstatusnotifieritem/default.nix index bc3b255caaeb..e6845ef56985 100644 --- a/pkgs/kde/frameworks/kstatusnotifieritem/default.nix +++ b/pkgs/kde/frameworks/kstatusnotifieritem/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kstatusnotifieritem"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/ksvg/default.nix b/pkgs/kde/frameworks/ksvg/default.nix index 82dbce5c0829..1d91aa3143a4 100644 --- a/pkgs/kde/frameworks/ksvg/default.nix +++ b/pkgs/kde/frameworks/ksvg/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "ksvg"; - extraBuildInputs = [qtdeclarative qtsvg]; + extraBuildInputs = [ + qtdeclarative + qtsvg + ]; } diff --git a/pkgs/kde/frameworks/ktexteditor/default.nix b/pkgs/kde/frameworks/ktexteditor/default.nix index 9a666c4e6a61..e7c470c99d09 100644 --- a/pkgs/kde/frameworks/ktexteditor/default.nix +++ b/pkgs/kde/frameworks/ktexteditor/default.nix @@ -7,5 +7,9 @@ mkKdeDerivation { pname = "ktexteditor"; - extraBuildInputs = [qtdeclarative qtspeech editorconfig-core-c]; + extraBuildInputs = [ + qtdeclarative + qtspeech + editorconfig-core-c + ]; } diff --git a/pkgs/kde/frameworks/ktexttemplate/default.nix b/pkgs/kde/frameworks/ktexttemplate/default.nix index 673a10863ac6..6fc59c737627 100644 --- a/pkgs/kde/frameworks/ktexttemplate/default.nix +++ b/pkgs/kde/frameworks/ktexttemplate/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "ktexttemplate"; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/frameworks/kunitconversion/default.nix b/pkgs/kde/frameworks/kunitconversion/default.nix index 1d7cb52566d4..544aebb871f3 100644 --- a/pkgs/kde/frameworks/kunitconversion/default.nix +++ b/pkgs/kde/frameworks/kunitconversion/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kunitconversion"; } diff --git a/pkgs/kde/frameworks/kuserfeedback/default.nix b/pkgs/kde/frameworks/kuserfeedback/default.nix index 979362e6bfb8..7379061982b5 100644 --- a/pkgs/kde/frameworks/kuserfeedback/default.nix +++ b/pkgs/kde/frameworks/kuserfeedback/default.nix @@ -7,6 +7,12 @@ mkKdeDerivation { pname = "kuserfeedback"; # Disable server-side stuff we don't care about - extraCmakeFlags = ["-DENABLE_CONSOLE=0" "-DENABLE_CLI=0"]; - extraNativeBuildInputs = [qttools qtsvg]; + extraCmakeFlags = [ + "-DENABLE_CONSOLE=0" + "-DENABLE_CLI=0" + ]; + extraNativeBuildInputs = [ + qttools + qtsvg + ]; } diff --git a/pkgs/kde/frameworks/kwallet/default.nix b/pkgs/kde/frameworks/kwallet/default.nix index 32fc1612237b..331bdee02b31 100644 --- a/pkgs/kde/frameworks/kwallet/default.nix +++ b/pkgs/kde/frameworks/kwallet/default.nix @@ -7,5 +7,9 @@ mkKdeDerivation { pname = "kwallet"; - extraBuildInputs = [libgcrypt kcrash kdoctools]; + extraBuildInputs = [ + libgcrypt + kcrash + kdoctools + ]; } diff --git a/pkgs/kde/frameworks/kwidgetsaddons/default.nix b/pkgs/kde/frameworks/kwidgetsaddons/default.nix index 09dfb3228d05..00e9adca5b2f 100644 --- a/pkgs/kde/frameworks/kwidgetsaddons/default.nix +++ b/pkgs/kde/frameworks/kwidgetsaddons/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kwidgetsaddons"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/kwindowsystem/default.nix b/pkgs/kde/frameworks/kwindowsystem/default.nix index a5fb8eddb7ea..5ae167b1cc9a 100644 --- a/pkgs/kde/frameworks/kwindowsystem/default.nix +++ b/pkgs/kde/frameworks/kwindowsystem/default.nix @@ -8,6 +8,12 @@ mkKdeDerivation { pname = "kwindowsystem"; - extraNativeBuildInputs = [qttools pkg-config]; - extraBuildInputs = [qtdeclarative qtwayland]; + extraNativeBuildInputs = [ + qttools + pkg-config + ]; + extraBuildInputs = [ + qtdeclarative + qtwayland + ]; } diff --git a/pkgs/kde/frameworks/kxmlgui/default.nix b/pkgs/kde/frameworks/kxmlgui/default.nix index 64734cde5af6..3b93b5b35146 100644 --- a/pkgs/kde/frameworks/kxmlgui/default.nix +++ b/pkgs/kde/frameworks/kxmlgui/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kxmlgui"; - extraBuildInputs = [qttools]; + extraBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/frameworks/modemmanager-qt/default.nix b/pkgs/kde/frameworks/modemmanager-qt/default.nix index 34a6f1954842..5acc420a8909 100644 --- a/pkgs/kde/frameworks/modemmanager-qt/default.nix +++ b/pkgs/kde/frameworks/modemmanager-qt/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "modemmanager-qt"; - extraNativeBuildInputs = [pkg-config]; - extraPropagatedBuildInputs = [modemmanager]; + extraNativeBuildInputs = [ pkg-config ]; + extraPropagatedBuildInputs = [ modemmanager ]; } diff --git a/pkgs/kde/frameworks/networkmanager-qt/default.nix b/pkgs/kde/frameworks/networkmanager-qt/default.nix index bdec89a9ca1d..e276cb3a82ba 100644 --- a/pkgs/kde/frameworks/networkmanager-qt/default.nix +++ b/pkgs/kde/frameworks/networkmanager-qt/default.nix @@ -7,7 +7,7 @@ mkKdeDerivation { pname = "networkmanager-qt"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtdeclarative]; - extraPropagatedBuildInputs = [networkmanager]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ qtdeclarative ]; + extraPropagatedBuildInputs = [ networkmanager ]; } diff --git a/pkgs/kde/frameworks/prison/default.nix b/pkgs/kde/frameworks/prison/default.nix index 6411be8a34cf..4cde20f930b0 100644 --- a/pkgs/kde/frameworks/prison/default.nix +++ b/pkgs/kde/frameworks/prison/default.nix @@ -8,5 +8,10 @@ mkKdeDerivation { pname = "prison"; - extraBuildInputs = [qtdeclarative qtmultimedia qrencode libdmtx]; + extraBuildInputs = [ + qtdeclarative + qtmultimedia + qrencode + libdmtx + ]; } diff --git a/pkgs/kde/frameworks/purpose/default.nix b/pkgs/kde/frameworks/purpose/default.nix index 8bf85ae19afe..a515728a3af4 100644 --- a/pkgs/kde/frameworks/purpose/default.nix +++ b/pkgs/kde/frameworks/purpose/default.nix @@ -8,6 +8,10 @@ mkKdeDerivation { pname = "purpose"; - extraBuildInputs = [qtdeclarative]; - extraPropagatedBuildInputs = [kaccounts-integration kdeclarative prison]; + extraBuildInputs = [ qtdeclarative ]; + extraPropagatedBuildInputs = [ + kaccounts-integration + kdeclarative + prison + ]; } diff --git a/pkgs/kde/frameworks/qqc2-desktop-style/default.nix b/pkgs/kde/frameworks/qqc2-desktop-style/default.nix index 5ceb41012d66..45f22d8fa5d3 100644 --- a/pkgs/kde/frameworks/qqc2-desktop-style/default.nix +++ b/pkgs/kde/frameworks/qqc2-desktop-style/default.nix @@ -7,8 +7,11 @@ mkKdeDerivation { pname = "qqc2-desktop-style"; - extraNativeBuildInputs = [qttools]; - extraBuildInputs = [qtdeclarative kirigami.unwrapped]; + extraNativeBuildInputs = [ qttools ]; + extraBuildInputs = [ + qtdeclarative + kirigami.unwrapped + ]; - excludeDependencies = ["kirigami"]; + excludeDependencies = [ "kirigami" ]; } diff --git a/pkgs/kde/frameworks/solid/default.nix b/pkgs/kde/frameworks/solid/default.nix index 2c628b8dbc3e..6b767e9d43f7 100644 --- a/pkgs/kde/frameworks/solid/default.nix +++ b/pkgs/kde/frameworks/solid/default.nix @@ -13,7 +13,11 @@ mkKdeDerivation { ./fix-search-path.patch ]; - extraNativeBuildInputs = [qttools bison flex]; - extraBuildInputs = [libimobiledevice]; + extraNativeBuildInputs = [ + qttools + bison + flex + ]; + extraBuildInputs = [ libimobiledevice ]; meta.mainProgram = "solid-hardware6"; } diff --git a/pkgs/kde/frameworks/sonnet/default.nix b/pkgs/kde/frameworks/sonnet/default.nix index b5b82f6e675c..fbeb8b10d555 100644 --- a/pkgs/kde/frameworks/sonnet/default.nix +++ b/pkgs/kde/frameworks/sonnet/default.nix @@ -9,7 +9,14 @@ mkKdeDerivation { pname = "sonnet"; - extraNativeBuildInputs = [qttools pkg-config]; - extraBuildInputs = [qtdeclarative aspell hunspell]; + extraNativeBuildInputs = [ + qttools + pkg-config + ]; + extraBuildInputs = [ + qtdeclarative + aspell + hunspell + ]; meta.mainProgram = "parsetrigrams6"; } diff --git a/pkgs/kde/frameworks/syndication/default.nix b/pkgs/kde/frameworks/syndication/default.nix index cec50a6777f7..444fec861489 100644 --- a/pkgs/kde/frameworks/syndication/default.nix +++ b/pkgs/kde/frameworks/syndication/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "syndication"; } diff --git a/pkgs/kde/frameworks/syntax-highlighting/default.nix b/pkgs/kde/frameworks/syntax-highlighting/default.nix index 1a5430901f2e..7985dcb95702 100644 --- a/pkgs/kde/frameworks/syntax-highlighting/default.nix +++ b/pkgs/kde/frameworks/syntax-highlighting/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "syntax-highlighting"; - extraBuildInputs = [qtdeclarative]; - extraNativeBuildInputs = [qttools perl]; + extraBuildInputs = [ qtdeclarative ]; + extraNativeBuildInputs = [ + qttools + perl + ]; meta.mainProgram = "ksyntaxhighlighter6"; } diff --git a/pkgs/kde/frameworks/threadweaver/default.nix b/pkgs/kde/frameworks/threadweaver/default.nix index 9da07c2af2ac..dddae60d9666 100644 --- a/pkgs/kde/frameworks/threadweaver/default.nix +++ b/pkgs/kde/frameworks/threadweaver/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "threadweaver"; } diff --git a/pkgs/kde/gear/accessibility-inspector/default.nix b/pkgs/kde/gear/accessibility-inspector/default.nix index 1197f2933008..cb623e7cebb3 100644 --- a/pkgs/kde/gear/accessibility-inspector/default.nix +++ b/pkgs/kde/gear/accessibility-inspector/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "accessibility-inspector"; } diff --git a/pkgs/kde/gear/akonadi-calendar-tools/default.nix b/pkgs/kde/gear/akonadi-calendar-tools/default.nix index bc863c026709..0c0d88a42570 100644 --- a/pkgs/kde/gear/akonadi-calendar-tools/default.nix +++ b/pkgs/kde/gear/akonadi-calendar-tools/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "akonadi-calendar-tools"; } diff --git a/pkgs/kde/gear/akonadi-calendar/default.nix b/pkgs/kde/gear/akonadi-calendar/default.nix index 66c615e53b18..10ef8e6ed05e 100644 --- a/pkgs/kde/gear/akonadi-calendar/default.nix +++ b/pkgs/kde/gear/akonadi-calendar/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "akonadi-calendar"; meta.mainProgram = "kalendarac"; diff --git a/pkgs/kde/gear/akonadi-contacts/default.nix b/pkgs/kde/gear/akonadi-contacts/default.nix index b8c1c5bf92cc..b93d750c0ffd 100644 --- a/pkgs/kde/gear/akonadi-contacts/default.nix +++ b/pkgs/kde/gear/akonadi-contacts/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "akonadi-contacts"; } diff --git a/pkgs/kde/gear/akonadi-import-wizard/default.nix b/pkgs/kde/gear/akonadi-import-wizard/default.nix index 9037457ee8b0..ff7e72d54041 100644 --- a/pkgs/kde/gear/akonadi-import-wizard/default.nix +++ b/pkgs/kde/gear/akonadi-import-wizard/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "akonadi-import-wizard"; meta.mainProgram = "akonadiimportwizard"; diff --git a/pkgs/kde/gear/akonadi-mime/default.nix b/pkgs/kde/gear/akonadi-mime/default.nix index 9db5272e6b4b..72cc1275afe6 100644 --- a/pkgs/kde/gear/akonadi-mime/default.nix +++ b/pkgs/kde/gear/akonadi-mime/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "akonadi-mime"; - extraNativeBuildInputs = [shared-mime-info libxslt]; + extraNativeBuildInputs = [ + shared-mime-info + libxslt + ]; } diff --git a/pkgs/kde/gear/akonadi-notes/default.nix b/pkgs/kde/gear/akonadi-notes/default.nix index a1cd161a510f..01f572f8fb90 100644 --- a/pkgs/kde/gear/akonadi-notes/default.nix +++ b/pkgs/kde/gear/akonadi-notes/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "akonadi-notes"; } diff --git a/pkgs/kde/gear/akonadi-search/default.nix b/pkgs/kde/gear/akonadi-search/default.nix index 4d7ec7aafc20..5b8add9abb8c 100644 --- a/pkgs/kde/gear/akonadi-search/default.nix +++ b/pkgs/kde/gear/akonadi-search/default.nix @@ -29,5 +29,8 @@ mkKdeDerivation rec { rustc ]; - extraBuildInputs = [corrosion xapian]; + extraBuildInputs = [ + corrosion + xapian + ]; } diff --git a/pkgs/kde/gear/akonadi/default.nix b/pkgs/kde/gear/akonadi/default.nix index 64966c4fad58..bb6d2f609930 100644 --- a/pkgs/kde/gear/akonadi/default.nix +++ b/pkgs/kde/gear/akonadi/default.nix @@ -20,8 +20,16 @@ mkKdeDerivation { "-DMYSQLD_SCRIPTS_PATH=${lib.getBin mariadb}/bin" ]; - extraNativeBuildInputs = [qttools shared-mime-info]; - extraBuildInputs = [kaccounts-integration accounts-qt xz mariadb]; + extraNativeBuildInputs = [ + qttools + shared-mime-info + ]; + extraBuildInputs = [ + kaccounts-integration + accounts-qt + xz + mariadb + ]; # Hardcoded as a QString, which is UTF-16 so Nix can't pick it up automatically postFixup = '' diff --git a/pkgs/kde/gear/akonadiconsole/default.nix b/pkgs/kde/gear/akonadiconsole/default.nix index ca116910011c..dbed7d556452 100644 --- a/pkgs/kde/gear/akonadiconsole/default.nix +++ b/pkgs/kde/gear/akonadiconsole/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "akonadiconsole"; - extraBuildInputs = [xapian]; + extraBuildInputs = [ xapian ]; meta.mainProgram = "akonadiconsole"; } diff --git a/pkgs/kde/gear/akregator/default.nix b/pkgs/kde/gear/akregator/default.nix index 4d52e4947b78..17517816b73e 100644 --- a/pkgs/kde/gear/akregator/default.nix +++ b/pkgs/kde/gear/akregator/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "akregator"; - extraBuildInputs = [qtwebengine]; + extraBuildInputs = [ qtwebengine ]; } diff --git a/pkgs/kde/gear/alligator/default.nix b/pkgs/kde/gear/alligator/default.nix index c2f7a14734e2..f317a97e8623 100644 --- a/pkgs/kde/gear/alligator/default.nix +++ b/pkgs/kde/gear/alligator/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "alligator"; meta.mainProgram = "alligator"; diff --git a/pkgs/kde/gear/analitza/default.nix b/pkgs/kde/gear/analitza/default.nix index 318c0b648279..4402ab1d5300 100644 --- a/pkgs/kde/gear/analitza/default.nix +++ b/pkgs/kde/gear/analitza/default.nix @@ -9,6 +9,13 @@ mkKdeDerivation { pname = "analitza"; - extraNativeBuildInputs = [qt5compat qtsvg qttools]; - extraBuildInputs = [qtdeclarative eigen]; + extraNativeBuildInputs = [ + qt5compat + qtsvg + qttools + ]; + extraBuildInputs = [ + qtdeclarative + eigen + ]; } diff --git a/pkgs/kde/gear/angelfish/default.nix b/pkgs/kde/gear/angelfish/default.nix index b9883c7c2a1e..f599178ad37b 100644 --- a/pkgs/kde/gear/angelfish/default.nix +++ b/pkgs/kde/gear/angelfish/default.nix @@ -28,5 +28,10 @@ mkKdeDerivation rec { rustc ]; - extraBuildInputs = [qtsvg qtwebengine corrosion qcoro]; + extraBuildInputs = [ + qtsvg + qtwebengine + corrosion + qcoro + ]; } diff --git a/pkgs/kde/gear/ark/default.nix b/pkgs/kde/gear/ark/default.nix index fb9c3d8e596f..6127e723dd40 100644 --- a/pkgs/kde/gear/ark/default.nix +++ b/pkgs/kde/gear/ark/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "ark"; - extraBuildInputs = [libarchive libzip]; + extraBuildInputs = [ + libarchive + libzip + ]; meta.mainProgram = "ark"; } diff --git a/pkgs/kde/gear/artikulate/default.nix b/pkgs/kde/gear/artikulate/default.nix index c82db10260f7..60bd663852ee 100644 --- a/pkgs/kde/gear/artikulate/default.nix +++ b/pkgs/kde/gear/artikulate/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "artikulate"; - extraBuildInputs = [qtmultimedia]; + extraBuildInputs = [ qtmultimedia ]; # FIXME(qt5) meta.broken = true; } diff --git a/pkgs/kde/gear/audex/default.nix b/pkgs/kde/gear/audex/default.nix index c6043d641608..9a7c8fb0eabf 100644 --- a/pkgs/kde/gear/audex/default.nix +++ b/pkgs/kde/gear/audex/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "audex"; - extraBuildInputs = [libcdio libcdio-paranoia]; + extraBuildInputs = [ + libcdio + libcdio-paranoia + ]; } diff --git a/pkgs/kde/gear/audiocd-kio/default.nix b/pkgs/kde/gear/audiocd-kio/default.nix index c2f5c2558826..b4fa60026b18 100644 --- a/pkgs/kde/gear/audiocd-kio/default.nix +++ b/pkgs/kde/gear/audiocd-kio/default.nix @@ -20,5 +20,10 @@ mkKdeDerivation { }) ]; - extraBuildInputs = [cdparanoia flac libogg libvorbis]; + extraBuildInputs = [ + cdparanoia + flac + libogg + libvorbis + ]; } diff --git a/pkgs/kde/gear/audiotube/default.nix b/pkgs/kde/gear/audiotube/default.nix index c9ae14f3be9b..b27ab60155a5 100644 --- a/pkgs/kde/gear/audiotube/default.nix +++ b/pkgs/kde/gear/audiotube/default.nix @@ -14,41 +14,40 @@ purpose, qcoro, python3, -}: let +}: +let ps = python3.pkgs; pythonDeps = [ ps.yt-dlp ps.ytmusicapi ]; in - mkKdeDerivation { - pname = "audiotube"; +mkKdeDerivation { + pname = "audiotube"; - extraNativeBuildInputs = [ - ps.pybind11 - ]; + extraNativeBuildInputs = [ + ps.pybind11 + ]; - extraBuildInputs = - [ - qtdeclarative - qtmultimedia - qtsvg + extraBuildInputs = [ + qtdeclarative + qtmultimedia + qtsvg - extra-cmake-modules - futuresql - kirigami - kirigami-addons - kcoreaddons - ki18n - kcrash - kwindowsystem - purpose - qcoro - ] - ++ pythonDeps; + extra-cmake-modules + futuresql + kirigami + kirigami-addons + kcoreaddons + ki18n + kcrash + kwindowsystem + purpose + qcoro + ] ++ pythonDeps; - qtWrapperArgs = [ - "--prefix PYTHONPATH : ${ps.makePythonPath pythonDeps}" - ]; - meta.mainProgram = "audiotube"; - } + qtWrapperArgs = [ + "--prefix PYTHONPATH : ${ps.makePythonPath pythonDeps}" + ]; + meta.mainProgram = "audiotube"; +} diff --git a/pkgs/kde/gear/baloo-widgets/default.nix b/pkgs/kde/gear/baloo-widgets/default.nix index 7e576348f060..9835c248eec5 100644 --- a/pkgs/kde/gear/baloo-widgets/default.nix +++ b/pkgs/kde/gear/baloo-widgets/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "baloo-widgets"; meta.mainProgram = "baloo_filemetadata_temp_extractor"; diff --git a/pkgs/kde/gear/blinken/default.nix b/pkgs/kde/gear/blinken/default.nix index 8b6fbc68066a..92cb126b089d 100644 --- a/pkgs/kde/gear/blinken/default.nix +++ b/pkgs/kde/gear/blinken/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "blinken"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "blinken"; } diff --git a/pkgs/kde/gear/bomber/default.nix b/pkgs/kde/gear/bomber/default.nix index 611edb5d2c7a..3e10833d322a 100644 --- a/pkgs/kde/gear/bomber/default.nix +++ b/pkgs/kde/gear/bomber/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "bomber"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "bomber"; } diff --git a/pkgs/kde/gear/bovo/default.nix b/pkgs/kde/gear/bovo/default.nix index 5bafedfd1b14..c3fef1c90778 100644 --- a/pkgs/kde/gear/bovo/default.nix +++ b/pkgs/kde/gear/bovo/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "bovo"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "bovo"; } diff --git a/pkgs/kde/gear/calendarsupport/default.nix b/pkgs/kde/gear/calendarsupport/default.nix index b6632a384d65..9b80b02aa79d 100644 --- a/pkgs/kde/gear/calendarsupport/default.nix +++ b/pkgs/kde/gear/calendarsupport/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "calendarsupport"; } diff --git a/pkgs/kde/gear/calindori/default.nix b/pkgs/kde/gear/calindori/default.nix index 41efa7a9e48f..565ffe6d5865 100644 --- a/pkgs/kde/gear/calindori/default.nix +++ b/pkgs/kde/gear/calindori/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "calindori"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; } diff --git a/pkgs/kde/gear/cantor/default.nix b/pkgs/kde/gear/cantor/default.nix index 42963aabbba0..80d11e576a98 100644 --- a/pkgs/kde/gear/cantor/default.nix +++ b/pkgs/kde/gear/cantor/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "cantor"; - extraNativeBuildInputs = [shared-mime-info]; + extraNativeBuildInputs = [ shared-mime-info ]; # FIXME(qt5) meta.broken = true; } diff --git a/pkgs/kde/gear/cervisia/default.nix b/pkgs/kde/gear/cervisia/default.nix index d8546e9d8a30..804cd7bed758 100644 --- a/pkgs/kde/gear/cervisia/default.nix +++ b/pkgs/kde/gear/cervisia/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "cervisia"; # FIXME(qt5) diff --git a/pkgs/kde/gear/colord-kde/default.nix b/pkgs/kde/gear/colord-kde/default.nix index 9e2aa630d688..e2ce75a98e77 100644 --- a/pkgs/kde/gear/colord-kde/default.nix +++ b/pkgs/kde/gear/colord-kde/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "colord-kde"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [lcms2 xorg.libXrandr]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + lcms2 + xorg.libXrandr + ]; meta.mainProgram = "colord-kde-icc-importer"; } diff --git a/pkgs/kde/gear/default.nix b/pkgs/kde/gear/default.nix index 303e3dde5da5..c296c82a8d9e 100644 --- a/pkgs/kde/gear/default.nix +++ b/pkgs/kde/gear/default.nix @@ -1,252 +1,253 @@ -{callPackage}: { - accessibility-inspector = callPackage ./accessibility-inspector {}; - akonadi = callPackage ./akonadi {}; - akonadi-calendar = callPackage ./akonadi-calendar {}; - akonadi-calendar-tools = callPackage ./akonadi-calendar-tools {}; - akonadi-contacts = callPackage ./akonadi-contacts {}; - akonadi-import-wizard = callPackage ./akonadi-import-wizard {}; - akonadi-mime = callPackage ./akonadi-mime {}; - akonadi-notes = callPackage ./akonadi-notes {}; - akonadi-search = callPackage ./akonadi-search {}; - akonadiconsole = callPackage ./akonadiconsole {}; - akregator = callPackage ./akregator {}; - alligator = callPackage ./alligator {}; - analitza = callPackage ./analitza {}; - angelfish = callPackage ./angelfish {}; - arianna = callPackage ./arianna {}; - ark = callPackage ./ark {}; - artikulate = callPackage ./artikulate {}; - audex = callPackage ./audex {}; - audiocd-kio = callPackage ./audiocd-kio {}; - audiotube = callPackage ./audiotube {}; - baloo-widgets = callPackage ./baloo-widgets {}; - blinken = callPackage ./blinken {}; - bomber = callPackage ./bomber {}; - bovo = callPackage ./bovo {}; - calendarsupport = callPackage ./calendarsupport {}; - calindori = callPackage ./calindori {}; - cantor = callPackage ./cantor {}; - cervisia = callPackage ./cervisia {}; - colord-kde = callPackage ./colord-kde {}; - dolphin = callPackage ./dolphin {}; - dolphin-plugins = callPackage ./dolphin-plugins {}; - dragon = callPackage ./dragon {}; - elisa = callPackage ./elisa {}; - eventviews = callPackage ./eventviews {}; - falkon = callPackage ./falkon {}; - ffmpegthumbs = callPackage ./ffmpegthumbs {}; - filelight = callPackage ./filelight {}; - francis = callPackage ./francis {}; - ghostwriter = callPackage ./ghostwriter {}; - granatier = callPackage ./granatier {}; - grantlee-editor = callPackage ./grantlee-editor {}; - grantleetheme = callPackage ./grantleetheme {}; - gwenview = callPackage ./gwenview {}; - incidenceeditor = callPackage ./incidenceeditor {}; - isoimagewriter = callPackage ./isoimagewriter {}; - itinerary = callPackage ./itinerary {}; - juk = callPackage ./juk {}; - k3b = callPackage ./k3b {}; - kaccounts-integration = callPackage ./kaccounts-integration {}; - kaccounts-providers = callPackage ./kaccounts-providers {}; - kaddressbook = callPackage ./kaddressbook {}; - kajongg = callPackage ./kajongg {}; - kalarm = callPackage ./kalarm {}; - kalgebra = callPackage ./kalgebra {}; - kalk = callPackage ./kalk {}; - kalm = callPackage ./kalm {}; - kalzium = callPackage ./kalzium {}; - kamera = callPackage ./kamera {}; - kamoso = callPackage ./kamoso {}; - kanagram = callPackage ./kanagram {}; - kapman = callPackage ./kapman {}; - kapptemplate = callPackage ./kapptemplate {}; - kasts = callPackage ./kasts {}; - kate = callPackage ./kate {}; - katomic = callPackage ./katomic {}; - kbackup = callPackage ./kbackup {}; - kblackbox = callPackage ./kblackbox {}; - kblocks = callPackage ./kblocks {}; - kbounce = callPackage ./kbounce {}; - kbreakout = callPackage ./kbreakout {}; - kbruch = callPackage ./kbruch {}; - kcachegrind = callPackage ./kcachegrind {}; - kcalc = callPackage ./kcalc {}; - kcalutils = callPackage ./kcalutils {}; - kcharselect = callPackage ./kcharselect {}; - kclock = callPackage ./kclock {}; - kcolorchooser = callPackage ./kcolorchooser {}; - kcron = callPackage ./kcron {}; - kde-dev-scripts = callPackage ./kde-dev-scripts {}; - kde-dev-utils = callPackage ./kde-dev-utils {}; - kde-inotify-survey = callPackage ./kde-inotify-survey {}; - kdebugsettings = callPackage ./kdebugsettings {}; - kdeconnect-kde = callPackage ./kdeconnect-kde {}; - kdeedu-data = callPackage ./kdeedu-data {}; - kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket {}; - kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers {}; - kdenetwork-filesharing = callPackage ./kdenetwork-filesharing {}; - kdenlive = callPackage ./kdenlive {}; - kdepim-addons = callPackage ./kdepim-addons {}; - kdepim-runtime = callPackage ./kdepim-runtime {}; - kdesdk-kio = callPackage ./kdesdk-kio {}; - kdesdk-thumbnailers = callPackage ./kdesdk-thumbnailers {}; - kdev-php = callPackage ./kdev-php {}; - kdev-python = callPackage ./kdev-python {}; - kdevelop = callPackage ./kdevelop {}; - kdf = callPackage ./kdf {}; - kdialog = callPackage ./kdialog {}; - kdiamond = callPackage ./kdiamond {}; - keditbookmarks = callPackage ./keditbookmarks {}; - keysmith = callPackage ./keysmith {}; - kfind = callPackage ./kfind {}; - kfourinline = callPackage ./kfourinline {}; - kgeography = callPackage ./kgeography {}; - kget = callPackage ./kget {}; - kgoldrunner = callPackage ./kgoldrunner {}; - kgpg = callPackage ./kgpg {}; - kgraphviewer = callPackage ./kgraphviewer {}; - khangman = callPackage ./khangman {}; - khealthcertificate = callPackage ./khealthcertificate {}; - khelpcenter = callPackage ./khelpcenter {}; - kidentitymanagement = callPackage ./kidentitymanagement {}; - kig = callPackage ./kig {}; - kigo = callPackage ./kigo {}; - killbots = callPackage ./killbots {}; - kimagemapeditor = callPackage ./kimagemapeditor {}; - kimap = callPackage ./kimap {}; - kio-admin = callPackage ./kio-admin {}; - kio-extras = callPackage ./kio-extras {}; - kio-gdrive = callPackage ./kio-gdrive {}; - kio-zeroconf = callPackage ./kio-zeroconf {}; - kirigami-gallery = callPackage ./kirigami-gallery {}; - kiriki = callPackage ./kiriki {}; - kiten = callPackage ./kiten {}; - kitinerary = callPackage ./kitinerary {}; - kjournald = callPackage ./kjournald {}; - kjumpingcube = callPackage ./kjumpingcube {}; - kldap = callPackage ./kldap {}; - kleopatra = callPackage ./kleopatra {}; - klettres = callPackage ./klettres {}; - klickety = callPackage ./klickety {}; - klines = callPackage ./klines {}; - kmag = callPackage ./kmag {}; - kmahjongg = callPackage ./kmahjongg {}; - kmail = callPackage ./kmail {}; - kmail-account-wizard = callPackage ./kmail-account-wizard {}; - kmailtransport = callPackage ./kmailtransport {}; - kmbox = callPackage ./kmbox {}; - kmime = callPackage ./kmime {}; - kmines = callPackage ./kmines {}; - kmix = callPackage ./kmix {}; - kmousetool = callPackage ./kmousetool {}; - kmouth = callPackage ./kmouth {}; - kmplot = callPackage ./kmplot {}; - knavalbattle = callPackage ./knavalbattle {}; - knetwalk = callPackage ./knetwalk {}; - knights = callPackage ./knights {}; - koko = callPackage ./koko {}; - kolf = callPackage ./kolf {}; - kollision = callPackage ./kollision {}; - kolourpaint = callPackage ./kolourpaint {}; - kompare = callPackage ./kompare {}; - kongress = callPackage ./kongress {}; - konqueror = callPackage ./konqueror {}; - konquest = callPackage ./konquest {}; - konsole = callPackage ./konsole {}; - kontact = callPackage ./kontact {}; - kontactinterface = callPackage ./kontactinterface {}; - kontrast = callPackage ./kontrast {}; - konversation = callPackage ./konversation {}; - kopeninghours = callPackage ./kopeninghours {}; - korganizer = callPackage ./korganizer {}; - kosmindoormap = callPackage ./kosmindoormap {}; - kpat = callPackage ./kpat {}; - kpimtextedit = callPackage ./kpimtextedit {}; - kpkpass = callPackage ./kpkpass {}; - kpmcore = callPackage ./kpmcore {}; - kpublictransport = callPackage ./kpublictransport {}; - kqtquickcharts = callPackage ./kqtquickcharts {}; - krdc = callPackage ./krdc {}; - krecorder = callPackage ./krecorder {}; - kreversi = callPackage ./kreversi {}; - krfb = callPackage ./krfb {}; - kross-interpreters = callPackage ./kross-interpreters {}; - kruler = callPackage ./kruler {}; - ksanecore = callPackage ./ksanecore {}; - kshisen = callPackage ./kshisen {}; - ksirk = callPackage ./ksirk {}; - ksmtp = callPackage ./ksmtp {}; - ksnakeduel = callPackage ./ksnakeduel {}; - kspaceduel = callPackage ./kspaceduel {}; - ksquares = callPackage ./ksquares {}; - ksudoku = callPackage ./ksudoku {}; - ksystemlog = callPackage ./ksystemlog {}; - kteatime = callPackage ./kteatime {}; - ktimer = callPackage ./ktimer {}; - ktnef = callPackage ./ktnef {}; - ktorrent = callPackage ./ktorrent {}; - ktouch = callPackage ./ktouch {}; - ktrip = callPackage ./ktrip {}; - ktuberling = callPackage ./ktuberling {}; - kturtle = callPackage ./kturtle {}; - kubrick = callPackage ./kubrick {}; - kwalletmanager = callPackage ./kwalletmanager {}; - kwave = callPackage ./kwave {}; - kweather = callPackage ./kweather {}; - kweathercore = callPackage ./kweathercore {}; - kwordquiz = callPackage ./kwordquiz {}; - libgravatar = callPackage ./libgravatar {}; - libkcddb = callPackage ./libkcddb {}; - libkcompactdisc = callPackage ./libkcompactdisc {}; - libkdcraw = callPackage ./libkdcraw {}; - libkdegames = callPackage ./libkdegames {}; - libkdepim = callPackage ./libkdepim {}; - libkeduvocdocument = callPackage ./libkeduvocdocument {}; - libkexiv2 = callPackage ./libkexiv2 {}; - libkgapi = callPackage ./libkgapi {}; - libkleo = callPackage ./libkleo {}; - libkmahjongg = callPackage ./libkmahjongg {}; - libkomparediff2 = callPackage ./libkomparediff2 {}; - libksane = callPackage ./libksane {}; - libksieve = callPackage ./libksieve {}; - libktorrent = callPackage ./libktorrent {}; - lokalize = callPackage ./lokalize {}; - lskat = callPackage ./lskat {}; - mailcommon = callPackage ./mailcommon {}; - mailimporter = callPackage ./mailimporter {}; - marble = callPackage ./marble {}; - markdownpart = callPackage ./markdownpart {}; - massif-visualizer = callPackage ./massif-visualizer {}; - mbox-importer = callPackage ./mbox-importer {}; - merkuro = callPackage ./merkuro {}; - messagelib = callPackage ./messagelib {}; - mimetreeparser = callPackage ./mimetreeparser {}; - minuet = callPackage ./minuet {}; - neochat = callPackage ./neochat {}; - okular = callPackage ./okular {}; - palapeli = callPackage ./palapeli {}; - parley = callPackage ./parley {}; - partitionmanager = callPackage ./partitionmanager {}; - picmi = callPackage ./picmi {}; - pim-data-exporter = callPackage ./pim-data-exporter {}; - pim-sieve-editor = callPackage ./pim-sieve-editor {}; - pimcommon = callPackage ./pimcommon {}; - plasmatube = callPackage ./plasmatube {}; - poxml = callPackage ./poxml {}; - qmlkonsole = callPackage ./qmlkonsole {}; - rocs = callPackage ./rocs {}; - signon-kwallet-extension = callPackage ./signon-kwallet-extension {}; - skanlite = callPackage ./skanlite {}; - skanpage = callPackage ./skanpage {}; - skladnik = callPackage ./skladnik {}; - spectacle = callPackage ./spectacle {}; - step = callPackage ./step {}; - svgpart = callPackage ./svgpart {}; - sweeper = callPackage ./sweeper {}; - telly-skout = callPackage ./telly-skout {}; - tokodon = callPackage ./tokodon {}; - umbrello = callPackage ./umbrello {}; - yakuake = callPackage ./yakuake {}; - zanshin = callPackage ./zanshin {}; +{ callPackage }: +{ + accessibility-inspector = callPackage ./accessibility-inspector { }; + akonadi = callPackage ./akonadi { }; + akonadi-calendar = callPackage ./akonadi-calendar { }; + akonadi-calendar-tools = callPackage ./akonadi-calendar-tools { }; + akonadi-contacts = callPackage ./akonadi-contacts { }; + akonadi-import-wizard = callPackage ./akonadi-import-wizard { }; + akonadi-mime = callPackage ./akonadi-mime { }; + akonadi-notes = callPackage ./akonadi-notes { }; + akonadi-search = callPackage ./akonadi-search { }; + akonadiconsole = callPackage ./akonadiconsole { }; + akregator = callPackage ./akregator { }; + alligator = callPackage ./alligator { }; + analitza = callPackage ./analitza { }; + angelfish = callPackage ./angelfish { }; + arianna = callPackage ./arianna { }; + ark = callPackage ./ark { }; + artikulate = callPackage ./artikulate { }; + audex = callPackage ./audex { }; + audiocd-kio = callPackage ./audiocd-kio { }; + audiotube = callPackage ./audiotube { }; + baloo-widgets = callPackage ./baloo-widgets { }; + blinken = callPackage ./blinken { }; + bomber = callPackage ./bomber { }; + bovo = callPackage ./bovo { }; + calendarsupport = callPackage ./calendarsupport { }; + calindori = callPackage ./calindori { }; + cantor = callPackage ./cantor { }; + cervisia = callPackage ./cervisia { }; + colord-kde = callPackage ./colord-kde { }; + dolphin = callPackage ./dolphin { }; + dolphin-plugins = callPackage ./dolphin-plugins { }; + dragon = callPackage ./dragon { }; + elisa = callPackage ./elisa { }; + eventviews = callPackage ./eventviews { }; + falkon = callPackage ./falkon { }; + ffmpegthumbs = callPackage ./ffmpegthumbs { }; + filelight = callPackage ./filelight { }; + francis = callPackage ./francis { }; + ghostwriter = callPackage ./ghostwriter { }; + granatier = callPackage ./granatier { }; + grantlee-editor = callPackage ./grantlee-editor { }; + grantleetheme = callPackage ./grantleetheme { }; + gwenview = callPackage ./gwenview { }; + incidenceeditor = callPackage ./incidenceeditor { }; + isoimagewriter = callPackage ./isoimagewriter { }; + itinerary = callPackage ./itinerary { }; + juk = callPackage ./juk { }; + k3b = callPackage ./k3b { }; + kaccounts-integration = callPackage ./kaccounts-integration { }; + kaccounts-providers = callPackage ./kaccounts-providers { }; + kaddressbook = callPackage ./kaddressbook { }; + kajongg = callPackage ./kajongg { }; + kalarm = callPackage ./kalarm { }; + kalgebra = callPackage ./kalgebra { }; + kalk = callPackage ./kalk { }; + kalm = callPackage ./kalm { }; + kalzium = callPackage ./kalzium { }; + kamera = callPackage ./kamera { }; + kamoso = callPackage ./kamoso { }; + kanagram = callPackage ./kanagram { }; + kapman = callPackage ./kapman { }; + kapptemplate = callPackage ./kapptemplate { }; + kasts = callPackage ./kasts { }; + kate = callPackage ./kate { }; + katomic = callPackage ./katomic { }; + kbackup = callPackage ./kbackup { }; + kblackbox = callPackage ./kblackbox { }; + kblocks = callPackage ./kblocks { }; + kbounce = callPackage ./kbounce { }; + kbreakout = callPackage ./kbreakout { }; + kbruch = callPackage ./kbruch { }; + kcachegrind = callPackage ./kcachegrind { }; + kcalc = callPackage ./kcalc { }; + kcalutils = callPackage ./kcalutils { }; + kcharselect = callPackage ./kcharselect { }; + kclock = callPackage ./kclock { }; + kcolorchooser = callPackage ./kcolorchooser { }; + kcron = callPackage ./kcron { }; + kde-dev-scripts = callPackage ./kde-dev-scripts { }; + kde-dev-utils = callPackage ./kde-dev-utils { }; + kde-inotify-survey = callPackage ./kde-inotify-survey { }; + kdebugsettings = callPackage ./kdebugsettings { }; + kdeconnect-kde = callPackage ./kdeconnect-kde { }; + kdeedu-data = callPackage ./kdeedu-data { }; + kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket { }; + kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers { }; + kdenetwork-filesharing = callPackage ./kdenetwork-filesharing { }; + kdenlive = callPackage ./kdenlive { }; + kdepim-addons = callPackage ./kdepim-addons { }; + kdepim-runtime = callPackage ./kdepim-runtime { }; + kdesdk-kio = callPackage ./kdesdk-kio { }; + kdesdk-thumbnailers = callPackage ./kdesdk-thumbnailers { }; + kdev-php = callPackage ./kdev-php { }; + kdev-python = callPackage ./kdev-python { }; + kdevelop = callPackage ./kdevelop { }; + kdf = callPackage ./kdf { }; + kdialog = callPackage ./kdialog { }; + kdiamond = callPackage ./kdiamond { }; + keditbookmarks = callPackage ./keditbookmarks { }; + keysmith = callPackage ./keysmith { }; + kfind = callPackage ./kfind { }; + kfourinline = callPackage ./kfourinline { }; + kgeography = callPackage ./kgeography { }; + kget = callPackage ./kget { }; + kgoldrunner = callPackage ./kgoldrunner { }; + kgpg = callPackage ./kgpg { }; + kgraphviewer = callPackage ./kgraphviewer { }; + khangman = callPackage ./khangman { }; + khealthcertificate = callPackage ./khealthcertificate { }; + khelpcenter = callPackage ./khelpcenter { }; + kidentitymanagement = callPackage ./kidentitymanagement { }; + kig = callPackage ./kig { }; + kigo = callPackage ./kigo { }; + killbots = callPackage ./killbots { }; + kimagemapeditor = callPackage ./kimagemapeditor { }; + kimap = callPackage ./kimap { }; + kio-admin = callPackage ./kio-admin { }; + kio-extras = callPackage ./kio-extras { }; + kio-gdrive = callPackage ./kio-gdrive { }; + kio-zeroconf = callPackage ./kio-zeroconf { }; + kirigami-gallery = callPackage ./kirigami-gallery { }; + kiriki = callPackage ./kiriki { }; + kiten = callPackage ./kiten { }; + kitinerary = callPackage ./kitinerary { }; + kjournald = callPackage ./kjournald { }; + kjumpingcube = callPackage ./kjumpingcube { }; + kldap = callPackage ./kldap { }; + kleopatra = callPackage ./kleopatra { }; + klettres = callPackage ./klettres { }; + klickety = callPackage ./klickety { }; + klines = callPackage ./klines { }; + kmag = callPackage ./kmag { }; + kmahjongg = callPackage ./kmahjongg { }; + kmail = callPackage ./kmail { }; + kmail-account-wizard = callPackage ./kmail-account-wizard { }; + kmailtransport = callPackage ./kmailtransport { }; + kmbox = callPackage ./kmbox { }; + kmime = callPackage ./kmime { }; + kmines = callPackage ./kmines { }; + kmix = callPackage ./kmix { }; + kmousetool = callPackage ./kmousetool { }; + kmouth = callPackage ./kmouth { }; + kmplot = callPackage ./kmplot { }; + knavalbattle = callPackage ./knavalbattle { }; + knetwalk = callPackage ./knetwalk { }; + knights = callPackage ./knights { }; + koko = callPackage ./koko { }; + kolf = callPackage ./kolf { }; + kollision = callPackage ./kollision { }; + kolourpaint = callPackage ./kolourpaint { }; + kompare = callPackage ./kompare { }; + kongress = callPackage ./kongress { }; + konqueror = callPackage ./konqueror { }; + konquest = callPackage ./konquest { }; + konsole = callPackage ./konsole { }; + kontact = callPackage ./kontact { }; + kontactinterface = callPackage ./kontactinterface { }; + kontrast = callPackage ./kontrast { }; + konversation = callPackage ./konversation { }; + kopeninghours = callPackage ./kopeninghours { }; + korganizer = callPackage ./korganizer { }; + kosmindoormap = callPackage ./kosmindoormap { }; + kpat = callPackage ./kpat { }; + kpimtextedit = callPackage ./kpimtextedit { }; + kpkpass = callPackage ./kpkpass { }; + kpmcore = callPackage ./kpmcore { }; + kpublictransport = callPackage ./kpublictransport { }; + kqtquickcharts = callPackage ./kqtquickcharts { }; + krdc = callPackage ./krdc { }; + krecorder = callPackage ./krecorder { }; + kreversi = callPackage ./kreversi { }; + krfb = callPackage ./krfb { }; + kross-interpreters = callPackage ./kross-interpreters { }; + kruler = callPackage ./kruler { }; + ksanecore = callPackage ./ksanecore { }; + kshisen = callPackage ./kshisen { }; + ksirk = callPackage ./ksirk { }; + ksmtp = callPackage ./ksmtp { }; + ksnakeduel = callPackage ./ksnakeduel { }; + kspaceduel = callPackage ./kspaceduel { }; + ksquares = callPackage ./ksquares { }; + ksudoku = callPackage ./ksudoku { }; + ksystemlog = callPackage ./ksystemlog { }; + kteatime = callPackage ./kteatime { }; + ktimer = callPackage ./ktimer { }; + ktnef = callPackage ./ktnef { }; + ktorrent = callPackage ./ktorrent { }; + ktouch = callPackage ./ktouch { }; + ktrip = callPackage ./ktrip { }; + ktuberling = callPackage ./ktuberling { }; + kturtle = callPackage ./kturtle { }; + kubrick = callPackage ./kubrick { }; + kwalletmanager = callPackage ./kwalletmanager { }; + kwave = callPackage ./kwave { }; + kweather = callPackage ./kweather { }; + kweathercore = callPackage ./kweathercore { }; + kwordquiz = callPackage ./kwordquiz { }; + libgravatar = callPackage ./libgravatar { }; + libkcddb = callPackage ./libkcddb { }; + libkcompactdisc = callPackage ./libkcompactdisc { }; + libkdcraw = callPackage ./libkdcraw { }; + libkdegames = callPackage ./libkdegames { }; + libkdepim = callPackage ./libkdepim { }; + libkeduvocdocument = callPackage ./libkeduvocdocument { }; + libkexiv2 = callPackage ./libkexiv2 { }; + libkgapi = callPackage ./libkgapi { }; + libkleo = callPackage ./libkleo { }; + libkmahjongg = callPackage ./libkmahjongg { }; + libkomparediff2 = callPackage ./libkomparediff2 { }; + libksane = callPackage ./libksane { }; + libksieve = callPackage ./libksieve { }; + libktorrent = callPackage ./libktorrent { }; + lokalize = callPackage ./lokalize { }; + lskat = callPackage ./lskat { }; + mailcommon = callPackage ./mailcommon { }; + mailimporter = callPackage ./mailimporter { }; + marble = callPackage ./marble { }; + markdownpart = callPackage ./markdownpart { }; + massif-visualizer = callPackage ./massif-visualizer { }; + mbox-importer = callPackage ./mbox-importer { }; + merkuro = callPackage ./merkuro { }; + messagelib = callPackage ./messagelib { }; + mimetreeparser = callPackage ./mimetreeparser { }; + minuet = callPackage ./minuet { }; + neochat = callPackage ./neochat { }; + okular = callPackage ./okular { }; + palapeli = callPackage ./palapeli { }; + parley = callPackage ./parley { }; + partitionmanager = callPackage ./partitionmanager { }; + picmi = callPackage ./picmi { }; + pim-data-exporter = callPackage ./pim-data-exporter { }; + pim-sieve-editor = callPackage ./pim-sieve-editor { }; + pimcommon = callPackage ./pimcommon { }; + plasmatube = callPackage ./plasmatube { }; + poxml = callPackage ./poxml { }; + qmlkonsole = callPackage ./qmlkonsole { }; + rocs = callPackage ./rocs { }; + signon-kwallet-extension = callPackage ./signon-kwallet-extension { }; + skanlite = callPackage ./skanlite { }; + skanpage = callPackage ./skanpage { }; + skladnik = callPackage ./skladnik { }; + spectacle = callPackage ./spectacle { }; + step = callPackage ./step { }; + svgpart = callPackage ./svgpart { }; + sweeper = callPackage ./sweeper { }; + telly-skout = callPackage ./telly-skout { }; + tokodon = callPackage ./tokodon { }; + umbrello = callPackage ./umbrello { }; + yakuake = callPackage ./yakuake { }; + zanshin = callPackage ./zanshin { }; } diff --git a/pkgs/kde/gear/dolphin-plugins/default.nix b/pkgs/kde/gear/dolphin-plugins/default.nix index cc88d732389f..652158c2e07b 100644 --- a/pkgs/kde/gear/dolphin-plugins/default.nix +++ b/pkgs/kde/gear/dolphin-plugins/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "dolphin-plugins"; } diff --git a/pkgs/kde/gear/dolphin/default.nix b/pkgs/kde/gear/dolphin/default.nix index eb70e9c9d086..df4c4c3bdaf3 100644 --- a/pkgs/kde/gear/dolphin/default.nix +++ b/pkgs/kde/gear/dolphin/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "dolphin"; } diff --git a/pkgs/kde/gear/dragon/default.nix b/pkgs/kde/gear/dragon/default.nix index 3b49b3372ce6..a825f60421b9 100644 --- a/pkgs/kde/gear/dragon/default.nix +++ b/pkgs/kde/gear/dragon/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "dragon"; meta.mainProgram = "dragon"; diff --git a/pkgs/kde/gear/elisa/default.nix b/pkgs/kde/gear/elisa/default.nix index 459fb247390b..ee280ae93198 100644 --- a/pkgs/kde/gear/elisa/default.nix +++ b/pkgs/kde/gear/elisa/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "elisa"; - extraBuildInputs = [qtmultimedia libvlc]; + extraBuildInputs = [ + qtmultimedia + libvlc + ]; meta.mainProgram = "elisa"; } diff --git a/pkgs/kde/gear/eventviews/default.nix b/pkgs/kde/gear/eventviews/default.nix index d9d0eeb7d798..dfdca9c5ce10 100644 --- a/pkgs/kde/gear/eventviews/default.nix +++ b/pkgs/kde/gear/eventviews/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "eventviews"; } diff --git a/pkgs/kde/gear/falkon/default.nix b/pkgs/kde/gear/falkon/default.nix index bc8125b99ec8..daa26d9ce5e7 100644 --- a/pkgs/kde/gear/falkon/default.nix +++ b/pkgs/kde/gear/falkon/default.nix @@ -9,7 +9,16 @@ mkKdeDerivation { pname = "falkon"; - extraNativeBuildInputs = [qttools qtwebchannel qtwebengine]; - extraBuildInputs = [extra-cmake-modules qtwebchannel qtwebengine python3Packages.pyside6]; + extraNativeBuildInputs = [ + qttools + qtwebchannel + qtwebengine + ]; + extraBuildInputs = [ + extra-cmake-modules + qtwebchannel + qtwebengine + python3Packages.pyside6 + ]; meta.mainProgram = "falkon"; } diff --git a/pkgs/kde/gear/ffmpegthumbs/default.nix b/pkgs/kde/gear/ffmpegthumbs/default.nix index 62bd0e10378c..71740192c421 100644 --- a/pkgs/kde/gear/ffmpegthumbs/default.nix +++ b/pkgs/kde/gear/ffmpegthumbs/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "ffmpegthumbs"; - extraBuildInputs = [ffmpeg]; + extraBuildInputs = [ ffmpeg ]; } diff --git a/pkgs/kde/gear/francis/default.nix b/pkgs/kde/gear/francis/default.nix index 8e2494b65fe1..231eadcd85b4 100644 --- a/pkgs/kde/gear/francis/default.nix +++ b/pkgs/kde/gear/francis/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "francis"; - extraBuildInputs = [qtsvg knotifications]; + extraBuildInputs = [ + qtsvg + knotifications + ]; } diff --git a/pkgs/kde/gear/granatier/default.nix b/pkgs/kde/gear/granatier/default.nix index 1c8593258ca3..6f1f673c6f05 100644 --- a/pkgs/kde/gear/granatier/default.nix +++ b/pkgs/kde/gear/granatier/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "granatier"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "granatier"; } diff --git a/pkgs/kde/gear/grantlee-editor/default.nix b/pkgs/kde/gear/grantlee-editor/default.nix index a80ea7d8b939..4c82ad082c70 100644 --- a/pkgs/kde/gear/grantlee-editor/default.nix +++ b/pkgs/kde/gear/grantlee-editor/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "grantlee-editor"; - extraBuildInputs = [qtwebengine]; + extraBuildInputs = [ qtwebengine ]; } diff --git a/pkgs/kde/gear/grantleetheme/default.nix b/pkgs/kde/gear/grantleetheme/default.nix index 5e21e92a54e5..5457d75b0f0c 100644 --- a/pkgs/kde/gear/grantleetheme/default.nix +++ b/pkgs/kde/gear/grantleetheme/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "grantleetheme"; } diff --git a/pkgs/kde/gear/gwenview/default.nix b/pkgs/kde/gear/gwenview/default.nix index 4bbb5f98eb1e..71780b6bf9a7 100644 --- a/pkgs/kde/gear/gwenview/default.nix +++ b/pkgs/kde/gear/gwenview/default.nix @@ -14,7 +14,7 @@ mkKdeDerivation { pname = "gwenview"; - extraNativeBuildInputs = [pkg-config]; + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtsvg qtwayland diff --git a/pkgs/kde/gear/incidenceeditor/default.nix b/pkgs/kde/gear/incidenceeditor/default.nix index cf8c1e7857c4..b5603c82ca0c 100644 --- a/pkgs/kde/gear/incidenceeditor/default.nix +++ b/pkgs/kde/gear/incidenceeditor/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "incidenceeditor"; } diff --git a/pkgs/kde/gear/isoimagewriter/default.nix b/pkgs/kde/gear/isoimagewriter/default.nix index e9b41bcb84e9..e9dc082f3293 100644 --- a/pkgs/kde/gear/isoimagewriter/default.nix +++ b/pkgs/kde/gear/isoimagewriter/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "isoimagewriter"; - extraBuildInputs = [qgpgme]; + extraBuildInputs = [ qgpgme ]; meta.mainProgram = "isoimagewriter"; } diff --git a/pkgs/kde/gear/itinerary/default.nix b/pkgs/kde/gear/itinerary/default.nix index ca1872662f32..0b2292a2ada3 100644 --- a/pkgs/kde/gear/itinerary/default.nix +++ b/pkgs/kde/gear/itinerary/default.nix @@ -10,9 +10,16 @@ mkKdeDerivation { pname = "itinerary"; # FIXME: this should really be fixed at ECM level somehow - patches = [./optional-runtime-dependencies.patch]; + patches = [ ./optional-runtime-dependencies.patch ]; - extraNativeBuildInputs = [pkg-config shared-mime-info]; - extraBuildInputs = [qtlocation qtpositioning libical]; + extraNativeBuildInputs = [ + pkg-config + shared-mime-info + ]; + extraBuildInputs = [ + qtlocation + qtpositioning + libical + ]; meta.mainProgram = "itinerary"; } diff --git a/pkgs/kde/gear/juk/default.nix b/pkgs/kde/gear/juk/default.nix index 53eff6a9cc18..c0bc805639a4 100644 --- a/pkgs/kde/gear/juk/default.nix +++ b/pkgs/kde/gear/juk/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "juk"; - extraBuildInputs = [qtsvg taglib]; + extraBuildInputs = [ + qtsvg + taglib + ]; meta.mainProgram = "juk"; } diff --git a/pkgs/kde/gear/k3b/default.nix b/pkgs/kde/gear/k3b/default.nix index ba4a1fc6aab4..a11f03a6333f 100644 --- a/pkgs/kde/gear/k3b/default.nix +++ b/pkgs/kde/gear/k3b/default.nix @@ -25,7 +25,10 @@ mkKdeDerivation { pname = "k3b"; - extraNativeBuildInputs = [pkg-config shared-mime-info]; + extraNativeBuildInputs = [ + pkg-config + shared-mime-info + ]; # FIXME: Musicbrainz 2.x???, musepack extraBuildInputs = [ @@ -40,20 +43,27 @@ mkKdeDerivation { ]; qtWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ - cdrdao - cdrtools - dvdplusrwtools - libburn - normalize - sox - transcode - vcdimager - flac - ]}" + "--prefix PATH : ${ + lib.makeBinPath [ + cdrdao + cdrtools + dvdplusrwtools + libburn + normalize + sox + transcode + vcdimager + flac + ] + }" # FIXME: this should really be done with patchelf --add-rpath, but it breaks the binary somehow - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ cdparanoia libdvdcss ]}" + "--prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + cdparanoia + libdvdcss + ] + }" ]; meta.mainProgram = "k3b"; diff --git a/pkgs/kde/gear/kaccounts-integration/default.nix b/pkgs/kde/gear/kaccounts-integration/default.nix index 1b927d3e01ef..06a4436ba133 100644 --- a/pkgs/kde/gear/kaccounts-integration/default.nix +++ b/pkgs/kde/gear/kaccounts-integration/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kaccounts-integration"; - propagatedNativeBuildInputs = [intltool]; + propagatedNativeBuildInputs = [ intltool ]; } diff --git a/pkgs/kde/gear/kaccounts-providers/default.nix b/pkgs/kde/gear/kaccounts-providers/default.nix index 6cd2fd7e3304..bf0ecf678302 100644 --- a/pkgs/kde/gear/kaccounts-providers/default.nix +++ b/pkgs/kde/gear/kaccounts-providers/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "kaccounts-providers"; - extraNativeBuildInputs = [intltool]; - extraBuildInputs = [qtdeclarative qtwebengine]; + extraNativeBuildInputs = [ intltool ]; + extraBuildInputs = [ + qtdeclarative + qtwebengine + ]; } diff --git a/pkgs/kde/gear/kaddressbook/default.nix b/pkgs/kde/gear/kaddressbook/default.nix index a5ef9c659f4e..56039912bb51 100644 --- a/pkgs/kde/gear/kaddressbook/default.nix +++ b/pkgs/kde/gear/kaddressbook/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kaddressbook"; meta.mainProgram = "kaddressbook"; diff --git a/pkgs/kde/gear/kajongg/default.nix b/pkgs/kde/gear/kajongg/default.nix index 651ac3b3115a..555c384b6081 100644 --- a/pkgs/kde/gear/kajongg/default.nix +++ b/pkgs/kde/gear/kajongg/default.nix @@ -6,7 +6,11 @@ mkKdeDerivation { pname = "kajongg"; - extraBuildInputs = [qtsvg python3 python3.pkgs.twisted]; + extraBuildInputs = [ + qtsvg + python3 + python3.pkgs.twisted + ]; # FIXME: completely horked, is actually a Python app, needs a lot of fixing meta.broken = true; } diff --git a/pkgs/kde/gear/kalarm/default.nix b/pkgs/kde/gear/kalarm/default.nix index f795cd3bf68e..0a1dc3524417 100644 --- a/pkgs/kde/gear/kalarm/default.nix +++ b/pkgs/kde/gear/kalarm/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "kalarm"; - extraBuildInputs = [libcanberra libvlc]; + extraBuildInputs = [ + libcanberra + libvlc + ]; } diff --git a/pkgs/kde/gear/kalgebra/default.nix b/pkgs/kde/gear/kalgebra/default.nix index 89aaafc04c96..1b3cd47fc93e 100644 --- a/pkgs/kde/gear/kalgebra/default.nix +++ b/pkgs/kde/gear/kalgebra/default.nix @@ -8,5 +8,10 @@ mkKdeDerivation { pname = "kalgebra"; - extraBuildInputs = [qtsvg qtwebengine ncurses readline]; + extraBuildInputs = [ + qtsvg + qtwebengine + ncurses + readline + ]; } diff --git a/pkgs/kde/gear/kalk/default.nix b/pkgs/kde/gear/kalk/default.nix index 511b0bdf0654..6f339fe609dd 100644 --- a/pkgs/kde/gear/kalk/default.nix +++ b/pkgs/kde/gear/kalk/default.nix @@ -12,7 +12,11 @@ mkKdeDerivation { pname = "kalk"; - extraNativeBuildInputs = [pkg-config bison flex]; + extraNativeBuildInputs = [ + pkg-config + bison + flex + ]; extraBuildInputs = [ qtdeclarative kirigami-addons diff --git a/pkgs/kde/gear/kalm/default.nix b/pkgs/kde/gear/kalm/default.nix index 0c4eee90bc31..295084a63db7 100644 --- a/pkgs/kde/gear/kalm/default.nix +++ b/pkgs/kde/gear/kalm/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kalm"; } diff --git a/pkgs/kde/gear/kalzium/default.nix b/pkgs/kde/gear/kalzium/default.nix index 1c45498294d0..7cdcd1efec63 100644 --- a/pkgs/kde/gear/kalzium/default.nix +++ b/pkgs/kde/gear/kalzium/default.nix @@ -11,7 +11,15 @@ mkKdeDerivation { pname = "kalzium"; # FIXME: look into how to make it find libfacile - extraNativeBuildInputs = [pkg-config ocaml]; - extraBuildInputs = [eigen openbabel qtsvg qtscxml]; + extraNativeBuildInputs = [ + pkg-config + ocaml + ]; + extraBuildInputs = [ + eigen + openbabel + qtsvg + qtscxml + ]; meta.mainProgram = "kalzium"; } diff --git a/pkgs/kde/gear/kamera/default.nix b/pkgs/kde/gear/kamera/default.nix index 3ab21c99f4ed..d6f9be0bc99a 100644 --- a/pkgs/kde/gear/kamera/default.nix +++ b/pkgs/kde/gear/kamera/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kamera"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [libgphoto2]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ libgphoto2 ]; } diff --git a/pkgs/kde/gear/kamoso/default.nix b/pkgs/kde/gear/kamoso/default.nix index b83e193f3117..fa86b87f2f8d 100644 --- a/pkgs/kde/gear/kamoso/default.nix +++ b/pkgs/kde/gear/kamoso/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kamoso"; # FIXME(qt5) diff --git a/pkgs/kde/gear/kanagram/default.nix b/pkgs/kde/gear/kanagram/default.nix index e7d3d7b443ed..aec99c0f32c2 100644 --- a/pkgs/kde/gear/kanagram/default.nix +++ b/pkgs/kde/gear/kanagram/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kanagram"; - extraBuildInputs = [qtspeech]; + extraBuildInputs = [ qtspeech ]; meta.mainProgram = "kanagram"; } diff --git a/pkgs/kde/gear/kapman/default.nix b/pkgs/kde/gear/kapman/default.nix index 61cfb1fdf3fa..abae489b60f6 100644 --- a/pkgs/kde/gear/kapman/default.nix +++ b/pkgs/kde/gear/kapman/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "kapman"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kapman"; } diff --git a/pkgs/kde/gear/kapptemplate/default.nix b/pkgs/kde/gear/kapptemplate/default.nix index 9b4f350b1b65..49b8dab441b0 100644 --- a/pkgs/kde/gear/kapptemplate/default.nix +++ b/pkgs/kde/gear/kapptemplate/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kapptemplate"; meta.mainProgram = "kapptemplate"; diff --git a/pkgs/kde/gear/kasts/default.nix b/pkgs/kde/gear/kasts/default.nix index 2375bb00af21..f95ea1c80892 100644 --- a/pkgs/kde/gear/kasts/default.nix +++ b/pkgs/kde/gear/kasts/default.nix @@ -9,7 +9,7 @@ mkKdeDerivation { pname = "kasts"; - extraNativeBuildInputs = [pkg-config]; + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtsvg qtmultimedia diff --git a/pkgs/kde/gear/kate/default.nix b/pkgs/kde/gear/kate/default.nix index 044b7b35e8b5..622787ac3877 100644 --- a/pkgs/kde/gear/kate/default.nix +++ b/pkgs/kde/gear/kate/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kate"; } diff --git a/pkgs/kde/gear/katomic/default.nix b/pkgs/kde/gear/katomic/default.nix index e9dcd6ebe040..61d3d6e653ea 100644 --- a/pkgs/kde/gear/katomic/default.nix +++ b/pkgs/kde/gear/katomic/default.nix @@ -1,11 +1,11 @@ { mkKdeDerivation, - _7zz + _7zz, }: mkKdeDerivation { pname = "katomic"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "katomic"; } diff --git a/pkgs/kde/gear/kbackup/default.nix b/pkgs/kde/gear/kbackup/default.nix index 49e43996b932..4ccab6e8ca3e 100644 --- a/pkgs/kde/gear/kbackup/default.nix +++ b/pkgs/kde/gear/kbackup/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "kbackup"; - extraNativeBuildInputs = [shared-mime-info]; - extraBuildInputs = [qt5compat libarchive]; + extraNativeBuildInputs = [ shared-mime-info ]; + extraBuildInputs = [ + qt5compat + libarchive + ]; meta.mainProgram = "kbackup"; } diff --git a/pkgs/kde/gear/kblackbox/default.nix b/pkgs/kde/gear/kblackbox/default.nix index 26156c9195a9..5d1147074e4a 100644 --- a/pkgs/kde/gear/kblackbox/default.nix +++ b/pkgs/kde/gear/kblackbox/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "kblackbox"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kblackbox"; } diff --git a/pkgs/kde/gear/kblocks/default.nix b/pkgs/kde/gear/kblocks/default.nix index 1e4628b03037..228e02beb8cc 100644 --- a/pkgs/kde/gear/kblocks/default.nix +++ b/pkgs/kde/gear/kblocks/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kblocks"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kblocks"; } diff --git a/pkgs/kde/gear/kbounce/default.nix b/pkgs/kde/gear/kbounce/default.nix index e93c9e50d673..d816a91632f1 100644 --- a/pkgs/kde/gear/kbounce/default.nix +++ b/pkgs/kde/gear/kbounce/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "kbounce"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kbounce"; } diff --git a/pkgs/kde/gear/kbreakout/default.nix b/pkgs/kde/gear/kbreakout/default.nix index 541ae0789ed4..29fb4eeadd9b 100644 --- a/pkgs/kde/gear/kbreakout/default.nix +++ b/pkgs/kde/gear/kbreakout/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kbreakout"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "kbreakout"; } diff --git a/pkgs/kde/gear/kbruch/default.nix b/pkgs/kde/gear/kbruch/default.nix index 9533db2c30e5..d4e4c40b20f2 100644 --- a/pkgs/kde/gear/kbruch/default.nix +++ b/pkgs/kde/gear/kbruch/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kbruch"; meta.mainProgram = "kbruch"; diff --git a/pkgs/kde/gear/kcachegrind/default.nix b/pkgs/kde/gear/kcachegrind/default.nix index 52de8a88e666..d657c059ca22 100644 --- a/pkgs/kde/gear/kcachegrind/default.nix +++ b/pkgs/kde/gear/kcachegrind/default.nix @@ -7,7 +7,7 @@ mkKdeDerivation { pname = "kcachegrind"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; qtWrapperArgs = [ "--suffix PATH : ${lib.makeBinPath [ graphviz ]}" diff --git a/pkgs/kde/gear/kcalc/default.nix b/pkgs/kde/gear/kcalc/default.nix index 28f1d314ce96..645ececef858 100644 --- a/pkgs/kde/gear/kcalc/default.nix +++ b/pkgs/kde/gear/kcalc/default.nix @@ -8,6 +8,11 @@ mkKdeDerivation { pname = "kcalc"; - extraBuildInputs = [qt5compat gmp mpfr kdoctools]; + extraBuildInputs = [ + qt5compat + gmp + mpfr + kdoctools + ]; meta.mainProgram = "kcalc"; } diff --git a/pkgs/kde/gear/kcalutils/default.nix b/pkgs/kde/gear/kcalutils/default.nix index 1b58cce9ff00..38f9951477c9 100644 --- a/pkgs/kde/gear/kcalutils/default.nix +++ b/pkgs/kde/gear/kcalutils/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kcalutils"; } diff --git a/pkgs/kde/gear/kcharselect/default.nix b/pkgs/kde/gear/kcharselect/default.nix index 9ee054d9339a..3dae9bdfa84b 100644 --- a/pkgs/kde/gear/kcharselect/default.nix +++ b/pkgs/kde/gear/kcharselect/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kcharselect"; meta.mainProgram = "kcharselect"; diff --git a/pkgs/kde/gear/kclock/default.nix b/pkgs/kde/gear/kclock/default.nix index 97db5fd92f0e..56ec55e885da 100644 --- a/pkgs/kde/gear/kclock/default.nix +++ b/pkgs/kde/gear/kclock/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "kclock"; - extraBuildInputs = [qtsvg qtmultimedia]; + extraBuildInputs = [ + qtsvg + qtmultimedia + ]; } diff --git a/pkgs/kde/gear/kcolorchooser/default.nix b/pkgs/kde/gear/kcolorchooser/default.nix index f4c5132800e3..f4f51cf5164f 100644 --- a/pkgs/kde/gear/kcolorchooser/default.nix +++ b/pkgs/kde/gear/kcolorchooser/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kcolorchooser"; meta.mainProgram = "kcolorchooser"; diff --git a/pkgs/kde/gear/kcron/default.nix b/pkgs/kde/gear/kcron/default.nix index b1707101d49f..9278e6672d86 100644 --- a/pkgs/kde/gear/kcron/default.nix +++ b/pkgs/kde/gear/kcron/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kcron"; } diff --git a/pkgs/kde/gear/kde-dev-scripts/default.nix b/pkgs/kde/gear/kde-dev-scripts/default.nix index 7e82f80b8114..41dcc71d8c17 100644 --- a/pkgs/kde/gear/kde-dev-scripts/default.nix +++ b/pkgs/kde/gear/kde-dev-scripts/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kde-dev-scripts"; } diff --git a/pkgs/kde/gear/kde-dev-utils/default.nix b/pkgs/kde/gear/kde-dev-utils/default.nix index 6efce8354eec..98365e9f0c2d 100644 --- a/pkgs/kde/gear/kde-dev-utils/default.nix +++ b/pkgs/kde/gear/kde-dev-utils/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kde-dev-utils"; - extraBuildInputs = [qttools]; + extraBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/gear/kde-inotify-survey/default.nix b/pkgs/kde/gear/kde-inotify-survey/default.nix index 6e319b60c81d..5ecc800aa9da 100644 --- a/pkgs/kde/gear/kde-inotify-survey/default.nix +++ b/pkgs/kde/gear/kde-inotify-survey/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kde-inotify-survey"; meta.mainProgram = "kde-inotify-survey"; diff --git a/pkgs/kde/gear/kdebugsettings/default.nix b/pkgs/kde/gear/kdebugsettings/default.nix index 21477c665694..c2cceb383873 100644 --- a/pkgs/kde/gear/kdebugsettings/default.nix +++ b/pkgs/kde/gear/kdebugsettings/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdebugsettings"; meta.mainProgram = "kdebugsettings"; diff --git a/pkgs/kde/gear/kdeconnect-kde/default.nix b/pkgs/kde/gear/kdeconnect-kde/default.nix index c8575ee51ea6..3bc3abd422ea 100644 --- a/pkgs/kde/gear/kdeconnect-kde/default.nix +++ b/pkgs/kde/gear/kdeconnect-kde/default.nix @@ -27,8 +27,15 @@ mkKdeDerivation { echo "${sshfs}" > $out/nix-support/depends ''; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtconnectivity qtmultimedia qtwayland wayland wayland-protocols libfakekey]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtconnectivity + qtmultimedia + qtwayland + wayland + wayland-protocols + libfakekey + ]; extraCmakeFlags = [ "-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner" diff --git a/pkgs/kde/gear/kdeedu-data/default.nix b/pkgs/kde/gear/kdeedu-data/default.nix index 74bc3921389c..d47f41510a3a 100644 --- a/pkgs/kde/gear/kdeedu-data/default.nix +++ b/pkgs/kde/gear/kdeedu-data/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdeedu-data"; } diff --git a/pkgs/kde/gear/kdegraphics-mobipocket/default.nix b/pkgs/kde/gear/kdegraphics-mobipocket/default.nix index 7636cbe1dd27..56596b0537f6 100644 --- a/pkgs/kde/gear/kdegraphics-mobipocket/default.nix +++ b/pkgs/kde/gear/kdegraphics-mobipocket/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kdegraphics-mobipocket"; - extraBuildInputs = [qt5compat]; + extraBuildInputs = [ qt5compat ]; } diff --git a/pkgs/kde/gear/kdenetwork-filesharing/default.nix b/pkgs/kde/gear/kdenetwork-filesharing/default.nix index a91dc2529503..35292d554ef6 100644 --- a/pkgs/kde/gear/kdenetwork-filesharing/default.nix +++ b/pkgs/kde/gear/kdenetwork-filesharing/default.nix @@ -5,10 +5,10 @@ mkKdeDerivation { pname = "kdenetwork-filesharing"; - patches = [./smbd-path.patch]; + patches = [ ./smbd-path.patch ]; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; # We can't actually install samba via PackageKit, so let's not confuse users any more than we have to - extraCmakeFlags = ["-DSAMBA_INSTALL=OFF"]; + extraCmakeFlags = [ "-DSAMBA_INSTALL=OFF" ]; } diff --git a/pkgs/kde/gear/kdenlive/default.nix b/pkgs/kde/gear/kdenlive/default.nix index 8c08272cd946..b9a6e321531c 100644 --- a/pkgs/kde/gear/kdenlive/default.nix +++ b/pkgs/kde/gear/kdenlive/default.nix @@ -17,13 +17,11 @@ mkKdeDerivation { pname = "kdenlive"; patches = [ - ( - substituteAll { - src = ./dependency-paths.patch; - inherit mediainfo mlt glaxnimate; - ffmpeg = ffmpeg-full; - } - ) + (substituteAll { + src = ./dependency-paths.patch; + inherit mediainfo mlt glaxnimate; + ffmpeg = ffmpeg-full; + }) ]; extraNativeBuildInputs = [ shared-mime-info ]; diff --git a/pkgs/kde/gear/kdepim-addons/default.nix b/pkgs/kde/gear/kdepim-addons/default.nix index 4c59f3f5512a..4b800b7c1913 100644 --- a/pkgs/kde/gear/kdepim-addons/default.nix +++ b/pkgs/kde/gear/kdepim-addons/default.nix @@ -31,5 +31,9 @@ mkKdeDerivation rec { rustc ]; - extraBuildInputs = [discount corrosion alpaka]; + extraBuildInputs = [ + discount + corrosion + alpaka + ]; } diff --git a/pkgs/kde/gear/kdepim-runtime/default.nix b/pkgs/kde/gear/kdepim-runtime/default.nix index a4c2f81afb82..e3cd581afcd5 100644 --- a/pkgs/kde/gear/kdepim-runtime/default.nix +++ b/pkgs/kde/gear/kdepim-runtime/default.nix @@ -14,11 +14,26 @@ mkKdeDerivation { pname = "kdepim-runtime"; - extraNativeBuildInputs = [pkg-config shared-mime-info libxslt]; + extraNativeBuildInputs = [ + pkg-config + shared-mime-info + libxslt + ]; # FIXME: libkolabxml - extraBuildInputs = [qtnetworkauth qtspeech qtwebengine cyrus_sasl libetebase]; + extraBuildInputs = [ + qtnetworkauth + qtspeech + qtwebengine + cyrus_sasl + libetebase + ]; qtWrapperArgs = [ - "--prefix SASL_PATH : ${lib.makeSearchPath "lib/sasl2" [ cyrus_sasl.out libkgapi ]}" + "--prefix SASL_PATH : ${ + lib.makeSearchPath "lib/sasl2" [ + cyrus_sasl.out + libkgapi + ] + }" ]; } diff --git a/pkgs/kde/gear/kdesdk-kio/default.nix b/pkgs/kde/gear/kdesdk-kio/default.nix index 1ec970a818f6..24a4601ddbb2 100644 --- a/pkgs/kde/gear/kdesdk-kio/default.nix +++ b/pkgs/kde/gear/kdesdk-kio/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kdesdk-kio"; - extraNativeBuildInputs = [perl]; + extraNativeBuildInputs = [ perl ]; } diff --git a/pkgs/kde/gear/kdesdk-thumbnailers/default.nix b/pkgs/kde/gear/kdesdk-thumbnailers/default.nix index 727fff83b3d2..47673f9bed22 100644 --- a/pkgs/kde/gear/kdesdk-thumbnailers/default.nix +++ b/pkgs/kde/gear/kdesdk-thumbnailers/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdesdk-thumbnailers"; } diff --git a/pkgs/kde/gear/kdev-php/default.nix b/pkgs/kde/gear/kdev-php/default.nix index 861bc9615b1c..285c51170c6b 100644 --- a/pkgs/kde/gear/kdev-php/default.nix +++ b/pkgs/kde/gear/kdev-php/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kdev-php"; - extraNativeBuildInputs = [kdevelop-pg-qt]; + extraNativeBuildInputs = [ kdevelop-pg-qt ]; } diff --git a/pkgs/kde/gear/kdev-python/default.nix b/pkgs/kde/gear/kdev-python/default.nix index 6ddeff1b5850..23901bb4d78e 100644 --- a/pkgs/kde/gear/kdev-python/default.nix +++ b/pkgs/kde/gear/kdev-python/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdev-python"; } diff --git a/pkgs/kde/gear/kdf/default.nix b/pkgs/kde/gear/kdf/default.nix index 8021e701cbaa..f4350dc606df 100644 --- a/pkgs/kde/gear/kdf/default.nix +++ b/pkgs/kde/gear/kdf/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdf"; } diff --git a/pkgs/kde/gear/kdialog/default.nix b/pkgs/kde/gear/kdialog/default.nix index 2ef126650578..c1f96a49b1e9 100644 --- a/pkgs/kde/gear/kdialog/default.nix +++ b/pkgs/kde/gear/kdialog/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdialog"; } diff --git a/pkgs/kde/gear/kdiamond/default.nix b/pkgs/kde/gear/kdiamond/default.nix index 1636a80fd727..11e0dbf40f50 100644 --- a/pkgs/kde/gear/kdiamond/default.nix +++ b/pkgs/kde/gear/kdiamond/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kdiamond"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "kdiamond"; } diff --git a/pkgs/kde/gear/keditbookmarks/default.nix b/pkgs/kde/gear/keditbookmarks/default.nix index 8eec9c76ec75..4308c79ccee3 100644 --- a/pkgs/kde/gear/keditbookmarks/default.nix +++ b/pkgs/kde/gear/keditbookmarks/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "keditbookmarks"; } diff --git a/pkgs/kde/gear/keysmith/default.nix b/pkgs/kde/gear/keysmith/default.nix index 4d96f630a661..e01b7a61e266 100644 --- a/pkgs/kde/gear/keysmith/default.nix +++ b/pkgs/kde/gear/keysmith/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "keysmith"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtsvg libsodium]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtsvg + libsodium + ]; meta.mainProgram = "keysmith"; } diff --git a/pkgs/kde/gear/kfind/default.nix b/pkgs/kde/gear/kfind/default.nix index b652b790eb7f..d1e815913254 100644 --- a/pkgs/kde/gear/kfind/default.nix +++ b/pkgs/kde/gear/kfind/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kfind"; - extraBuildInputs = [qt5compat]; + extraBuildInputs = [ qt5compat ]; meta.mainProgram = "kfind"; } diff --git a/pkgs/kde/gear/kfourinline/default.nix b/pkgs/kde/gear/kfourinline/default.nix index 2c77d372fc16..1bd6606b2cf2 100644 --- a/pkgs/kde/gear/kfourinline/default.nix +++ b/pkgs/kde/gear/kfourinline/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kfourinline"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; } diff --git a/pkgs/kde/gear/kgeography/default.nix b/pkgs/kde/gear/kgeography/default.nix index 560faec8e010..c2c04553c24d 100644 --- a/pkgs/kde/gear/kgeography/default.nix +++ b/pkgs/kde/gear/kgeography/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kgeography"; meta.mainProgram = "kgeography"; diff --git a/pkgs/kde/gear/kget/default.nix b/pkgs/kde/gear/kget/default.nix index e88cd601bb0e..412d0a3c0b69 100644 --- a/pkgs/kde/gear/kget/default.nix +++ b/pkgs/kde/gear/kget/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "kget"; - extraBuildInputs = [qgpgme libmms]; + extraBuildInputs = [ + qgpgme + libmms + ]; meta.mainProgram = "kget"; } diff --git a/pkgs/kde/gear/kgoldrunner/default.nix b/pkgs/kde/gear/kgoldrunner/default.nix index ba82b55cccad..10a0634e1b50 100644 --- a/pkgs/kde/gear/kgoldrunner/default.nix +++ b/pkgs/kde/gear/kgoldrunner/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kgoldrunner"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "kgoldrunner"; } diff --git a/pkgs/kde/gear/kgpg/default.nix b/pkgs/kde/gear/kgpg/default.nix index 2b974de5123c..d2979a933a54 100644 --- a/pkgs/kde/gear/kgpg/default.nix +++ b/pkgs/kde/gear/kgpg/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "kgpg"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [gpgme]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ gpgme ]; meta.mainProgram = "kgpg"; } diff --git a/pkgs/kde/gear/kgraphviewer/default.nix b/pkgs/kde/gear/kgraphviewer/default.nix index de47a29cb6a1..560d4685921a 100644 --- a/pkgs/kde/gear/kgraphviewer/default.nix +++ b/pkgs/kde/gear/kgraphviewer/default.nix @@ -10,5 +10,10 @@ mkKdeDerivation { pname = "kgraphviewer"; extraNativeBuildInputs = [ pkg-config ]; - extraBuildInputs = [ qt5compat qtsvg boost graphviz ]; + extraBuildInputs = [ + qt5compat + qtsvg + boost + graphviz + ]; } diff --git a/pkgs/kde/gear/khangman/default.nix b/pkgs/kde/gear/khangman/default.nix index e3f95b7a6a5a..460baf52760b 100644 --- a/pkgs/kde/gear/khangman/default.nix +++ b/pkgs/kde/gear/khangman/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "khangman"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "khangman"; } diff --git a/pkgs/kde/gear/khealthcertificate/default.nix b/pkgs/kde/gear/khealthcertificate/default.nix index 6d5461bffc3c..ef4b1ab16680 100644 --- a/pkgs/kde/gear/khealthcertificate/default.nix +++ b/pkgs/kde/gear/khealthcertificate/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "khealthcertificate"; - extraNativeBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/gear/khelpcenter/default.nix b/pkgs/kde/gear/khelpcenter/default.nix index 231d1036b0b1..2348754b71b6 100644 --- a/pkgs/kde/gear/khelpcenter/default.nix +++ b/pkgs/kde/gear/khelpcenter/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "khelpcenter"; - extraBuildInputs = [qtwebengine xapian]; + extraBuildInputs = [ + qtwebengine + xapian + ]; meta.mainProgram = "khelpcenter"; } diff --git a/pkgs/kde/gear/kidentitymanagement/default.nix b/pkgs/kde/gear/kidentitymanagement/default.nix index c66c416fd7ce..bfcfa3f19696 100644 --- a/pkgs/kde/gear/kidentitymanagement/default.nix +++ b/pkgs/kde/gear/kidentitymanagement/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kidentitymanagement"; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/gear/kig/default.nix b/pkgs/kde/gear/kig/default.nix index a3e4de99e6a8..8a1761644378 100644 --- a/pkgs/kde/gear/kig/default.nix +++ b/pkgs/kde/gear/kig/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kig"; # FIXME(qt5) diff --git a/pkgs/kde/gear/kigo/default.nix b/pkgs/kde/gear/kigo/default.nix index 4fd00e721f81..6c2f4a1793d7 100644 --- a/pkgs/kde/gear/kigo/default.nix +++ b/pkgs/kde/gear/kigo/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "kigo"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kigo"; } diff --git a/pkgs/kde/gear/killbots/default.nix b/pkgs/kde/gear/killbots/default.nix index 592cb97ba681..71853ae6eb96 100644 --- a/pkgs/kde/gear/killbots/default.nix +++ b/pkgs/kde/gear/killbots/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "killbots"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "killbots"; } diff --git a/pkgs/kde/gear/kimagemapeditor/default.nix b/pkgs/kde/gear/kimagemapeditor/default.nix index 71efc86fd2ae..9341cf5ab4db 100644 --- a/pkgs/kde/gear/kimagemapeditor/default.nix +++ b/pkgs/kde/gear/kimagemapeditor/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kimagemapeditor"; - extraBuildInputs = [qtwebengine]; + extraBuildInputs = [ qtwebengine ]; meta.mainProgram = "kimagemapeditor"; } diff --git a/pkgs/kde/gear/kimap/default.nix b/pkgs/kde/gear/kimap/default.nix index d106166ec4a6..3f5bc4496070 100644 --- a/pkgs/kde/gear/kimap/default.nix +++ b/pkgs/kde/gear/kimap/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kimap"; - extraBuildInputs = [cyrus_sasl]; + extraBuildInputs = [ cyrus_sasl ]; } diff --git a/pkgs/kde/gear/kio-admin/default.nix b/pkgs/kde/gear/kio-admin/default.nix index 042253978983..7734ac049225 100644 --- a/pkgs/kde/gear/kio-admin/default.nix +++ b/pkgs/kde/gear/kio-admin/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kio-admin"; } diff --git a/pkgs/kde/gear/kio-extras/default.nix b/pkgs/kde/gear/kio-extras/default.nix index 79a5cb405ae4..2260feeac62c 100644 --- a/pkgs/kde/gear/kio-extras/default.nix +++ b/pkgs/kde/gear/kio-extras/default.nix @@ -19,7 +19,11 @@ mkKdeDerivation { pname = "kio-extras"; - extraNativeBuildInputs = [pkg-config gperf shared-mime-info]; + extraNativeBuildInputs = [ + pkg-config + gperf + shared-mime-info + ]; extraBuildInputs = [ qt5compat qtsvg diff --git a/pkgs/kde/gear/kio-gdrive/default.nix b/pkgs/kde/gear/kio-gdrive/default.nix index 1c28dd3dcd10..3fc930a31699 100644 --- a/pkgs/kde/gear/kio-gdrive/default.nix +++ b/pkgs/kde/gear/kio-gdrive/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kio-gdrive"; } diff --git a/pkgs/kde/gear/kio-zeroconf/default.nix b/pkgs/kde/gear/kio-zeroconf/default.nix index 0b731162af83..8a1d91bbb1a5 100644 --- a/pkgs/kde/gear/kio-zeroconf/default.nix +++ b/pkgs/kde/gear/kio-zeroconf/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kio-zeroconf"; } diff --git a/pkgs/kde/gear/kirigami-gallery/default.nix b/pkgs/kde/gear/kirigami-gallery/default.nix index d9e1e12367a2..bb739046baca 100644 --- a/pkgs/kde/gear/kirigami-gallery/default.nix +++ b/pkgs/kde/gear/kirigami-gallery/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "kirigami-gallery"; - extraNativeBuildInputs = [qtsvg qttools]; + extraNativeBuildInputs = [ + qtsvg + qttools + ]; } diff --git a/pkgs/kde/gear/kiriki/default.nix b/pkgs/kde/gear/kiriki/default.nix index 50d04e49e939..91290cbc3a29 100644 --- a/pkgs/kde/gear/kiriki/default.nix +++ b/pkgs/kde/gear/kiriki/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kiriki"; meta.mainProgram = "kiriki"; diff --git a/pkgs/kde/gear/kiten/default.nix b/pkgs/kde/gear/kiten/default.nix index 5f87c6c66b39..d6eeab96eb66 100644 --- a/pkgs/kde/gear/kiten/default.nix +++ b/pkgs/kde/gear/kiten/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kiten"; } diff --git a/pkgs/kde/gear/kitinerary/default.nix b/pkgs/kde/gear/kitinerary/default.nix index de3f4ef00005..28710c095fcc 100644 --- a/pkgs/kde/gear/kitinerary/default.nix +++ b/pkgs/kde/gear/kitinerary/default.nix @@ -10,7 +10,7 @@ mkKdeDerivation { pname = "kitinerary"; - extraNativeBuildInputs = [shared-mime-info]; + extraNativeBuildInputs = [ shared-mime-info ]; extraBuildInputs = [ qtsvg qtdeclarative diff --git a/pkgs/kde/gear/kjournald/default.nix b/pkgs/kde/gear/kjournald/default.nix index 879e698db4d1..f902fba1e0dc 100644 --- a/pkgs/kde/gear/kjournald/default.nix +++ b/pkgs/kde/gear/kjournald/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "kjournald"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtdeclarative systemd]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtdeclarative + systemd + ]; meta.mainProgram = "kjournaldbrowser"; } diff --git a/pkgs/kde/gear/kjumpingcube/default.nix b/pkgs/kde/gear/kjumpingcube/default.nix index 0141748b39dc..65ae1386cf27 100644 --- a/pkgs/kde/gear/kjumpingcube/default.nix +++ b/pkgs/kde/gear/kjumpingcube/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "kjumpingcube"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kjumpingcube"; } diff --git a/pkgs/kde/gear/kldap/default.nix b/pkgs/kde/gear/kldap/default.nix index 99c17b169147..7c3e9b960002 100644 --- a/pkgs/kde/gear/kldap/default.nix +++ b/pkgs/kde/gear/kldap/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "kldap"; - extraBuildInputs = [cyrus_sasl openldap]; + extraBuildInputs = [ + cyrus_sasl + openldap + ]; } diff --git a/pkgs/kde/gear/kleopatra/default.nix b/pkgs/kde/gear/kleopatra/default.nix index 58d3f4b5a9cf..560ab8fb71fc 100644 --- a/pkgs/kde/gear/kleopatra/default.nix +++ b/pkgs/kde/gear/kleopatra/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kleopatra"; - extraNativeBuildInputs = [shared-mime-info]; - extraBuildInputs = [akonadi-mime]; + extraNativeBuildInputs = [ shared-mime-info ]; + extraBuildInputs = [ akonadi-mime ]; } diff --git a/pkgs/kde/gear/klettres/default.nix b/pkgs/kde/gear/klettres/default.nix index ef6305d0f121..b01e22878385 100644 --- a/pkgs/kde/gear/klettres/default.nix +++ b/pkgs/kde/gear/klettres/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "klettres"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "klettres"; } diff --git a/pkgs/kde/gear/klickety/default.nix b/pkgs/kde/gear/klickety/default.nix index 339fa31003a5..a0d214f3e79c 100644 --- a/pkgs/kde/gear/klickety/default.nix +++ b/pkgs/kde/gear/klickety/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "klickety"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "klickety"; } diff --git a/pkgs/kde/gear/klines/default.nix b/pkgs/kde/gear/klines/default.nix index 52bb95c0d787..fe39ba85440c 100644 --- a/pkgs/kde/gear/klines/default.nix +++ b/pkgs/kde/gear/klines/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "klines"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "klines"; } diff --git a/pkgs/kde/gear/kmag/default.nix b/pkgs/kde/gear/kmag/default.nix index 3d8046715dca..0650d3bd763c 100644 --- a/pkgs/kde/gear/kmag/default.nix +++ b/pkgs/kde/gear/kmag/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmag"; meta.mainProgram = "kmag"; diff --git a/pkgs/kde/gear/kmahjongg/default.nix b/pkgs/kde/gear/kmahjongg/default.nix index 9d01f435be00..1816b16f283c 100644 --- a/pkgs/kde/gear/kmahjongg/default.nix +++ b/pkgs/kde/gear/kmahjongg/default.nix @@ -7,8 +7,11 @@ mkKdeDerivation { pname = "kmahjongg"; - extraBuildInputs = [qtdeclarative qtsvg]; + extraBuildInputs = [ + qtdeclarative + qtsvg + ]; - qtWrapperArgs = ["--prefix XDG_DATA_DIRS : ${libkmahjongg}/share"]; + qtWrapperArgs = [ "--prefix XDG_DATA_DIRS : ${libkmahjongg}/share" ]; meta.mainProgram = "kmahjongg"; } diff --git a/pkgs/kde/gear/kmail-account-wizard/default.nix b/pkgs/kde/gear/kmail-account-wizard/default.nix index acd23f72d683..88e790f1a93a 100644 --- a/pkgs/kde/gear/kmail-account-wizard/default.nix +++ b/pkgs/kde/gear/kmail-account-wizard/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmail-account-wizard"; meta.mainProgram = "accountwizard"; diff --git a/pkgs/kde/gear/kmail/default.nix b/pkgs/kde/gear/kmail/default.nix index f3f659fbaf5f..ce38c7d15fdc 100644 --- a/pkgs/kde/gear/kmail/default.nix +++ b/pkgs/kde/gear/kmail/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmail"; } diff --git a/pkgs/kde/gear/kmailtransport/default.nix b/pkgs/kde/gear/kmailtransport/default.nix index cf1bf8c1b223..7953ec021b64 100644 --- a/pkgs/kde/gear/kmailtransport/default.nix +++ b/pkgs/kde/gear/kmailtransport/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmailtransport"; } diff --git a/pkgs/kde/gear/kmbox/default.nix b/pkgs/kde/gear/kmbox/default.nix index ef840d3eda4d..9f1a0ef7c400 100644 --- a/pkgs/kde/gear/kmbox/default.nix +++ b/pkgs/kde/gear/kmbox/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmbox"; } diff --git a/pkgs/kde/gear/kmime/default.nix b/pkgs/kde/gear/kmime/default.nix index a2beb4fdf58f..300185643481 100644 --- a/pkgs/kde/gear/kmime/default.nix +++ b/pkgs/kde/gear/kmime/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kmime"; - extraNativeBuildInputs = [qttools]; - extraBuildInputs = [ki18n]; + extraNativeBuildInputs = [ qttools ]; + extraBuildInputs = [ ki18n ]; } diff --git a/pkgs/kde/gear/kmines/default.nix b/pkgs/kde/gear/kmines/default.nix index 687cf0d29480..243fd722e954 100644 --- a/pkgs/kde/gear/kmines/default.nix +++ b/pkgs/kde/gear/kmines/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "kmines"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "kmines"; } diff --git a/pkgs/kde/gear/kmix/default.nix b/pkgs/kde/gear/kmix/default.nix index b83392baa7df..8c6e1a3c4b81 100644 --- a/pkgs/kde/gear/kmix/default.nix +++ b/pkgs/kde/gear/kmix/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmix"; # FIXME(qt5) diff --git a/pkgs/kde/gear/kmousetool/default.nix b/pkgs/kde/gear/kmousetool/default.nix index 78a73e45768b..7eca9ab12c73 100644 --- a/pkgs/kde/gear/kmousetool/default.nix +++ b/pkgs/kde/gear/kmousetool/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "kmousetool"; - extraBuildInputs = [qtmultimedia xorg.libXt]; + extraBuildInputs = [ + qtmultimedia + xorg.libXt + ]; meta.mainProgram = "kmousetool"; } diff --git a/pkgs/kde/gear/kmouth/default.nix b/pkgs/kde/gear/kmouth/default.nix index 9abffa1d2da6..098f8a5ec33f 100644 --- a/pkgs/kde/gear/kmouth/default.nix +++ b/pkgs/kde/gear/kmouth/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kmouth"; - extraBuildInputs = [qtspeech]; + extraBuildInputs = [ qtspeech ]; meta.mainProgram = "kmouth"; } diff --git a/pkgs/kde/gear/kmplot/default.nix b/pkgs/kde/gear/kmplot/default.nix index b38941765747..6830d3edeae1 100644 --- a/pkgs/kde/gear/kmplot/default.nix +++ b/pkgs/kde/gear/kmplot/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kmplot"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kmplot"; } diff --git a/pkgs/kde/gear/knavalbattle/default.nix b/pkgs/kde/gear/knavalbattle/default.nix index abd9281ff52e..a04c8dee5baa 100644 --- a/pkgs/kde/gear/knavalbattle/default.nix +++ b/pkgs/kde/gear/knavalbattle/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "knavalbattle"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "knavalbattle"; } diff --git a/pkgs/kde/gear/knetwalk/default.nix b/pkgs/kde/gear/knetwalk/default.nix index 265e6d32f542..36305d57cc87 100644 --- a/pkgs/kde/gear/knetwalk/default.nix +++ b/pkgs/kde/gear/knetwalk/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "knetwalk"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "knetwalk"; } diff --git a/pkgs/kde/gear/knights/default.nix b/pkgs/kde/gear/knights/default.nix index 4deca218d095..2fd61dc79f19 100644 --- a/pkgs/kde/gear/knights/default.nix +++ b/pkgs/kde/gear/knights/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "knights"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg qtspeech]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ + qtsvg + qtspeech + ]; meta.mainProgram = "knights"; } diff --git a/pkgs/kde/gear/koko/default.nix b/pkgs/kde/gear/koko/default.nix index 1241f68e12a7..e823a6cff139 100644 --- a/pkgs/kde/gear/koko/default.nix +++ b/pkgs/kde/gear/koko/default.nix @@ -7,7 +7,8 @@ qtsvg, exiv2, kirigami-addons, -}: let +}: +let # URLs snapshotted through # https://web.archive.org/save/$url # Update when stale enough I guess? @@ -24,22 +25,22 @@ sha256 = "0cwbfff8gzci5zrahh6d53b9b3bfv1cbwlv0k6076531i1c7md9p"; }; in - mkKdeDerivation { - pname = "koko"; +mkKdeDerivation { + pname = "koko"; - prePatch = '' - ln -s ${admin1} src/admin1CodesASCII.txt - ln -s ${admin2} src/admin2Codes.txt - ln -s ${cities1000} src/cities1000.zip - ''; + prePatch = '' + ln -s ${admin1} src/admin1CodesASCII.txt + ln -s ${admin2} src/admin2Codes.txt + ln -s ${cities1000} src/cities1000.zip + ''; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [ - qtmultimedia - qtpositioning - qtsvg - exiv2 - kirigami-addons - ]; - meta.mainProgram = "koko"; - } + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtmultimedia + qtpositioning + qtsvg + exiv2 + kirigami-addons + ]; + meta.mainProgram = "koko"; +} diff --git a/pkgs/kde/gear/kolf/default.nix b/pkgs/kde/gear/kolf/default.nix index 39657f077a7d..020ffdad5c99 100644 --- a/pkgs/kde/gear/kolf/default.nix +++ b/pkgs/kde/gear/kolf/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "kolf"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "kolf"; } diff --git a/pkgs/kde/gear/kollision/default.nix b/pkgs/kde/gear/kollision/default.nix index 299549d47513..f8924cb68930 100644 --- a/pkgs/kde/gear/kollision/default.nix +++ b/pkgs/kde/gear/kollision/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "kollision"; - extraNativeBuildInputs = [_7zz]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "kollision"; } diff --git a/pkgs/kde/gear/kolourpaint/default.nix b/pkgs/kde/gear/kolourpaint/default.nix index 7cf5583345d2..752be8e2bd45 100644 --- a/pkgs/kde/gear/kolourpaint/default.nix +++ b/pkgs/kde/gear/kolourpaint/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kolourpaint"; meta.mainProgram = "kolourpaint"; diff --git a/pkgs/kde/gear/kompare/default.nix b/pkgs/kde/gear/kompare/default.nix index 32bcaf2401d9..223db6239307 100644 --- a/pkgs/kde/gear/kompare/default.nix +++ b/pkgs/kde/gear/kompare/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kompare"; meta.mainProgram = "kompare"; diff --git a/pkgs/kde/gear/kongress/default.nix b/pkgs/kde/gear/kongress/default.nix index e91c9cf59069..c82cb663f37e 100644 --- a/pkgs/kde/gear/kongress/default.nix +++ b/pkgs/kde/gear/kongress/default.nix @@ -7,5 +7,9 @@ mkKdeDerivation { pname = "kongress"; - extraBuildInputs = [kcontacts qtsvg qtlocation]; + extraBuildInputs = [ + kcontacts + qtsvg + qtlocation + ]; } diff --git a/pkgs/kde/gear/konqueror/default.nix b/pkgs/kde/gear/konqueror/default.nix index 9ae274fc84c3..5bd29359e979 100644 --- a/pkgs/kde/gear/konqueror/default.nix +++ b/pkgs/kde/gear/konqueror/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "konqueror"; - extraNativeBuildInputs = [hunspell]; - extraBuildInputs = [qtwebengine]; + extraNativeBuildInputs = [ hunspell ]; + extraBuildInputs = [ qtwebengine ]; extraCmakeFlags = [ "-DWebEngineDictConverter_EXECUTABLE=${qtwebengine}/libexec/qwebengine_convert_dict" diff --git a/pkgs/kde/gear/konquest/default.nix b/pkgs/kde/gear/konquest/default.nix index 538428d84c72..3b7cfbf59e54 100644 --- a/pkgs/kde/gear/konquest/default.nix +++ b/pkgs/kde/gear/konquest/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "konquest"; - extraBuildInputs = [qtscxml qtsvg]; + extraBuildInputs = [ + qtscxml + qtsvg + ]; meta.mainProgram = "konquest"; } diff --git a/pkgs/kde/gear/konsole/default.nix b/pkgs/kde/gear/konsole/default.nix index 65a94bb19096..0e95e6a045a8 100644 --- a/pkgs/kde/gear/konsole/default.nix +++ b/pkgs/kde/gear/konsole/default.nix @@ -6,7 +6,10 @@ mkKdeDerivation { pname = "konsole"; - extraBuildInputs = [qt5compat qtmultimedia]; + extraBuildInputs = [ + qt5compat + qtmultimedia + ]; meta.mainProgram = "konsole"; } diff --git a/pkgs/kde/gear/kontactinterface/default.nix b/pkgs/kde/gear/kontactinterface/default.nix index 4c7d6acab1ca..1f81eda91e92 100644 --- a/pkgs/kde/gear/kontactinterface/default.nix +++ b/pkgs/kde/gear/kontactinterface/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kontactinterface"; } diff --git a/pkgs/kde/gear/kontrast/default.nix b/pkgs/kde/gear/kontrast/default.nix index 1ad85ad64802..6d3ef5d3adb9 100644 --- a/pkgs/kde/gear/kontrast/default.nix +++ b/pkgs/kde/gear/kontrast/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "kontrast"; - extraBuildInputs = [qtsvg qcoro]; + extraBuildInputs = [ + qtsvg + qcoro + ]; meta.mainProgram = "kontrast"; } diff --git a/pkgs/kde/gear/konversation/default.nix b/pkgs/kde/gear/konversation/default.nix index ba58215e3093..b78bb62f62fc 100644 --- a/pkgs/kde/gear/konversation/default.nix +++ b/pkgs/kde/gear/konversation/default.nix @@ -7,8 +7,11 @@ mkKdeDerivation { pname = "konversation"; - extraBuildInputs = [qt5compat]; - extraNativeBuildInputs = [qtmultimedia qttools]; + extraBuildInputs = [ qt5compat ]; + extraNativeBuildInputs = [ + qtmultimedia + qttools + ]; meta.mainProgram = "konversation"; } diff --git a/pkgs/kde/gear/kopeninghours/default.nix b/pkgs/kde/gear/kopeninghours/default.nix index 7ba5214ac09f..7cb81e62ee78 100644 --- a/pkgs/kde/gear/kopeninghours/default.nix +++ b/pkgs/kde/gear/kopeninghours/default.nix @@ -9,7 +9,10 @@ mkKdeDerivation { pname = "kopeninghours"; - extraNativeBuildInputs = [bison flex]; + extraNativeBuildInputs = [ + bison + flex + ]; extraBuildInputs = [ qtdeclarative (boost.override { diff --git a/pkgs/kde/gear/korganizer/default.nix b/pkgs/kde/gear/korganizer/default.nix index c20e6625e1bd..17331248185f 100644 --- a/pkgs/kde/gear/korganizer/default.nix +++ b/pkgs/kde/gear/korganizer/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "korganizer"; - extraBuildInputs = [qttools]; + extraBuildInputs = [ qttools ]; meta.mainProgram = "korganizer"; } diff --git a/pkgs/kde/gear/kosmindoormap/default.nix b/pkgs/kde/gear/kosmindoormap/default.nix index 37f991a7adeb..26ad09427458 100644 --- a/pkgs/kde/gear/kosmindoormap/default.nix +++ b/pkgs/kde/gear/kosmindoormap/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "kosmindoormap"; - extraNativeBuildInputs = [bison flex]; - extraBuildInputs = [recastnavigation]; + extraNativeBuildInputs = [ + bison + flex + ]; + extraBuildInputs = [ recastnavigation ]; } diff --git a/pkgs/kde/gear/kpat/default.nix b/pkgs/kde/gear/kpat/default.nix index e770f5935705..0462c8c4f9aa 100644 --- a/pkgs/kde/gear/kpat/default.nix +++ b/pkgs/kde/gear/kpat/default.nix @@ -10,13 +10,16 @@ mkKdeDerivation { pname = "kpat"; - extraNativeBuildInputs = [_7zz shared-mime-info]; + extraNativeBuildInputs = [ + _7zz + shared-mime-info + ]; extraBuildInputs = [ qtsvg black-hole-solver freecell-solver ]; - qtWrapperArgs = ["--prefix XDG_DATA_DIRS : ${libkdegames}/share"]; + qtWrapperArgs = [ "--prefix XDG_DATA_DIRS : ${libkdegames}/share" ]; meta.mainProgram = "kpat"; } diff --git a/pkgs/kde/gear/kpimtextedit/default.nix b/pkgs/kde/gear/kpimtextedit/default.nix index 0c33280cc059..f24c126f4669 100644 --- a/pkgs/kde/gear/kpimtextedit/default.nix +++ b/pkgs/kde/gear/kpimtextedit/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kpimtextedit"; - extraBuildInputs = [qt5compat]; + extraBuildInputs = [ qt5compat ]; } diff --git a/pkgs/kde/gear/kpkpass/default.nix b/pkgs/kde/gear/kpkpass/default.nix index a2f116f67d77..662873300447 100644 --- a/pkgs/kde/gear/kpkpass/default.nix +++ b/pkgs/kde/gear/kpkpass/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kpkpass"; - extraNativeBuildInputs = [shared-mime-info]; + extraNativeBuildInputs = [ shared-mime-info ]; } diff --git a/pkgs/kde/gear/kpmcore/default.nix b/pkgs/kde/gear/kpmcore/default.nix index 9dfa4f3d6813..3da512e1701a 100644 --- a/pkgs/kde/gear/kpmcore/default.nix +++ b/pkgs/kde/gear/kpmcore/default.nix @@ -24,7 +24,8 @@ udftools, xfsprogs, zfs, -}: let +}: +let # https://github.com/KDE/kpmcore/blob/06f15334ecfbe871730a90dbe2b694ba060ee998/src/util/externalcommand_whitelist.h runtimeDeps = [ cryptsetup @@ -54,21 +55,23 @@ # FIXME: audit to see if these are all still required ]; - trustedprefixes = writeText "kpmcore-trustedprefixes" (lib.concatStringsSep "\n" (map lib.getBin runtimeDeps)); + trustedprefixes = writeText "kpmcore-trustedprefixes" ( + lib.concatStringsSep "\n" (map lib.getBin runtimeDeps) + ); in - mkKdeDerivation { - pname = "kpmcore"; +mkKdeDerivation { + pname = "kpmcore"; - postPatch = '' - cp ${trustedprefixes} src/util/trustedprefixes - ''; + postPatch = '' + cp ${trustedprefixes} src/util/trustedprefixes + ''; - preConfigure = '' - substituteInPlace src/util/CMakeLists.txt \ - --replace \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions - substituteInPlace src/backend/corebackend.cpp \ - --replace /usr/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy $out/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy - ''; + preConfigure = '' + substituteInPlace src/util/CMakeLists.txt \ + --replace \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions + substituteInPlace src/backend/corebackend.cpp \ + --replace /usr/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy $out/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy + ''; - extraNativeBuildInputs = [pkg-config]; - } + extraNativeBuildInputs = [ pkg-config ]; +} diff --git a/pkgs/kde/gear/kpublictransport/default.nix b/pkgs/kde/gear/kpublictransport/default.nix index bc1a663b7762..40f0587d3024 100644 --- a/pkgs/kde/gear/kpublictransport/default.nix +++ b/pkgs/kde/gear/kpublictransport/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kpublictransport"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/gear/kqtquickcharts/default.nix b/pkgs/kde/gear/kqtquickcharts/default.nix index 682cd0531b7b..310b50170b15 100644 --- a/pkgs/kde/gear/kqtquickcharts/default.nix +++ b/pkgs/kde/gear/kqtquickcharts/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kqtquickcharts"; # FIXME(qt5) diff --git a/pkgs/kde/gear/krdc/default.nix b/pkgs/kde/gear/krdc/default.nix index e589de328b82..f54d12364497 100644 --- a/pkgs/kde/gear/krdc/default.nix +++ b/pkgs/kde/gear/krdc/default.nix @@ -9,8 +9,13 @@ mkKdeDerivation { pname = "krdc"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland libssh libvncserver freerdp]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtwayland + libssh + libvncserver + freerdp + ]; meta.mainProgram = "krdc"; } diff --git a/pkgs/kde/gear/krecorder/default.nix b/pkgs/kde/gear/krecorder/default.nix index a975f1b95684..04d9d4c05826 100644 --- a/pkgs/kde/gear/krecorder/default.nix +++ b/pkgs/kde/gear/krecorder/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "krecorder"; - extraBuildInputs = [qtmultimedia]; + extraBuildInputs = [ qtmultimedia ]; meta.mainProgram = "krecorder"; } diff --git a/pkgs/kde/gear/kreversi/default.nix b/pkgs/kde/gear/kreversi/default.nix index 3f5591c299b6..4b15b9c1a8be 100644 --- a/pkgs/kde/gear/kreversi/default.nix +++ b/pkgs/kde/gear/kreversi/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "kreversi"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kreversi"; } diff --git a/pkgs/kde/gear/krfb/default.nix b/pkgs/kde/gear/krfb/default.nix index 3ab41fcc4f51..808067fb0000 100644 --- a/pkgs/kde/gear/krfb/default.nix +++ b/pkgs/kde/gear/krfb/default.nix @@ -13,6 +13,11 @@ mkKdeDerivation { "-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner" ]; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland libvncserver pipewire xorg.libXdamage]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtwayland + libvncserver + pipewire + xorg.libXdamage + ]; } diff --git a/pkgs/kde/gear/kross-interpreters/default.nix b/pkgs/kde/gear/kross-interpreters/default.nix index 4040fa401ef9..186c4bc67ccf 100644 --- a/pkgs/kde/gear/kross-interpreters/default.nix +++ b/pkgs/kde/gear/kross-interpreters/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "kross-interpreters"; - extraBuildInputs = [extra-cmake-modules]; + extraBuildInputs = [ extra-cmake-modules ]; # FIXME(qt5) meta.broken = true; } diff --git a/pkgs/kde/gear/kruler/default.nix b/pkgs/kde/gear/kruler/default.nix index 9eb9a917fc17..9a21899a18d2 100644 --- a/pkgs/kde/gear/kruler/default.nix +++ b/pkgs/kde/gear/kruler/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kruler"; meta.mainProgram = "kruler"; diff --git a/pkgs/kde/gear/ksanecore/default.nix b/pkgs/kde/gear/ksanecore/default.nix index 7f7e63fb2caf..36b7b1b45804 100644 --- a/pkgs/kde/gear/ksanecore/default.nix +++ b/pkgs/kde/gear/ksanecore/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "ksanecore"; - extraBuildInputs = [sane-backends]; + extraBuildInputs = [ sane-backends ]; } diff --git a/pkgs/kde/gear/kshisen/default.nix b/pkgs/kde/gear/kshisen/default.nix index 3859610e0f1d..7d41717f9ba6 100644 --- a/pkgs/kde/gear/kshisen/default.nix +++ b/pkgs/kde/gear/kshisen/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kshisen"; meta.mainProgram = "kshisen"; diff --git a/pkgs/kde/gear/ksirk/default.nix b/pkgs/kde/gear/ksirk/default.nix index 5c4196a7aff0..2123d3d54abf 100644 --- a/pkgs/kde/gear/ksirk/default.nix +++ b/pkgs/kde/gear/ksirk/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "ksirk"; - extraBuildInputs = [qtmultimedia]; + extraBuildInputs = [ qtmultimedia ]; } diff --git a/pkgs/kde/gear/ksmtp/default.nix b/pkgs/kde/gear/ksmtp/default.nix index c098ddd49c81..290456b3273d 100644 --- a/pkgs/kde/gear/ksmtp/default.nix +++ b/pkgs/kde/gear/ksmtp/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "ksmtp"; - extraBuildInputs = [qt5compat cyrus_sasl]; + extraBuildInputs = [ + qt5compat + cyrus_sasl + ]; } diff --git a/pkgs/kde/gear/ksnakeduel/default.nix b/pkgs/kde/gear/ksnakeduel/default.nix index 3f07eaa0e48f..a5e656fa427b 100644 --- a/pkgs/kde/gear/ksnakeduel/default.nix +++ b/pkgs/kde/gear/ksnakeduel/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "ksnakeduel"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "ksnakeduel"; } diff --git a/pkgs/kde/gear/kspaceduel/default.nix b/pkgs/kde/gear/kspaceduel/default.nix index 34194d2322cf..28e0f9f256a6 100644 --- a/pkgs/kde/gear/kspaceduel/default.nix +++ b/pkgs/kde/gear/kspaceduel/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kspaceduel"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kspaceduel"; } diff --git a/pkgs/kde/gear/ksquares/default.nix b/pkgs/kde/gear/ksquares/default.nix index 8dfbcf00244d..b13cd0c56f6f 100644 --- a/pkgs/kde/gear/ksquares/default.nix +++ b/pkgs/kde/gear/ksquares/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "ksquares"; meta.mainProgram = "ksquares"; diff --git a/pkgs/kde/gear/ksudoku/default.nix b/pkgs/kde/gear/ksudoku/default.nix index 15ac4e2ce4f8..4b6841bf1b1f 100644 --- a/pkgs/kde/gear/ksudoku/default.nix +++ b/pkgs/kde/gear/ksudoku/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "ksudoku"; - extraBuildInputs = [qtsvg]; - extraNativeBuildInputs = [_7zz]; + extraBuildInputs = [ qtsvg ]; + extraNativeBuildInputs = [ _7zz ]; meta.mainProgram = "ksudoku"; } diff --git a/pkgs/kde/gear/ksystemlog/default.nix b/pkgs/kde/gear/ksystemlog/default.nix index 772a4f54b077..6594c685e149 100644 --- a/pkgs/kde/gear/ksystemlog/default.nix +++ b/pkgs/kde/gear/ksystemlog/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "ksystemlog"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qt5compat audit]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qt5compat + audit + ]; meta.mainProgram = "ksystemlog"; } diff --git a/pkgs/kde/gear/kteatime/default.nix b/pkgs/kde/gear/kteatime/default.nix index 408bc14883cf..ac7056109d72 100644 --- a/pkgs/kde/gear/kteatime/default.nix +++ b/pkgs/kde/gear/kteatime/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kteatime"; meta.mainProgram = "kteatime"; diff --git a/pkgs/kde/gear/ktimer/default.nix b/pkgs/kde/gear/ktimer/default.nix index 1b46f8b72c72..714643cc40d0 100644 --- a/pkgs/kde/gear/ktimer/default.nix +++ b/pkgs/kde/gear/ktimer/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "ktimer"; - extraBuildInputs = [qt5compat]; + extraBuildInputs = [ qt5compat ]; meta.mainProgram = "ktimer"; } diff --git a/pkgs/kde/gear/ktnef/default.nix b/pkgs/kde/gear/ktnef/default.nix index 7fcd568ade72..81bd5c70b616 100644 --- a/pkgs/kde/gear/ktnef/default.nix +++ b/pkgs/kde/gear/ktnef/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "ktnef"; } diff --git a/pkgs/kde/gear/ktorrent/default.nix b/pkgs/kde/gear/ktorrent/default.nix index 92e0646e696a..ae1d8aedfdf3 100644 --- a/pkgs/kde/gear/ktorrent/default.nix +++ b/pkgs/kde/gear/ktorrent/default.nix @@ -7,5 +7,9 @@ mkKdeDerivation { pname = "ktorrent"; - extraBuildInputs = [qtwebengine taglib libmaxminddb]; + extraBuildInputs = [ + qtwebengine + taglib + libmaxminddb + ]; } diff --git a/pkgs/kde/gear/ktouch/default.nix b/pkgs/kde/gear/ktouch/default.nix index 7f744a9f79d5..6955dc3f0402 100644 --- a/pkgs/kde/gear/ktouch/default.nix +++ b/pkgs/kde/gear/ktouch/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "ktouch"; # FIXME(qt5) diff --git a/pkgs/kde/gear/ktrip/default.nix b/pkgs/kde/gear/ktrip/default.nix index 0f8b001c7d6b..feb8f5c54a74 100644 --- a/pkgs/kde/gear/ktrip/default.nix +++ b/pkgs/kde/gear/ktrip/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "ktrip"; meta.mainProgram = "ktrip"; diff --git a/pkgs/kde/gear/ktuberling/default.nix b/pkgs/kde/gear/ktuberling/default.nix index 100301670bf3..278f7f823d3d 100644 --- a/pkgs/kde/gear/ktuberling/default.nix +++ b/pkgs/kde/gear/ktuberling/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "ktuberling"; - extraBuildInputs = [qtmultimedia]; + extraBuildInputs = [ qtmultimedia ]; meta.mainProgram = "ktuberling"; } diff --git a/pkgs/kde/gear/kturtle/default.nix b/pkgs/kde/gear/kturtle/default.nix index 8997c051b189..aa628c11219a 100644 --- a/pkgs/kde/gear/kturtle/default.nix +++ b/pkgs/kde/gear/kturtle/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "kturtle"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "kturtle"; } diff --git a/pkgs/kde/gear/kubrick/default.nix b/pkgs/kde/gear/kubrick/default.nix index a194ebae5b68..27648efe830f 100644 --- a/pkgs/kde/gear/kubrick/default.nix +++ b/pkgs/kde/gear/kubrick/default.nix @@ -7,8 +7,11 @@ mkKdeDerivation { pname = "kubrick"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg libGLU]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ + qtsvg + libGLU + ]; meta.mainProgram = "kubrick"; } diff --git a/pkgs/kde/gear/kwalletmanager/default.nix b/pkgs/kde/gear/kwalletmanager/default.nix index 4ce00339a259..466d42129ef3 100644 --- a/pkgs/kde/gear/kwalletmanager/default.nix +++ b/pkgs/kde/gear/kwalletmanager/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kwalletmanager"; meta.mainProgram = "kwalletmanager5"; diff --git a/pkgs/kde/gear/kwave/default.nix b/pkgs/kde/gear/kwave/default.nix index 1c0f82ac7b3d..0c0fa7aca5ac 100644 --- a/pkgs/kde/gear/kwave/default.nix +++ b/pkgs/kde/gear/kwave/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kwave"; # FIXME(qt5) diff --git a/pkgs/kde/gear/kweather/default.nix b/pkgs/kde/gear/kweather/default.nix index 53e122c98fe6..20d4c8a1e670 100644 --- a/pkgs/kde/gear/kweather/default.nix +++ b/pkgs/kde/gear/kweather/default.nix @@ -7,6 +7,10 @@ mkKdeDerivation { pname = "kweather"; - extraBuildInputs = [qtsvg qtcharts kholidays]; + extraBuildInputs = [ + qtsvg + qtcharts + kholidays + ]; meta.mainProgram = "kweather"; } diff --git a/pkgs/kde/gear/libgravatar/default.nix b/pkgs/kde/gear/libgravatar/default.nix index ddbdfa6dc6c8..fe2fddb9f018 100644 --- a/pkgs/kde/gear/libgravatar/default.nix +++ b/pkgs/kde/gear/libgravatar/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "libgravatar"; } diff --git a/pkgs/kde/gear/libkcddb/default.nix b/pkgs/kde/gear/libkcddb/default.nix index 8325f19cedff..fea14f50c6e3 100644 --- a/pkgs/kde/gear/libkcddb/default.nix +++ b/pkgs/kde/gear/libkcddb/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "libkcddb"; - extraBuildInputs = [libmusicbrainz5]; + extraBuildInputs = [ libmusicbrainz5 ]; } diff --git a/pkgs/kde/gear/libkcompactdisc/default.nix b/pkgs/kde/gear/libkcompactdisc/default.nix index 66615d3791d6..bbe58fc00a41 100644 --- a/pkgs/kde/gear/libkcompactdisc/default.nix +++ b/pkgs/kde/gear/libkcompactdisc/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "libkcompactdisc"; - extraBuildInputs = [alsa-lib]; + extraBuildInputs = [ alsa-lib ]; } diff --git a/pkgs/kde/gear/libkdcraw/default.nix b/pkgs/kde/gear/libkdcraw/default.nix index df6717b22ded..883d86f3b12f 100644 --- a/pkgs/kde/gear/libkdcraw/default.nix +++ b/pkgs/kde/gear/libkdcraw/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "libkdcraw"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [libraw]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ libraw ]; } diff --git a/pkgs/kde/gear/libkdegames/default.nix b/pkgs/kde/gear/libkdegames/default.nix index 95a0265f0836..81325c12837a 100644 --- a/pkgs/kde/gear/libkdegames/default.nix +++ b/pkgs/kde/gear/libkdegames/default.nix @@ -10,6 +10,14 @@ mkKdeDerivation { pname = "libkdegames"; - extraNativeBuildInputs = [_7zz svgcleaner]; - extraBuildInputs = [openal libsndfile qtdeclarative qtsvg]; + extraNativeBuildInputs = [ + _7zz + svgcleaner + ]; + extraBuildInputs = [ + openal + libsndfile + qtdeclarative + qtsvg + ]; } diff --git a/pkgs/kde/gear/libkdepim/default.nix b/pkgs/kde/gear/libkdepim/default.nix index d682c45225eb..fc9d3f3d637c 100644 --- a/pkgs/kde/gear/libkdepim/default.nix +++ b/pkgs/kde/gear/libkdepim/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "libkdepim"; - extraNativeBuildInputs = [qttools]; + extraNativeBuildInputs = [ qttools ]; } diff --git a/pkgs/kde/gear/libkeduvocdocument/default.nix b/pkgs/kde/gear/libkeduvocdocument/default.nix index f67c4e0ba497..3a68dabf464b 100644 --- a/pkgs/kde/gear/libkeduvocdocument/default.nix +++ b/pkgs/kde/gear/libkeduvocdocument/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "libkeduvocdocument"; } diff --git a/pkgs/kde/gear/libkexiv2/default.nix b/pkgs/kde/gear/libkexiv2/default.nix index fa5cb7851ea2..c6d1d034e5da 100644 --- a/pkgs/kde/gear/libkexiv2/default.nix +++ b/pkgs/kde/gear/libkexiv2/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "libkexiv2"; - extraBuildInputs = [qt5compat exiv2]; - extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [ + qt5compat + exiv2 + ]; + extraNativeBuildInputs = [ pkg-config ]; } diff --git a/pkgs/kde/gear/libkgapi/default.nix b/pkgs/kde/gear/libkgapi/default.nix index 87d3beb23c50..43322955a26a 100644 --- a/pkgs/kde/gear/libkgapi/default.nix +++ b/pkgs/kde/gear/libkgapi/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "libkgapi"; - extraBuildInputs = [qttools cyrus_sasl]; + extraBuildInputs = [ + qttools + cyrus_sasl + ]; } diff --git a/pkgs/kde/gear/libkleo/default.nix b/pkgs/kde/gear/libkleo/default.nix index 47cd88fee577..e6a01bfdc7d8 100644 --- a/pkgs/kde/gear/libkleo/default.nix +++ b/pkgs/kde/gear/libkleo/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "libkleo"; - extraBuildInputs = [qt5compat boost]; - extraPropagatedBuildInputs = [qgpgme]; + extraBuildInputs = [ + qt5compat + boost + ]; + extraPropagatedBuildInputs = [ qgpgme ]; } diff --git a/pkgs/kde/gear/libkmahjongg/default.nix b/pkgs/kde/gear/libkmahjongg/default.nix index f411605318a2..5a736622beed 100644 --- a/pkgs/kde/gear/libkmahjongg/default.nix +++ b/pkgs/kde/gear/libkmahjongg/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "libkmahjongg"; - extraNativeBuildInputs = [_7zz svgcleaner]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ + _7zz + svgcleaner + ]; + extraBuildInputs = [ qtsvg ]; } diff --git a/pkgs/kde/gear/libkomparediff2/default.nix b/pkgs/kde/gear/libkomparediff2/default.nix index 43cccc19603f..c7b15720d837 100644 --- a/pkgs/kde/gear/libkomparediff2/default.nix +++ b/pkgs/kde/gear/libkomparediff2/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "libkomparediff2"; - extraBuildInputs = [qt5compat]; + extraBuildInputs = [ qt5compat ]; } diff --git a/pkgs/kde/gear/libksane/default.nix b/pkgs/kde/gear/libksane/default.nix index 319d47b8b2d9..a5a67b012356 100644 --- a/pkgs/kde/gear/libksane/default.nix +++ b/pkgs/kde/gear/libksane/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "libksane"; } diff --git a/pkgs/kde/gear/libksieve/default.nix b/pkgs/kde/gear/libksieve/default.nix index cec2f027b73d..e36d8995687e 100644 --- a/pkgs/kde/gear/libksieve/default.nix +++ b/pkgs/kde/gear/libksieve/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "libksieve"; - extraBuildInputs = [qtwebengine cyrus_sasl]; + extraBuildInputs = [ + qtwebengine + cyrus_sasl + ]; } diff --git a/pkgs/kde/gear/libktorrent/default.nix b/pkgs/kde/gear/libktorrent/default.nix index 263cbb3cadb3..c802f01111f9 100644 --- a/pkgs/kde/gear/libktorrent/default.nix +++ b/pkgs/kde/gear/libktorrent/default.nix @@ -9,7 +9,11 @@ mkKdeDerivation { pname = "libktorrent"; - extraNativeBuildInputs = [doxygen]; - extraBuildInputs = [qt5compat]; - extraPropagatedBuildInputs = [boost gmp libgcrypt]; + extraNativeBuildInputs = [ doxygen ]; + extraBuildInputs = [ qt5compat ]; + extraPropagatedBuildInputs = [ + boost + gmp + libgcrypt + ]; } diff --git a/pkgs/kde/gear/lokalize/default.nix b/pkgs/kde/gear/lokalize/default.nix index b92c8e9fb5e8..28fd32734933 100644 --- a/pkgs/kde/gear/lokalize/default.nix +++ b/pkgs/kde/gear/lokalize/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "lokalize"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [hunspell]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ hunspell ]; } diff --git a/pkgs/kde/gear/lskat/default.nix b/pkgs/kde/gear/lskat/default.nix index eefb95f9e1b4..84b7c2715d8e 100644 --- a/pkgs/kde/gear/lskat/default.nix +++ b/pkgs/kde/gear/lskat/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "lskat"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "lskat"; } diff --git a/pkgs/kde/gear/mailcommon/default.nix b/pkgs/kde/gear/mailcommon/default.nix index a82e6adb266c..51a702ac9d9b 100644 --- a/pkgs/kde/gear/mailcommon/default.nix +++ b/pkgs/kde/gear/mailcommon/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "mailcommon"; - extraNativeBuildInputs = [libxslt]; - extraBuildInputs = [qtwebengine qttools]; + extraNativeBuildInputs = [ libxslt ]; + extraBuildInputs = [ + qtwebengine + qttools + ]; } diff --git a/pkgs/kde/gear/mailimporter/default.nix b/pkgs/kde/gear/mailimporter/default.nix index d43e0a2288f9..f9b3c490b9a1 100644 --- a/pkgs/kde/gear/mailimporter/default.nix +++ b/pkgs/kde/gear/mailimporter/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "mailimporter"; } diff --git a/pkgs/kde/gear/marble/default.nix b/pkgs/kde/gear/marble/default.nix index 1f6e574ed312..d2ecc7ae5093 100644 --- a/pkgs/kde/gear/marble/default.nix +++ b/pkgs/kde/gear/marble/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "marble"; # FIXME(qt5) diff --git a/pkgs/kde/gear/markdownpart/default.nix b/pkgs/kde/gear/markdownpart/default.nix index e40b6d03f883..962be3a91b5f 100644 --- a/pkgs/kde/gear/markdownpart/default.nix +++ b/pkgs/kde/gear/markdownpart/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "markdownpart"; } diff --git a/pkgs/kde/gear/massif-visualizer/default.nix b/pkgs/kde/gear/massif-visualizer/default.nix index 27eb0515ee64..04b958217e74 100644 --- a/pkgs/kde/gear/massif-visualizer/default.nix +++ b/pkgs/kde/gear/massif-visualizer/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "massif-visualizer"; - extraBuildInputs = [ qt5compat qtsvg ]; + extraBuildInputs = [ + qt5compat + qtsvg + ]; extraNativeBuildInputs = [ shared-mime-info ]; } diff --git a/pkgs/kde/gear/mbox-importer/default.nix b/pkgs/kde/gear/mbox-importer/default.nix index 44092f401a43..3e28187b3d20 100644 --- a/pkgs/kde/gear/mbox-importer/default.nix +++ b/pkgs/kde/gear/mbox-importer/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "mbox-importer"; meta.mainProgram = "mboximporter"; diff --git a/pkgs/kde/gear/merkuro/default.nix b/pkgs/kde/gear/merkuro/default.nix index 7ad2c3637f70..ec149aea4bf7 100644 --- a/pkgs/kde/gear/merkuro/default.nix +++ b/pkgs/kde/gear/merkuro/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "merkuro"; - extraBuildInputs = [qtsvg libplasma]; + extraBuildInputs = [ + qtsvg + libplasma + ]; } diff --git a/pkgs/kde/gear/messagelib/default.nix b/pkgs/kde/gear/messagelib/default.nix index 47058be34826..db8f4e04f045 100644 --- a/pkgs/kde/gear/messagelib/default.nix +++ b/pkgs/kde/gear/messagelib/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "messagelib"; - extraPropagatedBuildInputs = [qtwebengine]; + extraPropagatedBuildInputs = [ qtwebengine ]; } diff --git a/pkgs/kde/gear/mimetreeparser/default.nix b/pkgs/kde/gear/mimetreeparser/default.nix index 3bebd8aee726..67c271ad2612 100644 --- a/pkgs/kde/gear/mimetreeparser/default.nix +++ b/pkgs/kde/gear/mimetreeparser/default.nix @@ -7,5 +7,9 @@ mkKdeDerivation { pname = "mimetreeparser"; - extraBuildInputs = [qt5compat qtdeclarative qgpgme]; + extraBuildInputs = [ + qt5compat + qtdeclarative + qgpgme + ]; } diff --git a/pkgs/kde/gear/minuet/default.nix b/pkgs/kde/gear/minuet/default.nix index 05e80a590128..347d2cd7e9ee 100644 --- a/pkgs/kde/gear/minuet/default.nix +++ b/pkgs/kde/gear/minuet/default.nix @@ -7,6 +7,10 @@ mkKdeDerivation { pname = "minuet"; - extraBuildInputs = [qtdeclarative qtsvg fluidsynth]; + extraBuildInputs = [ + qtdeclarative + qtsvg + fluidsynth + ]; meta.mainProgram = "minuet"; } diff --git a/pkgs/kde/gear/neochat/default.nix b/pkgs/kde/gear/neochat/default.nix index a45aa2c328fc..56c96f2245ff 100644 --- a/pkgs/kde/gear/neochat/default.nix +++ b/pkgs/kde/gear/neochat/default.nix @@ -7,6 +7,10 @@ mkKdeDerivation { pname = "neochat"; - extraBuildInputs = [qtlocation qtwebview kunifiedpush]; + extraBuildInputs = [ + qtlocation + qtwebview + kunifiedpush + ]; meta.mainProgram = "neochat"; } diff --git a/pkgs/kde/gear/okular/default.nix b/pkgs/kde/gear/okular/default.nix index e500709a28b8..b6048d9611d4 100644 --- a/pkgs/kde/gear/okular/default.nix +++ b/pkgs/kde/gear/okular/default.nix @@ -14,7 +14,7 @@ mkKdeDerivation { pname = "okular"; - extraNativeBuildInputs = [pkg-config]; + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtspeech qtsvg diff --git a/pkgs/kde/gear/palapeli/default.nix b/pkgs/kde/gear/palapeli/default.nix index 144ef589e51c..f6a96aed4f55 100644 --- a/pkgs/kde/gear/palapeli/default.nix +++ b/pkgs/kde/gear/palapeli/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "palapeli"; - extraNativeBuildInputs = [shared-mime-info]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ shared-mime-info ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "palapeli"; } diff --git a/pkgs/kde/gear/parley/default.nix b/pkgs/kde/gear/parley/default.nix index 35342dd958cb..e2a275c4c02c 100644 --- a/pkgs/kde/gear/parley/default.nix +++ b/pkgs/kde/gear/parley/default.nix @@ -7,6 +7,10 @@ mkKdeDerivation { pname = "parley"; - extraBuildInputs = [qtsvg qtmultimedia qtwebengine]; + extraBuildInputs = [ + qtsvg + qtmultimedia + qtwebengine + ]; meta.mainProgram = "parley"; } diff --git a/pkgs/kde/gear/partitionmanager/default.nix b/pkgs/kde/gear/partitionmanager/default.nix index 68cb09a01a5a..9f36e91df58c 100644 --- a/pkgs/kde/gear/partitionmanager/default.nix +++ b/pkgs/kde/gear/partitionmanager/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "partitionmanager"; - propagatedUserEnvPkgs = [kpmcore]; + propagatedUserEnvPkgs = [ kpmcore ]; passthru = { inherit kpmcore; diff --git a/pkgs/kde/gear/picmi/default.nix b/pkgs/kde/gear/picmi/default.nix index 341cd3922aff..aa7bf73fe97a 100644 --- a/pkgs/kde/gear/picmi/default.nix +++ b/pkgs/kde/gear/picmi/default.nix @@ -6,8 +6,8 @@ mkKdeDerivation { pname = "picmi"; - extraNativeBuildInputs = [_7zz]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ _7zz ]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "picmi"; } diff --git a/pkgs/kde/gear/pim-data-exporter/default.nix b/pkgs/kde/gear/pim-data-exporter/default.nix index da2097f46763..162a2524f828 100644 --- a/pkgs/kde/gear/pim-data-exporter/default.nix +++ b/pkgs/kde/gear/pim-data-exporter/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "pim-data-exporter"; } diff --git a/pkgs/kde/gear/pim-sieve-editor/default.nix b/pkgs/kde/gear/pim-sieve-editor/default.nix index 5cc193d0d7ee..323ec35e768b 100644 --- a/pkgs/kde/gear/pim-sieve-editor/default.nix +++ b/pkgs/kde/gear/pim-sieve-editor/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "pim-sieve-editor"; meta.mainProgram = "sieveeditor"; diff --git a/pkgs/kde/gear/pimcommon/default.nix b/pkgs/kde/gear/pimcommon/default.nix index 9ef947dde6fe..853c6e0afba6 100644 --- a/pkgs/kde/gear/pimcommon/default.nix +++ b/pkgs/kde/gear/pimcommon/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "pimcommon"; - extraBuildInputs = [qttools]; - extraNativeBuildInputs = [libxslt]; + extraBuildInputs = [ qttools ]; + extraNativeBuildInputs = [ libxslt ]; } diff --git a/pkgs/kde/gear/plasmatube/default.nix b/pkgs/kde/gear/plasmatube/default.nix index 63236fe00d76..46b32c579040 100644 --- a/pkgs/kde/gear/plasmatube/default.nix +++ b/pkgs/kde/gear/plasmatube/default.nix @@ -10,9 +10,18 @@ mkKdeDerivation { pname = "plasmatube"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtquick3d qtsvg mpv-unwrapped]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtquick3d + qtsvg + mpv-unwrapped + ]; - qtWrapperArgs = ["--prefix" "PATH" ":" (lib.makeBinPath [ yt-dlp ])]; + qtWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath [ yt-dlp ]) + ]; meta.mainProgram = "plasmatube"; } diff --git a/pkgs/kde/gear/poxml/default.nix b/pkgs/kde/gear/poxml/default.nix index 963f0502964a..508d311dbc4a 100644 --- a/pkgs/kde/gear/poxml/default.nix +++ b/pkgs/kde/gear/poxml/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "poxml"; } diff --git a/pkgs/kde/gear/qmlkonsole/default.nix b/pkgs/kde/gear/qmlkonsole/default.nix index 9be6552020f6..470752ffd795 100644 --- a/pkgs/kde/gear/qmlkonsole/default.nix +++ b/pkgs/kde/gear/qmlkonsole/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "qmlkonsole"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "qmlkonsole"; } diff --git a/pkgs/kde/gear/rocs/default.nix b/pkgs/kde/gear/rocs/default.nix index 73e7143f8df0..0e368461a770 100644 --- a/pkgs/kde/gear/rocs/default.nix +++ b/pkgs/kde/gear/rocs/default.nix @@ -5,7 +5,7 @@ mkKdeDerivation { pname = "rocs"; - extraBuildInputs = [boost]; + extraBuildInputs = [ boost ]; # FIXME(qt5) meta.broken = true; } diff --git a/pkgs/kde/gear/signon-kwallet-extension/default.nix b/pkgs/kde/gear/signon-kwallet-extension/default.nix index 15900552d50f..ec954b987328 100644 --- a/pkgs/kde/gear/signon-kwallet-extension/default.nix +++ b/pkgs/kde/gear/signon-kwallet-extension/default.nix @@ -6,11 +6,11 @@ mkKdeDerivation { pname = "signon-kwallet-extension"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [signond]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ signond ]; # NB: not actually broken, just makes it install to $out instead of $signon/lib/extensions # This is useless without a wrapped signond. # FIXME: wrap signond with SSO_EXTENSIONS_DIR=$wrapper/lib/extensions - extraCmakeFlags = ["-DINSTALL_BROKEN_SIGNON_EXTENSION=1"]; + extraCmakeFlags = [ "-DINSTALL_BROKEN_SIGNON_EXTENSION=1" ]; } diff --git a/pkgs/kde/gear/skanlite/default.nix b/pkgs/kde/gear/skanlite/default.nix index 4a9c26e41588..20fff8d8c1df 100644 --- a/pkgs/kde/gear/skanlite/default.nix +++ b/pkgs/kde/gear/skanlite/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "skanlite"; - extraBuildInputs = [qt5compat]; + extraBuildInputs = [ qt5compat ]; meta.mainProgram = "skanlite"; } diff --git a/pkgs/kde/gear/skanpage/default.nix b/pkgs/kde/gear/skanpage/default.nix index c855041220c9..4c9e10422098 100644 --- a/pkgs/kde/gear/skanpage/default.nix +++ b/pkgs/kde/gear/skanpage/default.nix @@ -1,7 +1,7 @@ { mkKdeDerivation, qtwebengine, - tesseractLanguages ? [], + tesseractLanguages ? [ ], tesseract5, leptonica, }: @@ -10,7 +10,7 @@ mkKdeDerivation { extraBuildInputs = [ qtwebengine - (tesseract5.override {enableLanguages = tesseractLanguages;}) + (tesseract5.override { enableLanguages = tesseractLanguages; }) leptonica ]; meta.mainProgram = "skanpage"; diff --git a/pkgs/kde/gear/skladnik/default.nix b/pkgs/kde/gear/skladnik/default.nix index ae4dd03f3e3c..6c574514dbb7 100644 --- a/pkgs/kde/gear/skladnik/default.nix +++ b/pkgs/kde/gear/skladnik/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "skladnik"; } diff --git a/pkgs/kde/gear/spectacle/default.nix b/pkgs/kde/gear/spectacle/default.nix index dba026d22f24..c5c71a1beaa2 100644 --- a/pkgs/kde/gear/spectacle/default.nix +++ b/pkgs/kde/gear/spectacle/default.nix @@ -11,9 +11,12 @@ mkKdeDerivation { qtwayland qtmultimedia (opencv.override { - enableCuda = false; # fails to compile, disabled in case someone sets config.cudaSupport - enabledModules = [ "core" "imgproc" ]; # https://invent.kde.org/graphics/spectacle/-/blob/master/CMakeLists.txt?ref_type=heads#L83 - runAccuracyTests = false; # tests will fail because of missing plugins but that's okay + enableCuda = false; # fails to compile, disabled in case someone sets config.cudaSupport + enabledModules = [ + "core" + "imgproc" + ]; # https://invent.kde.org/graphics/spectacle/-/blob/master/CMakeLists.txt?ref_type=heads#L83 + runAccuracyTests = false; # tests will fail because of missing plugins but that's okay }) ]; meta.mainProgram = "spectacle"; diff --git a/pkgs/kde/gear/step/default.nix b/pkgs/kde/gear/step/default.nix index f921df199128..983755d21139 100644 --- a/pkgs/kde/gear/step/default.nix +++ b/pkgs/kde/gear/step/default.nix @@ -11,7 +11,16 @@ mkKdeDerivation { pname = "step"; - extraNativeBuildInputs = [qttools qtsvg pkg-config shared-mime-info]; - extraBuildInputs = [eigen gsl libqalculate]; + extraNativeBuildInputs = [ + qttools + qtsvg + pkg-config + shared-mime-info + ]; + extraBuildInputs = [ + eigen + gsl + libqalculate + ]; meta.mainProgram = "step"; } diff --git a/pkgs/kde/gear/svgpart/default.nix b/pkgs/kde/gear/svgpart/default.nix index 44f25d0312b1..b79a9053a065 100644 --- a/pkgs/kde/gear/svgpart/default.nix +++ b/pkgs/kde/gear/svgpart/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "svgpart"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; } diff --git a/pkgs/kde/gear/sweeper/default.nix b/pkgs/kde/gear/sweeper/default.nix index 24e75b7c5301..99aad7379dd8 100644 --- a/pkgs/kde/gear/sweeper/default.nix +++ b/pkgs/kde/gear/sweeper/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "sweeper"; diff --git a/pkgs/kde/gear/telly-skout/default.nix b/pkgs/kde/gear/telly-skout/default.nix index 9bcae06c9049..d179f8d5be86 100644 --- a/pkgs/kde/gear/telly-skout/default.nix +++ b/pkgs/kde/gear/telly-skout/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "telly-skout"; meta.mainProgram = "telly-skout"; diff --git a/pkgs/kde/gear/tokodon/default.nix b/pkgs/kde/gear/tokodon/default.nix index fd47144eda1d..47411b5e37c2 100644 --- a/pkgs/kde/gear/tokodon/default.nix +++ b/pkgs/kde/gear/tokodon/default.nix @@ -11,7 +11,14 @@ mkKdeDerivation { pname = "tokodon"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtmultimedia qtsvg qtwebsockets qtwebview mpv-unwrapped sonnet]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtmultimedia + qtsvg + qtwebsockets + qtwebview + mpv-unwrapped + sonnet + ]; meta.mainProgram = "tokodon"; } diff --git a/pkgs/kde/gear/umbrello/default.nix b/pkgs/kde/gear/umbrello/default.nix index 6aca83a9e825..836ae577c7f4 100644 --- a/pkgs/kde/gear/umbrello/default.nix +++ b/pkgs/kde/gear/umbrello/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "umbrello"; # FIXME(qt5) diff --git a/pkgs/kde/gear/yakuake/default.nix b/pkgs/kde/gear/yakuake/default.nix index a5955e5c2e18..fb7fc1ecf007 100644 --- a/pkgs/kde/gear/yakuake/default.nix +++ b/pkgs/kde/gear/yakuake/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "yakuake"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "yakuake"; } diff --git a/pkgs/kde/gear/zanshin/default.nix b/pkgs/kde/gear/zanshin/default.nix index 357b6963ff09..2b814696444d 100644 --- a/pkgs/kde/gear/zanshin/default.nix +++ b/pkgs/kde/gear/zanshin/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "zanshin"; - extraBuildInputs = [boost]; + extraBuildInputs = [ boost ]; } diff --git a/pkgs/kde/lib/mk-kde-derivation.nix b/pkgs/kde/lib/mk-kde-derivation.nix index b32e79295f6d..37921f442173 100644 --- a/pkgs/kde/lib/mk-kde-derivation.nix +++ b/pkgs/kde/lib/mk-kde-derivation.nix @@ -1,21 +1,22 @@ -self: { +self: +{ lib, stdenv, makeSetupHook, fetchurl, cmake, qt6, -}: let +}: +let dependencies = (lib.importJSON ../generated/dependencies.json).dependencies; projectInfo = lib.importJSON ../generated/projects.json; licenseInfo = lib.importJSON ../generated/licenses.json; licensesBySpdxId = (lib.mapAttrs' (_: v: { - name = v.spdxId or "unknown"; - value = v; - }) - lib.licenses) + name = v.spdxId or "unknown"; + value = v; + }) lib.licenses) // { # https://community.kde.org/Policies/Licensing_Policy "LicenseRef-KDE-Accepted-GPL" = lib.licenses.gpl3Plus; @@ -71,78 +72,89 @@ self: { None = null; }; - moveDevHook = makeSetupHook {name = "kf6-move-dev-hook";} ./move-dev-hook.sh; + moveDevHook = makeSetupHook { name = "kf6-move-dev-hook"; } ./move-dev-hook.sh; in - { - pname, - version ? self.sources.${pname}.version, - src ? self.sources.${pname}, - extraBuildInputs ? [], - extraNativeBuildInputs ? [], - extraPropagatedBuildInputs ? [], - extraCmakeFlags ? [], - excludeDependencies ? [], - ... - } @ args: let - depNames = dependencies.${pname} or []; - filteredDepNames = builtins.filter (dep: !(builtins.elem dep excludeDependencies)) depNames; +{ + pname, + version ? self.sources.${pname}.version, + src ? self.sources.${pname}, + extraBuildInputs ? [ ], + extraNativeBuildInputs ? [ ], + extraPropagatedBuildInputs ? [ ], + extraCmakeFlags ? [ ], + excludeDependencies ? [ ], + ... +}@args: +let + depNames = dependencies.${pname} or [ ]; + filteredDepNames = builtins.filter (dep: !(builtins.elem dep excludeDependencies)) depNames; - # FIXME(later): this is wrong for cross, some of these things really need to go into nativeBuildInputs, - # but cross is currently very broken anyway, so we can figure this out later. - deps = map (dep: self.${dep}) filteredDepNames; + # FIXME(later): this is wrong for cross, some of these things really need to go into nativeBuildInputs, + # but cross is currently very broken anyway, so we can figure this out later. + deps = map (dep: self.${dep}) filteredDepNames; - traceDuplicateDeps = attrName: attrValue: - let - pretty = lib.generators.toPretty {}; - duplicates = builtins.filter (dep: (builtins.elem (lib.getName dep) filteredDepNames)) attrValue; - in - if duplicates != [] - then lib.warn "Duplicate dependencies in ${attrName} of package ${pname}: ${pretty duplicates}" - else lib.id; + traceDuplicateDeps = + attrName: attrValue: + let + pretty = lib.generators.toPretty { }; + duplicates = builtins.filter (dep: (builtins.elem (lib.getName dep) filteredDepNames)) attrValue; + in + if duplicates != [ ] then + lib.warn "Duplicate dependencies in ${attrName} of package ${pname}: ${pretty duplicates}" + else + lib.id; - traceAllDuplicateDeps = lib.flip lib.pipe [ - (traceDuplicateDeps "extraBuildInputs" extraBuildInputs) - (traceDuplicateDeps "extraPropagatedBuildInputs" extraPropagatedBuildInputs) + traceAllDuplicateDeps = lib.flip lib.pipe [ + (traceDuplicateDeps "extraBuildInputs" extraBuildInputs) + (traceDuplicateDeps "extraPropagatedBuildInputs" extraPropagatedBuildInputs) + ]; + + defaultArgs = { + inherit version src; + + outputs = [ + "out" + "dev" + "devtools" ]; - defaultArgs = { - inherit version src; + nativeBuildInputs = [ + cmake + qt6.wrapQtAppsHook + moveDevHook + ] ++ extraNativeBuildInputs; + buildInputs = [ qt6.qtbase ] ++ extraBuildInputs; - outputs = ["out" "dev" "devtools"]; + # FIXME: figure out what to propagate here + propagatedBuildInputs = deps ++ extraPropagatedBuildInputs; + strictDeps = true; - nativeBuildInputs = [cmake qt6.wrapQtAppsHook moveDevHook] ++ extraNativeBuildInputs; - buildInputs = [qt6.qtbase] ++ extraBuildInputs; + dontFixCmake = true; + cmakeFlags = [ "-DQT_MAJOR_VERSION=6" ] ++ extraCmakeFlags; - # FIXME: figure out what to propagate here - propagatedBuildInputs = deps ++ extraPropagatedBuildInputs; - strictDeps = true; + separateDebugInfo = true; - dontFixCmake = true; - cmakeFlags = ["-DQT_MAJOR_VERSION=6"] ++ extraCmakeFlags; + env.LANG = "C.UTF-8"; + }; - separateDebugInfo = true; + cleanArgs = builtins.removeAttrs args [ + "extraBuildInputs" + "extraNativeBuildInputs" + "extraPropagatedBuildInputs" + "extraCmakeFlags" + "excludeDependencies" + "meta" + ]; - env.LANG = "C.UTF-8"; - }; + meta = { + description = projectInfo.${pname}.description; + homepage = "https://invent.kde.org/${projectInfo.${pname}.repo_path}"; + license = lib.filter (l: l != null) (map (l: licensesBySpdxId.${l}) licenseInfo.${pname}); + maintainers = lib.teams.qt-kde.members; + # Platforms are currently limited to what upstream tests in CI, but can be extended if there's interest. + platforms = lib.platforms.linux ++ lib.platforms.freebsd; + } // (args.meta or { }); - cleanArgs = builtins.removeAttrs args [ - "extraBuildInputs" - "extraNativeBuildInputs" - "extraPropagatedBuildInputs" - "extraCmakeFlags" - "excludeDependencies" - "meta" - ]; - - meta = { - description = projectInfo.${pname}.description; - homepage = "https://invent.kde.org/${projectInfo.${pname}.repo_path}"; - license = lib.filter (l: l != null) (map (l: licensesBySpdxId.${l}) licenseInfo.${pname}); - maintainers = lib.teams.qt-kde.members; - # Platforms are currently limited to what upstream tests in CI, but can be extended if there's interest. - platforms = lib.platforms.linux ++ lib.platforms.freebsd; - } // (args.meta or { }); - - pos = builtins.unsafeGetAttrPos "pname" args; - in - traceAllDuplicateDeps (stdenv.mkDerivation (defaultArgs // cleanArgs // { inherit meta pos; })) + pos = builtins.unsafeGetAttrPos "pname" args; +in +traceAllDuplicateDeps (stdenv.mkDerivation (defaultArgs // cleanArgs // { inherit meta pos; })) diff --git a/pkgs/kde/misc/kdevelop-pg-qt/default.nix b/pkgs/kde/misc/kdevelop-pg-qt/default.nix index cca569099b8f..534733516757 100644 --- a/pkgs/kde/misc/kdevelop-pg-qt/default.nix +++ b/pkgs/kde/misc/kdevelop-pg-qt/default.nix @@ -10,14 +10,17 @@ mkKdeDerivation rec { version = "2.3.0"; # Breaks with split -dev - outputs = ["out"]; + outputs = [ "out" ]; src = fetchurl { url = "mirror://kde/stable/kdevelop-pg-qt/${version}/src/kdevelop-pg-qt-${version}.tar.xz"; hash = "sha256-PT7zyzlelnDmDDmepthlzHluAOUsNV7tlD++yn2nEg0="; }; - extraNativeBuildInputs = [ bison flex ]; + extraNativeBuildInputs = [ + bison + flex + ]; meta.license = with lib.licenses; [ bsd3 diff --git a/pkgs/kde/misc/kdiagram/default.nix b/pkgs/kde/misc/kdiagram/default.nix index f5d6d9d8bc58..48355004b761 100644 --- a/pkgs/kde/misc/kdiagram/default.nix +++ b/pkgs/kde/misc/kdiagram/default.nix @@ -14,7 +14,10 @@ mkKdeDerivation rec { hash = "sha256-Rlmwws2dsYFD9avZyAYJHDqrarwalWu/goFas9MYnG0="; }; - extraNativeBuildInputs = [qttools qtsvg]; + extraNativeBuildInputs = [ + qttools + qtsvg + ]; - meta.license = [lib.licenses.gpl2Only]; + meta.license = [ lib.licenses.gpl2Only ]; } diff --git a/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix b/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix index f4c2637a9600..aead489e80d4 100644 --- a/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix +++ b/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix @@ -13,7 +13,7 @@ mkKdeDerivation rec { hash = "sha256-LNJHwBPnX0EGWbrDcq/5PSLXHFpUwFnhN7lESvizQno="; }; - extraNativeBuildInputs = [doxygen]; + extraNativeBuildInputs = [ doxygen ]; - meta.license = [lib.licenses.gpl3Plus]; + meta.license = [ lib.licenses.gpl3Plus ]; } diff --git a/pkgs/kde/misc/kio-fuse/default.nix b/pkgs/kde/misc/kio-fuse/default.nix index b5461fd02de0..cf28083b0813 100644 --- a/pkgs/kde/misc/kio-fuse/default.nix +++ b/pkgs/kde/misc/kio-fuse/default.nix @@ -14,8 +14,8 @@ mkKdeDerivation rec { hash = "sha256-fRBFgSJ9Whm0JLM/QWjRgVVrEBXW3yIY4BqI1kRJ6Us="; }; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [fuse3]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ fuse3 ]; - meta.license = with lib.licenses; [gpl3Plus]; + meta.license = with lib.licenses; [ gpl3Plus ]; } diff --git a/pkgs/kde/misc/kirigami-addons/default.nix b/pkgs/kde/misc/kirigami-addons/default.nix index 5930357a7ee8..d23cc7175baf 100644 --- a/pkgs/kde/misc/kirigami-addons/default.nix +++ b/pkgs/kde/misc/kirigami-addons/default.nix @@ -14,8 +14,8 @@ mkKdeDerivation rec { hash = "sha256-VuPOtSBVtWAzIOoIsn02c9MqORqNWGRtmYIn2LUfCpM="; }; - extraBuildInputs = [qtdeclarative]; - extraPropagatedBuildInputs = [qt5compat]; + extraBuildInputs = [ qtdeclarative ]; + extraPropagatedBuildInputs = [ qt5compat ]; meta.license = with lib.licenses; [ bsd2 diff --git a/pkgs/kde/misc/ktextaddons/default.nix b/pkgs/kde/misc/ktextaddons/default.nix index ae37770e9927..4ca047e52f40 100644 --- a/pkgs/kde/misc/ktextaddons/default.nix +++ b/pkgs/kde/misc/ktextaddons/default.nix @@ -15,7 +15,11 @@ mkKdeDerivation rec { hash = "sha256-ZLgGAuhLJekWRiCvP2NB+oZbhegmq49eAgYa4koneyA="; }; - extraBuildInputs = [qtspeech qttools kxmlgui]; + extraBuildInputs = [ + qtspeech + qttools + kxmlgui + ]; meta.license = with lib.licenses; [ bsd3 diff --git a/pkgs/kde/misc/kunifiedpush/default.nix b/pkgs/kde/misc/kunifiedpush/default.nix index 9e7cb57ba3ad..5e9ac62a9732 100644 --- a/pkgs/kde/misc/kunifiedpush/default.nix +++ b/pkgs/kde/misc/kunifiedpush/default.nix @@ -18,8 +18,17 @@ mkKdeDerivation { hash = "sha256-bhlsEP7cLuA6Rj6nrpp5iC3uolc02twNMLsWl+d/BXo="; }; - extraBuildInputs = [qtwebsockets kdeclarative kpackage]; + extraBuildInputs = [ + qtwebsockets + kdeclarative + kpackage + ]; - meta.license = with lib.licenses; [bsd2 bsd3 cc0 lgpl2Plus]; + meta.license = with lib.licenses; [ + bsd2 + bsd3 + cc0 + lgpl2Plus + ]; meta.mainProgram = "kunifiedpush-distributor"; } diff --git a/pkgs/kde/misc/kup/default.nix b/pkgs/kde/misc/kup/default.nix index 420b6bc72c5d..60ae6db479e9 100644 --- a/pkgs/kde/misc/kup/default.nix +++ b/pkgs/kde/misc/kup/default.nix @@ -1,7 +1,8 @@ -{ lib -, mkKdeDerivation -, fetchFromGitLab -, libgit2 +{ + lib, + mkKdeDerivation, + fetchFromGitLab, + libgit2, }: mkKdeDerivation rec { pname = "kup"; diff --git a/pkgs/kde/misc/mpvqt/default.nix b/pkgs/kde/misc/mpvqt/default.nix index 84d78e26bc00..c7bd84f17401 100644 --- a/pkgs/kde/misc/mpvqt/default.nix +++ b/pkgs/kde/misc/mpvqt/default.nix @@ -17,8 +17,17 @@ mkKdeDerivation rec { hash = "sha256-XHiCxH7dJxJamloM2SJbiFHDt8j4rVfv/M9PaBzvgM4="; }; - extraBuildInputs = [qtdeclarative]; - extraPropagatedBuildInputs = [mpv-unwrapped]; + extraBuildInputs = [ qtdeclarative ]; + extraPropagatedBuildInputs = [ mpv-unwrapped ]; - meta.license = with lib.licenses; [bsd2 bsd3 cc-by-sa-40 cc0 lgpl21Only lgpl3Only lgpl3Plus mit]; + meta.license = with lib.licenses; [ + bsd2 + bsd3 + cc-by-sa-40 + cc0 + lgpl21Only + lgpl3Only + lgpl3Plus + mit + ]; } diff --git a/pkgs/kde/misc/oxygen-icons/default.nix b/pkgs/kde/misc/oxygen-icons/default.nix index 91144f0c0bcf..b556bd989e2c 100644 --- a/pkgs/kde/misc/oxygen-icons/default.nix +++ b/pkgs/kde/misc/oxygen-icons/default.nix @@ -14,5 +14,5 @@ mkKdeDerivation rec { dontStrip = true; - meta.license = [lib.licenses.lgpl3Plus]; + meta.license = [ lib.licenses.lgpl3Plus ]; } diff --git a/pkgs/kde/misc/phonon-vlc/default.nix b/pkgs/kde/misc/phonon-vlc/default.nix index bd828172bf8d..88f278d92986 100644 --- a/pkgs/kde/misc/phonon-vlc/default.nix +++ b/pkgs/kde/misc/phonon-vlc/default.nix @@ -14,10 +14,13 @@ mkKdeDerivation rec { hash = "sha256-M4R53EUeS5SzyltXje90Hc+C9cYmooB9NiNb4tznyaU="; }; - extraNativeBuildInputs = [qttools]; - extraBuildInputs = [libvlc]; + extraNativeBuildInputs = [ qttools ]; + extraBuildInputs = [ libvlc ]; - cmakeFlags = ["-DPHONON_BUILD_QT5=0" "-DPHONON_BUILD_QT6=1"]; + cmakeFlags = [ + "-DPHONON_BUILD_QT5=0" + "-DPHONON_BUILD_QT6=1" + ]; - meta.license = with lib.licenses; [lgpl21Plus]; + meta.license = with lib.licenses; [ lgpl21Plus ]; } diff --git a/pkgs/kde/misc/phonon/default.nix b/pkgs/kde/misc/phonon/default.nix index ed0aad052746..76e57f30b3a5 100644 --- a/pkgs/kde/misc/phonon/default.nix +++ b/pkgs/kde/misc/phonon/default.nix @@ -30,8 +30,14 @@ mkKdeDerivation rec { qttools ]; - cmakeFlags = ["-DPHONON_BUILD_QT5=0" "-DPHONON_BUILD_QT6=1"]; + cmakeFlags = [ + "-DPHONON_BUILD_QT5=0" + "-DPHONON_BUILD_QT6=1" + ]; - meta.license = with lib.licenses; [lgpl21Plus gpl2Plus]; + meta.license = with lib.licenses; [ + lgpl21Plus + gpl2Plus + ]; meta.mainProgram = "phononsettings"; } diff --git a/pkgs/kde/misc/polkit-qt-1/default.nix b/pkgs/kde/misc/polkit-qt-1/default.nix index 432cc5da8059..78ce60455d09 100644 --- a/pkgs/kde/misc/polkit-qt-1/default.nix +++ b/pkgs/kde/misc/polkit-qt-1/default.nix @@ -15,10 +15,17 @@ mkKdeDerivation rec { sha256 = "sha256-XTthHAYtK3apN1C7EMkHv9IdH/CNChXcLPY+J44Wd/s="; }; - patches = [./full-paths.patch]; + patches = [ ./full-paths.patch ]; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [glib polkit]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + glib + polkit + ]; - meta.license = with lib.licenses; [bsd3 gpl2Plus lgpl2Plus]; + meta.license = with lib.licenses; [ + bsd3 + gpl2Plus + lgpl2Plus + ]; } diff --git a/pkgs/kde/misc/pulseaudio-qt/default.nix b/pkgs/kde/misc/pulseaudio-qt/default.nix index d5a69da692ac..108824c87ff6 100644 --- a/pkgs/kde/misc/pulseaudio-qt/default.nix +++ b/pkgs/kde/misc/pulseaudio-qt/default.nix @@ -14,8 +14,11 @@ mkKdeDerivation rec { hash = "sha256-zY9RyHAAc9D9kNV4QIOs63PnK6mnBOYF4KZ5CUJqhSA="; }; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [pulseaudio]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ pulseaudio ]; - meta.license = with lib.licenses; [lgpl21Only lgpl3Only]; + meta.license = with lib.licenses; [ + lgpl21Only + lgpl3Only + ]; } diff --git a/pkgs/kde/plasma/bluedevil/default.nix b/pkgs/kde/plasma/bluedevil/default.nix index 993d121d1f37..3a6695833654 100644 --- a/pkgs/kde/plasma/bluedevil/default.nix +++ b/pkgs/kde/plasma/bluedevil/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "bluedevil"; - extraNativeBuildInputs = [shared-mime-info]; + extraNativeBuildInputs = [ shared-mime-info ]; } diff --git a/pkgs/kde/plasma/breeze-grub/default.nix b/pkgs/kde/plasma/breeze-grub/default.nix index 5dd3d199e44a..033e2a34800f 100644 --- a/pkgs/kde/plasma/breeze-grub/default.nix +++ b/pkgs/kde/plasma/breeze-grub/default.nix @@ -1,12 +1,12 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "breeze-grub"; # doesn't actually use cmake or anything - nativeBuildInputs = []; - buildInputs = []; + nativeBuildInputs = [ ]; + buildInputs = [ ]; - outputs = ["out"]; + outputs = [ "out" ]; installPhase = '' runHook preInstall diff --git a/pkgs/kde/plasma/breeze-gtk/default.nix b/pkgs/kde/plasma/breeze-gtk/default.nix index fc0bc4759d48..88c424d0fd27 100644 --- a/pkgs/kde/plasma/breeze-gtk/default.nix +++ b/pkgs/kde/plasma/breeze-gtk/default.nix @@ -8,7 +8,11 @@ mkKdeDerivation { pname = "breeze-gtk"; # FIXME(later): upstream - patches = [./0001-fix-add-executable-bit.patch]; + patches = [ ./0001-fix-add-executable-bit.patch ]; - extraNativeBuildInputs = [sass python3 python3Packages.pycairo]; + extraNativeBuildInputs = [ + sass + python3 + python3Packages.pycairo + ]; } diff --git a/pkgs/kde/plasma/breeze-plymouth/default.nix b/pkgs/kde/plasma/breeze-plymouth/default.nix index 7551eca94e3a..97abe3948ac9 100644 --- a/pkgs/kde/plasma/breeze-plymouth/default.nix +++ b/pkgs/kde/plasma/breeze-plymouth/default.nix @@ -12,41 +12,58 @@ osVersion ? null, topColor ? "black", bottomColor ? "black", -}: let - validColors = ["black" "cardboard_grey" "charcoal_grey" "icon_blue" "paper_white" "plasma_blue" "neon_blue" "neon_green"]; +}: +let + validColors = [ + "black" + "cardboard_grey" + "charcoal_grey" + "icon_blue" + "paper_white" + "plasma_blue" + "neon_blue" + "neon_green" + ]; resolvedLogoName = - if (logoFile != null && logoName == null) - then lib.strings.removeSuffix ".png" (baseNameOf (toString logoFile)) - else logoName; + if (logoFile != null && logoName == null) then + lib.strings.removeSuffix ".png" (baseNameOf (toString logoFile)) + else + logoName; in - assert lib.asserts.assertOneOf "topColor" topColor validColors; - assert lib.asserts.assertOneOf "bottomColor" bottomColor validColors; - mkKdeDerivation { - pname = "breeze-plymouth"; +assert lib.asserts.assertOneOf "topColor" topColor validColors; +assert lib.asserts.assertOneOf "bottomColor" bottomColor validColors; +mkKdeDerivation { + pname = "breeze-plymouth"; - # FIXME(later): discuss with upstream - patches = [./install-paths.patch]; + # FIXME(later): discuss with upstream + patches = [ ./install-paths.patch ]; - extraNativeBuildInputs = [pkg-config] ++ lib.optionals (logoFile != null) [imagemagick netpbm perl]; - extraBuildInputs = [plymouth]; + extraNativeBuildInputs = + [ pkg-config ] + ++ lib.optionals (logoFile != null) [ + imagemagick + netpbm + perl + ]; + extraBuildInputs = [ plymouth ]; - extraCmakeFlags = - [] - ++ lib.optional (osName != null) "-DDISTRO_NAME=${osName}" - ++ lib.optional (osVersion != null) "-DDISTRO_VERSION=${osVersion}" - ++ lib.optional (logoName != null) "-DDISTRO_LOGO=${logoName}" - ++ lib.optional (topColor != null) "-DBACKGROUND_TOP_COLOR=${topColor}" - ++ lib.optional (bottomColor != null) "-DBACKGROUND_BOTTOM_COLOR=${bottomColor}"; + extraCmakeFlags = + [ ] + ++ lib.optional (osName != null) "-DDISTRO_NAME=${osName}" + ++ lib.optional (osVersion != null) "-DDISTRO_VERSION=${osVersion}" + ++ lib.optional (logoName != null) "-DDISTRO_LOGO=${logoName}" + ++ lib.optional (topColor != null) "-DBACKGROUND_TOP_COLOR=${topColor}" + ++ lib.optional (bottomColor != null) "-DBACKGROUND_BOTTOM_COLOR=${bottomColor}"; - postPatch = - '' - substituteInPlace cmake/FindPlymouth.cmake --subst-var out - '' - + lib.optionalString (logoFile != null) '' - cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png + postPatch = + '' + substituteInPlace cmake/FindPlymouth.cmake --subst-var out + '' + + lib.optionalString (logoFile != null) '' + cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png - # conversion for 16bit taken from the breeze-plymouth readme - convert ${logoFile} -alpha Background -background "#000000" -fill "#000000" -flatten tmp.png - pngtopnm tmp.png | pnmquant 16 | pnmtopng > breeze/images/16bit/${resolvedLogoName}.logo.png - ''; - } + # conversion for 16bit taken from the breeze-plymouth readme + convert ${logoFile} -alpha Background -background "#000000" -fill "#000000" -flatten tmp.png + pngtopnm tmp.png | pnmquant 16 | pnmtopng > breeze/images/16bit/${resolvedLogoName}.logo.png + ''; +} diff --git a/pkgs/kde/plasma/breeze/default.nix b/pkgs/kde/plasma/breeze/default.nix index 3b6fed6221fd..6768ffb94ecf 100644 --- a/pkgs/kde/plasma/breeze/default.nix +++ b/pkgs/kde/plasma/breeze/default.nix @@ -6,7 +6,11 @@ mkKdeDerivation { pname = "breeze"; - outputs = ["out" "dev" "qt5"]; + outputs = [ + "out" + "dev" + "qt5" + ]; # We can't add qt5 stuff to dependencies or the hooks blow up, # so manually point everything to everything. Oof. diff --git a/pkgs/kde/plasma/default.nix b/pkgs/kde/plasma/default.nix index 6fa4d2383f99..4610811b357c 100644 --- a/pkgs/kde/plasma/default.nix +++ b/pkgs/kde/plasma/default.nix @@ -1,66 +1,67 @@ -{callPackage}: { - bluedevil = callPackage ./bluedevil {}; - breeze = callPackage ./breeze {}; - breeze-grub = callPackage ./breeze-grub {}; - breeze-gtk = callPackage ./breeze-gtk {}; - breeze-plymouth = callPackage ./breeze-plymouth {}; - discover = callPackage ./discover {}; - drkonqi = callPackage ./drkonqi {}; - flatpak-kcm = callPackage ./flatpak-kcm {}; - kactivitymanagerd = callPackage ./kactivitymanagerd {}; - kde-cli-tools = callPackage ./kde-cli-tools {}; - kde-gtk-config = callPackage ./kde-gtk-config {}; - kdecoration = callPackage ./kdecoration {}; - kdeplasma-addons = callPackage ./kdeplasma-addons {}; - kgamma = callPackage ./kgamma {}; - kglobalacceld = callPackage ./kglobalacceld {}; - kinfocenter = callPackage ./kinfocenter {}; - kmenuedit = callPackage ./kmenuedit {}; - kpipewire = callPackage ./kpipewire {}; - krdp = callPackage ./krdp {}; - kscreen = callPackage ./kscreen {}; - kscreenlocker = callPackage ./kscreenlocker {}; - ksshaskpass = callPackage ./ksshaskpass {}; - ksystemstats = callPackage ./ksystemstats {}; - kwallet-pam = callPackage ./kwallet-pam {}; - kwayland = callPackage ./kwayland {}; - kwayland-integration = callPackage ./kwayland-integration {}; - kwin = callPackage ./kwin {}; - kwrited = callPackage ./kwrited {}; - layer-shell-qt = callPackage ./layer-shell-qt {}; - libkscreen = callPackage ./libkscreen {}; - libksysguard = callPackage ./libksysguard {}; - libplasma = callPackage ./libplasma {}; - milou = callPackage ./milou {}; - ocean-sound-theme = callPackage ./ocean-sound-theme {}; - oxygen = callPackage ./oxygen {}; - oxygen-sounds = callPackage ./oxygen-sounds {}; - plasma-activities = callPackage ./plasma-activities {}; - plasma-activities-stats = callPackage ./plasma-activities-stats {}; - plasma-browser-integration = callPackage ./plasma-browser-integration {}; - plasma-desktop = callPackage ./plasma-desktop {}; - plasma-disks = callPackage ./plasma-disks {}; - plasma-firewall = callPackage ./plasma-firewall {}; - plasma-integration = callPackage ./plasma-integration {}; - plasma-mobile = callPackage ./plasma-mobile {}; - plasma-nano = callPackage ./plasma-nano {}; - plasma-nm = callPackage ./plasma-nm {}; - plasma-pa = callPackage ./plasma-pa {}; - plasma-sdk = callPackage ./plasma-sdk {}; - plasma-systemmonitor = callPackage ./plasma-systemmonitor {}; - plasma-thunderbolt = callPackage ./plasma-thunderbolt {}; - plasma-vault = callPackage ./plasma-vault {}; - plasma-welcome = callPackage ./plasma-welcome {}; - plasma-workspace = callPackage ./plasma-workspace {}; - plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers {}; - plasma5support = callPackage ./plasma5support {}; - plymouth-kcm = callPackage ./plymouth-kcm {}; - polkit-kde-agent-1 = callPackage ./polkit-kde-agent-1 {}; - powerdevil = callPackage ./powerdevil {}; - print-manager = callPackage ./print-manager {}; - qqc2-breeze-style = callPackage ./qqc2-breeze-style {}; - sddm-kcm = callPackage ./sddm-kcm {}; - systemsettings = callPackage ./systemsettings {}; - wacomtablet = callPackage ./wacomtablet {}; - xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde {}; +{ callPackage }: +{ + bluedevil = callPackage ./bluedevil { }; + breeze = callPackage ./breeze { }; + breeze-grub = callPackage ./breeze-grub { }; + breeze-gtk = callPackage ./breeze-gtk { }; + breeze-plymouth = callPackage ./breeze-plymouth { }; + discover = callPackage ./discover { }; + drkonqi = callPackage ./drkonqi { }; + flatpak-kcm = callPackage ./flatpak-kcm { }; + kactivitymanagerd = callPackage ./kactivitymanagerd { }; + kde-cli-tools = callPackage ./kde-cli-tools { }; + kde-gtk-config = callPackage ./kde-gtk-config { }; + kdecoration = callPackage ./kdecoration { }; + kdeplasma-addons = callPackage ./kdeplasma-addons { }; + kgamma = callPackage ./kgamma { }; + kglobalacceld = callPackage ./kglobalacceld { }; + kinfocenter = callPackage ./kinfocenter { }; + kmenuedit = callPackage ./kmenuedit { }; + kpipewire = callPackage ./kpipewire { }; + krdp = callPackage ./krdp { }; + kscreen = callPackage ./kscreen { }; + kscreenlocker = callPackage ./kscreenlocker { }; + ksshaskpass = callPackage ./ksshaskpass { }; + ksystemstats = callPackage ./ksystemstats { }; + kwallet-pam = callPackage ./kwallet-pam { }; + kwayland = callPackage ./kwayland { }; + kwayland-integration = callPackage ./kwayland-integration { }; + kwin = callPackage ./kwin { }; + kwrited = callPackage ./kwrited { }; + layer-shell-qt = callPackage ./layer-shell-qt { }; + libkscreen = callPackage ./libkscreen { }; + libksysguard = callPackage ./libksysguard { }; + libplasma = callPackage ./libplasma { }; + milou = callPackage ./milou { }; + ocean-sound-theme = callPackage ./ocean-sound-theme { }; + oxygen = callPackage ./oxygen { }; + oxygen-sounds = callPackage ./oxygen-sounds { }; + plasma-activities = callPackage ./plasma-activities { }; + plasma-activities-stats = callPackage ./plasma-activities-stats { }; + plasma-browser-integration = callPackage ./plasma-browser-integration { }; + plasma-desktop = callPackage ./plasma-desktop { }; + plasma-disks = callPackage ./plasma-disks { }; + plasma-firewall = callPackage ./plasma-firewall { }; + plasma-integration = callPackage ./plasma-integration { }; + plasma-mobile = callPackage ./plasma-mobile { }; + plasma-nano = callPackage ./plasma-nano { }; + plasma-nm = callPackage ./plasma-nm { }; + plasma-pa = callPackage ./plasma-pa { }; + plasma-sdk = callPackage ./plasma-sdk { }; + plasma-systemmonitor = callPackage ./plasma-systemmonitor { }; + plasma-thunderbolt = callPackage ./plasma-thunderbolt { }; + plasma-vault = callPackage ./plasma-vault { }; + plasma-welcome = callPackage ./plasma-welcome { }; + plasma-workspace = callPackage ./plasma-workspace { }; + plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers { }; + plasma5support = callPackage ./plasma5support { }; + plymouth-kcm = callPackage ./plymouth-kcm { }; + polkit-kde-agent-1 = callPackage ./polkit-kde-agent-1 { }; + powerdevil = callPackage ./powerdevil { }; + print-manager = callPackage ./print-manager { }; + qqc2-breeze-style = callPackage ./qqc2-breeze-style { }; + sddm-kcm = callPackage ./sddm-kcm { }; + systemsettings = callPackage ./systemsettings { }; + wacomtablet = callPackage ./wacomtablet { }; + xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde { }; } diff --git a/pkgs/kde/plasma/discover/default.nix b/pkgs/kde/plasma/discover/default.nix index d25a4fc6ea9b..89d3df681814 100644 --- a/pkgs/kde/plasma/discover/default.nix +++ b/pkgs/kde/plasma/discover/default.nix @@ -9,10 +9,15 @@ mkKdeDerivation { pname = "discover"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwebview discount flatpak fwupd]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtwebview + discount + flatpak + fwupd + ]; # The PackageKit backend doesn't work for us and causes Discover # to freak out when loading. Disable it to not confuse users. - excludeDependencies = ["packagekit-qt"]; + excludeDependencies = [ "packagekit-qt" ]; } diff --git a/pkgs/kde/plasma/drkonqi/default.nix b/pkgs/kde/plasma/drkonqi/default.nix index 2fa13f09d0bd..6e936a23cd99 100644 --- a/pkgs/kde/plasma/drkonqi/default.nix +++ b/pkgs/kde/plasma/drkonqi/default.nix @@ -5,7 +5,8 @@ gdb, python3, substituteAll, -}: let +}: +let gdb' = gdb.override { hostCpuOnly = true; python3 = python3.withPackages (ps: [ @@ -15,21 +16,21 @@ ]); }; in - mkKdeDerivation { - pname = "drkonqi"; +mkKdeDerivation { + pname = "drkonqi"; - patches = [ - (substituteAll { - src = ./gdb-path.patch; - gdb = "${gdb'}/bin/gdb"; - }) - ]; + patches = [ + (substituteAll { + src = ./gdb-path.patch; + gdb = "${gdb'}/bin/gdb"; + }) + ]; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [systemd]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ systemd ]; - extraCmakeFlags = [ - "-DWITH_GDB12=1" - "-DWITH_PYTHON_VENDORING=0" - ]; - } + extraCmakeFlags = [ + "-DWITH_GDB12=1" + "-DWITH_PYTHON_VENDORING=0" + ]; +} diff --git a/pkgs/kde/plasma/flatpak-kcm/default.nix b/pkgs/kde/plasma/flatpak-kcm/default.nix index a43447a15413..1afd87240d16 100644 --- a/pkgs/kde/plasma/flatpak-kcm/default.nix +++ b/pkgs/kde/plasma/flatpak-kcm/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "flatpak-kcm"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [flatpak qtsvg]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + flatpak + qtsvg + ]; } diff --git a/pkgs/kde/plasma/kactivitymanagerd/default.nix b/pkgs/kde/plasma/kactivitymanagerd/default.nix index b0d2fea109cc..48c539521d29 100644 --- a/pkgs/kde/plasma/kactivitymanagerd/default.nix +++ b/pkgs/kde/plasma/kactivitymanagerd/default.nix @@ -6,5 +6,8 @@ mkKdeDerivation { pname = "kactivitymanagerd"; - extraBuildInputs = [qt5compat boost]; + extraBuildInputs = [ + qt5compat + boost + ]; } diff --git a/pkgs/kde/plasma/kde-cli-tools/default.nix b/pkgs/kde/plasma/kde-cli-tools/default.nix index cbaddad84169..45b3040e6d9f 100644 --- a/pkgs/kde/plasma/kde-cli-tools/default.nix +++ b/pkgs/kde/plasma/kde-cli-tools/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kde-cli-tools"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; } diff --git a/pkgs/kde/plasma/kde-gtk-config/default.nix b/pkgs/kde/plasma/kde-gtk-config/default.nix index 045358ffbde5..c9b5a827eea8 100644 --- a/pkgs/kde/plasma/kde-gtk-config/default.nix +++ b/pkgs/kde/plasma/kde-gtk-config/default.nix @@ -17,24 +17,26 @@ mkKdeDerivation { # aren't found. patches = [ ./0001-gsettings-schemas-path.patch - ( - substituteAll { - src = ./dependency-paths.patch; - pgrep = lib.getExe' procps "pgrep"; - xsettingsd = lib.getExe xsettingsd; - } - ) + (substituteAll { + src = ./dependency-paths.patch; + pgrep = lib.getExe' procps "pgrep"; + xsettingsd = lib.getExe xsettingsd; + }) ]; preConfigure = '' NIX_CFLAGS_COMPILE+=" -DGSETTINGS_SCHEMAS_PATH=\"$GSETTINGS_SCHEMAS_PATH\"" ''; - extraNativeBuildInputs = [pkg-config wrapGAppsHook3 sass]; - extraBuildInputs = [qtsvg]; + extraNativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + sass + ]; + extraBuildInputs = [ qtsvg ]; dontWrapGApps = true; # There is nothing to wrap - extraCmakeFlags = ["-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/"]; + extraCmakeFlags = [ "-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/" ]; # Hardcoded as QStrings, which are UTF-16 so Nix can't pick these up automatically postFixup = '' diff --git a/pkgs/kde/plasma/kdecoration/default.nix b/pkgs/kde/plasma/kdecoration/default.nix index 9f879b1cea17..21025a6678ce 100644 --- a/pkgs/kde/plasma/kdecoration/default.nix +++ b/pkgs/kde/plasma/kdecoration/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kdecoration"; } diff --git a/pkgs/kde/plasma/kdeplasma-addons/default.nix b/pkgs/kde/plasma/kdeplasma-addons/default.nix index afb0708e8e6b..e23fdacdf158 100644 --- a/pkgs/kde/plasma/kdeplasma-addons/default.nix +++ b/pkgs/kde/plasma/kdeplasma-addons/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kdeplasma-addons"; - extraBuildInputs = [qtwebengine]; + extraBuildInputs = [ qtwebengine ]; } diff --git a/pkgs/kde/plasma/kgamma/default.nix b/pkgs/kde/plasma/kgamma/default.nix index dcd119ace8ec..607a04a945ea 100644 --- a/pkgs/kde/plasma/kgamma/default.nix +++ b/pkgs/kde/plasma/kgamma/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "kgamma"; - extraBuildInputs = [xorg.libXxf86vm]; + extraBuildInputs = [ xorg.libXxf86vm ]; } diff --git a/pkgs/kde/plasma/kglobalacceld/default.nix b/pkgs/kde/plasma/kglobalacceld/default.nix index caafb6c91347..afe98e7fa6b2 100644 --- a/pkgs/kde/plasma/kglobalacceld/default.nix +++ b/pkgs/kde/plasma/kglobalacceld/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kglobalacceld"; } diff --git a/pkgs/kde/plasma/kinfocenter/default.nix b/pkgs/kde/plasma/kinfocenter/default.nix index 2ef5008905ac..8911e77cf452 100644 --- a/pkgs/kde/plasma/kinfocenter/default.nix +++ b/pkgs/kde/plasma/kinfocenter/default.nix @@ -40,9 +40,12 @@ mkKdeDerivation { patches = [ # fwupdmgr is provided through NixOS' module - (substituteAll ({ - src = ./0001-tool-paths.patch; - } // tools)) + (substituteAll ( + { + src = ./0001-tool-paths.patch; + } + // tools + )) ]; postPatch = '' @@ -50,7 +53,7 @@ mkKdeDerivation { --replace-fail " aha " " ${lib.getExe aha} " ''; - extraBuildInputs = [libusb1]; + extraBuildInputs = [ libusb1 ]; # fix wrong symlink of infocenter pointing to a 'systemsettings5' binary in # the same directory, while it is actually located in a completely different diff --git a/pkgs/kde/plasma/kmenuedit/default.nix b/pkgs/kde/plasma/kmenuedit/default.nix index 4f88e8013173..85e56a3de6d9 100644 --- a/pkgs/kde/plasma/kmenuedit/default.nix +++ b/pkgs/kde/plasma/kmenuedit/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kmenuedit"; meta.mainProgram = "kmenuedit"; diff --git a/pkgs/kde/plasma/kpipewire/default.nix b/pkgs/kde/plasma/kpipewire/default.nix index c79bfc792d51..eb604d1a61c4 100644 --- a/pkgs/kde/plasma/kpipewire/default.nix +++ b/pkgs/kde/plasma/kpipewire/default.nix @@ -10,6 +10,12 @@ mkKdeDerivation { pname = "kpipewire"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtquick3d pipewire ffmpeg mesa libva]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtquick3d + pipewire + ffmpeg + mesa + libva + ]; } diff --git a/pkgs/kde/plasma/krdp/default.nix b/pkgs/kde/plasma/krdp/default.nix index 38208475ca27..8dd95c1a7659 100644 --- a/pkgs/kde/plasma/krdp/default.nix +++ b/pkgs/kde/plasma/krdp/default.nix @@ -20,7 +20,7 @@ mkKdeDerivation { }) ]; - extraNativeBuildInputs = [pkg-config]; + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtkeychain qtwayland diff --git a/pkgs/kde/plasma/kscreen/default.nix b/pkgs/kde/plasma/kscreen/default.nix index 3ceedb860de0..379e13d561c8 100644 --- a/pkgs/kde/plasma/kscreen/default.nix +++ b/pkgs/kde/plasma/kscreen/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "kscreen"; - extraBuildInputs = [qtsensors]; + extraBuildInputs = [ qtsensors ]; postFixup = '' substituteInPlace $out/share/kglobalaccel/org.kde.kscreen.desktop \ diff --git a/pkgs/kde/plasma/kscreenlocker/default.nix b/pkgs/kde/plasma/kscreenlocker/default.nix index cab85f5e6889..edf549ef75e9 100644 --- a/pkgs/kde/plasma/kscreenlocker/default.nix +++ b/pkgs/kde/plasma/kscreenlocker/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "kscreenlocker"; - extraNativeBuildInputs = [wayland-scanner]; - extraBuildInputs = [pam qqc2-breeze-style]; + extraNativeBuildInputs = [ wayland-scanner ]; + extraBuildInputs = [ + pam + qqc2-breeze-style + ]; } diff --git a/pkgs/kde/plasma/ksshaskpass/default.nix b/pkgs/kde/plasma/ksshaskpass/default.nix index dee8ae1e2ce8..4a148489a129 100644 --- a/pkgs/kde/plasma/ksshaskpass/default.nix +++ b/pkgs/kde/plasma/ksshaskpass/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "ksshaskpass"; meta.mainProgram = "ksshaskpass"; diff --git a/pkgs/kde/plasma/ksystemstats/default.nix b/pkgs/kde/plasma/ksystemstats/default.nix index 1d098b10b023..5582de47cb9f 100644 --- a/pkgs/kde/plasma/ksystemstats/default.nix +++ b/pkgs/kde/plasma/ksystemstats/default.nix @@ -9,8 +9,14 @@ mkKdeDerivation { pname = "ksystemstats"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [networkmanager-qt lm_sensors libnl]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + networkmanager-qt + lm_sensors + libnl + ]; - cmakeFlags = ["-DSYSTEMSTATS_DBUS_INTERFACE=${libksysguard}/share/dbus-1/interfaces/org.kde.ksystemstats1.xml"]; + cmakeFlags = [ + "-DSYSTEMSTATS_DBUS_INTERFACE=${libksysguard}/share/dbus-1/interfaces/org.kde.ksystemstats1.xml" + ]; } diff --git a/pkgs/kde/plasma/kwallet-pam/default.nix b/pkgs/kde/plasma/kwallet-pam/default.nix index a540f54a85ce..4dc35d59f485 100644 --- a/pkgs/kde/plasma/kwallet-pam/default.nix +++ b/pkgs/kde/plasma/kwallet-pam/default.nix @@ -13,6 +13,9 @@ mkKdeDerivation { sed -i pam_kwallet_init -e "s|socat|${lib.getBin socat}/bin/socat|" ''; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [pam libgcrypt]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + pam + libgcrypt + ]; } diff --git a/pkgs/kde/plasma/kwayland-integration/default.nix b/pkgs/kde/plasma/kwayland-integration/default.nix index 0274068f7f79..8de6d3fae8be 100644 --- a/pkgs/kde/plasma/kwayland-integration/default.nix +++ b/pkgs/kde/plasma/kwayland-integration/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kwayland-integration"; # FIXME(qt5) diff --git a/pkgs/kde/plasma/kwayland/default.nix b/pkgs/kde/plasma/kwayland/default.nix index 86713b834bec..f456e94dc3c6 100644 --- a/pkgs/kde/plasma/kwayland/default.nix +++ b/pkgs/kde/plasma/kwayland/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "kwayland"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ qtwayland ]; } diff --git a/pkgs/kde/plasma/kwin/default.nix b/pkgs/kde/plasma/kwin/default.nix index ffa7e146ece6..85679de86150 100644 --- a/pkgs/kde/plasma/kwin/default.nix +++ b/pkgs/kde/plasma/kwin/default.nix @@ -41,7 +41,10 @@ mkKdeDerivation { "--set-default TZDIR /etc/zoneinfo" ]; - extraNativeBuildInputs = [pkg-config python3]; + extraNativeBuildInputs = [ + pkg-config + python3 + ]; extraBuildInputs = [ qtquick3d qtsensors diff --git a/pkgs/kde/plasma/kwrited/default.nix b/pkgs/kde/plasma/kwrited/default.nix index c9bb0ff6e6ca..2b66791b1685 100644 --- a/pkgs/kde/plasma/kwrited/default.nix +++ b/pkgs/kde/plasma/kwrited/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "kwrited"; meta.mainProgram = "kwrited"; diff --git a/pkgs/kde/plasma/layer-shell-qt/default.nix b/pkgs/kde/plasma/layer-shell-qt/default.nix index dd7290379c5f..009b2633b6f7 100644 --- a/pkgs/kde/plasma/layer-shell-qt/default.nix +++ b/pkgs/kde/plasma/layer-shell-qt/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "layer-shell-qt"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ qtwayland ]; } diff --git a/pkgs/kde/plasma/libkscreen/default.nix b/pkgs/kde/plasma/libkscreen/default.nix index ccd11318e2be..fa969f46a537 100644 --- a/pkgs/kde/plasma/libkscreen/default.nix +++ b/pkgs/kde/plasma/libkscreen/default.nix @@ -8,7 +8,12 @@ mkKdeDerivation { pname = "libkscreen"; - extraNativeBuildInputs = [qttools qtwayland jq wayland]; - extraBuildInputs = [qtwayland]; + extraNativeBuildInputs = [ + qttools + qtwayland + jq + wayland + ]; + extraBuildInputs = [ qtwayland ]; meta.mainProgram = "kscreen-doctor"; } diff --git a/pkgs/kde/plasma/libksysguard/default.nix b/pkgs/kde/plasma/libksysguard/default.nix index 9dae888737ab..5f6ecce54353 100644 --- a/pkgs/kde/plasma/libksysguard/default.nix +++ b/pkgs/kde/plasma/libksysguard/default.nix @@ -10,5 +10,12 @@ mkKdeDerivation { pname = "libksysguard"; - extraBuildInputs = [qtwebchannel qtwebengine qttools libpcap libnl lm_sensors]; + extraBuildInputs = [ + qtwebchannel + qtwebengine + qttools + libpcap + libnl + lm_sensors + ]; } diff --git a/pkgs/kde/plasma/libplasma/default.nix b/pkgs/kde/plasma/libplasma/default.nix index 1ff05b92ef0e..348bd4cb2bc2 100644 --- a/pkgs/kde/plasma/libplasma/default.nix +++ b/pkgs/kde/plasma/libplasma/default.nix @@ -8,6 +8,10 @@ mkKdeDerivation { pname = "libplasma"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtsvg qtwayland wayland]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtsvg + qtwayland + wayland + ]; } diff --git a/pkgs/kde/plasma/lightdm-greeter-kde/default.nix b/pkgs/kde/plasma/lightdm-greeter-kde/default.nix index 9d508409f9d3..e6b7b64f925d 100644 --- a/pkgs/kde/plasma/lightdm-greeter-kde/default.nix +++ b/pkgs/kde/plasma/lightdm-greeter-kde/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "lightdm-greeter-kde"; } diff --git a/pkgs/kde/plasma/milou/default.nix b/pkgs/kde/plasma/milou/default.nix index 555c7cbee2c7..69a69e14753f 100644 --- a/pkgs/kde/plasma/milou/default.nix +++ b/pkgs/kde/plasma/milou/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "milou"; } diff --git a/pkgs/kde/plasma/ocean-sound-theme/default.nix b/pkgs/kde/plasma/ocean-sound-theme/default.nix index 72adf43e3604..784e80f5997a 100644 --- a/pkgs/kde/plasma/ocean-sound-theme/default.nix +++ b/pkgs/kde/plasma/ocean-sound-theme/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "ocean-sound-theme"; } diff --git a/pkgs/kde/plasma/oxygen-sounds/default.nix b/pkgs/kde/plasma/oxygen-sounds/default.nix index 68ee47d20eb8..8153b0d75715 100644 --- a/pkgs/kde/plasma/oxygen-sounds/default.nix +++ b/pkgs/kde/plasma/oxygen-sounds/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "oxygen-sounds"; } diff --git a/pkgs/kde/plasma/oxygen/default.nix b/pkgs/kde/plasma/oxygen/default.nix index 718a9737a8e1..7d4eb0c37874 100644 --- a/pkgs/kde/plasma/oxygen/default.nix +++ b/pkgs/kde/plasma/oxygen/default.nix @@ -6,7 +6,11 @@ mkKdeDerivation { pname = "oxygen"; - outputs = ["out" "dev" "qt5"]; + outputs = [ + "out" + "dev" + "qt5" + ]; # We can't add qt5 stuff to dependencies or the hooks blow up, # so manually point everything to everything. Oof. diff --git a/pkgs/kde/plasma/plasma-activities-stats/default.nix b/pkgs/kde/plasma/plasma-activities-stats/default.nix index dff496e4f631..3e25cdb19674 100644 --- a/pkgs/kde/plasma/plasma-activities-stats/default.nix +++ b/pkgs/kde/plasma/plasma-activities-stats/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "plasma-activities-stats"; } diff --git a/pkgs/kde/plasma/plasma-activities/default.nix b/pkgs/kde/plasma/plasma-activities/default.nix index c9fdd0821181..01354b5a6a28 100644 --- a/pkgs/kde/plasma/plasma-activities/default.nix +++ b/pkgs/kde/plasma/plasma-activities/default.nix @@ -6,6 +6,9 @@ mkKdeDerivation { pname = "plasma-activities"; - extraBuildInputs = [qtdeclarative boost]; + extraBuildInputs = [ + qtdeclarative + boost + ]; meta.mainProgram = "plasma-activities-cli6"; } diff --git a/pkgs/kde/plasma/plasma-browser-integration/default.nix b/pkgs/kde/plasma/plasma-browser-integration/default.nix index e069d067f294..b4fb1c2b03a3 100644 --- a/pkgs/kde/plasma/plasma-browser-integration/default.nix +++ b/pkgs/kde/plasma/plasma-browser-integration/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "plasma-browser-integration"; meta.mainProgram = "plasma-browser-integration-host"; diff --git a/pkgs/kde/plasma/plasma-desktop/default.nix b/pkgs/kde/plasma/plasma-desktop/default.nix index a84a55779d36..46a0a73fb453 100644 --- a/pkgs/kde/plasma/plasma-desktop/default.nix +++ b/pkgs/kde/plasma/plasma-desktop/default.nix @@ -18,55 +18,56 @@ libcanberra, libxkbfile, ibus, -}: let +}: +let # run gsettings with desktop schemas for using in "kcm_access" kcm # and in kaccess - gsettings-wrapper = runCommandLocal "gsettings-wrapper" {nativeBuildInputs = [makeWrapper];} '' + gsettings-wrapper = runCommandLocal "gsettings-wrapper" { nativeBuildInputs = [ makeWrapper ]; } '' mkdir -p $out/bin makeWrapper ${glib}/bin/gsettings $out/bin/gsettings --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas.out}/share/gsettings-schemas/${gsettings-desktop-schemas.name} ''; in - mkKdeDerivation { - pname = "plasma-desktop"; +mkKdeDerivation { + pname = "plasma-desktop"; - patches = [ - (substituteAll { - src = ./hwclock-path.patch; - hwclock = "${lib.getBin util-linux}/bin/hwclock"; - }) - (substituteAll { - src = ./kcm-access.patch; - gsettings = "${gsettings-wrapper}/bin/gsettings"; - }) - ./tzdir.patch - ./no-discover-shortcut.patch - (substituteAll { - src = ./wallpaper-paths.patch; - wallpapers = "${lib.getBin breeze}/share/wallpapers"; - }) - ]; + patches = [ + (substituteAll { + src = ./hwclock-path.patch; + hwclock = "${lib.getBin util-linux}/bin/hwclock"; + }) + (substituteAll { + src = ./kcm-access.patch; + gsettings = "${gsettings-wrapper}/bin/gsettings"; + }) + ./tzdir.patch + ./no-discover-shortcut.patch + (substituteAll { + src = ./wallpaper-paths.patch; + wallpapers = "${lib.getBin breeze}/share/wallpapers"; + }) + ]; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [ - qtsvg - qtwayland + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtsvg + qtwayland - kaccounts-integration + kaccounts-integration - SDL2 - libcanberra - libxkbfile - xkeyboard_config + SDL2 + libcanberra + libxkbfile + xkeyboard_config - xorg.libXcursor - xorg.libXft - xorg.xf86inputlibinput - xorg.xf86inputevdev - xorg.xorgserver + xorg.libXcursor + xorg.libXft + xorg.xf86inputlibinput + xorg.xf86inputevdev + xorg.xorgserver - ibus - ]; + ibus + ]; - # wrap kaccess with wrapped gsettings so it can access accessibility schemas - qtWrapperArgs = ["--prefix PATH : ${lib.makeBinPath [gsettings-wrapper]}"]; - } + # wrap kaccess with wrapped gsettings so it can access accessibility schemas + qtWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ gsettings-wrapper ]}" ]; +} diff --git a/pkgs/kde/plasma/plasma-firewall/default.nix b/pkgs/kde/plasma/plasma-firewall/default.nix index 202d3ea089b2..b777de3bb619 100644 --- a/pkgs/kde/plasma/plasma-firewall/default.nix +++ b/pkgs/kde/plasma/plasma-firewall/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "plasma-firewall"; } diff --git a/pkgs/kde/plasma/plasma-integration/default.nix b/pkgs/kde/plasma/plasma-integration/default.nix index a626b9447934..55c1bb7ee10a 100644 --- a/pkgs/kde/plasma/plasma-integration/default.nix +++ b/pkgs/kde/plasma/plasma-integration/default.nix @@ -9,9 +9,13 @@ mkKdeDerivation { pname = "plasma-integration"; # force it to check our custom import path too - patches = [./qml-path.patch]; + patches = [ ./qml-path.patch ]; - outputs = ["out" "dev" "qt5"]; + outputs = [ + "out" + "dev" + "qt5" + ]; # We can't add qt5 stuff to dependencies or the hooks blow up, # so manually point everything to everything. Oof. @@ -57,7 +61,10 @@ mkKdeDerivation { "-DKF5XmlGui_DIR=${libsForQt5.kxmlgui.dev}/lib/cmake/KF5XmlGui" ]; - extraBuildInputs = [qtwayland xorg.libXcursor]; + extraBuildInputs = [ + qtwayland + xorg.libXcursor + ]; # Move Qt5 plugin to Qt5 plugin path postInstall = '' diff --git a/pkgs/kde/plasma/plasma-mobile/default.nix b/pkgs/kde/plasma/plasma-mobile/default.nix index 8c6766e13b03..18654f28dc3d 100644 --- a/pkgs/kde/plasma/plasma-mobile/default.nix +++ b/pkgs/kde/plasma/plasma-mobile/default.nix @@ -7,8 +7,8 @@ mkKdeDerivation { pname = "plasma-mobile"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtsensors]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ qtsensors ]; postFixup = '' substituteInPlace "$out/share/wayland-sessions/plasma-mobile.desktop" \ --replace-fail \ diff --git a/pkgs/kde/plasma/plasma-nano/default.nix b/pkgs/kde/plasma/plasma-nano/default.nix index 9cdb24f013e7..2d16f3085f17 100644 --- a/pkgs/kde/plasma/plasma-nano/default.nix +++ b/pkgs/kde/plasma/plasma-nano/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "plasma-nano"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; } diff --git a/pkgs/kde/plasma/plasma-nm/default.nix b/pkgs/kde/plasma/plasma-nm/default.nix index a53ec99a8bed..6d93b623477b 100644 --- a/pkgs/kde/plasma/plasma-nm/default.nix +++ b/pkgs/kde/plasma/plasma-nm/default.nix @@ -17,7 +17,7 @@ mkKdeDerivation { }) ]; - extraNativeBuildInputs = [pkg-config]; + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtwebengine mobile-broadband-provider-info diff --git a/pkgs/kde/plasma/plasma-pa/default.nix b/pkgs/kde/plasma/plasma-pa/default.nix index 4d721ecc711b..8213000dc40e 100644 --- a/pkgs/kde/plasma/plasma-pa/default.nix +++ b/pkgs/kde/plasma/plasma-pa/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "plasma-pa"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [libcanberra pulseaudio]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + libcanberra + pulseaudio + ]; } diff --git a/pkgs/kde/plasma/plasma-sdk/default.nix b/pkgs/kde/plasma/plasma-sdk/default.nix index 68f5a30fc936..52e3f6859e5b 100644 --- a/pkgs/kde/plasma/plasma-sdk/default.nix +++ b/pkgs/kde/plasma/plasma-sdk/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "plasma-sdk"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; } diff --git a/pkgs/kde/plasma/plasma-systemmonitor/default.nix b/pkgs/kde/plasma/plasma-systemmonitor/default.nix index a8e20716ed56..0aceb98496ac 100644 --- a/pkgs/kde/plasma/plasma-systemmonitor/default.nix +++ b/pkgs/kde/plasma/plasma-systemmonitor/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "plasma-systemmonitor"; meta.mainProgram = "plasma-systemmonitor"; diff --git a/pkgs/kde/plasma/plasma-thunderbolt/default.nix b/pkgs/kde/plasma/plasma-thunderbolt/default.nix index 5b1b682ac9bc..6a1a96371047 100644 --- a/pkgs/kde/plasma/plasma-thunderbolt/default.nix +++ b/pkgs/kde/plasma/plasma-thunderbolt/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "plasma-thunderbolt"; } diff --git a/pkgs/kde/plasma/plasma-vault/default.nix b/pkgs/kde/plasma/plasma-vault/default.nix index 9ab545ab87b8..f933687143a8 100644 --- a/pkgs/kde/plasma/plasma-vault/default.nix +++ b/pkgs/kde/plasma/plasma-vault/default.nix @@ -25,5 +25,5 @@ mkKdeDerivation { ''-DNIXPKGS_GOCRYPTFS=\"${lib.getBin gocryptfs}/bin/gocryptfs\"'' ]; - extraNativeBuildInputs = [pkg-config]; + extraNativeBuildInputs = [ pkg-config ]; } diff --git a/pkgs/kde/plasma/plasma-welcome/default.nix b/pkgs/kde/plasma/plasma-welcome/default.nix index 7265a3f3f1ff..3786b3d0c89a 100644 --- a/pkgs/kde/plasma/plasma-welcome/default.nix +++ b/pkgs/kde/plasma/plasma-welcome/default.nix @@ -5,6 +5,6 @@ mkKdeDerivation { pname = "plasma-welcome"; - extraBuildInputs = [qtsvg]; + extraBuildInputs = [ qtsvg ]; meta.mainProgram = "plasma-welcome"; } diff --git a/pkgs/kde/plasma/plasma-workspace-wallpapers/default.nix b/pkgs/kde/plasma/plasma-workspace-wallpapers/default.nix index af8c89249274..5d661c1c94fd 100644 --- a/pkgs/kde/plasma/plasma-workspace-wallpapers/default.nix +++ b/pkgs/kde/plasma/plasma-workspace-wallpapers/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "plasma-workspace-wallpapers"; - extraBuildInputs = [extra-cmake-modules]; + extraBuildInputs = [ extra-cmake-modules ]; } diff --git a/pkgs/kde/plasma/plasma-workspace/default.nix b/pkgs/kde/plasma/plasma-workspace/default.nix index a8dfdd9a9e12..2bb51422b0af 100644 --- a/pkgs/kde/plasma/plasma-workspace/default.nix +++ b/pkgs/kde/plasma/plasma-workspace/default.nix @@ -36,7 +36,10 @@ mkKdeDerivation { chmod -x $out/libexec/plasma-sourceenv.sh ''; - extraNativeBuildInputs = [pkg-config spirv-tools]; + extraNativeBuildInputs = [ + pkg-config + spirv-tools + ]; extraBuildInputs = [ qtsvg qtwayland @@ -61,5 +64,8 @@ mkKdeDerivation { echo "${lsof} ${xorg.xmessage} ${xorg.xsetroot}" > $out/nix-support/depends ''; - passthru.providedSessions = ["plasma" "plasmax11"]; + passthru.providedSessions = [ + "plasma" + "plasmax11" + ]; } diff --git a/pkgs/kde/plasma/plasma5support/default.nix b/pkgs/kde/plasma/plasma5support/default.nix index 385626aeedc0..f1c0632fdcf3 100644 --- a/pkgs/kde/plasma/plasma5support/default.nix +++ b/pkgs/kde/plasma/plasma5support/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "plasma5support"; } diff --git a/pkgs/kde/plasma/plymouth-kcm/default.nix b/pkgs/kde/plasma/plymouth-kcm/default.nix index ccb117f11a53..b5f7f6578014 100644 --- a/pkgs/kde/plasma/plymouth-kcm/default.nix +++ b/pkgs/kde/plasma/plymouth-kcm/default.nix @@ -6,7 +6,7 @@ mkKdeDerivation { pname = "plymouth-kcm"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [plymouth]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ plymouth ]; meta.mainProgram = "kplymouththemeinstaller"; } diff --git a/pkgs/kde/plasma/polkit-kde-agent-1/default.nix b/pkgs/kde/plasma/polkit-kde-agent-1/default.nix index 6c4bf0653f09..53f7f2959d60 100644 --- a/pkgs/kde/plasma/polkit-kde-agent-1/default.nix +++ b/pkgs/kde/plasma/polkit-kde-agent-1/default.nix @@ -5,5 +5,5 @@ mkKdeDerivation { pname = "polkit-kde-agent-1"; - extraBuildInputs = [qtdeclarative]; + extraBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/kde/plasma/powerdevil/default.nix b/pkgs/kde/plasma/powerdevil/default.nix index 8b0c270e85c6..3faa5c38417e 100644 --- a/pkgs/kde/plasma/powerdevil/default.nix +++ b/pkgs/kde/plasma/powerdevil/default.nix @@ -6,6 +6,6 @@ mkKdeDerivation { pname = "powerdevil"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [libcap]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ libcap ]; } diff --git a/pkgs/kde/plasma/print-manager/default.nix b/pkgs/kde/plasma/print-manager/default.nix index fce60dcb968b..dd06f5217637 100644 --- a/pkgs/kde/plasma/print-manager/default.nix +++ b/pkgs/kde/plasma/print-manager/default.nix @@ -6,5 +6,5 @@ mkKdeDerivation { pname = "print-manager"; # FIXME: cups-smb? - extraBuildInputs = [cups]; + extraBuildInputs = [ cups ]; } diff --git a/pkgs/kde/plasma/qqc2-breeze-style/default.nix b/pkgs/kde/plasma/qqc2-breeze-style/default.nix index 2d950f63e0c5..97a7da956794 100644 --- a/pkgs/kde/plasma/qqc2-breeze-style/default.nix +++ b/pkgs/kde/plasma/qqc2-breeze-style/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "qqc2-breeze-style"; } diff --git a/pkgs/kde/plasma/sddm-kcm/default.nix b/pkgs/kde/plasma/sddm-kcm/default.nix index d21ea6ac58f2..e6ba4bb608f2 100644 --- a/pkgs/kde/plasma/sddm-kcm/default.nix +++ b/pkgs/kde/plasma/sddm-kcm/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "sddm-kcm"; meta.mainProgram = "sddmthemeinstaller"; diff --git a/pkgs/kde/plasma/systemsettings/default.nix b/pkgs/kde/plasma/systemsettings/default.nix index 10feafc859c3..7902e83710ff 100644 --- a/pkgs/kde/plasma/systemsettings/default.nix +++ b/pkgs/kde/plasma/systemsettings/default.nix @@ -1,4 +1,4 @@ -{mkKdeDerivation}: +{ mkKdeDerivation }: mkKdeDerivation { pname = "systemsettings"; meta.mainProgram = "systemsettings"; diff --git a/pkgs/kde/plasma/wacomtablet/default.nix b/pkgs/kde/plasma/wacomtablet/default.nix index 58b80fa9575f..c4482a689606 100644 --- a/pkgs/kde/plasma/wacomtablet/default.nix +++ b/pkgs/kde/plasma/wacomtablet/default.nix @@ -7,7 +7,10 @@ mkKdeDerivation { pname = "wacomtablet"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [libwacom xf86_input_wacom]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + libwacom + xf86_input_wacom + ]; meta.mainProgram = "kde_wacom_tabletfinder"; } diff --git a/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix b/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix index 7563e934e502..0614c0c191d5 100644 --- a/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix +++ b/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix @@ -7,6 +7,9 @@ mkKdeDerivation { pname = "xdg-desktop-portal-kde"; - extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland cups]; + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtwayland + cups + ]; } diff --git a/pkgs/kde/third-party/applet-window-buttons6/default.nix b/pkgs/kde/third-party/applet-window-buttons6/default.nix index be70f8398f41..282978fbc338 100644 --- a/pkgs/kde/third-party/applet-window-buttons6/default.nix +++ b/pkgs/kde/third-party/applet-window-buttons6/default.nix @@ -1,12 +1,13 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, extra-cmake-modules -, kcoreaddons -, kdeclarative -, kdecoration -, libplasma +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + extra-cmake-modules, + kcoreaddons, + kdeclarative, + kdecoration, + libplasma, }: stdenv.mkDerivation rec {