propagate ki18n dependencies

pkgs/applications/kde-apps-15.08/ark.nix

@@ -27,7 +27,6 @@ kdeApp {
     kconfig
     kcrash
     kdbusaddons
-    ki18n
     kiconthemes
     kio
     kservice
@@ -37,6 +36,7 @@ kdeApp {
   ];
   propagatedBuildInputs = [
     khtml
+    ki18n
   ];
   meta = {
     license = with lib.licenses; [ gpl2 lgpl3 ];

pkgs/applications/kde-apps-15.08/baloo-widgets.nix

@@ -20,13 +20,13 @@ kdeApp {
   buildInputs = [
     kconfig
     kio
-    ki18n
     kservice
   ];
   propagatedBuildInputs = [
     baloo
     kdelibs4support
     kfilemetadata
+    ki18n
   ];
   meta = {
     license = [ lib.licenses.lgpl21 ];

pkgs/applications/kde-apps-15.08/dolphin-plugins.nix

@@ -17,12 +17,12 @@ kdeApp {
   ];
   buildInputs = [
     kxmlgui
-    ki18n
     kio
     dolphin
   ];
   propagatedBuildInputs = [
     kdelibs4support
+    ki18n
   ];
   meta = {
     license = [ lib.licenses.gpl2 ];

pkgs/applications/kde-apps-15.08/dolphin.nix

@@ -37,7 +37,6 @@ kdeApp {
     kcmutils
     kcoreaddons
     knewstuff
-    ki18n
     kdbusaddons
     kbookmarks
     kconfig
@@ -57,6 +56,7 @@ kdeApp {
     kactivities
     kdelibs4support
     kfilemetadata
+    ki18n
   ];
   meta = {
     license = with lib.licenses; [ gpl2 fdl12 ];

pkgs/applications/kde-apps-15.08/kate.nix

@@ -38,7 +38,6 @@ kdeApp {
     kcrash
     kguiaddons
     kiconthemes
-    ki18n
     kinit
     kjobwidgets
     kio
@@ -57,6 +56,7 @@ kdeApp {
   ];
   propagatedBuildInputs = [
     kactivities
+    ki18n
   ];
   meta = {
     license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];

pkgs/applications/kde-apps-15.08/konsole.nix

@@ -39,7 +39,6 @@ kdeApp {
     kconfigwidgets
     kcoreaddons
     kguiaddons
-    ki18n
     kiconthemes
     kinit
     kio
@@ -55,6 +54,7 @@ kdeApp {
   ];
   propagatedBuildInputs = [
     kdelibs4support
+    ki18n
   ];
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];

pkgs/applications/kde-apps-15.08/print-manager.nix

@@ -29,7 +29,6 @@ kdeApp {
     kconfigwidgets
     kdbusaddons
     kiconthemes
-    ki18n
     kcmutils
     kio
     knotifications
@@ -38,6 +37,9 @@ kdeApp {
     kwindowsystem
     kitemviews
   ];
+  propagatedBuildInputs = [
+    ki18n
+  ];
   meta = {
     license = [ lib.licenses.gpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];

pkgs/desktops/plasma-5.4/breeze-qt5.nix

@@ -10,10 +10,10 @@ plasmaPackage {
     extra-cmake-modules
   ];
   buildInputs = [
-    kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons ki18n
+    kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons
     kwindowsystem qtx11extras
   ];
-  propagatedBuildInputs = [ frameworkintegration ];
+  propagatedBuildInputs = [ frameworkintegration ki18n ];
   cmakeFlags = [ "-DUSE_KDE4=OFF" ];
   postInstall = ''
     wrapKDEProgram "$out/bin/breeze-settings5"

pkgs/desktops/plasma-5.4/kde-gtk-config.nix

@@ -16,9 +16,10 @@ plasmaPackage {
   name = "kde-gtk-config";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    glib gtk2 gtk3 karchive kcmutils kconfigwidgets ki18n kiconthemes
+    glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
     kio knewstuff
   ];
+  propagatedBuildInputs = [ ki18n ];
   cmakeFlags = [
     "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
     "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include"

pkgs/desktops/plasma-5.4/kdeplasma-addons.nix

@@ -11,7 +11,7 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    ibus kconfig kconfigwidgets kcoreaddons kcmutils ki18n kio
+    ibus kconfig kconfigwidgets kcoreaddons kcmutils kio
     knewstuff kross krunner kservice kunitconversion plasma-framework
   ];
   propagatedBuildInputs = [ kdelibs4support qtdeclarative qtx11extras ];

pkgs/desktops/plasma-5.4/khelpcenter.nix

@@ -10,9 +10,9 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    kconfig kcoreaddons kdbusaddons ki18n kinit kcmutils kservice
+    kconfig kcoreaddons kdbusaddons kinit kcmutils kservice
   ];
-  propagatedBuildInputs = [ kdelibs4support khtml ];
+  propagatedBuildInputs = [ kdelibs4support khtml ki18n ];
   postInstall = ''
     wrapKDEProgram "$out/bin/khelpcenter"
   '';

pkgs/desktops/plasma-5.4/khotkeys.nix

@@ -7,8 +7,8 @@ plasmaPackage {
   name = "khotkeys";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    kcmutils kdbusaddons ki18n kio kxmlgui plasma-framework
+    kcmutils kdbusaddons kio kxmlgui plasma-framework
     plasma-workspace
   ];
-  propagatedBuildInputs = [ kdelibs4support kglobalaccel qtx11extras ];
+  propagatedBuildInputs = [ kdelibs4support kglobalaccel ki18n qtx11extras ];
 }

pkgs/desktops/plasma-5.4/kinfocenter.nix

@@ -12,10 +12,10 @@ plasmaPackage {
   ];
   buildInputs = [
     kcmutils kcompletion kconfig kconfigwidgets kcoreaddons
-    kdbusaddons ki18n kiconthemes kio kpackage kservice kwidgetsaddons
+    kdbusaddons kiconthemes kio kpackage kservice kwidgetsaddons
     kxmlgui libraw1394 pciutils solid
   ];
-  propagatedBuildInputs = [ kdeclarative kdelibs4support ];
+  propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kinfocenter"
   '';

pkgs/desktops/plasma-5.4/kmenuedit.nix

@@ -9,9 +9,9 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    ki18n kxmlgui kdbusaddons kiconthemes kio sonnet
+    kxmlgui kdbusaddons kiconthemes kio sonnet
   ];
-  propagatedBuildInputs = [ kdelibs4support ];
+  propagatedBuildInputs = [ kdelibs4support ki18n ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kmenuedit"
   '';

pkgs/desktops/plasma-5.4/kscreen.nix

@@ -9,10 +9,10 @@ plasmaPackage {
     extra-cmake-modules
   ];
   buildInputs = [
-    kconfig kconfigwidgets kdbusaddons ki18n kwidgetsaddons kxmlgui
+    kconfig kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui
     libkscreen
   ];
-  propagatedBuildInputs = [ kglobalaccel qtdeclarative ];
+  propagatedBuildInputs = [ kglobalaccel ki18n qtdeclarative ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kscreen-console"
   '';

pkgs/desktops/plasma-5.4/ksshaskpass.nix

@@ -1,24 +1,12 @@
-{ plasmaPackage
+{ plasmaPackage, extra-cmake-modules, kdoctools, kcoreaddons
-, extra-cmake-modules
+, ki18n, kwallet, kwidgetsaddons
-, kdoctools
-, kcoreaddons
-, ki18n
-, kwallet
-, kwidgetsaddons
 }:
 
 plasmaPackage {
   name = "ksshaskpass";
-  nativeBuildInputs = [
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-    extra-cmake-modules
+  buildInputs = [ kcoreaddons kwallet kwidgetsaddons ];
-    kdoctools
+  propagatedBuildInputs = [ ki18n ];
-  ];
-  buildInputs = [
-    kcoreaddons
-    ki18n
-    kwallet
-    kwidgetsaddons
-  ];
   postInstall = ''
     wrapKDEProgram "$out/bin/ksshaskpass"
   '';

pkgs/desktops/plasma-5.4/ksysguard.nix

@@ -10,10 +10,9 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    kconfig kcoreaddons ki18n kitemviews knewstuff kiconthemes
+    kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
-    libksysguard
   ];
-  propagatedBuildInputs = [ kdelibs4support ];
+  propagatedBuildInputs = [ kdelibs4support ki18n ];
   postInstall = ''
     wrapKDEProgram "$out/bin/ksysguardd"
     wrapKDEProgram "$out/bin/ksysguard"

pkgs/desktops/plasma-5.4/kwin/default.nix

@@ -15,13 +15,12 @@ plasmaPackage {
   ];
   buildInputs = [
     epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons
-    kcrash kdecoration ki18n kiconthemes kinit kio knewstuff
+    kcrash kdecoration kiconthemes kinit kio knewstuff knotifications
-    knotifications kpackage kservice kwayland kwidgetsaddons
+    kpackage kservice kwayland kwidgetsaddons kwindowsystem kxmlgui
-    kwindowsystem kxmlgui libinput libICE libSM plasma-framework
+    libinput libICE libSM plasma-framework qtdeclarative qtscript
-    qtdeclarative qtscript qtx11extras udev wayland
+    qtx11extras udev wayland xcb-util-cursor
-    xcb-util-cursor
   ];
-  propagatedBuildInputs = [ kactivities kdeclarative kglobalaccel ];
+  propagatedBuildInputs = [ kactivities kdeclarative kglobalaccel ki18n ];
   patches = [ ./kwin-import-plugin-follow-symlinks.patch ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kwin_x11"

pkgs/desktops/plasma-5.4/kwrited.nix

@@ -1,22 +1,10 @@
-{ plasmaPackage
+{ plasmaPackage, extra-cmake-modules, kcoreaddons, ki18n, kpty
-, extra-cmake-modules
+, knotifications, kdbusaddons
-, kcoreaddons
-, ki18n
-, kpty
-, knotifications
-, kdbusaddons
 }:
 
 plasmaPackage {
   name = "kwrited";
-  nativeBuildInputs = [
+  nativeBuildInputs = [ extra-cmake-modules ];
-    extra-cmake-modules
+  buildInputs = [ kcoreaddons kpty knotifications kdbusaddons ];
-  ];
+  propagatedBuildInputs = [ ki18n ];
-  buildInputs = [
-    kcoreaddons
-    ki18n
-    kpty
-    knotifications
-    kdbusaddons
-  ];
 }

pkgs/desktops/plasma-5.4/libkscreen/default.nix

@@ -11,6 +11,8 @@ plasmaPackage {
   ];
   buildInputs = [
     libXrandr
+  ];
+  propagatedBuildInputs = [
     qtx11extras
   ];
 }

pkgs/desktops/plasma-5.4/milou.nix

@@ -9,7 +9,7 @@ plasmaPackage {
     extra-cmake-modules
   ];
   buildInputs = [
-    qtscript kcoreaddons ki18n kservice plasma-framework krunner
+    qtscript kcoreaddons kservice plasma-framework krunner
   ];
-  propagatedBuildInputs = [ kdeclarative qtdeclarative ];
+  propagatedBuildInputs = [ kdeclarative ki18n qtdeclarative ];
 }

pkgs/desktops/plasma-5.4/oxygen.nix

@@ -9,10 +9,10 @@ plasmaPackage {
     extra-cmake-modules
   ];
   buildInputs = [
-    ki18n kcmutils kconfig kdecoration kguiaddons kwidgetsaddons
+    kcmutils kconfig kdecoration kguiaddons kwidgetsaddons
     kservice kcompletion kwindowsystem qtx11extras
   ];
-  propagatedBuildInputs = [ frameworkintegration ];
+  propagatedBuildInputs = [ frameworkintegration ki18n ];
   postInstall = ''
     wrapKDEProgram "$out/bin/oxygen-demo5"
     wrapKDEProgram "$out/bin/oxygen-settings5"

pkgs/desktops/plasma-5.4/plasma-desktop/default.nix

@@ -17,7 +17,7 @@ plasmaPackage {
   ];
   buildInputs = [
     attica boost fontconfig kcmutils kdbusaddons kded
-    ki18n kitemmodels knewstuff knotifications
+    kitemmodels knewstuff knotifications
     knotifyconfig kpeople krunner kwallet kwin libcanberra_kde
     libXcursor libpulseaudio libXft libxkbfile phonon plasma-framework
     plasma-workspace qtdeclarative qtx11extras qtsvg xf86inputevdev
@@ -25,7 +25,7 @@ plasmaPackage {
   ];
   propagatedBuildInputs = [
     baloo kactivities kauth kdeclarative kdelibs4support kemoticons
-    kglobalaccel
+    kglobalaccel ki18n
   ];
   patches = [
     (substituteAll {

pkgs/desktops/plasma-5.4/plasma-mediacenter.nix

@@ -10,8 +10,10 @@ plasmaPackage {
     extra-cmake-modules
   ];
   buildInputs = [
-    kconfig kcoreaddons kguiaddons ki18n kio kservice plasma-framework
+    kconfig kcoreaddons kguiaddons kio kservice plasma-framework
     qtdeclarative qtmultimedia taglib
   ];
-  propagatedBuildInputs = [ baloo kactivities kdeclarative kfilemetadata ];
+  propagatedBuildInputs = [
+    baloo kactivities kdeclarative kfilemetadata ki18n
+  ];
 }

pkgs/desktops/plasma-5.4/plasma-nm.nix

@@ -14,13 +14,13 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    kcompletion kconfigwidgets kcoreaddons kdbusaddons ki18n
+    kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes
-    kiconthemes kinit kio kitemviews knotifications kservice kwallet
+    kinit kio kitemviews knotifications kservice kwallet
     kwidgetsaddons kwindowsystem kxmlgui
     mobile_broadband_provider_info modemmanager-qt networkmanager-qt
     openconnect plasma-framework solid
   ];
-  propagatedBuildInputs = [ kdeclarative kdelibs4support qtdeclarative ];
+  propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n qtdeclarative ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kde5-nm-connection-editor"
   '';

pkgs/desktops/plasma-5.4/plasma-pa.nix

@@ -9,8 +9,7 @@ plasmaPackage {
     extra-cmake-modules
   ];
   buildInputs = [
-    glib kconfigwidgets kcoreaddons ki18n libpulseaudio
+    glib kconfigwidgets kcoreaddons libpulseaudio plasma-framework
-    plasma-framework
   ];
-  propagatedBuildInputs = [ kdeclarative kglobalaccel ];
+  propagatedBuildInputs = [ kdeclarative kglobalaccel ki18n ];
 }

pkgs/desktops/plasma-5.4/polkit-kde-agent.nix

@@ -18,7 +18,6 @@ plasmaPackage {
     extra-cmake-modules
   ];
   buildInputs = [
-    ki18n
     kwindowsystem
     kdbusaddons
     kwidgetsaddons
@@ -29,4 +28,5 @@ plasmaPackage {
     knotifications
     polkitQt
   ];
+  propagatedBuildInputs = [ ki18n ];
 }

pkgs/desktops/plasma-5.4/powerdevil.nix

@@ -11,10 +11,10 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    kconfig kdbusaddons ki18n kidletime kio knotifyconfig libkscreen
+    kconfig kdbusaddons kidletime kio knotifyconfig libkscreen
     plasma-workspace solid udev
   ];
   propagatedBuildInputs = [
-    kactivities kauth kdelibs4support kglobalaccel qtx11extras
+    kactivities kauth kdelibs4support kglobalaccel ki18n qtx11extras
   ];
 }

pkgs/desktops/plasma-5.4/systemsettings.nix

@@ -10,10 +10,10 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    kitemviews kcmutils ki18n kio kservice kiconthemes kwindowsystem
+    kitemviews kcmutils kio kservice kiconthemes kwindowsystem
     kxmlgui kdbusaddons kconfig
   ];
-  propagatedBuildInputs = [ khtml ];
+  propagatedBuildInputs = [ khtml ki18n ];
   postInstall = ''
     wrapKDEProgram "$out/bin/systemsettings5"
   '';

pkgs/development/libraries/kde-frameworks-5.14/baloo.nix

@@ -7,10 +7,10 @@ kdeFramework {
   name = "baloo";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    kconfig kcrash kdbusaddons ki18n kidletime kio lmdb qtquick1 solid
+    kconfig kcrash kdbusaddons kidletime kio lmdb qtquick1 solid
   ];
   propagatedBuildInputs = [
-    kauth kcoreaddons kfilemetadata qtbase
+    kauth kcoreaddons kfilemetadata ki18n qtbase
   ];
   postInstall = ''
     wrapKDEProgram "$out/bin/baloo_file"

pkgs/development/libraries/kde-frameworks-5.14/frameworkintegration.nix

@@ -1,33 +1,16 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, extra-cmake-modules, kbookmarks, kcompletion
-, extra-cmake-modules
+, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications
-, kbookmarks
+, kwidgetsaddons, libXcursor, qtx11extras
-, kcompletion
-, kconfig
-, kconfigwidgets
-, ki18n
-, kiconthemes
-, kio
-, knotifications
-, kwidgetsaddons
-, libXcursor
-, qtx11extras
 }:
 
 kdeFramework {
   name = "frameworkintegration";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    kbookmarks
+    kbookmarks kcompletion kconfig kio knotifications kwidgetsaddons
-    kcompletion
-    kconfig
-    ki18n
-    kio
-    knotifications
-    kwidgetsaddons
     libXcursor
-    qtx11extras
   ];
-  propagatedBuildInputs = [ kconfigwidgets kiconthemes ];
+  propagatedBuildInputs = [ kconfigwidgets ki18n kiconthemes qtx11extras ];
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
   };

pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix

@@ -7,10 +7,10 @@ kdeFramework {
   name = "kactivities";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    boost kcmutils kconfig kcoreaddons kdbusaddons ki18n kio kservice
+    boost kcmutils kconfig kcoreaddons kdbusaddons kio kservice
     kwindowsystem kxmlgui
   ];
-  propagatedBuildInputs = [ kdeclarative kglobalaccel qtdeclarative ];
+  propagatedBuildInputs = [ kdeclarative kglobalaccel ki18n qtdeclarative ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kactivitymanagerd"
   '';

pkgs/development/libraries/kde-frameworks-5.14/kcmutils/default.nix

@@ -7,9 +7,9 @@ kdeFramework {
   name = "kcmutils";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    kcoreaddons ki18n kiconthemes kitemviews kpackage kxmlgui
+    kcoreaddons kiconthemes kitemviews kpackage kxmlgui
   ];
-  propagatedBuildInputs = [ kconfigwidgets kdeclarative kservice ];
+  propagatedBuildInputs = [ kconfigwidgets kdeclarative ki18n kservice ];
   patches = [ ./kcmutils-pluginselector-follow-symlinks.patch ];
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];

pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/default.nix

@@ -5,8 +5,8 @@
 kdeFramework {
   name = "kconfigwidgets";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ kguiaddons ki18n ];
+  buildInputs = [ kguiaddons ];
-  propagatedBuildInputs = [ kauth kconfig kcodecs kwidgetsaddons ];
+  propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ];
   patches = [ ./kconfigwidgets-helpclient-follow-symlinks.patch ];
   postInstall = ''
     wrapKDEProgram "$out/bin/preparetips5"

pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix

@@ -1,26 +1,15 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, extra-cmake-modules, epoxy, kconfig
-, extra-cmake-modules
+, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage
-, epoxy
+, kwidgetsaddons, kwindowsystem, pkgconfig, qtdeclarative
-, kconfig
-, kglobalaccel
-, kguiaddons
-, ki18n
-, kiconthemes
-, kio
-, kpackage
-, kwidgetsaddons
-, kwindowsystem
-, pkgconfig
-, qtdeclarative
 }:
 
 kdeFramework {
   name = "kdeclarative";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    epoxy kguiaddons ki18n kiconthemes kio kwidgetsaddons kwindowsystem
+    epoxy kguiaddons kiconthemes kio kwidgetsaddons kwindowsystem
   ];
-  propagatedBuildInputs = [ kconfig kglobalaccel kpackage qtdeclarative ];
+  propagatedBuildInputs = [ kconfig kglobalaccel ki18n kpackage qtdeclarative ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kpackagelauncherqml"
   '';

pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix

@@ -13,13 +13,13 @@ kdeFramework {
   name = "kdelibs4support";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    kcompletion kconfig ki18n kio kservice kwidgetsaddons
+    kcompletion kconfig kio kservice kwidgetsaddons
     kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
   ];
   propagatedBuildInputs = [
     kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons
-    kdesignerplugin kemoticons kglobalaccel kguiaddons kiconthemes
+    kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n
-    kitemmodels kinit knotifications kparts ktextwidgets
+    kiconthemes kitemmodels kinit knotifications kparts ktextwidgets
     kunitconversion kwindowsystem
   ];
   cmakeFlags = [

pkgs/development/libraries/kde-frameworks-5.14/kdesu.nix

@@ -1,16 +1,12 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty
-, extra-cmake-modules
-, kcoreaddons
-, ki18n
-, kpty
 , kservice
 }:
 
 kdeFramework {
   name = "kdesu";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons ki18n kservice ];
+  buildInputs = [ kcoreaddons kservice ];
-  propagatedBuildInputs = [ kpty ];
+  propagatedBuildInputs = [ ki18n kpty ];
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
   };

pkgs/development/libraries/kde-frameworks-5.14/kdewebkit.nix

@@ -1,21 +1,12 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, extra-cmake-modules
+, ki18n, kio, kjobwidgets, kparts, kservice, kwallet, qtwebkit
-, kconfig
-, kcoreaddons
-, ki18n
-, kio
-, kjobwidgets
-, kparts
-, kservice
-, kwallet
-, qtwebkit
 }:
 
 kdeFramework {
   name = "kdewebkit";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kconfig kcoreaddons ki18n kio kjobwidgets kparts kservice kwallet ];
+  buildInputs = [ kconfig kcoreaddons kio kjobwidgets kparts kservice kwallet ];
-  propagatedBuildInputs = [ qtwebkit ];
+  propagatedBuildInputs = [ ki18n qtwebkit ];
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
   };

pkgs/development/libraries/kde-frameworks-5.14/kdoctools/default.nix

@@ -1,17 +1,12 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45
-, extra-cmake-modules
+, docbook5_xsl, karchive, ki18n, perl, perlPackages
-, docbook_xml_dtd_45
-, docbook5_xsl
-, karchive
-, ki18n
-, perl
-, perlPackages
 }:
 
 kdeFramework {
   name = "kdoctools";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ karchive ki18n ];
+  buildInputs = [ karchive ];
+  propagatedBuildInputs = [ ki18n ];
   propagatedNativeBuildInputs = [ perl perlPackages.URI ];
   cmakeFlags = [
     "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"

pkgs/development/libraries/kde-frameworks-5.14/kfilemetadata.nix

@@ -1,21 +1,12 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, extra-cmake-modules, attr, ebook_tools, exiv2
-, extra-cmake-modules
+, ffmpeg, karchive, ki18n, popplerQt, qtbase, taglib
-, attr
-, ebook_tools
-, exiv2
-, ffmpeg
-, karchive
-, ki18n
-, popplerQt
-, qtbase
-, taglib
 }:
 
 kdeFramework {
   name = "kfilemetadata";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive ki18n popplerQt taglib ];
+  buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive popplerQt taglib ];
-  propagatedBuildInputs = [ qtbase ];
+  propagatedBuildInputs = [ qtbase ki18n ];
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
   };

