From 27e7233eba4e1dedc3bdc02ff48c44e18899826f Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 18 Mar 2023 02:04:04 +0300 Subject: [PATCH 1/8] kirigami-addons: 0.6 -> 0.7.2 --- pkgs/development/libraries/kirigami-addons/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kirigami-addons/default.nix b/pkgs/development/libraries/kirigami-addons/default.nix index fec795c5748f..ec3c19fe31bc 100644 --- a/pkgs/development/libraries/kirigami-addons/default.nix +++ b/pkgs/development/libraries/kirigami-addons/default.nix @@ -12,14 +12,14 @@ mkDerivation rec { pname = "kirigami-addons"; - version = "0.6"; + version = "0.7.2"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "libraries"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RUu/0O/YRVRsRYeASfW8UQ/Ql2VbLOdVySVo9/hAmLw="; + sha256 = "sha256-2s9ShwYd2hOb18WRA2nLst6Q4UBHvFL+g7Grpjclz9I="; }; nativeBuildInputs = [ From 9359136d3a0eae3c7a5b169b2c8df496e38b01b5 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 18 Mar 2023 11:00:36 +0300 Subject: [PATCH 2/8] grantlee: 5.2.0 -> 5.3.1 --- pkgs/development/libraries/grantlee/5/default.nix | 4 ++-- .../grantlee/5/grantlee-no-canonicalize-filepath.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix index 56899b1f8978..b115e1c8d7b6 100644 --- a/pkgs/development/libraries/grantlee/5/default.nix +++ b/pkgs/development/libraries/grantlee/5/default.nix @@ -2,14 +2,14 @@ mkDerivation rec { pname = "grantlee"; - version = "5.2.0"; + version = "5.3.1"; grantleePluginPrefix = "lib/grantlee/${lib.versions.majorMinor version}"; src = fetchFromGitHub { owner = "steveire"; repo = "grantlee"; rev = "v${version}"; - sha256 = "sha256-mAbgzdBdIW1wOTQNBePQuyTgkKdpn1c+zR3H7mXHvgk="; + sha256 = "sha256-enP7b6A7Ndew2LJH569fN3IgPu2/KL5rCmU/jmKb9sY="; }; buildInputs = [ qtbase qtscript ]; diff --git a/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch b/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch index 64eb11c3f156..b29911bcfcdb 100644 --- a/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch +++ b/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch @@ -9,7 +9,7 @@ Index: grantlee-5.1.0/templates/lib/templateloader.cpp - if (file.exists() - && !fi.canonicalFilePath().contains( - QDir(d->m_templateDirs.at(i)).canonicalPath())) -- return Template(); +- return {}; ++i; } From c103991d2b06ebe182b6c0154caa3e9ce21f16cd Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 18 Mar 2023 11:20:24 +0300 Subject: [PATCH 3/8] kpipewire: propagate libepoxy --- pkgs/desktops/plasma-5/kpipewire.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/plasma-5/kpipewire.nix b/pkgs/desktops/plasma-5/kpipewire.nix index fd412711e4a2..59169cd510c8 100644 --- a/pkgs/desktops/plasma-5/kpipewire.nix +++ b/pkgs/desktops/plasma-5/kpipewire.nix @@ -19,10 +19,10 @@ mkDerivation { ki18n kcoreaddons plasma-wayland-protocols - libepoxy ffmpeg mesa pipewire wayland ]; + propagatedBuildInputs = [ libepoxy ]; } From bef31256a5cc17b97e374505a1fd2846cf6d4e30 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 18 Mar 2023 11:32:26 +0300 Subject: [PATCH 4/8] kiconthemes: backport compile error fix --- .../libraries/kde-frameworks/kiconthemes/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix index f807193718d5..564e3ae25371 100644 --- a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, + mkDerivation, fetchpatch, extra-cmake-modules, breeze-icons, karchive, kcoreaddons, kconfigwidgets, ki18n, kitemviews, qtbase, qtsvg, qttools, @@ -9,6 +9,12 @@ mkDerivation { pname = "kiconthemes"; patches = [ ./default-theme-breeze.patch + + # fix compile error + (fetchpatch { + url = "https://invent.kde.org/frameworks/kiconthemes/-/commit/d5d04e3c3fa92fbfd95eced39c3e272b8980563d.patch"; + hash = "sha256-8YGWJg7+LrPpezW8ubObcFovI5DCVn3gbdH7KDdEeQw="; + }) ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ From e5ca54ba8f676b73eb3b74c1836b6e0ab9c6d3ed Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 18 Mar 2023 13:59:42 +0300 Subject: [PATCH 5/8] ktextaddons: init at 1.1.0 --- .../libraries/ktextaddons/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/ktextaddons/default.nix diff --git a/pkgs/development/libraries/ktextaddons/default.nix b/pkgs/development/libraries/ktextaddons/default.nix new file mode 100644 index 000000000000..b7286e7bea29 --- /dev/null +++ b/pkgs/development/libraries/ktextaddons/default.nix @@ -0,0 +1,20 @@ +{ lib, mkDerivation, fetchurl, cmake, extra-cmake-modules, karchive, kconfigwidgets, kcoreaddons, ki18n, kxmlgui, qtkeychain }: +mkDerivation rec { + pname = "ktextaddons"; + version = "1.1.0"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; + hash = "sha256-BV1tHCD6kGI5Zj8PRZcEanLi1O7huS+qUijjtePDvik="; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules ]; + buildInputs = [ karchive kconfigwidgets kcoreaddons ki18n kxmlgui qtkeychain ]; + + meta = with lib; { + description = "Various text handling addons for KDE applications"; + homepage = "https://invent.kde.org/libraries/ktextaddons/"; + license = licenses.gpl2Plus; + maintainers = []; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c73b3258e3d..383db5ab7fa7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20886,6 +20886,8 @@ with pkgs; kronosnet = callPackage ../development/libraries/kronosnet { }; + ktextaddons = libsForQt5.callPackage ../development/libraries/ktextaddons {}; + l-smash = callPackage ../development/libraries/l-smash { stdenv = gccStdenv; }; From b07f4b040e3683f83c2dc5824abd22f2b92a0a5b Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 18 Mar 2023 01:39:35 +0300 Subject: [PATCH 6/8] grantleetheme: fix outputs definition --- pkgs/applications/kde/grantleetheme/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/pkgs/applications/kde/grantleetheme/default.nix index ff4b8fc93ed9..92499645e7f4 100644 --- a/pkgs/applications/kde/grantleetheme/default.nix +++ b/pkgs/applications/kde/grantleetheme/default.nix @@ -10,7 +10,7 @@ mkDerivation { license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = kdepimTeam; }; - output = [ "out" "dev" ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ grantlee ki18n kiconthemes knewstuff kservice kxmlgui qtbase From f08f903ea5554c1737f55a3d06804bd691258f2f Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 18 Mar 2023 01:39:35 +0300 Subject: [PATCH 7/8] spacebar: remove gcc9 hack --- pkgs/applications/plasma-mobile/default.nix | 2 +- pkgs/applications/plasma-mobile/spacebar.nix | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix index 34f28ae7ff5d..255b3828f768 100644 --- a/pkgs/applications/plasma-mobile/default.nix +++ b/pkgs/applications/plasma-mobile/default.nix @@ -75,7 +75,7 @@ let plasma-settings = callPackage ./plasma-settings.nix {}; plasmatube = callPackage ./plasmatube {}; qmlkonsole = callPackage ./qmlkonsole.nix {}; - spacebar = callPackage ./spacebar.nix { inherit srcs; }; + spacebar = callPackage ./spacebar.nix {}; tokodon = callPackage ./tokodon.nix {}; }; diff --git a/pkgs/applications/plasma-mobile/spacebar.nix b/pkgs/applications/plasma-mobile/spacebar.nix index c120851e5b2e..659b92228d2c 100644 --- a/pkgs/applications/plasma-mobile/spacebar.nix +++ b/pkgs/applications/plasma-mobile/spacebar.nix @@ -1,7 +1,5 @@ { lib , mkDerivation -, gcc12Stdenv -, srcs , cmake , extra-cmake-modules @@ -17,17 +15,14 @@ , knotifications , kpeople , libphonenumber -, libqofono , modemmanager-qt , protobuf , qcoro , qtquickcontrols2 }: -# Workaround for AArch64 still using GCC9. -gcc12Stdenv.mkDerivation rec { +mkDerivation { pname = "spacebar"; - inherit (srcs.spacebar) version src; nativeBuildInputs = [ cmake From 81a72db597d12ff1c9cc404fbf021e0c15212b48 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 18 Mar 2023 16:04:57 +0300 Subject: [PATCH 8/8] akonadi-contacts: propagate grantleetheme --- pkgs/applications/kde/akonadi-contacts.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix index 76c4f3f2c507..d89670d7719c 100644 --- a/pkgs/applications/kde/akonadi-contacts.nix +++ b/pkgs/applications/kde/akonadi-contacts.nix @@ -16,10 +16,10 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtwebengine - grantlee grantleetheme + grantlee kcmutils kdbusaddons ki18n kiconthemes kio kitemmodels ktextwidgets prison akonadi-mime kcontacts kmime libkleo ]; - propagatedBuildInputs = [ akonadi ]; + propagatedBuildInputs = [ akonadi grantleetheme ]; outputs = [ "out" "dev" ]; }