diff --git a/pkgs/kde/frameworks/kio/default.nix b/pkgs/kde/frameworks/kio/default.nix index 3e6e6ab0ec74..f2ee6fb684e3 100644 --- a/pkgs/kde/frameworks/kio/default.nix +++ b/pkgs/kde/frameworks/kio/default.nix @@ -2,6 +2,7 @@ mkKdeDerivation, qt5compat, qttools, + kauth, acl, attr, }: @@ -16,6 +17,7 @@ mkKdeDerivation { extraBuildInputs = [ qt5compat qttools + kauth acl attr ]; diff --git a/pkgs/kde/frameworks/kwallet/default.nix b/pkgs/kde/frameworks/kwallet/default.nix index 3ba43cd40e3e..6f78a1b9d4fe 100644 --- a/pkgs/kde/frameworks/kwallet/default.nix +++ b/pkgs/kde/frameworks/kwallet/default.nix @@ -1,6 +1,7 @@ { mkKdeDerivation, pkg-config, + gpgme, libgcrypt, libsecret, kdoctools, @@ -13,6 +14,7 @@ mkKdeDerivation { ]; extraBuildInputs = [ + gpgme libgcrypt libsecret kdoctools diff --git a/pkgs/kde/gear/kdenetwork-filesharing/default.nix b/pkgs/kde/gear/kdenetwork-filesharing/default.nix index 597cb8cc80de..b72f4af7b955 100644 --- a/pkgs/kde/gear/kdenetwork-filesharing/default.nix +++ b/pkgs/kde/gear/kdenetwork-filesharing/default.nix @@ -2,9 +2,10 @@ lib, mkKdeDerivation, replaceVars, + qtdeclarative, + kauth, samba, shadow, - qtdeclarative, }: mkKdeDerivation { pname = "kdenetwork-filesharing"; @@ -19,7 +20,10 @@ mkKdeDerivation { ./samba-hint.patch ]; - extraBuildInputs = [ qtdeclarative ]; + extraBuildInputs = [ + qtdeclarative + kauth + ]; # We can't actually install samba via PackageKit, so let's not confuse users any more than we have to extraCmakeFlags = [ "-DSAMBA_INSTALL=OFF" ]; diff --git a/pkgs/kde/gear/kontrast/default.nix b/pkgs/kde/gear/kontrast/default.nix index 6d3ef5d3adb9..4ef2889cc1a0 100644 --- a/pkgs/kde/gear/kontrast/default.nix +++ b/pkgs/kde/gear/kontrast/default.nix @@ -1,14 +1,12 @@ { mkKdeDerivation, qtsvg, - qcoro, }: mkKdeDerivation { pname = "kontrast"; extraBuildInputs = [ qtsvg - qcoro ]; meta.mainProgram = "kontrast"; } diff --git a/pkgs/kde/gear/okular/default.nix b/pkgs/kde/gear/okular/default.nix index b6048d9611d4..d55b5cd4bb0b 100644 --- a/pkgs/kde/gear/okular/default.nix +++ b/pkgs/kde/gear/okular/default.nix @@ -3,6 +3,7 @@ pkg-config, qtspeech, qtsvg, + plasma-activities, poppler, libtiff, libspectre, @@ -19,6 +20,8 @@ mkKdeDerivation { qtspeech qtsvg + plasma-activities + poppler libtiff libspectre diff --git a/pkgs/kde/generated/dependencies.json b/pkgs/kde/generated/dependencies.json index 58f03bb030f1..bf2aada9b34b 100644 --- a/pkgs/kde/generated/dependencies.json +++ b/pkgs/kde/generated/dependencies.json @@ -18,6 +18,8 @@ "kcrash", "ki18n", "kiconthemes", + "kirigami", + "kirigami-addons", "kitemmodels", "kwidgetsaddons", "kwindowsystem", @@ -366,6 +368,7 @@ "extra-cmake-modules", "karchive", "kcmutils", + "kcolorscheme", "kcompletion", "kconfig", "kconfigwidgets", @@ -379,14 +382,14 @@ "ki18n", "kiconthemes", "kio", + "kjobwidgets", "knotifications", "kparts", "kservice", "ktextwidgets", "kwidgetsaddons", "kwindowsystem", - "kxmlgui", - "phonon" + "kxmlgui" ], "blinken": [ "extra-cmake-modules", @@ -570,6 +573,9 @@ ], "cervisia": [ "extra-cmake-modules", + "kcompletion", + "kcoreaddons", + "kdbusaddons", "kdesu", "kdoctools", "ki18n", @@ -949,6 +955,13 @@ "wayland", "wayland-protocols" ], + "hana": [ + "extra-cmake-modules", + "kconfig", + "ki18n", + "kio", + "kirigami" + ], "haruna": [ "extra-cmake-modules", "kconfig", @@ -971,6 +984,7 @@ "kdbusaddons", "ki18n", "kirigami", + "kirigami-addons", "kwindowsystem", "libkleo", "qqc2-desktop-style" @@ -1077,6 +1091,7 @@ "k3b": [ "extra-cmake-modules", "karchive", + "kauth", "kcmutils", "kconfig", "kcoreaddons", @@ -1128,7 +1143,6 @@ "kio", "kservice", "kwidgetsaddons", - "kwindowsystem", "kxmlgui" ], "kaddressbook": [ @@ -1158,7 +1172,6 @@ ], "kaichat": [ "extra-cmake-modules", - "kcompletion", "kconfig", "kcoreaddons", "kcrash", @@ -1167,12 +1180,14 @@ "ki18n", "kiconthemes", "kio", - "kitemviews", + "knotifications", + "knotifyconfig", "kstatusnotifieritem", "ktextaddons", "kwidgetsaddons", "kxmlgui", - "purpose" + "purpose", + "sonnet" ], "kaidan": [ "extra-cmake-modules", @@ -1738,6 +1753,7 @@ "kiconthemes", "kitemviews", "kwidgetsaddons", + "kwindowsystem", "kxmlgui" ], "kdeclarative": [ @@ -1953,9 +1969,7 @@ ], "kdesdk-thumbnailers": [ "extra-cmake-modules", - "kconfig", "kcoreaddons", - "ki18n", "kio" ], "kdesu": [ @@ -2180,6 +2194,20 @@ "kwidgetsaddons", "kwindowsystem" ], + "keepsecret": [ + "extra-cmake-modules", + "kcolorscheme", + "kconfig", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "ki18n", + "kiconthemes", + "kirigami", + "kirigami-addons", + "kitemmodels", + "qqc2-desktop-style" + ], "keurocalc": [ "extra-cmake-modules", "kconfig", @@ -2591,7 +2619,6 @@ "kio": [ "extra-cmake-modules", "karchive", - "kauth", "kbookmarks", "kcolorscheme", "kcompletion", @@ -2688,11 +2715,14 @@ ], "kirigami-addons": [ "extra-cmake-modules", + "kcolorscheme", "kconfig", "kcoreaddons", + "kcrash", "kglobalaccel", "kguiaddons", "ki18n", + "kiconthemes", "kirigami" ], "kirigami-gallery": [ @@ -2731,7 +2761,8 @@ "ki18n", "kpackage", "libkscreen", - "plasma-desktop" + "plasma-desktop", + "plasma-workspace" ], "kitemmodels": [ "extra-cmake-modules" @@ -3040,8 +3071,7 @@ "kstatusnotifieritem", "kwidgetsaddons", "kwindowsystem", - "kxmlgui", - "phonon" + "kxmlgui" ], "kmouth": [ "extra-cmake-modules", @@ -3084,6 +3114,7 @@ "kxmlgui" ], "kmymoney": [ + "akonadi", "alkimia", "extra-cmake-modules", "kcmutils", @@ -3097,6 +3128,7 @@ "kholidays", "ki18n", "kiconthemes", + "kidentitymanagement", "kio", "kitemmodels", "kitemviews", @@ -3277,6 +3309,7 @@ "kconfig", "kcoreaddons", "kdbusaddons", + "kdoctools", "kguiaddons", "ki18n", "kiconthemes", @@ -3398,7 +3431,8 @@ "kdoctools", "ki18n", "kirigami", - "kirigami-addons" + "kirigami-addons", + "qcoro" ], "konversation": [ "extra-cmake-modules", @@ -3490,6 +3524,7 @@ ], "kosmindoormap": [ "extra-cmake-modules", + "kcontacts", "ki18n", "kirigami", "kirigami-addons", @@ -3596,6 +3631,8 @@ "kguiaddons", "ki18n", "kirigami", + "kirigami-addons", + "kitemmodels", "knotifications", "kunifiedpush", "kweathercore" @@ -3614,7 +3651,8 @@ "extra-cmake-modules" ], "kquickimageeditor": [ - "extra-cmake-modules" + "extra-cmake-modules", + "kconfig" ], "krdc": [ "extra-cmake-modules", @@ -3801,6 +3839,8 @@ "kcoreaddons", "kdbusaddons", "ki18n", + "kimageformats", + "kirigami", "kpackage", "kservice", "ksvg", @@ -3939,7 +3979,6 @@ "extra-cmake-modules", "kconfig", "kcrash", - "kdoctools", "kguiaddons", "ki18n", "knewstuff", @@ -4027,6 +4066,7 @@ "kcoreaddons", "ki18n", "kio", + "kitemviews", "ktextwidgets", "qtkeychain", "sonnet", @@ -4231,7 +4271,6 @@ ], "kwallet": [ "extra-cmake-modules", - "gpgme", "kcolorscheme", "kconfig", "kcoreaddons", @@ -4312,12 +4351,13 @@ "extra-cmake-modules" ], "kwin": [ + "aurorae", "breeze", "breeze-icons", "extra-cmake-modules", "kcmutils", + "kcolorscheme", "kconfig", - "kconfigwidgets", "kcoreaddons", "kcrash", "kdeclarative", @@ -4329,6 +4369,7 @@ "kidletime", "kirigami", "knewstuff", + "knighttime", "knotifications", "kpackage", "kpipewire", @@ -4347,6 +4388,7 @@ "wayland-protocols" ], "kwin-x11": [ + "aurorae", "breeze", "breeze-icons", "extra-cmake-modules", @@ -4364,9 +4406,9 @@ "kidletime", "kirigami", "knewstuff", + "knighttime", "knotifications", "kpackage", - "kpipewire", "kscreenlocker", "kservice", "ksvg", @@ -4616,7 +4658,6 @@ "libplasma": [ "extra-cmake-modules", "karchive", - "kcmutils", "kcolorscheme", "kconfig", "kcoreaddons", @@ -4872,6 +4913,7 @@ "mimetreeparser": [ "extra-cmake-modules", "kcalendarcore", + "kirigami", "kmbox", "kmime", "kwidgetsaddons", @@ -4970,7 +5012,6 @@ "kxmlgui", "libkexiv2", "phonon", - "plasma-activities", "purpose", "threadweaver" ], @@ -5244,7 +5285,6 @@ "baloo", "breeze", "extra-cmake-modules", - "kaccounts-integration", "kactivitymanagerd", "kauth", "kcmutils", @@ -5379,6 +5419,7 @@ "bluedevil", "bluez-qt", "extra-cmake-modules", + "kauth", "kconfig", "kcoreaddons", "ki18n", @@ -5424,11 +5465,13 @@ "kconfigwidgets", "kcoreaddons", "kdbusaddons", + "kdeclarative", "ki18n", "kio", "kjobwidgets", "knotifications", "kpackage", + "kquickcharts", "kservice", "ksvg", "kwallet", @@ -5437,6 +5480,7 @@ "libplasma", "modemmanager-qt", "networkmanager-qt", + "prison", "qcoro", "solid" ], @@ -5449,6 +5493,7 @@ "kglobalaccel", "ki18n", "kirigami-addons", + "kitemmodels", "kpackage", "kstatusnotifieritem", "ksvg", @@ -5503,6 +5548,7 @@ "kcompletion", "kconfig", "kcoreaddons", + "kcrash", "kdbusaddons", "ki18n", "kiconthemes", @@ -5591,6 +5637,7 @@ ], "plasma-welcome": [ "extra-cmake-modules", + "kcmutils", "kcoreaddons", "kdbusaddons", "ki18n", @@ -5616,6 +5663,7 @@ "kbookmarks", "kcmutils", "kcodecs", + "kcolorscheme", "kcompletion", "kconfig", "kconfigwidgets", @@ -5624,7 +5672,6 @@ "kdbusaddons", "kdeclarative", "kded", - "kdesu", "kfilemetadata", "kglobalaccel", "kglobalacceld", @@ -5639,6 +5686,7 @@ "kitemviews", "kjobwidgets", "knewstuff", + "knighttime", "knotifications", "knotifyconfig", "kpackage", @@ -5686,10 +5734,12 @@ "kconfig", "kcoreaddons", "kguiaddons", + "kholidays", "ki18n", "kidletime", "kio", "knotifications", + "kunitconversion", "libksysguard", "networkmanager-qt", "plasma-activities", @@ -5730,6 +5780,7 @@ "kcrash", "kdbusaddons", "ki18n", + "knotifications", "kwindowsystem", "polkit-qt-1" ], @@ -5784,7 +5835,6 @@ "kcoreaddons", "kdbusaddons", "ki18n", - "kiconthemes", "kio", "kirigami", "knotifications", @@ -5806,6 +5856,7 @@ "ki18n", "kio", "kirigami", + "kitemmodels", "kservice" ], "pvfviewer": [ @@ -5831,7 +5882,6 @@ "kcodecs", "kcolorscheme", "kconfig", - "kcoreaddons", "kguiaddons", "kiconthemes", "kirigami" @@ -5910,6 +5960,7 @@ "ki18n", "kitemviews", "ktexteditor", + "ktexttemplate", "kxmlgui" ], "rolisteam": [ @@ -6219,6 +6270,7 @@ "systemsettings": [ "extra-cmake-modules", "kcmutils", + "kcolorscheme", "kconfig", "kcrash", "kdbusaddons", @@ -6241,6 +6293,7 @@ ], "tellico": [ "extra-cmake-modules", + "kcolorscheme", "kconfig", "kconfigwidgets", "kcrash", @@ -6249,6 +6302,7 @@ "ki18n", "kiconthemes", "kio", + "kio-extras", "kitemmodels", "knewstuff", "kwidgetsaddons", @@ -6317,9 +6371,6 @@ "kconfig", "kcoreaddons", "kcrash", - "kdev-php", - "kdevelop", - "kdevelop-pg-qt", "kdoctools", "ki18n", "kiconthemes", @@ -6405,6 +6456,7 @@ "kconfigwidgets", "kcoreaddons", "kcrash", + "kdeclarative", "ki18n", "kiconthemes", "kio", @@ -6418,6 +6470,7 @@ "kwidgetsaddons", "kwindowsystem", "kxmlgui", + "plasma-workspace", "solid", "wayland", "wayland-protocols" @@ -6462,5 +6515,5 @@ "kwindowsystem" ] }, - "version": "723afe12" + "version": "4fa0d47e" } \ No newline at end of file diff --git a/pkgs/kde/generated/licenses.json b/pkgs/kde/generated/licenses.json index d474fff199eb..b218ff318e9d 100644 --- a/pkgs/kde/generated/licenses.json +++ b/pkgs/kde/generated/licenses.json @@ -350,7 +350,6 @@ "BSD-3-Clause", "CC0-1.0", "GPL-2.0-only", - "GPL-2.0-or-later", "GPL-3.0-only", "LGPL-2.0-or-later", "LGPL-2.1-only", @@ -452,6 +451,7 @@ "flatpak-kcm": [ "BSD-2-Clause", "BSD-3-Clause", + "CC-BY-SA-4.0", "CC0-1.0", "GPL-2.0-only", "GPL-2.0-or-later", @@ -638,7 +638,9 @@ "LicenseRef-KDE-Accepted-GPL" ], "karchive": [ + "Apache-2.0", "BSD-2-Clause", + "CC-BY-SA-4.0", "CC0-1.0", "LGPL-2.0-or-later" ], @@ -761,6 +763,9 @@ "LicenseRef-KDE-Accepted-LGPL" ], "kcodecs": [ + "Apache-2.0", + "BSD-2-Clause", + "CC-BY-SA-4.0", "CC0-1.0", "GPL-2.0-or-later", "LGPL-2.0-only", @@ -1004,6 +1009,7 @@ "LicenseRef-KDE-Accepted-LGPL" ], "kdeplasma-addons": [ + "BSD-2-Clause", "BSD-3-Clause", "CC0-1.0", "GPL-2.0-only", @@ -1170,10 +1176,7 @@ ], "kglobalacceld": [ "CC0-1.0", - "LGPL-2.0-or-later", - "LGPL-2.1-only", - "LGPL-3.0-only", - "LicenseRef-KDE-Accepted-LGPL" + "LGPL-2.0-or-later" ], "kgoldrunner": [ "BSD-3-Clause", @@ -1296,6 +1299,7 @@ "GPL-2.0-or-later" ], "kimageformats": [ + "Apache-2.0", "BSD-2-Clause", "BSD-3-Clause", "CC0-1.0", @@ -1437,6 +1441,7 @@ "LGPL-2.0-only", "LGPL-2.0-or-later", "LGPL-2.1-only", + "LGPL-2.1-or-later", "LGPL-3.0-only", "LicenseRef-KDE-Accepted-LGPL" ], @@ -1597,6 +1602,17 @@ "GPL-3.0-only", "LicenseRef-KDE-Accepted-GPL" ], + "knighttime": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-3.0-only", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], "knotifications": [ "BSD-2-Clause", "BSD-3-Clause", @@ -1850,6 +1866,7 @@ ], "krdp": [ "BSD-2-Clause", + "BSD-3-Clause", "CC0-1.0", "GPL-2.0-or-later", "LGPL-2.0-or-later", @@ -2342,6 +2359,7 @@ "MIT" ], "libplasma": [ + "BSD-2-Clause", "BSD-3-Clause", "CC0-1.0", "GPL-2.0-only", @@ -2457,7 +2475,6 @@ "Qt-Commercial-exception-1.0" ], "milou": [ - "BSD-2-Clause", "CC0-1.0", "GPL-2.0-only", "GPL-3.0-only", @@ -2701,6 +2718,8 @@ ], "plasma-mobile": [ "Apache-2.0", + "BSD-2-Clause", + "CC-BY-SA-4.0", "CC0-1.0", "GPL-2.0-only", "GPL-2.0-or-later", @@ -2720,7 +2739,7 @@ "LGPL-2.0-or-later" ], "plasma-nm": [ - "BSD-2-Clauses", + "BSD-2-Clause", "CC0-1.0", "GPL-2.0-only", "GPL-2.0-or-later", @@ -2868,9 +2887,11 @@ "BSD-3-Clause", "CC0-1.0", "GPL-2.0-or-later", + "GPL-3.0-only", "LGPL-2.0-or-later", "LGPL-2.1-only", "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", "LicenseRef-KDE-Accepted-LGPL" ], "prison": [ diff --git a/pkgs/kde/generated/projects.json b/pkgs/kde/generated/projects.json index 2125ea7bc26c..ec7937b31351 100644 --- a/pkgs/kde/generated/projects.json +++ b/pkgs/kde/generated/projects.json @@ -1265,6 +1265,12 @@ "project_path": "unmaintained/jovie", "repo_path": "unmaintained/jovie" }, + "jp-archives": { + "description": "Patches for KDE and Qt created by the members of Japan KDE Users Group (JKUG)", + "name": "jp-archives", + "project_path": "unmaintained/jp-archives", + "repo_path": "unmaintained/jp-archives" + }, "jsmoke": { "description": "Smoke bindings for QtScript.", "name": "jsmoke", @@ -2477,6 +2483,12 @@ "project_path": "applications/keditbookmarks", "repo_path": "utilities/keditbookmarks" }, + "keepsecret": { + "description": "Password manager", + "name": "keepsecret", + "project_path": "utilities/keepsecret", + "repo_path": "utilities/keepsecret" + }, "kemoticons": { "description": "KEmoticons", "name": "kemoticons", @@ -2864,8 +2876,8 @@ "kiss": { "description": "KDE Initial System Setup", "name": "kiss", - "project_path": "system/kiss", - "repo_path": "system/kiss" + "project_path": "plasma/kiss", + "repo_path": "plasma/kiss" }, "kitemmodels": { "description": "KItemModels", @@ -6875,6 +6887,12 @@ "project_path": "sysadmin/sentry-bugzilla-bridge", "repo_path": "sysadmin/sentry-bugzilla-bridge" }, + "sysadmin-token-service": { + "description": "Service for issuing short lived access tokens for those presenting valid credentials", + "name": "sysadmin-token-service", + "project_path": "sysadmin/token-service", + "repo_path": "sysadmin/token-service" + }, "sysadmin-webstats": { "description": "Scripts and templates used to manage web statistics on KDE servers", "name": "sysadmin-webstats", diff --git a/pkgs/kde/third-party/applet-window-buttons6/default.nix b/pkgs/kde/third-party/applet-window-buttons6/default.nix index 33ab54b180cf..50ebbea0d664 100644 --- a/pkgs/kde/third-party/applet-window-buttons6/default.nix +++ b/pkgs/kde/third-party/applet-window-buttons6/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, cmake, extra-cmake-modules, + kcmutils, kcoreaddons, kdeclarative, kdecoration, @@ -29,6 +30,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + kcmutils kcoreaddons kdeclarative kdecoration diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index f0e1482b8579..caf4dc8be63c 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -15,6 +15,7 @@ kitemviews, kwidgetsaddons, qtquickcontrols2 ? null, + kcmutils, kcoreaddons, kdeclarative, kirigami ? null, @@ -78,6 +79,7 @@ stdenv.mkDerivation rec { kirigami2 ] ++ lib.optionals (lib.versions.major qtbase.version == "6") [ + kcmutils libplasma kirigami ]