pkgs/development/libraries/kde-frameworks-5.14/kiconthemes.nix

@@ -1,15 +1,12 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets, ki18n
-, extra-cmake-modules
+, kitemviews, qtsvg
-, kconfigwidgets
-, ki18n
-, kitemviews
-, qtsvg
 }:
 
 kdeFramework {
   name = "kiconthemes";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kconfigwidgets ki18n kitemviews qtsvg ];
+  buildInputs = [ kconfigwidgets kitemviews qtsvg ];
+  propagatedBuildInputs = [ ki18n ];
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
   };

pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix

@@ -1,13 +1,5 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kcrash
-, extra-cmake-modules
+, kdoctools, ki18n, kio, kservice, kwindowsystem, libcap
-, kconfig
-, kcrash
-, kdoctools
-, ki18n
-, kio
-, kservice
-, kwindowsystem
-, libcap
 , libcap_progs
 }:
 
@@ -16,7 +8,8 @@
 kdeFramework {
   name = "kinit";
   nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ];
-  buildInputs = [ kconfig kcrash ki18n kio kservice kwindowsystem libcap ];
+  buildInputs = [ kconfig kcrash kio kservice kwindowsystem libcap ];
+  propagatedBuildInputs = [ ki18n ];
   patches = [ ./0001-kinit-libpath.patch ];
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];

