diff options
Diffstat (limited to 'pkgs/kde')
29 files changed, 398 insertions, 344 deletions
diff --git a/pkgs/kde/frameworks/kfilemetadata/default.nix b/pkgs/kde/frameworks/kfilemetadata/default.nix index b6b5f3a7bfbd5..0e9fd5489e7e1 100644 --- a/pkgs/kde/frameworks/kfilemetadata/default.nix +++ b/pkgs/kde/frameworks/kfilemetadata/default.nix @@ -5,7 +5,6 @@ ebook_tools, exiv2, ffmpeg, - kcodecs, kconfig, kdegraphics-mobipocket, libappimage, @@ -18,5 +17,5 @@ mkKdeDerivation { patches = [./cmake-install-paths.patch]; extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [attr ebook_tools exiv2 ffmpeg kcodecs kconfig kdegraphics-mobipocket libappimage]; + extraBuildInputs = [attr ebook_tools exiv2 ffmpeg kconfig kdegraphics-mobipocket libappimage]; } diff --git a/pkgs/kde/frameworks/kguiaddons/default.nix b/pkgs/kde/frameworks/kguiaddons/default.nix index 3c1fb8034a0a4..3aa8bcdf29f5a 100644 --- a/pkgs/kde/frameworks/kguiaddons/default.nix +++ b/pkgs/kde/frameworks/kguiaddons/default.nix @@ -2,12 +2,11 @@ mkKdeDerivation, qtwayland, pkg-config, - wayland, }: mkKdeDerivation { pname = "kguiaddons"; extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland wayland]; + extraBuildInputs = [qtwayland]; meta.mainProgram = "kde-geo-uri-handler"; } diff --git a/pkgs/kde/frameworks/kidletime/default.nix b/pkgs/kde/frameworks/kidletime/default.nix index 8fd68f04ec14d..7171822ec1da4 100644 --- a/pkgs/kde/frameworks/kidletime/default.nix +++ b/pkgs/kde/frameworks/kidletime/default.nix @@ -2,12 +2,11 @@ mkKdeDerivation, qtwayland, pkg-config, - wayland-protocols, xorg, }: mkKdeDerivation { pname = "kidletime"; extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland xorg.libXScrnSaver wayland-protocols]; + extraBuildInputs = [qtwayland xorg.libXScrnSaver]; } diff --git a/pkgs/kde/frameworks/kwindowsystem/default.nix b/pkgs/kde/frameworks/kwindowsystem/default.nix index 711638cb106c2..a5fb8eddb7eab 100644 --- a/pkgs/kde/frameworks/kwindowsystem/default.nix +++ b/pkgs/kde/frameworks/kwindowsystem/default.nix @@ -4,11 +4,10 @@ qtdeclarative, qtwayland, pkg-config, - wayland, }: mkKdeDerivation { pname = "kwindowsystem"; extraNativeBuildInputs = [qttools pkg-config]; - extraBuildInputs = [qtdeclarative qtwayland wayland]; + extraBuildInputs = [qtdeclarative qtwayland]; } diff --git a/pkgs/kde/frameworks/qqc2-desktop-style/default.nix b/pkgs/kde/frameworks/qqc2-desktop-style/default.nix index d681efd14f415..3c756d9b93530 100644 --- a/pkgs/kde/frameworks/qqc2-desktop-style/default.nix +++ b/pkgs/kde/frameworks/qqc2-desktop-style/default.nix @@ -2,12 +2,10 @@ mkKdeDerivation, qtdeclarative, qttools, - sonnet, }: mkKdeDerivation { pname = "qqc2-desktop-style"; extraNativeBuildInputs = [qttools]; extraBuildInputs = [qtdeclarative]; - extraPropagatedBuildInputs = [sonnet]; } diff --git a/pkgs/kde/frameworks/solid/default.nix b/pkgs/kde/frameworks/solid/default.nix index d59d15f16ead3..2c628b8dbc3ed 100644 --- a/pkgs/kde/frameworks/solid/default.nix +++ b/pkgs/kde/frameworks/solid/default.nix @@ -1,6 +1,5 @@ { mkKdeDerivation, - fetchpatch, qttools, bison, flex, @@ -12,13 +11,6 @@ mkKdeDerivation { patches = [ # Also search /run/wrappers for mount/umount ./fix-search-path.patch - - # Backport fix for mounting removable LUKS devices - # FIXME: remove in 6.2 - (fetchpatch { - url = "https://invent.kde.org/frameworks/solid/-/commit/a3b18591ba144fae0cd0cfc087a45c64000d4e51.patch"; - hash = "sha256-e7+amjOShUSzPb0pAxnAuuh/fbK/YLESqR0co1bs+wg="; - }) ]; extraNativeBuildInputs = [qttools bison flex]; diff --git a/pkgs/kde/gear/akonadi-search/default.nix b/pkgs/kde/gear/akonadi-search/default.nix index 6e89f0b685ff7..416dd91a9ee5b 100644 --- a/pkgs/kde/gear/akonadi-search/default.nix +++ b/pkgs/kde/gear/akonadi-search/default.nix @@ -26,9 +26,8 @@ mkKdeDerivation rec { extraNativeBuildInputs = [ rustPlatform.cargoSetupHook cargo - corrosion rustc ]; - extraBuildInputs = [xapian]; + extraBuildInputs = [corrosion xapian]; } diff --git a/pkgs/kde/gear/angelfish/default.nix b/pkgs/kde/gear/angelfish/default.nix index 2250b5db6a43b..0d9b4a341f05d 100644 --- a/pkgs/kde/gear/angelfish/default.nix +++ b/pkgs/kde/gear/angelfish/default.nix @@ -25,9 +25,8 @@ mkKdeDerivation rec { extraNativeBuildInputs = [ rustPlatform.cargoSetupHook cargo - corrosion rustc ]; - extraBuildInputs = [qtsvg qtwebengine qcoro]; + extraBuildInputs = [qtsvg qtwebengine corrosion qcoro]; } diff --git a/pkgs/kde/gear/arianna/default.nix b/pkgs/kde/gear/arianna/default.nix index 9e56cfda9efe7..247da11b6d3dd 100644 --- a/pkgs/kde/gear/arianna/default.nix +++ b/pkgs/kde/gear/arianna/default.nix @@ -5,7 +5,6 @@ qtwebchannel, qtwebengine, kitemmodels, - kquickcharts, }: mkKdeDerivation { pname = "arianna"; @@ -16,7 +15,6 @@ mkKdeDerivation { qtwebchannel qtwebengine kitemmodels - kquickcharts ]; meta.mainProgram = "arianna"; } diff --git a/pkgs/kde/gear/ghostwriter/default.nix b/pkgs/kde/gear/ghostwriter/default.nix index f4b4a3cee21e3..273e805549e74 100644 --- a/pkgs/kde/gear/ghostwriter/default.nix +++ b/pkgs/kde/gear/ghostwriter/default.nix @@ -12,7 +12,7 @@ mkKdeDerivation { pname = "ghostwriter"; - extraNativeBuildInputs = [pkg-config kdoctools]; - extraBuildInputs = [qtsvg qttools qtwebchannel qtwebengine qt5compat hunspell]; + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [qtsvg qttools qtwebchannel qtwebengine qt5compat kdoctools hunspell]; meta.mainProgram = "ghostwriter"; } diff --git a/pkgs/kde/gear/gwenview/default.nix b/pkgs/kde/gear/gwenview/default.nix index 2788e592ef3e2..4bbb5f98eb1e8 100644 --- a/pkgs/kde/gear/gwenview/default.nix +++ b/pkgs/kde/gear/gwenview/default.nix @@ -10,8 +10,6 @@ kimageannotator, lcms2, libtiff, - wayland, - wayland-protocols, }: mkKdeDerivation { pname = "gwenview"; @@ -29,7 +27,5 @@ mkKdeDerivation { kimageannotator lcms2 libtiff - wayland - wayland-protocols ]; } diff --git a/pkgs/kde/gear/kasts/default.nix b/pkgs/kde/gear/kasts/default.nix index 860af4a1f0817..2375bb00af21f 100644 --- a/pkgs/kde/gear/kasts/default.nix +++ b/pkgs/kde/gear/kasts/default.nix @@ -3,7 +3,6 @@ qtsvg, qtmultimedia, pkg-config, - qqc2-desktop-style, taglib, libvlc, }: @@ -14,7 +13,6 @@ mkKdeDerivation { extraBuildInputs = [ qtsvg qtmultimedia - qqc2-desktop-style taglib libvlc ]; diff --git a/pkgs/kde/gear/kcalc/default.nix b/pkgs/kde/gear/kcalc/default.nix index fdc55b3532782..28f1d314ce964 100644 --- a/pkgs/kde/gear/kcalc/default.nix +++ b/pkgs/kde/gear/kcalc/default.nix @@ -8,7 +8,6 @@ mkKdeDerivation { pname = "kcalc"; - extraNativeBuildInputs = [kdoctools]; - extraBuildInputs = [qt5compat gmp mpfr]; + extraBuildInputs = [qt5compat gmp mpfr kdoctools]; meta.mainProgram = "kcalc"; } diff --git a/pkgs/kde/gear/kdepim-addons/default.nix b/pkgs/kde/gear/kdepim-addons/default.nix index e256ee8fdf1dc..fded9e9b02058 100644 --- a/pkgs/kde/gear/kdepim-addons/default.nix +++ b/pkgs/kde/gear/kdepim-addons/default.nix @@ -4,8 +4,8 @@ rustPlatform, cargo, rustc, - corrosion, discount, + corrosion, alpaka, # provided as callPackage input to enable easier overrides through overlays cargoHash ? "sha256-Yt1Gxw9Q1Q108YRJoUIpeNZlGjZ7yabLW3bRO4+x6Vo=", @@ -28,9 +28,8 @@ mkKdeDerivation rec { extraNativeBuildInputs = [ rustPlatform.cargoSetupHook cargo - corrosion rustc ]; - extraBuildInputs = [discount alpaka]; + extraBuildInputs = [discount corrosion alpaka]; } diff --git a/pkgs/kde/gear/kio-extras/default.nix b/pkgs/kde/gear/kio-extras/default.nix index b80f9175a5e9b..18cf462941373 100644 --- a/pkgs/kde/gear/kio-extras/default.nix +++ b/pkgs/kde/gear/kio-extras/default.nix @@ -3,7 +3,6 @@ qt5compat, qtsvg, pkg-config, - libkexiv2, samba, libssh, libmtp, @@ -24,7 +23,6 @@ mkKdeDerivation { extraBuildInputs = [ qt5compat qtsvg - libkexiv2 samba libssh diff --git a/pkgs/kde/gear/koko/default.nix b/pkgs/kde/gear/koko/default.nix index faec24560b6c6..1241f68e12a74 100644 --- a/pkgs/kde/gear/koko/default.nix +++ b/pkgs/kde/gear/koko/default.nix @@ -7,7 +7,6 @@ qtsvg, exiv2, kirigami-addons, - kquickimageeditor, }: let # URLs snapshotted through # https://web.archive.org/save/$url @@ -41,7 +40,6 @@ in qtsvg exiv2 kirigami-addons - kquickimageeditor ]; meta.mainProgram = "koko"; } diff --git a/pkgs/kde/gear/kopeninghours/default.nix b/pkgs/kde/gear/kopeninghours/default.nix index b315d765fb396..7ba5214ac09fb 100644 --- a/pkgs/kde/gear/kopeninghours/default.nix +++ b/pkgs/kde/gear/kopeninghours/default.nix @@ -16,5 +16,6 @@ mkKdeDerivation { enablePython = true; python = python3; }) + python3 ]; } diff --git a/pkgs/kde/gear/plasmatube/default.nix b/pkgs/kde/gear/plasmatube/default.nix index 05285f6b6c1d6..63236fe00d76f 100644 --- a/pkgs/kde/gear/plasmatube/default.nix +++ b/pkgs/kde/gear/plasmatube/default.nix @@ -3,18 +3,15 @@ mkKdeDerivation, qtquick3d, qtsvg, - purpose, - qqc2-desktop-style, pkg-config, - mpv, + mpv-unwrapped, yt-dlp, }: mkKdeDerivation { pname = "plasmatube"; extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtquick3d qtsvg mpv qqc2-desktop-style]; - extraPropagatedBuildInputs = [purpose]; + extraBuildInputs = [qtquick3d qtsvg mpv-unwrapped]; qtWrapperArgs = ["--prefix" "PATH" ":" (lib.makeBinPath [ yt-dlp ])]; meta.mainProgram = "plasmatube"; diff --git a/pkgs/kde/gear/sweeper/default.nix b/pkgs/kde/gear/sweeper/default.nix index e2b7fd934436e..24e75b7c5301e 100644 --- a/pkgs/kde/gear/sweeper/default.nix +++ b/pkgs/kde/gear/sweeper/default.nix @@ -1,10 +1,6 @@ -{ - mkKdeDerivation, - plasma-activities-stats, -}: +{mkKdeDerivation}: mkKdeDerivation { pname = "sweeper"; - extraBuildInputs = [plasma-activities-stats]; meta.mainProgram = "sweeper"; } diff --git a/pkgs/kde/gear/tokodon/default.nix b/pkgs/kde/gear/tokodon/default.nix index 1e12163eb98bd..fd47144eda1d1 100644 --- a/pkgs/kde/gear/tokodon/default.nix +++ b/pkgs/kde/gear/tokodon/default.nix @@ -5,14 +5,13 @@ qtsvg, qtwebsockets, qtwebview, - mpv, - kitemmodels, + mpv-unwrapped, sonnet, }: mkKdeDerivation { pname = "tokodon"; extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtmultimedia qtsvg qtwebsockets qtwebview mpv kitemmodels sonnet]; + extraBuildInputs = [qtmultimedia qtsvg qtwebsockets qtwebview mpv-unwrapped sonnet]; meta.mainProgram = "tokodon"; } diff --git a/pkgs/kde/generated/dependencies.json b/pkgs/kde/generated/dependencies.json index aed3f12814529..70f5499bfdbc0 100644 --- a/pkgs/kde/generated/dependencies.json +++ b/pkgs/kde/generated/dependencies.json @@ -18,7 +18,6 @@ "kcrash", "ki18n", "kiconthemes", - "kio", "kitemmodels", "kwidgetsaddons", "kxmlgui" @@ -70,6 +69,7 @@ "akonadi-mime": [ "akonadi", "extra-cmake-modules", + "kio", "kmime" ], "akonadi-notes": [ @@ -144,6 +144,7 @@ "ki18n", "kirigami", "kirigami-addons", + "qqc2-desktop-style", "syndication" ], "alpaka": [ @@ -275,6 +276,7 @@ "kconfigwidgets", "kcoreaddons", "kcrash", + "kdbusaddons", "kdoctools", "ki18n", "kiconthemes", @@ -509,7 +511,6 @@ "knotifyconfig", "kparts", "ktextwidgets", - "kwallet", "kwidgetsaddons", "kwindowsystem", "kxmlgui", @@ -704,6 +705,7 @@ "dolphin-plugins": [ "dolphin", "extra-cmake-modules", + "kconfig", "kcoreaddons", "ki18n", "kio", @@ -769,6 +771,7 @@ "kiconthemes", "kio", "kirigami", + "kirigami-addons", "kxmlgui", "qqc2-desktop-style" ], @@ -812,7 +815,8 @@ "kcoreaddons", "kdbusaddons", "ki18n", - "kirigami" + "kirigami", + "kirigami-addons" ], "filelight": [ "extra-cmake-modules", @@ -875,15 +879,6 @@ "kxmlgui", "sonnet" ], - "glaxnimate": [ - "extra-cmake-modules", - "karchive", - "kcompletion", - "kconfigwidgets", - "kcoreaddons", - "kcrash", - "kxmlgui" - ], "granatier": [ "extra-cmake-modules", "kconfig", @@ -952,7 +947,20 @@ "kiconthemes", "kio", "kirigami", - "mpvqt" + "mpvqt", + "qqc2-desktop-style" + ], + "hash-o-matic": [ + "extra-cmake-modules", + "kcolorscheme", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kirigami", + "kwindowsystem", + "libkleo", + "qqc2-desktop-style" ], "heaptrack": [ "extra-cmake-modules", @@ -1117,6 +1125,14 @@ "libkdepim", "pimcommon" ], + "kaidan": [ + "extra-cmake-modules", + "kcoreaddons", + "kio", + "kirigami", + "kirigami-addons", + "kquickimageeditor" + ], "kajongg": [ "extra-cmake-modules", "kdoctools", @@ -1183,7 +1199,8 @@ "kcrash", "ki18n", "kirigami", - "kirigami-addons" + "kirigami-addons", + "qqc2-desktop-style" ], "kalternatives": [ "extra-cmake-modules", @@ -1281,6 +1298,7 @@ "ki18n", "kirigami", "kirigami-addons", + "qqc2-desktop-style", "qtkeychain", "syndication", "threadweaver" @@ -2113,11 +2131,13 @@ "ki18n", "kirigami", "kwidgetsaddons", - "kwindowsystem" + "kwindowsystem", + "qqc2-desktop-style" ], "kfilemetadata": [ "extra-cmake-modules", "karchive", + "kcodecs", "kcoreaddons", "ki18n", "poppler", @@ -2150,6 +2170,7 @@ "kconfigwidgets", "kcoreaddons", "kcrash", + "kdbusaddons", "kdnssd", "kdoctools", "ki18n", @@ -2332,6 +2353,7 @@ "extra-cmake-modules" ], "kiconthemes": [ + "breeze-icons", "extra-cmake-modules", "karchive", "kcolorscheme", @@ -2574,6 +2596,7 @@ ], "kirigami-addons": [ "extra-cmake-modules", + "kconfig", "ki18n", "kirigami" ], @@ -2898,7 +2921,6 @@ "extra-cmake-modules", "kconfig", "kconfigwidgets", - "kcrash", "kdbusaddons", "kdoctools", "kglobalaccel", @@ -3419,7 +3441,6 @@ "kiconthemes", "kio", "ktextaddons", - "ktexttemplate", "kwidgetsaddons", "kxmlgui", "sonnet", @@ -3496,8 +3517,7 @@ "kcoreaddons", "ki18n", "kirigami", - "kirigami-addons", - "kwindowsystem" + "kirigami-addons" ], "kregexpeditor": [ "extra-cmake-modules", @@ -3506,7 +3526,6 @@ "kdoctools", "ki18n", "kiconthemes", - "kservice", "ktextwidgets", "kwidgetsaddons", "kxmlgui" @@ -3555,7 +3574,6 @@ "extra-cmake-modules", "kconfig", "kcoreaddons", - "kcrash", "kdbusaddons", "kdnssd", "kdoctools", @@ -3633,7 +3651,6 @@ "kconfigwidgets", "kcoreaddons", "kdbusaddons", - "kglobalaccel", "ki18n", "kpackage", "kservice", @@ -3698,6 +3715,7 @@ "kconfigwidgets", "kcoreaddons", "kcrash", + "kdbusaddons", "kdoctools", "ki18n", "kio", @@ -3761,6 +3779,20 @@ "kwallet", "kwidgetsaddons" ], + "kstars": [ + "breeze-icons", + "extra-cmake-modules", + "kconfig", + "kcrash", + "kdoctools", + "kguiaddons", + "ki18n", + "knewstuff", + "knotifications", + "knotifyconfig", + "kplotting", + "kxmlgui" + ], "kstatusnotifieritem": [ "extra-cmake-modules", "kwindowsystem" @@ -3772,6 +3804,7 @@ "kconfigwidgets", "kcoreaddons", "kcrash", + "kdbusaddons", "kdoctools", "kguiaddons", "ki18n", @@ -3988,6 +4021,7 @@ "kconfigwidgets", "kcoreaddons", "kcrash", + "kdbusaddons", "kdoctools", "ki18n", "kwidgetsaddons", @@ -4054,6 +4088,7 @@ "kdoctools", "ki18n", "kio", + "kservice", "kstatusnotifieritem", "kwallet", "kwidgetsaddons", @@ -4198,7 +4233,8 @@ "ktexteditor", "kuserfeedback", "kwidgetsaddons", - "kxmlgui" + "kxmlgui", + "purpose" ], "latte-dock": [ "extra-cmake-modules", @@ -4339,21 +4375,12 @@ "libksysguard": [ "extra-cmake-modules", "kauth", - "kcodecs", - "kcompletion", "kconfig", - "kconfigwidgets", "kcoreaddons", - "kglobalaccel", "ki18n", - "kiconthemes", - "kio", - "kjobwidgets", "knewstuff", "kpackage", "kservice", - "kwidgetsaddons", - "kwindowsystem", "solid" ], "libktorrent": [ @@ -4426,6 +4453,7 @@ "kconfig", "kcoreaddons", "kcrash", + "kdbusaddons", "kdoctools", "kguiaddons", "ki18n", @@ -4469,10 +4497,13 @@ ], "marknote": [ "extra-cmake-modules", + "kcolorscheme", "kconfig", "kcoreaddons", "ki18n", - "kirigami" + "kirigami", + "kirigami-addons", + "kxmlgui" ], "massif-visualizer": [ "extra-cmake-modules", @@ -4598,6 +4629,7 @@ ], "milou": [ "extra-cmake-modules", + "kconfig", "ki18n", "krunner", "libplasma" @@ -4629,6 +4661,7 @@ "kcolorscheme", "kconfig", "kcoreaddons", + "kcrash", "kdbusaddons", "ki18n", "kio", @@ -4642,6 +4675,7 @@ "kwindowsystem", "libquotient", "prison", + "purpose", "qcoro", "qqc2-desktop-style", "qtkeychain", @@ -4687,12 +4721,15 @@ "breeze-icons", "karchive", "kbookmarks", + "kcolorscheme", "kdegraphics-mobipocket", "ki18n", "kio", + "kitemviews", "kparts", "kpty", "ktextwidgets", + "kwidgetsaddons", "kxmlgui", "libkexiv2", "phonon", @@ -4700,6 +4737,15 @@ "purpose", "threadweaver" ], + "optiimage": [ + "extra-cmake-modules", + "kcoreaddons", + "ki18n", + "kio", + "kirigami", + "kirigami-addons", + "qqc2-desktop-style" + ], "oxygen": [ "extra-cmake-modules", "frameworkintegration", @@ -4731,6 +4777,7 @@ "kconfigwidgets", "kcoreaddons", "kcrash", + "kdbusaddons", "kdoctools", "ki18n", "kio", @@ -5210,18 +5257,11 @@ ], "plasma-settings": [ "extra-cmake-modules", - "kauth", - "kconfig", + "kcmutils", "kcoreaddons", "kdbusaddons", "ki18n", - "kio", - "kirigami-addons", - "kservice", - "libplasma", - "modemmanager-qt", - "networkmanager-qt", - "solid" + "kirigami-addons" ], "plasma-simplemenu": [ "extra-cmake-modules", @@ -5389,6 +5429,7 @@ "kitemmodels", "mpvqt", "purpose", + "qqc2-desktop-style", "qtkeychain" ], "plymouth-kcm": [ @@ -5486,6 +5527,14 @@ "kirigami", "kservice" ], + "pvfviewer": [ + "extra-cmake-modules", + "kdoctools", + "ki18n", + "kio", + "kwidgetsaddons", + "kxmlgui" + ], "qmlkonsole": [ "extra-cmake-modules", "kconfig", @@ -5549,6 +5598,21 @@ "messagelib", "pimcommon" ], + "rkward": [ + "extra-cmake-modules", + "karchive", + "kconfig", + "kcoreaddons", + "kcrash", + "kdoctools", + "ki18n", + "knotifications", + "kparts", + "ktexteditor", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui" + ], "rocs": [ "extra-cmake-modules", "karchive", @@ -5606,7 +5670,6 @@ "prison", "purpose", "qtkeychain", - "selenium-webdriver-at-spi", "sonnet", "syntax-highlighting" ], @@ -5634,7 +5697,6 @@ "extra-cmake-modules", "kpipewire", "kwayland", - "kwin", "kwindowsystem", "wayland" ], @@ -5663,6 +5725,20 @@ "kxmlgui", "purpose" ], + "skladnik": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kio", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], "skrooge": [ "extra-cmake-modules", "karchive", @@ -5758,7 +5834,8 @@ "kxmlgui", "layer-shell-qt", "purpose", - "wayland" + "wayland", + "zxing-cpp" ], "step": [ "extra-cmake-modules", @@ -5859,8 +5936,8 @@ ], "tellico": [ "extra-cmake-modules", - "kcoreaddons", - "kcrash", + "kconfig", + "kconfigwidgets", "kdoctools", "kfilemetadata", "ki18n", @@ -5868,9 +5945,7 @@ "kio", "kitemmodels", "knewstuff", - "kparts", - "ktexteditor", - "kxmlgui", + "kwidgetsaddons", "libkcddb", "libksane" ], @@ -5881,7 +5956,8 @@ "kcrash", "ki18n", "kirigami", - "kirigami-addons" + "kirigami-addons", + "qqc2-desktop-style" ], "threadweaver": [ "extra-cmake-modules" @@ -6070,5 +6146,5 @@ "kwindowsystem" ] }, - "version": "c03e6379" + "version": "525ad8d3" } \ No newline at end of file diff --git a/pkgs/kde/generated/projects.json b/pkgs/kde/generated/projects.json index 8986f2db0823f..d798654c27d8e 100644 --- a/pkgs/kde/generated/projects.json +++ b/pkgs/kde/generated/projects.json @@ -1058,7 +1058,7 @@ "glaxnimate": { "description": "Simple vector animation program.", "name": "glaxnimate", - "project_path": "playground/graphics/glaxnimate", + "project_path": "kdereview/glaxnimate", "repo_path": "graphics/glaxnimate" }, "gluon": { @@ -1920,7 +1920,7 @@ "repo_path": "unmaintained/kdenetwork-strigi-analyzers" }, "kdenlive": { - "description": "Free and open source video editor, based on MLT Framework and KDE Frameworks 5", + "description": "Free and open source video editor, based on MLT Framework and KDE Frameworks", "name": "kdenlive", "project_path": "kde/kdemultimedia/kdenlive", "repo_path": "multimedia/kdenlive" @@ -2808,9 +2808,9 @@ "repo_path": "education/klettres" }, "klevernotes": { - "description": "A convergent markdown note taking application.", + "description": "A note-taking and management application using markdown.", "name": "klevernotes", - "project_path": "playground/office/klevernotes", + "project_path": "kdereview/klevernotes", "repo_path": "office/klevernotes" }, "klickety": { @@ -7037,6 +7037,12 @@ "project_path": "websites/discover-kde-org", "repo_path": "websites/discover-kde-org" }, + "websites-docs-glaxnimate-org": { + "description": "Documentation website for Glaxnimate \u2014 docs.glaxnimate.org", + "name": "websites-docs-glaxnimate-org", + "project_path": "websites/docs-glaxnimate-org", + "repo_path": "websites/docs-glaxnimate-org" + }, "websites-docs-kde-org": { "description": "Scripts and other materials needed to support and operate docs.kde.org", "name": "websites-docs-kde-org", @@ -7163,11 +7169,11 @@ "project_path": "websites/ghostwriter-kde-org", "repo_path": "websites/ghostwriter-kde-org" }, - "websites-glaxnimate-kde-org": { - "description": "Website for Glaxnimate \u2014 glaxnimate.kde.org", - "name": "websites-glaxnimate-kde-org", - "project_path": "websites/glaxnimate-kde-org", - "repo_path": "websites/glaxnimate-kde-org" + "websites-glaxnimate-org": { + "description": "Website for Glaxnimate \u2014 glaxnimate.org", + "name": "websites-glaxnimate-org", + "project_path": "websites/glaxnimate-org", + "repo_path": "websites/glaxnimate-org" }, "websites-go-kde-org": { "description": "Data for the KDE Short URL Redirector Service - go.kde.org", diff --git a/pkgs/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json index a2b93aa050548..3096bec16988b 100644 --- a/pkgs/kde/generated/sources/frameworks.json +++ b/pkgs/kde/generated/sources/frameworks.json @@ -1,362 +1,362 @@ { "attica": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/attica-6.1.0.tar.xz", - "hash": "sha256-iz3KyaZ1Op0PeAeCww82ne0/UxxHjpXKHBlThK19taA=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/attica-6.2.0.tar.xz", + "hash": "sha256-J1+wCz9INwTYAEhIg6N4l5ejGYsM5oDYUxPZl3/94vA=" }, "baloo": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/baloo-6.1.0.tar.xz", - "hash": "sha256-VNghxNwSGRs/GutedTwQeMi7RvFRXQIEZ3Bdf3xZzKo=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/baloo-6.2.0.tar.xz", + "hash": "sha256-HqQTudutp9Bkah+Nw/BoiSjCZuY4hSjP0F1MB5p+Iqg=" }, "bluez-qt": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/bluez-qt-6.1.0.tar.xz", - "hash": "sha256-+UJO8V4H+BdPBpEa9GFqBt2Ird2pdflU+W6qqHHNjrs=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/bluez-qt-6.2.0.tar.xz", + "hash": "sha256-lkh09OS0z6Y6lAy9CsIb0NxPwGwU/3qNtU+YEZv4tDA=" }, "breeze-icons": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/breeze-icons-6.1.0.tar.xz", - "hash": "sha256-sbqALQ0NvQ7NeGy9+q9UXy3TwheWa4lLkyGioYQmoWo=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/breeze-icons-6.2.0.tar.xz", + "hash": "sha256-31o7FQdo3Vx4Gmw9GEjXn0sOsvMn4kjFQmoSNKpME1s=" }, "extra-cmake-modules": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/extra-cmake-modules-6.1.0.tar.xz", - "hash": "sha256-dsnt8AgH5s+NSuNfUZW0vD/pRkjZdv71Mr9/l9hjiL0=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/extra-cmake-modules-6.2.0.tar.xz", + "hash": "sha256-Y3S/oN3ti+JlxwKs1d4R7s0oUcYluT4ch9jQ9fGo6+E=" }, "frameworkintegration": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/frameworkintegration-6.1.0.tar.xz", - "hash": "sha256-R7s4p3i5RAW9niUb53S6kQwrhc1qRRK6H26bb4eRROg=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/frameworkintegration-6.2.0.tar.xz", + "hash": "sha256-5B9ksXitna3K1RsUW9WAhoq6Bh+4D/FWFCaNCexODXw=" }, "kapidox": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kapidox-6.1.0.tar.xz", - "hash": "sha256-sSnxafopk6yomOcmGdPbr6Owfom/9L08unNh3QS8XBU=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kapidox-6.2.0.tar.xz", + "hash": "sha256-A6zTkjMxrztOTsJ9MlNfow1lg9LQhh/SgqtjgiOYdas=" }, "karchive": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/karchive-6.1.0.tar.xz", - "hash": "sha256-V2xxM8+5lLUwvXN3AwuSa9oieqKuQg1dhTjyaBkm+Cw=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/karchive-6.2.0.tar.xz", + "hash": "sha256-FDXgnmS/TPJ87r/HZYLkTbnTexRT5Vru4Jd4vM/ZqLI=" }, "kauth": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kauth-6.1.0.tar.xz", - "hash": "sha256-R+eAQCCAUJjMmrNwtsU5mRuwKAQfqvWmGat8srmS8Is=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kauth-6.2.0.tar.xz", + "hash": "sha256-NRHZ2FfA9pYrAFs4HsXi/vne1ZJE2hTjHdBnPgWmmwo=" }, "kbookmarks": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kbookmarks-6.1.0.tar.xz", - "hash": "sha256-t2NWMhfB4+hINLS3d5iRxFEuj9J8srU68Aoqt2EtR0c=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kbookmarks-6.2.0.tar.xz", + "hash": "sha256-GvDWvnxDyxe8movaRkw3K58n+Z083zvpXsXyTjQ2jvs=" }, "kcalendarcore": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kcalendarcore-6.1.0.tar.xz", - "hash": "sha256-HP/vMqQHa3nCZwXhIEP8t2y7/K74wSDvQLhYzESiE5s=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kcalendarcore-6.2.0.tar.xz", + "hash": "sha256-o+J3wBNqWd5jWmWfcRnXNoUsL/9QCy9f1Dn2kGbz8gk=" }, "kcmutils": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kcmutils-6.1.0.tar.xz", - "hash": "sha256-PRebmormY26jNR5b4EFKNJkaeh9RTqSS0ki2gxXsKoY=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kcmutils-6.2.0.tar.xz", + "hash": "sha256-jO8UDKnqvynoighInHmQeOhSR5B/1vdBZa6v1O1AwLs=" }, "kcodecs": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kcodecs-6.1.0.tar.xz", - "hash": "sha256-8fAHWVWy3WE7XF95mYROofngoJ/z8ssjBlOunL2EOBY=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kcodecs-6.2.0.tar.xz", + "hash": "sha256-0ED7A1EMqQlC5UMjsa/SbsANRZsbLFTm7u7OUWaELy8=" }, "kcolorscheme": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kcolorscheme-6.1.0.tar.xz", - "hash": "sha256-wwqofzpgaAfEBo2rAIA5K9ykn4++8YVT4afeD3xbA2o=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kcolorscheme-6.2.0.tar.xz", + "hash": "sha256-CZDBcsWxKZa3wL48LlNTDO9l6vdtGShUzyB4cvupXxs=" }, "kcompletion": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kcompletion-6.1.0.tar.xz", - "hash": "sha256-4eC+vh7diL6gi7D0eEbSNiTjRIbfnDozgGl/xBGEScg=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kcompletion-6.2.0.tar.xz", + "hash": "sha256-WMuTjrER6IWd0bqlEGJGfyJrjGfLH9uYdI0+l/q/COk=" }, "kconfig": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kconfig-6.1.0.tar.xz", - "hash": "sha256-L9pfJb6sUmCnDz9ikUS1wim/NSyuIIiT7USpcyxtyvc=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kconfig-6.2.0.tar.xz", + "hash": "sha256-JRK8A2/EDNwjNFy/gDeFPHr9yTt/gVKFR6RR4PjEKek=" }, "kconfigwidgets": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kconfigwidgets-6.1.0.tar.xz", - "hash": "sha256-CyUrLnlv9vBelKuSEw/nOeT+aYwiMjC+k2tXnp350XE=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kconfigwidgets-6.2.0.tar.xz", + "hash": "sha256-O15yxuVee50LPr7g/os5wJjdB6Vt452hVWiRkl632WM=" }, "kcontacts": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kcontacts-6.1.0.tar.xz", - "hash": "sha256-vtC+W4MCz010kSAjTJjQ3GKdoEoBI2lBOGgaAiGEJk4=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kcontacts-6.2.0.tar.xz", + "hash": "sha256-cJyhnpB2+YdRdk0Cm41kjGphsXJiukghz5f5E8y9G/k=" }, "kcoreaddons": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kcoreaddons-6.1.0.tar.xz", - "hash": "sha256-dgjvmiSDsoo6+CowJAVM2zxYzx/fvXkaAvcO/IDqM0M=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kcoreaddons-6.2.0.tar.xz", + "hash": "sha256-P5g2o85ecog78DJYe3Rc5VQ1qnYnF0V50uAY2nFzOO0=" }, "kcrash": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kcrash-6.1.0.tar.xz", - "hash": "sha256-cn+C6XZ8L2R7fua9edUevUBpEnEyDct4NaMM+IBkee0=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kcrash-6.2.0.tar.xz", + "hash": "sha256-ALe0iFyyqS6DKBbpzB2oz1zMxMRILBNkjwIJiMhs9Yg=" }, "kdav": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kdav-6.1.0.tar.xz", - "hash": "sha256-ZETT6lgdUU+4KvlC0JKwvAYToayi+iMTqQAC0UhZTCs=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kdav-6.2.0.tar.xz", + "hash": "sha256-8YJ4z8creo7tSKTUR+rgfkMdFCmNvPWbpFu5NihsZOE=" }, "kdbusaddons": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kdbusaddons-6.1.0.tar.xz", - "hash": "sha256-tCOkyh/KuXO5RUOG77r13CxkLSHukSXXO4/Gf4BGNUE=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kdbusaddons-6.2.0.tar.xz", + "hash": "sha256-vKDfP8c2Hv/Pgf+3ldj/YuIYnqlnJJLWsmweAUT+3Wc=" }, "kdeclarative": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kdeclarative-6.1.0.tar.xz", - "hash": "sha256-+UE41i4XNVgS83YTqpNvrS5RQP5PCankLk2b+piBxwI=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kdeclarative-6.2.0.tar.xz", + "hash": "sha256-qFw/FZnSKfBS7jeG6QQazlUQyZhEyO/Hv8ndrtGTbYQ=" }, "kded": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kded-6.1.0.tar.xz", - "hash": "sha256-sY0O8jaZXBnakm5bo/JIaJhQ/95mDrhrGKto6HsRm6E=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kded-6.2.0.tar.xz", + "hash": "sha256-ym1pcbZhtRQu3mq5oay+JNQIXvvJ8TmIwXlkmxJhq08=" }, "kdesu": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kdesu-6.1.0.tar.xz", - "hash": "sha256-pqOX4IzNNTfcmxMp6MwfBcpqzz2cGDluQRjlFEa6gn4=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kdesu-6.2.0.tar.xz", + "hash": "sha256-fGEv6kidnj49PJDKsNMU2YSGvcBgFKYPYJ/f8hUFgi8=" }, "kdnssd": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kdnssd-6.1.0.tar.xz", - "hash": "sha256-O5gfemnyZe0zE0b1bUAw0xu98dk29iwnbH4zOztntxI=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kdnssd-6.2.0.tar.xz", + "hash": "sha256-UJARNnwRw7FwNNdD6mk0lRpvxSW5Un0Yw4r4H2Cwj0U=" }, "kdoctools": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kdoctools-6.1.0.tar.xz", - "hash": "sha256-JAJUrbtSGEpXEHIGi/UEu8NXnrmBGYPGo3lVYyYO87U=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kdoctools-6.2.0.tar.xz", + "hash": "sha256-7POFVuxfnZnuLOssKHJ/TIA0IhfLabmqlFpvcC3D/08=" }, "kfilemetadata": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kfilemetadata-6.1.0.tar.xz", - "hash": "sha256-1Sp4LFTq5doykSyodvGXX7fkv/4cseFyJtg2FKs7sco=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kfilemetadata-6.2.0.tar.xz", + "hash": "sha256-EGlBZUAkthZdo/rCYi++vTX/CfCDRa2TorLBq/oXfjA=" }, "kglobalaccel": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kglobalaccel-6.1.0.tar.xz", - "hash": "sha256-iFsT04iO6+WFWJ3CiOOCYESrW/O44qdJuQcNk9MvZPI=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kglobalaccel-6.2.0.tar.xz", + "hash": "sha256-x0cn/vSjloDjbF7SfNtMW3VQQ3lfpSd07jvGo7Vo5yQ=" }, "kguiaddons": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kguiaddons-6.1.0.tar.xz", - "hash": "sha256-CNiEUq5LzcBziRSZ2bQUEpzcWYK9O62Icm2+8o7lrFM=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kguiaddons-6.2.0.tar.xz", + "hash": "sha256-ulpeQtW5uUSGQZJjg2B0Qp/T+s/DZP1OOimlS8beXds=" }, "kholidays": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kholidays-6.1.0.tar.xz", - "hash": "sha256-g2YVWatXcM1WGQLuuBvlFxkiQ1tTnZf0vBcnfaS5cwo=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kholidays-6.2.0.tar.xz", + "hash": "sha256-nXqAUofgQoHdWbjMsTAkBqkv4JQeJzysHHJO9hJfrCk=" }, "ki18n": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/ki18n-6.1.0.tar.xz", - "hash": "sha256-FjIZ8bXJ3qeq6m3cSg0oqLnhiE0jnPVjPmhMIUhRdkg=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/ki18n-6.2.0.tar.xz", + "hash": "sha256-iqj0dA2wgPTwws6I0PKJdA1VyqBrf3a/IWPQ+5/TZg8=" }, "kiconthemes": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kiconthemes-6.1.0.tar.xz", - "hash": "sha256-ec53cB1BlHluLCVQCPGQcUYKoD/yCKIRf8TkyTEMNAI=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kiconthemes-6.2.0.tar.xz", + "hash": "sha256-wP/mX1P1m3W/BDLE9X99NraEDIf4Dp6luIzrcaKLVkU=" }, "kidletime": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kidletime-6.1.0.tar.xz", - "hash": "sha256-yNhcEp/S6VIL7DqpZwRJtOos8JIGClT9sky6Y0dfrzo=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kidletime-6.2.0.tar.xz", + "hash": "sha256-BpGC5Kv7g/k2YdW7Dq6xS0TjcF+jSS29uOwDv+bj2dw=" }, "kimageformats": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kimageformats-6.1.0.tar.xz", - "hash": "sha256-sDP6BYq0yWV+G81oKonKlKW4geeQTd3uaqtKFLr8yV4=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kimageformats-6.2.0.tar.xz", + "hash": "sha256-mEQhkYXwP+eZCurm/7ql9FKw9sUFPIcovIfpdoJkNWE=" }, "kio": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kio-6.1.0.tar.xz", - "hash": "sha256-R8sAJYyjj5we4qp5KfWxK8fZnLWA2lYK2nEFD6CJ/9I=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kio-6.2.0.tar.xz", + "hash": "sha256-Mx1v9rnLsOZSGl0HRrFSviWI/WMac9DiSbeM0s2mnM8=" }, "kirigami": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kirigami-6.1.0.tar.xz", - "hash": "sha256-KlQ4GGts+IR6V5wDD+03eGOOX7Tl61T3HcJgLaRgcZY=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kirigami-6.2.0.tar.xz", + "hash": "sha256-VyRbUY1kxGr6tCoaYZYJr7YOVGAzoWK3GMdSuINQtAw=" }, "kitemmodels": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kitemmodels-6.1.0.tar.xz", - "hash": "sha256-UWfTKvab8A9slTHIlRPVS//hbt00qelI77SekjXj4wI=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kitemmodels-6.2.0.tar.xz", + "hash": "sha256-wGaIgxMmDXWiB5OTNLBWtAFLpzZLQ3MlVheQ63s3Qro=" }, "kitemviews": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kitemviews-6.1.0.tar.xz", - "hash": "sha256-6ehsKqSSeMOJWbGAT+HGwgV/PpvolgkfiY+4FpKyCk0=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kitemviews-6.2.0.tar.xz", + "hash": "sha256-c2LZiT0emoY0glc+z8Or3djGNFEtihiE8JSl9UOvSik=" }, "kjobwidgets": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kjobwidgets-6.1.0.tar.xz", - "hash": "sha256-rHndtIs4UnpgWpVkSFrTcMvP20BrleD5JV1VJWRU/bg=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kjobwidgets-6.2.0.tar.xz", + "hash": "sha256-L7dgLyu6gYvP/+GtExDXkAiJ4Q5T44S4dClfs1k/s6E=" }, "knewstuff": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/knewstuff-6.1.0.tar.xz", - "hash": "sha256-HGoHZBBTgIQCHP8e6wK+LzQoAoRxejQpDUKxHf47PT8=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/knewstuff-6.2.0.tar.xz", + "hash": "sha256-9UlidWuOuYxnhANSoe/qRpjxWhfUvIKC9lrbDbCMV4A=" }, "knotifications": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/knotifications-6.1.0.tar.xz", - "hash": "sha256-AvNvS8HS0QlOGwIDo04DfOx4MDxqrZ1p+ayMc4is/Ks=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/knotifications-6.2.0.tar.xz", + "hash": "sha256-lifCAPWN5eXcTnTRoTAFYkEVttI9oDTmSqG/MUPngWQ=" }, "knotifyconfig": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/knotifyconfig-6.1.0.tar.xz", - "hash": "sha256-3+haRVAEcKMG3zF29mWvJYlSHvUJBhLnqC7GGOBh/oc=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/knotifyconfig-6.2.0.tar.xz", + "hash": "sha256-tb/sRYK8IvDIfHD90loF4UX9/l5KYKlj9RJXHgPTfMw=" }, "kpackage": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kpackage-6.1.0.tar.xz", - "hash": "sha256-7XWRK0FlgKT5rNvt7jHlkLGX4VfNod6hOtKHURFrUq8=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kpackage-6.2.0.tar.xz", + "hash": "sha256-eMhGbXIB8qpoCdmFiCQq72MUvkpHFVYXxSnGoFSfOV0=" }, "kparts": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kparts-6.1.0.tar.xz", - "hash": "sha256-38on49T+f6cDjLrT06CpVcVwvXO1vArOs5AOBxSVEB0=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kparts-6.2.0.tar.xz", + "hash": "sha256-BPcIKavHAzMn9C5eXuE2X026mWixhPNCEsVIbjapvrE=" }, "kpeople": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kpeople-6.1.0.tar.xz", - "hash": "sha256-pfouLmexqa1l7JWpUgGvKOINxGLp0xAHA0rU2leOHWI=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kpeople-6.2.0.tar.xz", + "hash": "sha256-P1+qSO3h5H7j43R+8K3y8dgyDb76jw7G63X9L0q0WDc=" }, "kplotting": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kplotting-6.1.0.tar.xz", - "hash": "sha256-uyExlyWyA4KkSpvi1wx2petY5sgM8otvMU9J6ctzsfo=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kplotting-6.2.0.tar.xz", + "hash": "sha256-zdx+leM3a+FiGjR/bp/6iK14e0haomx+AmM2wFJ3wW0=" }, "kpty": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kpty-6.1.0.tar.xz", - "hash": "sha256-3yJs2Qum93NWBATHmVYrJ2StOdT0HxUQXy7Z+bLPWd8=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kpty-6.2.0.tar.xz", + "hash": "sha256-92g+i1zV271CV+jVrNJuWGhaO8PxYdwP4Q9ToHUkAmQ=" }, "kquickcharts": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kquickcharts-6.1.0.tar.xz", - "hash": "sha256-dhtXOP8aG7H+aPBCfiiI4lyQG2+tRAFnY4biegbjpMc=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kquickcharts-6.2.0.tar.xz", + "hash": "sha256-/dlr9CGKMJvihSOsMYvXgW6L0f6/DncbEzWc1ljGdWs=" }, "krunner": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/krunner-6.1.0.tar.xz", - "hash": "sha256-+qIfmQ2YhmWe1Ex1PM+Nd86wfflOhMAYk/k7COBnYNQ=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/krunner-6.2.0.tar.xz", + "hash": "sha256-8Y8VeP+MdsRVg3pLyaPnEnO7pKxUr9JOFDqdwgcGBB8=" }, "kservice": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kservice-6.1.0.tar.xz", - "hash": "sha256-7i7n/eLEeVWJCHb4kKDRZ5LymwzHT9KWzKsVPYtc54E=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kservice-6.2.0.tar.xz", + "hash": "sha256-BkbJIZwNfZojcbkNxCfryGzzCtr8sitFjxMPAR3iiII=" }, "kstatusnotifieritem": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kstatusnotifieritem-6.1.0.tar.xz", - "hash": "sha256-k+LJyqcNTM6AWapsuB5bFh1AVwHbGE3f+BMD+iT97xQ=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kstatusnotifieritem-6.2.0.tar.xz", + "hash": "sha256-BLn8CQW2FK/I4K/PVFEBjSoSbxZSIbbbIOQXG+L7H88=" }, "ksvg": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/ksvg-6.1.0.tar.xz", - "hash": "sha256-KGqOHshnjXYZYKPNK0wOncg3716bY5a8jXaw/rcba18=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/ksvg-6.2.0.tar.xz", + "hash": "sha256-Vom/ncPvqyn92uoK8AquyMqDI+ZQT0kMO7O0eoLrdvM=" }, "ktexteditor": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/ktexteditor-6.1.0.tar.xz", - "hash": "sha256-O6GPQe9eV/6GjcKV0BhS0xsVkMC+iTrJfO7ZIpsJqd8=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/ktexteditor-6.2.0.tar.xz", + "hash": "sha256-wQpeTMkhrrUbF+l9TymIOrGGtj0QgZnmoxlECjnx8qA=" }, "ktexttemplate": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/ktexttemplate-6.1.0.tar.xz", - "hash": "sha256-Iib5RyrdGWr9W4t1uVOkLYJJMWQ37QYNAkRid34t83E=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/ktexttemplate-6.2.0.tar.xz", + "hash": "sha256-pZsObjrLlHN7gur6xH0UclJVxsbyHCNxzPnswQYs8so=" }, "ktextwidgets": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/ktextwidgets-6.1.0.tar.xz", - "hash": "sha256-cs1EchySCcwXvz6OHcy6gjvL6BVqo3AgXFzh/3RrZVM=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/ktextwidgets-6.2.0.tar.xz", + "hash": "sha256-RpNow0EmWGXiViq20751TbloligL3KkME0EnsVAate0=" }, "kunitconversion": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kunitconversion-6.1.0.tar.xz", - "hash": "sha256-323m8tQbOUOzHM7AUQE8sNT8bpl5qOUjLmQ245CzMew=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kunitconversion-6.2.0.tar.xz", + "hash": "sha256-5e1gV4ukw3hqEJzh+y5LNuSCWnkzjErKHd3JpJMAboA=" }, "kuserfeedback": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kuserfeedback-6.1.0.tar.xz", - "hash": "sha256-zfpG/QJ3PyWCDVqAF9bKl0bRBUz0TjrjP/9pHrJmvF8=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kuserfeedback-6.2.0.tar.xz", + "hash": "sha256-gpxS2xXWm5Dm0isI3qze3NE0I8kB5Nq2OJPoFLTnaFg=" }, "kwallet": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kwallet-6.1.0.tar.xz", - "hash": "sha256-z5Ktu9/nZDpOD5Oo0ilib7hZ/pA9C0tYQa0RQXW4RhM=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kwallet-6.2.0.tar.xz", + "hash": "sha256-LlgRmmRCywDjAU8BY26HIzfP82LsHvEgyvK6AYE70sE=" }, "kwidgetsaddons": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kwidgetsaddons-6.1.0.tar.xz", - "hash": "sha256-gSJdfsLW6nON7VX+QZeN62OcP3ei2q0OsuVCOqBG5M4=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kwidgetsaddons-6.2.0.tar.xz", + "hash": "sha256-A87y9mrsa397InbEfnIL2rk5sFt3twNF5/B2096tghE=" }, "kwindowsystem": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kwindowsystem-6.1.0.tar.xz", - "hash": "sha256-jAdUOIOqo4sBUI8GtEOVWdiQdwAG+On26OdpxdQiZZU=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kwindowsystem-6.2.0.tar.xz", + "hash": "sha256-D4+xK07qkmp/TPWeyF2VKXqMtn2Ak9xLGUtRocRnHYk=" }, "kxmlgui": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/kxmlgui-6.1.0.tar.xz", - "hash": "sha256-glugKq3KvBzhOlWDKVyLEDbC8UvR+kayZDHtxEzGzw0=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/kxmlgui-6.2.0.tar.xz", + "hash": "sha256-/yKnn8onN+M8VGPYf60rRpIMjUjGWDJoqa4nCXqKyQI=" }, "modemmanager-qt": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/modemmanager-qt-6.1.0.tar.xz", - "hash": "sha256-hTuu9b2BDIpk1MYPdI7xhCtzaOapUqL5PNSNhetfSXA=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/modemmanager-qt-6.2.0.tar.xz", + "hash": "sha256-89HbmsZKNTM0sHTkXNB/zktArBOIyWT4sml0bcNb7qg=" }, "networkmanager-qt": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/networkmanager-qt-6.1.0.tar.xz", - "hash": "sha256-bkl5tfiJr8/0+MdBfig8Hbnk3zbKBii7Pr7wm2Kr0wI=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/networkmanager-qt-6.2.0.tar.xz", + "hash": "sha256-e+Iqa7xYQ7GtoKFw+1bJyWvvZD19SFQT8q95KRTtAtI=" }, "prison": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/prison-6.1.0.tar.xz", - "hash": "sha256-FwhxB2mvGVPn88yhUNQ725YghWT4lHees5e2fPUmHvQ=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/prison-6.2.0.tar.xz", + "hash": "sha256-h3GWdcFlLwdzFJuN44T0BpSabWWr4lptNhHhENEtbKg=" }, "purpose": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/purpose-6.1.0.tar.xz", - "hash": "sha256-RhL/9M5RJ5ZCL0vePvqPX/Y/lri32S5I+H+WyJ4hGY4=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/purpose-6.2.0.tar.xz", + "hash": "sha256-VbAtSTh7dvVOO+xI+CzXjzmLVAO8jRDUgr//fjCgAoo=" }, "qqc2-desktop-style": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/qqc2-desktop-style-6.1.0.tar.xz", - "hash": "sha256-6R2avPkWnso1fn3It/xQSjt+Xv8yT+qm/+zICR4WItk=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/qqc2-desktop-style-6.2.0.tar.xz", + "hash": "sha256-uO0nDZMKrQXq3x7FpUCHDxEo2Mco2GFsQIAdaYCGmxw=" }, "solid": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/solid-6.1.0.tar.xz", - "hash": "sha256-B0qYS1jvUQF+52dUi/zgygC7cQ6IpKsAvJAgpGz6QmI=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/solid-6.2.0.tar.xz", + "hash": "sha256-ACoNKydZm+vHIVFmgdMnh2li/cr5lA8DNjT7k6T51yI=" }, "sonnet": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/sonnet-6.1.0.tar.xz", - "hash": "sha256-wTzrSCasT9AnuwhSSqczk82KoMZxmvi2MU0L0YCi6/4=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/sonnet-6.2.0.tar.xz", + "hash": "sha256-hOcSrVa8lP+O/Jvd+rQfbDJxIbPd1pAw6UCsyRM2J+0=" }, "syndication": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/syndication-6.1.0.tar.xz", - "hash": "sha256-CdU5Si4wJMEYi+e2kDR7efwhQabRuDO8W0lL3MMvloM=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/syndication-6.2.0.tar.xz", + "hash": "sha256-UOw4Q6COx7GFNSyUuJvC0nIM6vF+uWGkw9pV+T0Frzw=" }, "syntax-highlighting": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/syntax-highlighting-6.1.0.tar.xz", - "hash": "sha256-HnRJBSsOPpfWFdYVflZHlY6buY+l2PnF1pSCnF1nyrY=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/syntax-highlighting-6.2.0.tar.xz", + "hash": "sha256-Mn7VjSDVJQK7/ZJ4+hyeerSoRhWeXPYw0J++oUTru38=" }, "threadweaver": { - "version": "6.1.0", - "url": "mirror://kde/stable/frameworks/6.1/threadweaver-6.1.0.tar.xz", - "hash": "sha256-3aXVUI1hcH60y9BE83HjRID/L0Q4GtxM0bcDz05Fjcg=" + "version": "6.2.0", + "url": "mirror://kde/stable/frameworks/6.2/threadweaver-6.2.0.tar.xz", + "hash": "sha256-503i3wu1AUisyKYWH5gJmRrksjNLWKnuCSuh2CcEQzc=" } } \ No newline at end of file diff --git a/pkgs/kde/lib/mk-kde-derivation.nix b/pkgs/kde/lib/mk-kde-derivation.nix index 975d2e4af93ab..2a983782a4170 100644 --- a/pkgs/kde/lib/mk-kde-derivation.nix +++ b/pkgs/kde/lib/mk-kde-derivation.nix @@ -88,6 +88,20 @@ in # 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; + + traceAllDuplicateDeps = lib.flip lib.pipe [ + (traceDuplicateDeps "extraBuildInputs" extraBuildInputs) + (traceDuplicateDeps "extraPropagatedBuildInputs" extraPropagatedBuildInputs) + ]; + defaultArgs = { inherit version src; @@ -128,4 +142,4 @@ in pos = builtins.unsafeGetAttrPos "pname" args; in - stdenv.mkDerivation (defaultArgs // cleanArgs // { inherit meta pos; }) + traceAllDuplicateDeps (stdenv.mkDerivation (defaultArgs // cleanArgs // { inherit meta pos; })) diff --git a/pkgs/kde/misc/kirigami-addons/default.nix b/pkgs/kde/misc/kirigami-addons/default.nix index 90106d588fede..187a5aebe2ba4 100644 --- a/pkgs/kde/misc/kirigami-addons/default.nix +++ b/pkgs/kde/misc/kirigami-addons/default.nix @@ -7,11 +7,11 @@ }: mkKdeDerivation rec { pname = "kirigami-addons"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { url = "mirror://kde/stable/kirigami-addons/kirigami-addons-${version}.tar.xz"; - hash = "sha256-jvNSSZE5YWsxQqbXqSqyN0nFaEA+zo2FTwZKlB0IVTY="; + hash = "sha256-j/NkWKqQ/x2YBik1e23fXoira8kXsBGn+fpdXhKs9Ro="; }; extraBuildInputs = [qtdeclarative]; diff --git a/pkgs/kde/misc/mpvqt/default.nix b/pkgs/kde/misc/mpvqt/default.nix index fc237f97a803a..84d78e26bc000 100644 --- a/pkgs/kde/misc/mpvqt/default.nix +++ b/pkgs/kde/misc/mpvqt/default.nix @@ -2,7 +2,7 @@ lib, mkKdeDerivation, fetchFromGitLab, - mpv, + mpv-unwrapped, qtdeclarative, }: mkKdeDerivation rec { @@ -18,7 +18,7 @@ mkKdeDerivation rec { }; extraBuildInputs = [qtdeclarative]; - extraPropagatedBuildInputs = [mpv]; + extraPropagatedBuildInputs = [mpv-unwrapped]; meta.license = with lib.licenses; [bsd2 bsd3 cc-by-sa-40 cc0 lgpl21Only lgpl3Only lgpl3Plus mit]; } diff --git a/pkgs/kde/plasma/kwayland/default.nix b/pkgs/kde/plasma/kwayland/default.nix index 341fd8d356082..86713b834bec7 100644 --- a/pkgs/kde/plasma/kwayland/default.nix +++ b/pkgs/kde/plasma/kwayland/default.nix @@ -2,11 +2,10 @@ mkKdeDerivation, pkg-config, qtwayland, - wayland-protocols, }: mkKdeDerivation { pname = "kwayland"; extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland wayland-protocols]; + extraBuildInputs = [qtwayland]; } diff --git a/pkgs/kde/plasma/layer-shell-qt/default.nix b/pkgs/kde/plasma/layer-shell-qt/default.nix index 9783220cddf2d..dd7290379c5f2 100644 --- a/pkgs/kde/plasma/layer-shell-qt/default.nix +++ b/pkgs/kde/plasma/layer-shell-qt/default.nix @@ -2,12 +2,10 @@ mkKdeDerivation, qtwayland, pkg-config, - wayland, - wayland-protocols, }: mkKdeDerivation { pname = "layer-shell-qt"; extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland wayland wayland-protocols]; + extraBuildInputs = [qtwayland]; } diff --git a/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix b/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix index 9d5be65fe097b..7563e934e502f 100644 --- a/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix +++ b/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix @@ -2,13 +2,11 @@ mkKdeDerivation, pkg-config, qtwayland, - wayland, - wayland-protocols, cups, }: mkKdeDerivation { pname = "xdg-desktop-portal-kde"; extraNativeBuildInputs = [pkg-config]; - extraBuildInputs = [qtwayland wayland wayland-protocols cups]; + extraBuildInputs = [qtwayland cups]; } |