libsForQt5.mauiPackages: 2.2.2 -> 3.0.0

7 files changed, 125 insertions, 109 deletions

diff --git a/pkgs/applications/maui/default.nix b/pkgs/applications/maui/default.nix
index 3f5d1d499af5f..5379910c880f8 100644
--- a/pkgs/applications/maui/default.nix
+++ b/pkgs/applications/maui/default.nix
@@ -63,6 +63,7 @@ let
       mauikit-calendar = callPackage ./mauikit-calendar { };
       mauikit-filebrowsing = callPackage ./mauikit-filebrowsing.nix { };
       mauikit-imagetools = callPackage ./mauikit-imagetools.nix { };
+      mauikit-terminal = callPackage ./mauikit-terminal.nix { };
       mauikit-texteditor = callPackage ./mauikit-texteditor.nix { };
       mauiman = callPackage ./mauiman.nix { };
 
diff --git a/pkgs/applications/maui/mauikit-calendar/add-akonadi-calendar.patch b/pkgs/applications/maui/mauikit-calendar/add-akonadi-calendar.patch
deleted file mode 100644
index 0feb15b615fef..0000000000000
--- a/pkgs/applications/maui/mauikit-calendar/add-akonadi-calendar.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -89,6 +89,7 @@ set_package_properties(Qt5QuickCompiler PROPERTIES
- find_package(MauiKit)
-
- find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
-+find_package(KF5AkonadiCalendar ${AKONADI_VERSION} CONFIG REQUIRED)
- find_package(KF5AkonadiContact ${AKONADI_CONTACT_VERSION} CONFIG REQUIRED)
- find_package(KF5CalendarSupport ${CALENDARSUPPORT_LIB_VERSION} CONFIG REQUIRED)
- find_package(KF5EventViews ${EVENTVIEW_LIB_VERSION} CONFIG REQUIRED)
\ No newline at end of file
diff --git a/pkgs/applications/maui/mauikit-calendar/default.nix b/pkgs/applications/maui/mauikit-calendar/default.nix
index e9ea61592c0da..161e2046b7283 100644
--- a/pkgs/applications/maui/mauikit-calendar/default.nix
+++ b/pkgs/applications/maui/mauikit-calendar/default.nix
@@ -14,8 +14,6 @@
 mkDerivation {
   pname = "mauikit-calendar";
 
-  patches = [ ./add-akonadi-calendar.patch ];
-
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
diff --git a/pkgs/applications/maui/mauikit-imagetools.nix b/pkgs/applications/maui/mauikit-imagetools.nix
index 1b6a994b9fac4..141d1953528a0 100644
--- a/pkgs/applications/maui/mauikit-imagetools.nix
+++ b/pkgs/applications/maui/mauikit-imagetools.nix
@@ -1,6 +1,5 @@
 { lib
 , mkDerivation
-, fetchpatch
 , cmake
 , extra-cmake-modules
 , kconfig
@@ -17,14 +16,6 @@
 mkDerivation {
   pname = "mauikit-imagetools";
 
-  patches = [
-    (fetchpatch {
-      name = "remove-unused-method.patch";
-      url = "https://invent.kde.org/maui/mauikit-imagetools/-/commit/344852044d407b144bca01c41a409ceaa548bec0.patch";
-      hash = "sha256-Cpq/XzDgrKD8YVex2z9VxGTA+iDI5703+fHwkn0cIWA=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
diff --git a/pkgs/applications/maui/mauikit-terminal.nix b/pkgs/applications/maui/mauikit-terminal.nix
new file mode 100644
index 0000000000000..2f292ba2d0a1a
--- /dev/null
+++ b/pkgs/applications/maui/mauikit-terminal.nix
@@ -0,0 +1,32 @@
+{ lib
+, mkDerivation
+, cmake
+, extra-cmake-modules
+, kconfig
+, kcoreaddons
+, ki18n
+, mauikit
+}:
+
+mkDerivation {
+  pname = "mauikit-terminal";
+
+  nativeBuildInputs = [
+    cmake
+    extra-cmake-modules
+  ];
+
+  buildInputs = [
+    kconfig
+    kcoreaddons
+    ki18n
+    mauikit
+  ];
+
+  meta = with lib; {
+    homepage = "https://invent.kde.org/maui/mauikit-terminal";
+    description = "Terminal support components for Maui applications";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}
diff --git a/pkgs/applications/maui/srcs.nix b/pkgs/applications/maui/srcs.nix
index 75f9d6cd0c6d1..2221ae4a42f16 100644
--- a/pkgs/applications/maui/srcs.nix
+++ b/pkgs/applications/maui/srcs.nix
@@ -4,19 +4,19 @@
 
 {
   agenda = {
-    version = "0.1.1";
+    version = "0.5.0";
     src = fetchurl {
-      url = "${mirror}/stable/maui/agenda/0.1.1/agenda-0.1.1.tar.xz";
-      sha256 = "0czpsybvvvnfg0n1ri94a2agwhdnmy124ggxqb5kjnsw35ivz35a";
-      name = "agenda-0.1.1.tar.xz";
+      url = "${mirror}/stable/maui/agenda/0.5.0/agenda-0.5.0.tar.xz";
+      sha256 = "1ak87cda64c05knzdjf6sxjn70chs2sa6zh2adhq3mqm3dh9flf7";
+      name = "agenda-0.5.0.tar.xz";
     };
   };
   arca = {
-    version = "0.1.1";
+    version = "0.5.0";
     src = fetchurl {
-      url = "${mirror}/stable/maui/arca/0.1.1/arca-0.1.1.tar.xz";
-      sha256 = "0d4mdv1israljn9mhpb3nx8442g7kiqg87gmsb74z08v02yywmc0";
-      name = "arca-0.1.1.tar.xz";
+      url = "${mirror}/stable/maui/arca/0.5.0/arca-0.5.0.tar.xz";
+      sha256 = "12bqk5dxh1rqnbj61kymkzzgmilas6jilid4rijdgjaahdahw6hk";
+      name = "arca-0.5.0.tar.xz";
     };
   };
   bonsai = {
@@ -28,35 +28,35 @@
     };
   };
   booth = {
-    version = "1.0.2";
+    version = "1.1.0";
     src = fetchurl {
-      url = "${mirror}/stable/maui/booth/1.0.2/booth-1.0.2.tar.xz";
-      sha256 = "1b9akwwi1cmvk87zna0yrw1a6mwjd8qg0k3lnivwqfm5zi1xlpb6";
-      name = "booth-1.0.2.tar.xz";
+      url = "${mirror}/stable/maui/booth/1.1.0/booth-1.1.0.tar.xz";
+      sha256 = "1jr5iha1lvqnsh29y6k60nd63dqyh1clj8idqssfvaz09skbyk1q";
+      name = "booth-1.1.0.tar.xz";
     };
   };
   buho = {
-    version = "2.2.2";
+    version = "3.0.0";
     src = fetchurl {
-      url = "${mirror}/stable/maui/buho/2.2.2/buho-2.2.2.tar.xz";
-      sha256 = "0kvg34dmk46aawa8vnl70m8gi6qjr709czgmzb8a7pa77clyyyg8";
-      name = "buho-2.2.2.tar.xz";
+      url = "${mirror}/stable/maui/buho/3.0.0/buho-3.0.0.tar.xz";
+      sha256 = "1426b9wr8l8rzxgyahlchv9d4dgpqz5dr5nza3jax6mlh4ams507";
+      name = "buho-3.0.0.tar.xz";
     };
   };
   clip = {
-    version = "2.2.2";
+    version = "3.0.0";
     src = fetchurl {
-      url = "${mirror}/stable/maui/clip/2.2.2/clip-2.2.2.tar.xz";
-      sha256 = "1dk9x5lrp197g2qgi10p536dshaaxacgrkwr3pqywqcqqyrvjiyf";
-      name = "clip-2.2.2.tar.xz";
+      url = "${mirror}/stable/maui/clip/3.0.0/clip-3.0.0.tar.xz";
+      sha256 = "0a6z4h5rp3kmy5pp37df0abvbqxd6hx1jkss9w2sh59v8zijvrck";
+      name = "clip-3.0.0.tar.xz";
     };
   };
   communicator = {
-    version = "2.2.2";
+    version = "3.0.0";
     src = fetchurl {
-      url = "${mirror}/stable/maui/communicator/2.2.2/communicator-2.2.2.tar.xz";
-      sha256 = "02c7w6km6a5plf56g4wwdw8k8kif3pmwd1agvhvfpq84yq73naz4";
-      name = "communicator-2.2.2.tar.xz";
+      url = "${mirror}/stable/maui/communicator/3.0.0/communicator-3.0.0.tar.xz";
+      sha256 = "01qgqirjax3l8sn9813dl6ppz9p2syg83ljrxqgaj94h08ll2vi0";
+      name = "communicator-3.0.0.tar.xz";
     };
   };
   era = {
@@ -68,123 +68,123 @@
     };
   };
   fiery = {
-    version = "1.0.2";
+    version = "1.1.0";
     src = fetchurl {
-      url = "${mirror}/stable/maui/fiery/1.0.2/fiery-1.0.2.tar.xz";
-      sha256 = "0xw3p0dna3p05k8mv8sw8aw3clgb3kx72405826k0ldva8mh5q55";
-      name = "fiery-1.0.2.tar.xz";
+      url = "${mirror}/stable/maui/fiery/1.1.0/fiery-1.1.0.tar.xz";
+      sha256 = "16kwi6gwxzrb2c8x9s97ibsflv30j3z3sp2if6ypand74ni1b4px";
+      name = "fiery-1.1.0.tar.xz";
     };
   };
   index-fm = {
-    version = "2.2.2";
+    version = "3.0.0";
     src = fetchurl {
-      url = "${mirror}/stable/maui/index/2.2.2/index-fm-2.2.2.tar.xz";
-      sha256 = "156fb5kx9hkdg4q4c2r0822s49w86kixvn3m7m1gfxbc6hr5h291";
-      name = "index-fm-2.2.2.tar.xz";
+      url = "${mirror}/stable/maui/index/3.0.0/index-fm-3.0.0.tar.xz";
+      sha256 = "1w9fdwn7yvy389300p8qhb3795zzaqkqfrc1vnxydgzn995yv80w";
+      name = "index-fm-3.0.0.tar.xz";
     };
   };
   mauikit = {
-    version = "2.2.1";
+    version = "3.0.0";
     src = fetchurl {
-      url = "${mirror}/stable/maui/mauikit/2.2.1/mauikit-2.2.1.tar.xz";
-      sha256 = "0rwjd2g82j1cvspr0l889nss6p26yf19h39q20h3d9ls7fbj897h";
-      name = "mauikit-2.2.1.tar.xz";
+      url = "${mirror}/stable/maui/mauikit/3.0.0/mauikit-3.0.0.tar.xz";
+      sha256 = "1n95fcwgda9m9fmc90q0079xx4m9yh99yd51pj0nw7ynazlq2wyy";
+      name = "mauikit-3.0.0.tar.xz";
     };
   };
   mauikit-accounts = {
-    version = "2.2.2";
+    version = "3.0.0";
     src = fetchurl {
-      url = "${mirror}/stable/maui/mauikit-accounts/2.2.2/mauikit-accounts-2.2.2.tar.xz";
-      sha256 = "10rvzy5m5bmf98q5akvq87q00nz9mxmnp9ywnswl65gnmihiwis8";
-      name = "mauikit-accounts-2.2.2.tar.xz";
+      url = "${mirror}/stable/maui/mauikit-accounts/3.0.0/mauikit-accounts-3.0.0.tar.xz";
+      sha256 = "0ff7zrlvhqfsnwbfbp5bz3vgxldxl09rlaajz4g9k7n81apa0fgv";
+      name = "mauikit-accounts-3.0.0.tar.xz";
     };
   };
   mauikit-calendar = {
-    version = "1.0.1";
+    version = "1.1.0";
     src = fetchurl {
-      url = "${mirror}/stable/maui/mauikit-calendar/1.0.1/mauikit-calendar-1.0.1.tar.xz";
-      sha256 = "0l3195zy2qzcc1in9m0k8lpzbqbhdjvlr40n23plr6ldwc61q34b";
-      name = "mauikit-calendar-1.0.1.tar.xz";
+      url = "${mirror}/stable/maui/mauikit-calendar/1.1.0/mauikit-calendar-1.1.0.tar.xz";
+      sha256 = "1532ndxw6a2isw1zxhp5khk0ydczm03d7b42c5smjy56fkp7xmgx";
+      name = "mauikit-calendar-1.1.0.tar.xz";
     };
   };
   mauikit-documents = {
-    version = "1.0.1";
+    version = "1.1.0";
     src = fetchurl {
-      url = "${mirror}/stable/maui/mauikit-documents/1.0.1/mauikit-documents-1.0.1.tar.xz";
-      sha256 = "0rfznsdlfhf0bjk4fkybbvv56c55w0krjaa8by26fzkqannd7smd";
-      name = "mauikit-documents-1.0.1.tar.xz";
+      url = "${mirror}/stable/maui/mauikit-documents/1.1.0/mauikit-documents-1.1.0.tar.xz";
+      sha256 = "06r5jf0rmrry9hd0gbjz63a0f5r8dykkggww531jaqm898h79wrs";
+      name = "mauikit-documents-1.1.0.tar.xz";
     };
   };
   mauikit-filebrowsing = {
-    version = "2.2.2";
+    version = "3.0.0";
     src = fetchurl {
-      url = "${mirror}/stable/maui/mauikit-filebrowsing/2.2.2/mauikit-filebrowsing-2.2.2.tar.xz";
-      sha256 = "0dj06qak410gf4xykhigxrswbchfkicgihzksgv63z9ggfg64jbr";
-      name = "mauikit-filebrowsing-2.2.2.tar.xz";
+      url = "${mirror}/stable/maui/mauikit-filebrowsing/3.0.0/mauikit-filebrowsing-3.0.0.tar.xz";
+      sha256 = "03qdiww4dh6picsfhmzg0v5mf3ygsnprwq3x6s1lzlanl5a83pyk";
+      name = "mauikit-filebrowsing-3.0.0.tar.xz";
     };
   };
   mauikit-imagetools = {
-    version = "2.2.2";
+    version = "3.0.0";
     src = fetchurl {
-      url = "${mirror}/stable/maui/mauikit-imagetools/2.2.2/mauikit-imagetools-2.2.2.tar.xz";
-      sha256 = "1jf60725v887dfl3l9sbknkwns15bz7a7b9v0p6llhw00hiq83b4";
-      name = "mauikit-imagetools-2.2.2.tar.xz";
+      url = "${mirror}/stable/maui/mauikit-imagetools/3.0.0/mauikit-imagetools-3.0.0.tar.xz";
+      sha256 = "0lj8d6k78xiy3wcc2jhhqvdw0p5vji95280dvclkmh0ilvb7lfrd";
+      name = "mauikit-imagetools-3.0.0.tar.xz";
     };
   };
   mauikit-terminal = {
-    version = "1.0.0";
+    version = "1.1.0";
     src = fetchurl {
-      url = "${mirror}/stable/maui/mauikit-terminal/1.0.0/mauikit-terminal-1.0.0.tar.xz";
-      sha256 = "1r6dcna2fyglj4q33i5qnzv763y3y65fcqb4ralyydlb8x2nb248";
-      name = "mauikit-terminal-1.0.0.tar.xz";
+      url = "${mirror}/stable/maui/mauikit-terminal/1.1.0/mauikit-terminal-1.1.0.tar.xz";
+      sha256 = "0aki6m39yy2cnq3v6mdgyzld3slp0k5qd7v5g5hqb38mrbsbl66a";
+      name = "mauikit-terminal-1.1.0.tar.xz";
     };
   };
   mauikit-texteditor = {
-    version = "2.2.2";
+    version = "3.0.0";
     src = fetchurl {
-      url = "${mirror}/stable/maui/mauikit-texteditor/2.2.2/mauikit-texteditor-2.2.2.tar.xz";
-      sha256 = "0g8n0xzn9iiq122hb23rhn3c9vkq6hm7kgv5mv8dx2kv17gdyzcg";
-      name = "mauikit-texteditor-2.2.2.tar.xz";
+      url = "${mirror}/stable/maui/mauikit-texteditor/3.0.0/mauikit-texteditor-3.0.0.tar.xz";
+      sha256 = "1flbgsrp91fgv9m1xvlzsng3ks94i07k79832nx2azzs4g704sgf";
+      name = "mauikit-texteditor-3.0.0.tar.xz";
     };
   };
   mauiman = {
-    version = "1.0.2";
+    version = "1.1.0";
     src = fetchurl {
-      url = "${mirror}/stable/maui/mauiman/1.0.2/mauiman-1.0.2.tar.xz";
-      sha256 = "0v3jhy3j04aq5935pr6mzgdjwj6mgj1rwscmmg3b9vsi9f6s17n4";
-      name = "mauiman-1.0.2.tar.xz";
+      url = "${mirror}/stable/maui/mauiman/1.1.0/mauiman-1.1.0.tar.xz";
+      sha256 = "13s6wvp7h4zivw2m4hblsyha9qkihfqx41gh9jyw9pj8kmfp08v5";
+      name = "mauiman-1.1.0.tar.xz";
     };
   };
   nota = {
-    version = "2.2.2";
+    version = "3.0.0";
     src = fetchurl {
-      url = "${mirror}/stable/maui/nota/2.2.2/nota-2.2.2.tar.xz";
-      sha256 = "1c72s4ra5gl9gpq8amwhaw9wkgrgd0fiaknxhn528gzpmq52i8rn";
-      name = "nota-2.2.2.tar.xz";
+      url = "${mirror}/stable/maui/nota/3.0.0/nota-3.0.0.tar.xz";
+      sha256 = "0jk18qxkcx6n54pnm4mr2vpnhi07hscavacr1kijk4rxf0dyxf1i";
+      name = "nota-3.0.0.tar.xz";
     };
   };
   pix = {
-    version = "2.2.2";
+    version = "3.0.0";
     src = fetchurl {
-      url = "${mirror}/stable/maui/pix/2.2.2/pix-2.2.2.tar.xz";
-      sha256 = "0j315n1aka0pikqyq2hy15k3indr7g8vkcyxsikdd3kj968386pv";
-      name = "pix-2.2.2.tar.xz";
+      url = "${mirror}/stable/maui/pix/3.0.0/pix-3.0.0.tar.xz";
+      sha256 = "1h82c3xip1s3ii5f1maq5d9invgbxzarai8ba6c274lkv70yv1ni";
+      name = "pix-3.0.0.tar.xz";
     };
   };
   shelf = {
-    version = "2.2.2";
+    version = "3.0.0";
     src = fetchurl {
-      url = "${mirror}/stable/maui/shelf/2.2.2/shelf-2.2.2.tar.xz";
-      sha256 = "1aw6k7z7w0qslya20h0gv3k8h526jrz8a6vb10ack3i5gw6csp1k";
-      name = "shelf-2.2.2.tar.xz";
+      url = "${mirror}/stable/maui/shelf/3.0.0/shelf-3.0.0.tar.xz";
+      sha256 = "1944626qyxyybd8asfs00mkvljykz5ndxmnmi4jiz01j0xc70dyd";
+      name = "shelf-3.0.0.tar.xz";
     };
   };
   station = {
-    version = "2.2.2";
+    version = "3.0.0";
     src = fetchurl {
-      url = "${mirror}/stable/maui/station/2.2.2/station-2.2.2.tar.xz";
-      sha256 = "1svs6kjbk09l3sprq64bdm01y73vcb10y4ifh5y2a1fwa99c59sb";
-      name = "station-2.2.2.tar.xz";
+      url = "${mirror}/stable/maui/station/3.0.0/station-3.0.0.tar.xz";
+      sha256 = "04kidqm8hcxf8l1r6qi5bfxg6rkdy77i4inzgsgf3i7ky6gvah96";
+      name = "station-3.0.0.tar.xz";
     };
   };
   strike = {
@@ -196,11 +196,11 @@
     };
   };
   vvave = {
-    version = "2.2.2";
+    version = "3.0.0";
     src = fetchurl {
-      url = "${mirror}/stable/maui/vvave/2.2.2/vvave-2.2.2.tar.xz";
-      sha256 = "0m8jg79gz3dljbkrgjqlfmbmpgwawzaz37avx5nj1rlpm36b195f";
-      name = "vvave-2.2.2.tar.xz";
+      url = "${mirror}/stable/maui/vvave/3.0.0/vvave-3.0.0.tar.xz";
+      sha256 = "1x2vbmc3qk2kgx64dm8k5xm16vlvnhfnhgzv5kx1qxpr7kr3vif8";
+      name = "vvave-3.0.0.tar.xz";
     };
   };
 }
diff --git a/pkgs/applications/maui/station.nix b/pkgs/applications/maui/station.nix
index 531bb2d483afe..474e52c63a2b6 100644
--- a/pkgs/applications/maui/station.nix
+++ b/pkgs/applications/maui/station.nix
@@ -8,7 +8,9 @@
 , kirigami2
 , mauikit
 , mauikit-filebrowsing
+, mauikit-terminal
 , qmltermwidget
+, qtmultimedia
 }:
 
 mkDerivation {
@@ -26,7 +28,9 @@ mkDerivation {
     kirigami2
     mauikit
     mauikit-filebrowsing
+    mauikit-terminal
     qmltermwidget
+    qtmultimedia
   ];
 
   meta = with lib; {