pkgs/development/libraries/kde-frameworks-5.14/kio.nix

@@ -1,27 +1,8 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, extra-cmake-modules, acl, karchive
-, extra-cmake-modules
+, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons
-, acl
+, kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews
-, karchive
+, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet
-, kbookmarks
+, kwidgetsaddons, kwindowsystem, kxmlgui, qtscript, qtx11extras
-, kcompletion
-, kconfig
-, kconfigwidgets
-, kcoreaddons
-, kdbusaddons
-, kdoctools
-, ki18n
-, kiconthemes
-, kitemviews
-, kjobwidgets
-, knotifications
-, kservice
-, ktextwidgets
-, kwallet
-, kwidgetsaddons
-, kwindowsystem
-, kxmlgui
-, qtscript
-, qtx11extras
 , solid
 }:
 
@@ -29,12 +10,13 @@ kdeFramework {
   name = "kio";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    acl karchive kconfig kcoreaddons kdbusaddons ki18n kiconthemes
+    acl karchive kconfig kcoreaddons kdbusaddons kiconthemes
     knotifications ktextwidgets kwallet kwidgetsaddons kwindowsystem
-    qtscript qtx11extras
+    qtscript
   ];
   propagatedBuildInputs = [
-    kbookmarks kcompletion kconfigwidgets kitemviews kjobwidgets kservice kxmlgui solid
+    kbookmarks kcompletion kconfigwidgets ki18n kitemviews kjobwidgets
+    kservice kxmlgui solid qtx11extras
   ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kcookiejar5"

pkgs/development/libraries/kde-frameworks-5.14/kjsembed.nix

@@ -1,8 +1,4 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs
-, extra-cmake-modules
-, kdoctools
-, ki18n
-, kjs
 , qtsvg
 }:
 

pkgs/development/libraries/kde-frameworks-5.14/knewstuff.nix

@@ -1,28 +1,16 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, extra-cmake-modules, attica, karchive
-, extra-cmake-modules
+, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio
-, attica
+, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui
-, karchive
-, kcompletion
-, kconfig
-, kcoreaddons
-, ki18n
-, kiconthemes
-, kio
-, kitemviews
-, kservice
-, ktextwidgets
-, kwidgetsaddons
-, kxmlgui
 }:
 
 kdeFramework {
   name = "knewstuff";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio
+    karchive kcompletion kconfig kcoreaddons kiconthemes kio
     kitemviews ktextwidgets kwidgetsaddons
   ];
-  propagatedBuildInputs = [ attica kservice kxmlgui ];
+  propagatedBuildInputs = [ attica ki18n kservice kxmlgui ];
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
   };

pkgs/development/libraries/kde-frameworks-5.14/knotifyconfig.nix

@@ -1,16 +1,12 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig
-, extra-cmake-modules
+, ki18n, kio, phonon
-, kcompletion
-, kconfig
-, ki18n
-, kio
-, phonon
 }:
 
 kdeFramework {
   name = "knotifyconfig";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcompletion kconfig ki18n kio phonon ];
+  buildInputs = [ kcompletion kconfig kio phonon ];
+  propagatedBuildInputs = [ ki18n ];
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
   };

pkgs/development/libraries/kde-frameworks-5.14/kpackage/default.nix

@@ -10,8 +10,8 @@
 kdeFramework {
   name = "kpackage";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ karchive kconfig ki18n ];
+  buildInputs = [ karchive kconfig ];
-  propagatedBuildInputs = [ kcoreaddons ];
+  propagatedBuildInputs = [ kcoreaddons ki18n ];
   patches = [ ./0001-allow-external-paths.patch ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kpackagetool5"

pkgs/development/libraries/kde-frameworks-5.14/kparts.nix

@@ -1,26 +1,16 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, extra-cmake-modules
+, ki18n, kiconthemes, kio, kjobwidgets, knotifications, kservice
-, kconfig
+, ktextwidgets, kwidgetsaddons, kxmlgui
-, kcoreaddons
-, ki18n
-, kiconthemes
-, kio
-, kjobwidgets
-, knotifications
-, kservice
-, ktextwidgets
-, kwidgetsaddons
-, kxmlgui
 }:
 
 kdeFramework {
   name = "kparts";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    kconfig kcoreaddons ki18n kiconthemes kjobwidgets knotifications
+    kconfig kcoreaddons kiconthemes kjobwidgets knotifications
     kservice kwidgetsaddons
   ];
-  propagatedBuildInputs = [ kio ktextwidgets kxmlgui ];
+  propagatedBuildInputs = [ ki18n kio ktextwidgets kxmlgui ];
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
   };

pkgs/development/libraries/kde-frameworks-5.14/kpeople.nix

@@ -1,19 +1,14 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n
-, extra-cmake-modules
+, kitemviews, kservice, kwidgetsaddons, qtdeclarative
-, kcoreaddons
-, ki18n
-, kitemviews
-, kservice
-, kwidgetsaddons
-, qtdeclarative
 }:
 
 kdeFramework {
   name = "kpeople";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    kcoreaddons ki18n kitemviews kservice kwidgetsaddons qtdeclarative
+    kcoreaddons kitemviews kservice kwidgetsaddons
   ];
+  propagatedBuildInputs = [ ki18n qtdeclarative ];
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
   };

pkgs/development/libraries/kde-frameworks-5.14/kpty.nix

@@ -1,14 +1,9 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n }:
-, extra-cmake-modules
-, kcoreaddons
-, ki18n
-}:
 
 kdeFramework {
   name = "kpty";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ ki18n ];
+  propagatedBuildInputs = [ kcoreaddons ki18n ];
-  propagatedBuildInputs = [ kcoreaddons ];
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
   };

pkgs/development/libraries/kde-frameworks-5.14/kross.nix

@@ -1,15 +1,6 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, extra-cmake-modules, kcompletion, kcoreaddons
-, extra-cmake-modules
+, kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons
-, kcompletion
+, kxmlgui, qtscript
-, kcoreaddons
-, kdoctools
-, ki18n
-, kiconthemes
-, kio
-, kparts
-, kwidgetsaddons
-, kxmlgui
-, qtscript
 }:
 
 kdeFramework {

pkgs/development/libraries/kde-frameworks-5.14/krunner.nix

@@ -1,13 +1,5 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, extra-cmake-modules
+, ki18n, kio, kservice, plasma-framework, qtquick1, solid
-, kconfig
-, kcoreaddons
-, ki18n
-, kio
-, kservice
-, plasma-framework
-, qtquick1
-, solid
 , threadweaver
 }:
 
@@ -15,9 +7,9 @@ kdeFramework {
   name = "krunner";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    kconfig kcoreaddons ki18n kio kservice qtquick1 solid threadweaver
+    kconfig kcoreaddons kio kservice qtquick1 solid threadweaver
   ];
-  propagatedBuildInputs = [ plasma-framework ];
+  propagatedBuildInputs = [ ki18n plasma-framework ];
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
   };

pkgs/development/libraries/kde-frameworks-5.14/kservice/default.nix

@@ -1,20 +1,13 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, extra-cmake-modules
+, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem
-, kconfig
-, kcoreaddons
-, kcrash
-, kdbusaddons
-, kdoctools
-, ki18n
-, kwindowsystem
 }:
 
 kdeFramework {
   name = "kservice";
   setupHook = ./setup-hook.sh;
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ kcoreaddons kcrash kdbusaddons ki18n kwindowsystem ];
+  buildInputs = [ kcoreaddons kcrash kdbusaddons kwindowsystem ];
-  propagatedBuildInputs = [ kconfig ];
+  propagatedBuildInputs = [ kconfig ki18n ];
   patches = [
     ./kservice-kbuildsycoca-follow-symlinks.patch
     ./kservice-kbuildsycoca-no-canonicalize-path.patch

pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/default.nix

@@ -1,25 +1,16 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, extra-cmake-modules, karchive, kconfig
-, extra-cmake-modules
+, kguiaddons, ki18n, kio, kiconthemes, kparts, perl, qtscript
-, karchive
+, qtxmlpatterns, sonnet
-, kconfig
-, kguiaddons
-, ki18n
-, kio
-, kiconthemes
-, kparts
-, perl
-, qtscript
-, qtxmlpatterns
-, sonnet
 }:
 
 kdeFramework {
   name = "ktexteditor";
   nativeBuildInputs = [ extra-cmake-modules perl ];
   buildInputs = [
-    karchive kconfig kguiaddons ki18n kiconthemes kio kparts
+    karchive kconfig kguiaddons kiconthemes kio kparts qtscript
-    qtscript qtxmlpatterns sonnet
+    qtxmlpatterns sonnet
   ];
+  propagatedBuildInputs = [ ki18n ];
   patches = [ ./0001-no-qcoreapplication.patch ];
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];

pkgs/development/libraries/kde-frameworks-5.14/ktextwidgets.nix

@@ -1,12 +1,5 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig
-, extra-cmake-modules
+, kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem
-, kcompletion
-, kconfig
-, kconfigwidgets
-, ki18n
-, kiconthemes
-, kservice
-, kwindowsystem
 , sonnet
 }:
 

pkgs/development/libraries/kde-frameworks-5.14/kunitconversion.nix

@@ -1,12 +1,9 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, extra-cmake-modules, ki18n }:
-, extra-cmake-modules
-, ki18n
-}:
 
 kdeFramework {
   name = "kunitconversion";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ ki18n ];
+  propagatedBuildInputs = [ ki18n ];
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
   };

pkgs/development/libraries/kde-frameworks-5.14/kwallet.nix

@@ -1,25 +1,16 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, extra-cmake-modules
+, kdbusaddons, kdoctools, ki18n, kiconthemes, knotifications
-, kconfig
+, kservice, kwidgetsaddons, kwindowsystem, libgcrypt
-, kcoreaddons
-, kdbusaddons
-, kdoctools
-, ki18n
-, kiconthemes
-, knotifications
-, kservice
-, kwidgetsaddons
-, kwindowsystem
-, libgcrypt
 }:
 
 kdeFramework {
   name = "kwallet";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    kconfig kcoreaddons kdbusaddons ki18n kiconthemes knotifications
+    kconfig kcoreaddons kdbusaddons kiconthemes knotifications
     kservice kwidgetsaddons kwindowsystem libgcrypt
   ];
+  propagatedBuildInputs = [ ki18n ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kwalletd5"
     wrapKDEProgram "$out/bin/kwallet-query"

pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix

@@ -7,10 +7,10 @@ kdeFramework {
   name = "kxmlgui";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    attica kconfig kconfigwidgets ki18n kiconthemes kitemviews
+    attica kconfig kconfigwidgets kiconthemes kitemviews
     ktextwidgets kwindowsystem sonnet
   ];
-  propagatedBuildInputs = [ kglobalaccel ];
+  propagatedBuildInputs = [ kglobalaccel ki18n ];
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
   };

pkgs/development/libraries/kde-frameworks-5.14/kxmlrpcclient.nix

@@ -1,14 +1,9 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, extra-cmake-modules, ki18n, kio }:
-, extra-cmake-modules
-, ki18n
-, kio
-}:
 
 kdeFramework {
   name = "kxmlrpcclient";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ ki18n ];
+  propagatedBuildInputs = [ ki18n kio ];
-  propagatedBuildInputs = [ kio ];
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
   };

pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix

@@ -10,11 +10,11 @@ kdeFramework {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons
-    ki18n kiconthemes kio knotifications kwindowsystem kxmlgui
+    kiconthemes kio knotifications kwindowsystem kxmlgui qtscript
-    qtscript qtx11extras
   ];
   propagatedBuildInputs = [
-    kactivities kdeclarative kglobalaccel kpackage kservice
+    kactivities kdeclarative kglobalaccel ki18n kpackage kservice
+    qtx11extras
   ];
   postInstall = ''
     wrapKDEProgram "$out/bin/plasmapkg2"