From d21fe9c912f2e28cfb586a56b92ba48e75a47db0 Mon Sep 17 00:00:00 2001
From: enc0urage <127197575+enc0urage@users.noreply.github.com>
Date: Sat, 11 Mar 2023 20:37:45 +0000
Subject: [PATCH 01/96] coyim: 0.4 -> 0.4.1

---
 .../networking/instant-messengers/coyim/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix
index c86efd9c1030..61fb4b43a033 100644
--- a/pkgs/applications/networking/instant-messengers/coyim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix
@@ -13,7 +13,7 @@
 
 buildGoPackage rec {
   pname = "coyim";
-  version = "0.4";
+  version = "0.4.1";
 
   goPackagePath = "github.com/coyim/coyim";
 
@@ -21,7 +21,7 @@ buildGoPackage rec {
     owner = "coyim";
     repo = "coyim";
     rev = "v${version}";
-    sha256 = "sha256-dpTU5Tx1pfUGZMt9QNEYDytgArhhvEvh1Yvj6IAjgeI=";
+    sha256 = "sha256-PmB6POaHKEXzIAaz3lAbUOhtVOzrj5oXRk90giYo6SI=";
   };
 
   nativeBuildInputs = [ pkg-config wrapGAppsHook ];

From 532911e9aeec2ca4c64496361bc1cfe9bc3acab0 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Mon, 3 Apr 2023 15:18:27 +0200
Subject: [PATCH 02/96] pjsip: use finalAttrs in mkDerivation

---
 pkgs/applications/networking/pjsip/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix
index db76d3f58611..eeeb68df87b4 100644
--- a/pkgs/applications/networking/pjsip/default.nix
+++ b/pkgs/applications/networking/pjsip/default.nix
@@ -11,17 +11,16 @@
 , Security
 , python3
 , pythonSupport ? true
-, pjsip
 , runCommand
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pjsip";
   version = "2.13";
 
   src = fetchFromGitHub {
-    owner = pname;
+    owner = finalAttrs.pname;
     repo = "pjproject";
-    rev = version;
+    rev = finalAttrs.version;
     sha256 = "sha256-yzszmm3uIyXtYFgZtUP3iswLx4u/8UbFt80Ln25ToFE=";
   };
 
@@ -64,8 +63,8 @@ stdenv.mkDerivation rec {
   postInstall = ''
     mkdir -p $out/bin
     cp pjsip-apps/bin/pjsua-* $out/bin/pjsua
-    mkdir -p $out/share/${pname}-${version}/samples
-    cp pjsip-apps/bin/samples/*/* $out/share/${pname}-${version}/samples
+    mkdir -p $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples
+    cp pjsip-apps/bin/samples/*/* $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples
   '' + lib.optionalString pythonSupport ''
     (cd pjsip-apps/src/swig/python && \
       python setup.py install --prefix=$py
@@ -115,4 +114,4 @@ stdenv.mkDerivation rec {
     mainProgram = "pjsua";
     platforms = platforms.linux ++ platforms.darwin;
   };
-}
+})

From c32dd072f0f6fc8e00b3d926fbe4a3f32ba529ab Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Mon, 3 Apr 2023 15:18:52 +0200
Subject: [PATCH 03/96] pjsip: add version and pkg-config tests

---
 pkgs/applications/networking/pjsip/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix
index eeeb68df87b4..338d4cb2f08a 100644
--- a/pkgs/applications/networking/pjsip/default.nix
+++ b/pkgs/applications/networking/pjsip/default.nix
@@ -1,4 +1,5 @@
 { lib
+, testers
 , stdenv
 , fetchFromGitHub
 , fetchpatch
@@ -102,6 +103,16 @@ stdenv.mkDerivation (finalAttrs: {
   # We need the libgcc_s.so.1 loadable (for pthread_cancel to work)
   dontPatchELF = true;
 
+  passthru.tests.version = testers.testVersion {
+    package = finalAttrs.finalPackage;
+    command = "pjsua --version";
+  };
+
+  passthru.tests.pkg-config = testers.hasPkgConfigModule {
+    package = finalAttrs.finalPackage;
+    moduleName = "libpjproject";
+  };
+
   passthru.tests.python-pjsua2 = runCommand "python-pjsua2" { } ''
     ${(python3.withPackages (pkgs: [ pkgs.pjsua2 ])).interpreter} -c "import pjsua2" > $out
   '';

From 072cd2ab7a15b7fd475deaf5bb63405d351b82c2 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Mon, 3 Apr 2023 15:19:28 +0200
Subject: [PATCH 04/96] pjsip: fix pjsua executable compatiblity with darwin

---
 pkgs/applications/networking/pjsip/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix
index 338d4cb2f08a..11462dab9a1b 100644
--- a/pkgs/applications/networking/pjsip/default.nix
+++ b/pkgs/applications/networking/pjsip/default.nix
@@ -98,6 +98,11 @@ stdenv.mkDerivation (finalAttrs: {
         install_name_tool -id $lib "''${change_args[@]}" $lib
       fi
     done
+
+    # Rewrite library references for all executables.
+    find "$out" -executable -type f | while read executable; do
+      install_name_tool "''${change_args[@]}" "$executable"
+    done
   '';
 
   # We need the libgcc_s.so.1 loadable (for pthread_cancel to work)

From 1c5ca89f42e6cc17815f8e10585c8f862172158e Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Fri, 14 Apr 2023 15:18:56 +0200
Subject: [PATCH 05/96] nixos/lorri: install direnv

direnv is required to allow files to be run by lorri, so it should be installed, too.
---
 nixos/modules/services/development/lorri.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/development/lorri.nix b/nixos/modules/services/development/lorri.nix
index 8c64e3d9a560..74f56f5890fc 100644
--- a/nixos/modules/services/development/lorri.nix
+++ b/nixos/modules/services/development/lorri.nix
@@ -50,6 +50,6 @@ in {
       };
     };
 
-    environment.systemPackages = [ cfg.package ];
+    environment.systemPackages = [ cfg.package pkgs.direnv ];
   };
 }

From aaae98955fbec5d355b5080dfa5871c26d2a7418 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 16 Apr 2023 13:45:11 +0800
Subject: [PATCH 06/96] =?UTF-8?q?enchant:=202.3.3=20=E2=86=92=202.3.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/AbiWord/enchant/compare/v2.3.3...v2.3.4
---
 pkgs/development/libraries/enchant/2.x.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix
index 4c52a164f7cc..63b4b901a9ae 100644
--- a/pkgs/development/libraries/enchant/2.x.nix
+++ b/pkgs/development/libraries/enchant/2.x.nix
@@ -1,6 +1,8 @@
-{ lib, stdenv
+{ stdenv
+, lib
 , fetchurl
 , aspell
+, groff
 , pkg-config
 , glib
 , hunspell
@@ -11,16 +13,17 @@
 
 stdenv.mkDerivation rec {
   pname = "enchant";
-  version = "2.3.3";
+  version = "2.3.4";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-PaEhA/Ec9Jw88v0s4wF1dcUyGkieW5v6gd2R7EE/OJE=";
+    sha256 = "sha256-H34mdE2xyaD+ph0hafTlwc5DXPjCcxw34+QFQRnplKA=";
   };
 
   nativeBuildInputs = [
+    groff
     pkg-config
   ];
 

From 5397643a99f7253f1ac1f0814c38e8c0e067ed48 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 18 Apr 2023 08:07:59 +0000
Subject: [PATCH 07/96] xfce.tumbler: 4.18.0 -> 4.18.1

https://gitlab.xfce.org/xfce/tumbler/-/compare/tumbler-4.18.0...tumbler-4.18.1
---
 pkgs/desktops/xfce/core/tumbler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/core/tumbler/default.nix b/pkgs/desktops/xfce/core/tumbler/default.nix
index 9d47d1ec7a35..609c8f17d6ee 100644
--- a/pkgs/desktops/xfce/core/tumbler/default.nix
+++ b/pkgs/desktops/xfce/core/tumbler/default.nix
@@ -15,9 +15,9 @@
 mkXfceDerivation {
   category = "xfce";
   pname = "tumbler";
-  version = "4.18.0";
+  version = "4.18.1";
 
-  sha256 = "sha256-qxbS0PMhwVk2I3fbblJEeIuI72xSWVsQx5SslhOvg+c=";
+  sha256 = "sha256-hn77W8IsvwNc9xSuDe9rXw9499olOvvJ2P7q+26HIG8=";
 
   buildInputs = [
     libxfce4util

From d87b3d847a4a1c2ab50188d29eca86dc45ac02af Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 18 Apr 2023 08:10:16 +0000
Subject: [PATCH 08/96] xfce.xfconf: 4.18.0 -> 4.18.1

https://gitlab.xfce.org/xfce/xfconf/-/compare/xfconf-4.18.0...xfconf-4.18.1
---
 pkgs/desktops/xfce/core/xfconf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/core/xfconf/default.nix b/pkgs/desktops/xfce/core/xfconf/default.nix
index 18bc54436b4a..a25b76f7e02d 100644
--- a/pkgs/desktops/xfce/core/xfconf/default.nix
+++ b/pkgs/desktops/xfce/core/xfconf/default.nix
@@ -3,9 +3,9 @@
 mkXfceDerivation {
   category = "xfce";
   pname = "xfconf";
-  version = "4.18.0";
+  version = "4.18.1";
 
-  sha256 = "sha256-8zl2EWV1DRHsH0QUNa13OKvfIVDVOhIO0FCMbU978Js=";
+  sha256 = "sha256-HS+FzzTTAH8lzBBai3ESdnuvvvZW/vAVSmGe57mwcoo=";
 
   nativeBuildInputs = [ gobject-introspection vala ];
 

From ffd224125e92044333acad8822aeb0a528060cdd Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 18 Apr 2023 08:34:24 +0000
Subject: [PATCH 09/96] xfce.xfce4-genmon-plugin: 4.1.1 -> 4.2.0

https://gitlab.xfce.org/panel-plugins/xfce4-genmon-plugin/-/compare/xfce4-genmon-plugin-4.1.1...xfce4-genmon-plugin-4.2.0
---
 .../xfce/panel-plugins/xfce4-genmon-plugin/default.nix      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix
index 6a43c237037b..2219ce754af8 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin/default.nix
@@ -5,6 +5,7 @@
 , intltool
 , libxfce4util
 , xfce4-panel
+, xfconf
 , libxfce4ui
 , gtk3
 , gitUpdater
@@ -14,11 +15,11 @@ let
   category = "panel-plugins";
 in stdenv.mkDerivation rec {
   pname  = "xfce4-genmon-plugin";
-  version = "4.1.1";
+  version = "4.2.0";
 
   src = fetchurl {
     url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-shGf0P8Z+ik7l+yXsN6OJBeZ4IuGIYUVFnxWi9m1ATU=";
+    sha256 = "sha256-lI0I7l8hQIR/EJtTG8HUzGJoSWkT6nYA08WtiQJaA2I=";
   };
 
   nativeBuildInputs = [
@@ -30,6 +31,7 @@ in stdenv.mkDerivation rec {
     libxfce4util
     libxfce4ui
     xfce4-panel
+    xfconf
     gtk3
   ];
 

From 099a98015d1d8bfb24226a1179b72f2606517034 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Tue, 18 Apr 2023 16:28:37 +0200
Subject: [PATCH 10/96] ventoy: convert alias to none throw

First introduced aliases should not be throw to make transition easier.
---
 pkgs/top-level/aliases.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9d319aa08856..075316ad7bc6 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1675,8 +1675,8 @@ mapAliases ({
   vaultwarden-vault = vaultwarden.webvault; # Added 2022-12-13
   varnish71 = throw "varnish71 was removed from nixpkgs, because it was superseded upstream. Please switch to a different release"; # Added 2022-11-08
   vdirsyncerStable  = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168
-  ventoy-bin = throw "ventoy-bin has been renamed to ventoy"; # Added 2023-04-12
-  ventoy-bin-full = throw "ventoy-bin-full has been renamed to ventoy-full"; # Added 2023-04-12
+  ventoy-bin = ventoy; # Added 2023-04-12
+  ventoy-bin-full = ventoy-full; # Added 2023-04-12
   venus = throw "venus has been removed from nixpkgs, as it's unmaintained"; # Added 2021-02-05
   vgo2nix = throw "vgo2nix has been removed, because it was deprecated. Consider using gomod2nix instead"; # added 2022-08-24
   vimHugeX = vim-full; # Added 2022-12-04

From 6236e0cbdfa10d9da6f4f56392d3fa02fd821721 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 18 Apr 2023 21:58:48 +0800
Subject: [PATCH 11/96] =?UTF-8?q?libdmapsharing:=203.9.10=20=E2=86=92=203.?=
 =?UTF-8?q?9.12?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/libdmapsharing/-/compare/LIBDMAPSHARING_3_9_10...LIBDMAPSHARING_3_9_12
---
 .../libraries/libdmapsharing/default.nix      | 26 ++++---------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/libraries/libdmapsharing/default.nix b/pkgs/development/libraries/libdmapsharing/default.nix
index e469283ae7ca..8f8354ae8587 100644
--- a/pkgs/development/libraries/libdmapsharing/default.nix
+++ b/pkgs/development/libraries/libdmapsharing/default.nix
@@ -12,19 +12,16 @@
 , gdk-pixbuf
 , gst_all_1
 , glib
-, gtk3
-, libgee
-, check
 , gtk-doc
 , docbook-xsl-nons
 , docbook_xml_dtd_43
 , gobject-introspection
-, libsoup
+, libsoup_3
 }:
 
 stdenv.mkDerivation rec {
   pname = "libdmapsharing";
-  version = "3.9.10";
+  version = "3.9.12";
 
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev";
@@ -34,7 +31,7 @@ stdenv.mkDerivation rec {
     owner = "GNOME";
     repo = pname;
     rev = "${lib.toUpper pname}_${lib.replaceStrings ["."] ["_"] version}";
-    sha256 = "04y1wjwnbw4pzg05h383d83p6an6ylwy4b4g32jmjxpfi388x33g";
+    sha256 = "tnQ25RR/bAZJKa8vTwzkGK1iPc7CMGFbyX8mBf6TKr4=";
   };
 
   nativeBuildInputs = [
@@ -60,31 +57,18 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [
     glib
-    libsoup
-  ];
-
-  nativeCheckInputs = [
-    libgee
-    check
-    gtk3
+    libsoup_3
   ];
 
   configureFlags = [
     "--enable-gtk-doc"
+    "--disable-tests" # Tests require mDNS server.
   ];
 
-  # Cannot disable tests here or `check` from nativeCheckInputs would not be included.
-  # Cannot disable building the tests or docs will not build:
-  # https://gitlab.gnome.org/GNOME/libdmapsharing/-/issues/49
-  doCheck = true;
-
   preConfigure = ''
     NOCONFIGURE=1 ./autogen.sh
   '';
 
-  # Tests require mDNS server.
-  checkPhase = ":";
-
   meta = with lib; {
     homepage = "https://www.flyn.org/projects/libdmapsharing/";
     description = "Library that implements the DMAP family of protocols";

From 9c373c07ec2e446c50a041dc46c473a13d7c4dc2 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 18 Apr 2023 22:05:56 +0800
Subject: [PATCH 12/96] =?UTF-8?q?rhythmbox:=203.4.6=20=E2=86=92=203.4.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/rhythmbox/-/compare/v3.4.6...v3.4.7
---
 pkgs/applications/audio/rhythmbox/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix
index fe9f4a835c84..9cd6b0d9ae05 100644
--- a/pkgs/applications/audio/rhythmbox/default.nix
+++ b/pkgs/applications/audio/rhythmbox/default.nix
@@ -10,7 +10,7 @@
 , glib
 , gtk3
 , libpeas
-, libsoup
+, libsoup_3
 , libxml2
 , libsecret
 , libnotify
@@ -36,11 +36,11 @@
 
 stdenv.mkDerivation rec {
   pname = "rhythmbox";
-  version = "3.4.6";
+  version = "3.4.7";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "+VaCEM5V5BHpKcj7leERohHb0ZzEf1ePKRxdMZtesDQ=";
+    sha256 = "L21WwT/BpkxTT1AHiPtIKTbOVHs0PtkMZ94fK84M+n4=";
   };
 
   nativeBuildInputs = [
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     python3
-    libsoup
+    libsoup_3
     libxml2
     tdb
     json-glib
@@ -92,6 +92,7 @@ stdenv.mkDerivation rec {
   ];
 
   mesonFlags = [
+    "-Ddaap=enabled"
     "-Dtests=disabled"
   ];
 

From abf61df282b3c87ff494069330c4af0aef172765 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 18 Apr 2023 23:07:53 +0800
Subject: [PATCH 13/96] grilo-plugins: enable dmap plugin

Fixes 7e9e6958207e3f129e2f28c7d723a8d99de977b2.
---
 pkgs/development/libraries/grilo-plugins/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix
index 966e85a4bca3..88b83a32918f 100644
--- a/pkgs/development/libraries/grilo-plugins/default.nix
+++ b/pkgs/development/libraries/grilo-plugins/default.nix
@@ -8,6 +8,7 @@
 , gperf
 , sqlite
 , libarchive
+, libdmapsharing
 , libsoup_3
 , gnome
 , libxml2
@@ -71,6 +72,7 @@ stdenv.mkDerivation rec {
     gnome-online-accounts
     totem-pl-parser
     libarchive
+    libdmapsharing
     libsoup_3
     gmime
     gom

From a20c6d2d4cceb3622b218b8ae5cbc6c827d51a9b Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Tue, 18 Apr 2023 16:33:26 -0400
Subject: [PATCH 14/96] unzrip: unstable-2023-03-13 -> unstable-2023-04-16

Diff: https://github.com/quininer/unzrip/compare/bd2dffd43c3235857500190571602f3ce58c5f70...14ba4b4c9ff9c80444ecef762d665acaa5aecfce
---
 pkgs/tools/compression/unzrip/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/compression/unzrip/default.nix b/pkgs/tools/compression/unzrip/default.nix
index e3acb987b5c5..78b1278d8411 100644
--- a/pkgs/tools/compression/unzrip/default.nix
+++ b/pkgs/tools/compression/unzrip/default.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "unzrip";
-  version = "unstable-2023-03-13";
+  version = "unstable-2023-04-16";
 
   src = fetchFromGitHub {
     owner = "quininer";
     repo = "unzrip";
-    rev = "bd2dffd43c3235857500190571602f3ce58c5f70";
-    hash = "sha256-Ih47xF4JYQf10RuTnfJJGUAJwyxDxCAdTTCdwGf4i/U=";
+    rev = "14ba4b4c9ff9c80444ecef762d665acaa5aecfce";
+    hash = "sha256-QYu4PXWQGagj7r8lLs0IngIXzt6B8uq2qonycaGDg6g=";
   };
 
-  cargoHash = "sha256-11UESSKvTcr6Wa0cASRSQ55kBbRL5AelI6thv3oi0sI=";
+  cargoHash = "sha256-9CjKSdd+E2frI8VvdOawYQ3u+KF22xw9kBpnAufRUG0=";
 
   nativeBuildInputs = [
     pkg-config

From 31efcd6c104f01533d9c6a3635457db1d9fca754 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Tue, 18 Apr 2023 13:50:42 -0400
Subject: [PATCH 15/96] dnscontrol: fix version, only build the main package

---
 pkgs/applications/networking/dnscontrol/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix
index b339c528fa37..47c47276095d 100644
--- a/pkgs/applications/networking/dnscontrol/default.nix
+++ b/pkgs/applications/networking/dnscontrol/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildGoModule }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "dnscontrol";
@@ -13,7 +13,9 @@ buildGoModule rec {
 
   vendorHash = "sha256-BE/UnJw5elHYmyB+quN89ZkrlMcTjaVN0T2+h8cpPS8=";
 
-  ldflags = [ "-s" "-w" ];
+  subPackages = [ "." ];
+
+  ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
 
   preCheck = ''
     # requires network
@@ -23,6 +25,7 @@ buildGoModule rec {
   meta = with lib; {
     description = "Synchronize your DNS to multiple providers from a simple DSL";
     homepage = "https://stackexchange.github.io/dnscontrol/";
+    changelog = "https://github.com/StackExchange/dnscontrol/releases/tag/${src.rev}";
     license = licenses.mit;
     maintainers = with maintainers; [ mmahut SuperSandro2000 ];
   };

From c68e9124f6cd53f268ec5c56e5b80e6cd3653e58 Mon Sep 17 00:00:00 2001
From: Yaya <mak@nyantec.com>
Date: Tue, 18 Apr 2023 23:19:47 +0000
Subject: [PATCH 16/96] sftpgo: 2.4.4 -> 2.4.5

https://github.com/drakkan/sftpgo/releases/tag/v2.4.5
---
 pkgs/servers/sftpgo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sftpgo/default.nix b/pkgs/servers/sftpgo/default.nix
index 915575db65f0..3c727f171ec5 100644
--- a/pkgs/servers/sftpgo/default.nix
+++ b/pkgs/servers/sftpgo/default.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "sftpgo";
-  version = "2.4.4";
+  version = "2.4.5";
 
   src = fetchFromGitHub {
     owner = "drakkan";
     repo = "sftpgo";
     rev = "refs/tags/v${version}";
-    hash = "sha256-gB3r7Q4M4pXHB9cfCRU8hMccWaJ170es0CJfbo/7lsg=";
+    hash = "sha256-r7vnUzI0NBXe1bFLB3k/fl9+4Sby2W0WsN7SSqaPUgc=";
   };
 
-  vendorHash = "sha256-og3mn0iYl6aubcSAUohqG4ZSqdBB4AQYZtpKfbp7kcQ=";
+  vendorHash = "sha256-MAx5ue2YpEtkglPMHr+fep1Scw/ST2D6zkKVNWUbF0c=";
 
   ldflags = [
     "-s"

From a0e3878890c12247102c188e44fc55fa20391692 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Apr 2023 00:48:56 +0000
Subject: [PATCH 17/96] gatekeeper: 3.10.0 -> 3.12.0

---
 pkgs/applications/networking/cluster/gatekeeper/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/gatekeeper/default.nix b/pkgs/applications/networking/cluster/gatekeeper/default.nix
index 3edf48b932e1..51c544651654 100644
--- a/pkgs/applications/networking/cluster/gatekeeper/default.nix
+++ b/pkgs/applications/networking/cluster/gatekeeper/default.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "gatekeeper";
-  version = "3.10.0";
+  version = "3.12.0";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "gatekeeper";
     rev = "v${version}";
-    sha256 = "sha256-4U03gdOls1uPpTqxmjLo1ruE4eeuUlGxphOgS9e5C1A=";
+    sha256 = "sha256-DGLod05gmDzItPOBaGc2X/oMXSzvH932Wa44R+DUt/U=";
   };
 
-  vendorSha256 = null;
+  vendorHash = null;
 
   nativeBuildInputs = [
     installShellFiles

From 9f9e7b30047b7259f4432cdc8461d6e0b44f5866 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Apr 2023 02:43:20 +0000
Subject: [PATCH 18/96] firewalld-gui: 1.3.0 -> 1.3.1

---
 pkgs/applications/networking/firewalld/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/firewalld/default.nix b/pkgs/applications/networking/firewalld/default.nix
index b11c3d60c908..997ea8e37ede 100644
--- a/pkgs/applications/networking/firewalld/default.nix
+++ b/pkgs/applications/networking/firewalld/default.nix
@@ -31,13 +31,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "firewalld";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "firewalld";
     repo = "firewalld";
     rev = "v${version}";
-    sha256 = "sha256-UQ61do0f0bT3VNyZAx2ZuwQ+6SGvKUS6V5Y1B6EpJ5Q=";
+    sha256 = "sha256-P9jErGxylTAgWGoefqglAgU7FNRVpKHVXu9JzyjBnA8=";
   };
 
   patches = [

From 1504fcb1b05ffb462b4b2247a70ce8c3a620b106 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Wed, 19 Apr 2023 11:20:39 +0800
Subject: [PATCH 19/96] deepin.dde-daemon: fix hardcoded paths

---
 .../0003-search-in-XDG-directories.patch      | 65 +++++++++----------
 .../deepin/go-package/dde-daemon/default.nix  |  3 +
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/0003-search-in-XDG-directories.patch b/pkgs/desktops/deepin/go-package/dde-daemon/0003-search-in-XDG-directories.patch
index 29d86e3fa957..c0a8a02558c5 100644
--- a/pkgs/desktops/deepin/go-package/dde-daemon/0003-search-in-XDG-directories.patch
+++ b/pkgs/desktops/deepin/go-package/dde-daemon/0003-search-in-XDG-directories.patch
@@ -1,22 +1,22 @@
-From 528f590c0c81728c324444fd76e0f7113a2e3dc4 Mon Sep 17 00:00:00 2001
-From: rewine <lhongxu@outlook.com>
-Date: Wed, 5 Apr 2023 23:41:25 +0800
+From a0667a7e82b3176e64122f4d68c43de4fa350780 Mon Sep 17 00:00:00 2001
+From: rewine <luhongxu@deepin.org>
+Date: Tue, 18 Apr 2023 17:04:36 +0800
 Subject: [PATCH 3/4] search-in-XDG-directories
 
 ---
  accounts/manager.go                     |  5 ++++-
  accounts/user.go                        |  8 +++++++-
  appearance/fsnotify.go                  | 21 +++++++++++++++++----
+ appearance/ifc.go                       |  3 ++-
  apps/utils.go                           |  3 ++-
- dock/desktop_file_path.go               |  6 ++++++
  gesture/config.go                       |  4 ++--
  keybinding/shortcuts/system_shortcut.go |  4 +++-
  mime/app_info.go                        |  7 ++++++-
  system/gesture/config.go                |  4 +++-
- 9 files changed, 50 insertions(+), 12 deletions(-)
+ 9 files changed, 46 insertions(+), 13 deletions(-)
 
 diff --git a/accounts/manager.go b/accounts/manager.go
-index a5abb157..3fd7c153 100644
+index 22c26ce7..009d9dd9 100644
 --- a/accounts/manager.go
 +++ b/accounts/manager.go
 @@ -15,6 +15,7 @@ import (
@@ -40,7 +40,7 @@ index a5abb157..3fd7c153 100644
  
  type InterfaceConfig struct {
 diff --git a/accounts/user.go b/accounts/user.go
-index 99138941..56a7731a 100644
+index 900033c6..f8827fb2 100644
 --- a/accounts/user.go
 +++ b/accounts/user.go
 @@ -15,6 +15,7 @@ import (
@@ -51,7 +51,7 @@ index 99138941..56a7731a 100644
  	dbus "github.com/godbus/dbus"
  	"github.com/linuxdeepin/dde-daemon/accounts/users"
  	authenticate "github.com/linuxdeepin/go-dbus-factory/com.deepin.daemon.authenticate"
-@@ -645,7 +646,12 @@ func getUserSession(homeDir string) string {
+@@ -649,7 +650,12 @@ func getUserSession(homeDir string) string {
  }
  
  func getSessionList() []string {
@@ -119,6 +119,27 @@ index a409d0ba..ff674600 100644
  
  	m.watchDirs(iconDirs)
  }
+diff --git a/appearance/ifc.go b/appearance/ifc.go
+index f0bf32a3..6d60ffe4 100644
+--- a/appearance/ifc.go
++++ b/appearance/ifc.go
+@@ -10,6 +10,7 @@ import (
+ 	"strconv"
+ 	"strings"
+ 
++	"github.com/adrg/xdg"
+ 	"github.com/godbus/dbus"
+ 	"github.com/linuxdeepin/dde-daemon/appearance/fonts"
+ 	"github.com/linuxdeepin/dde-daemon/appearance/subthemes"
+@@ -265,7 +266,7 @@ func (m *Manager) thumbnail(ty, name string) (string, error) {
+ 	case TypeGtkTheme:
+ 		fName, ok := gtkThumbnailMap[name]
+ 		if ok {
+-			return filepath.Join("/usr/share/dde-daemon/appearance", fName+".svg"), nil
++			return xdg.SearchDataFile(filepath.Join("dde-daemon/appearance", fName+".svg"))
+ 		}
+ 		return subthemes.GetGtkThumbnail(name)
+ 	case TypeIconTheme:
 diff --git a/apps/utils.go b/apps/utils.go
 index 8863d6c2..dd6f8e16 100644
 --- a/apps/utils.go
@@ -140,30 +161,6 @@ index 8863d6c2..dd6f8e16 100644
  }
  
  // get user home
-diff --git a/dock/desktop_file_path.go b/dock/desktop_file_path.go
-index 7adc9f55..e1a97679 100644
---- a/dock/desktop_file_path.go
-+++ b/dock/desktop_file_path.go
-@@ -7,6 +7,8 @@ package dock
- import (
- 	"path/filepath"
- 	"strings"
-+
-+	"github.com/adrg/xdg"
- )
- 
- var pathDirCodeMap map[string]string
-@@ -20,6 +22,10 @@ func initPathDirCodeMap() {
- 		"/usr/local/share/applications/": "/L@",
- 	}
- 
-+	for _, dataPath := range xdg.DataDirs {
-+		pathDirCodeMap[dataPath] = "/S@"
-+	}
-+
- 	dir := filepath.Join(homeDir, ".local/share/applications")
- 	dir = addDirTrailingSlash(dir)
- 	pathDirCodeMap[dir] = "/H@"
 diff --git a/gesture/config.go b/gesture/config.go
 index bfbd4db7..4ce9d641 100644
 --- a/gesture/config.go
@@ -190,7 +187,7 @@ index bfbd4db7..4ce9d641 100644
  	gsKeyTouchPadEnabled    = "touch-pad-enabled"
  	gsKeyTouchScreenEnabled = "touch-screen-enabled"
 diff --git a/keybinding/shortcuts/system_shortcut.go b/keybinding/shortcuts/system_shortcut.go
-index d33a69f6..c3138099 100644
+index eaec22b5..95e1b222 100644
 --- a/keybinding/shortcuts/system_shortcut.go
 +++ b/keybinding/shortcuts/system_shortcut.go
 @@ -10,6 +10,7 @@ import (
@@ -253,5 +250,5 @@ index d4aebaac..f3fc92c3 100644
 +	return filepath;
  }
 -- 
-2.39.2
+2.38.1
 
diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix
index c97e6ca3c4e3..e8b2bfedefa9 100644
--- a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix
+++ b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix
@@ -58,6 +58,9 @@ buildGoPackage rec {
   ];
 
   postPatch = ''
+    substituteInPlace dock/desktop_file_path.go \
+      --replace "/usr/share" "/run/current-system/sw/share"
+
     substituteInPlace session/eventlog/{app_event.go,login_event.go} accounts/users/users_test.go \
       --replace "/bin/bash" "${runtimeShell}"
 

From 44d94157c62cf5d71a125e87c7d1817c9a7dafc3 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 19 Apr 2023 12:19:36 +0800
Subject: [PATCH 20/96] xfce.xfce4-timer-plugin: 1.7.1 -> 1.7.2

https://gitlab.xfce.org/panel-plugins/xfce4-timer-plugin/-/compare/xfce4-timer-plugin-1.7.1...xfce4-timer-plugin-1.7.2
---
 .../xfce4-timer-plugin/default.nix            | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix
index 96dabfbf48bd..997377f42b3e 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin/default.nix
@@ -1,16 +1,28 @@
-{ lib, stdenv, fetchurl, pkg-config, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, hicolor-icon-theme, gitUpdater }:
+{ lib
+, stdenv
+, fetchurl
+, pkg-config
+, intltool
+, libxfce4util
+, xfce4-panel
+, libxfce4ui
+, glib
+, gtk3
+, hicolor-icon-theme
+, gitUpdater
+}:
 
 let
   category = "panel-plugins";
 in
 
 stdenv.mkDerivation rec {
-  pname  = "xfce4-timer-plugin";
-  version = "1.7.1";
+  pname = "xfce4-timer-plugin";
+  version = "1.7.2";
 
   src = fetchurl {
     url = "mirror://xfce/src/${category}/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-S1LSkRsZSelFlxvmUzFV7mupnHcHjqx/1DsPKuyoJOM=";
+    sha256 = "sha256-/rO4wtOVBegWaDVAoyJr172ocMy8tMfQ9qv+7/XFi30=";
   };
 
   nativeBuildInputs = [
@@ -22,6 +34,7 @@ stdenv.mkDerivation rec {
     libxfce4util
     libxfce4ui
     xfce4-panel
+    glib
     gtk3
     hicolor-icon-theme
   ];

From e14a1883fbdc6344abda670599154eca7098bc8f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Apr 2023 07:39:52 +0000
Subject: [PATCH 21/96] python310Packages.snakeviz: 2.1.1 -> 2.1.2

---
 pkgs/development/python-modules/snakeviz/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/snakeviz/default.nix b/pkgs/development/python-modules/snakeviz/default.nix
index 95253b7c1593..05b019c1cd2f 100644
--- a/pkgs/development/python-modules/snakeviz/default.nix
+++ b/pkgs/development/python-modules/snakeviz/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "snakeviz";
-  version = "2.1.1";
+  version = "2.1.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0d96c006304f095cb4b3fb7ed98bb866ca35a7ca4ab9020bbc27d295ee4c94d9";
+    sha256 = "sha256-K4qRmrtefpKv41EnhguMJ2sqeXvv/OLayGFPmM/4byE=";
   };
 
   # Upstream doesn't run tests from setup.py

From bc2715162f6f0dddebf05cff24b8260aab5b71c4 Mon Sep 17 00:00:00 2001
From: Quentin JOLY <82603435+QJoly@users.noreply.github.com>
Date: Wed, 19 Apr 2023 11:19:17 +0300
Subject: [PATCH 22/96] maintainers: add qjoly

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index de3166443c35..7305520eff33 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -12632,6 +12632,12 @@
       fingerprint = "3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE";
     }];
   };
+  qjoly = {
+    email = "github@thoughtless.eu";
+    github = "qjoly";
+    githubId = 82603435;
+    name = "Quentin JOLY";
+  };
   qknight = {
     email = "js@lastlog.de";
     github = "qknight";

From d61e778a8bf7702071cc211e30e3391b2fa821cc Mon Sep 17 00:00:00 2001
From: Quentin JOLY <82603435+QJoly@users.noreply.github.com>
Date: Wed, 19 Apr 2023 11:20:11 +0300
Subject: [PATCH 23/96] nova: init at 3.6.2

---
 .../networking/cluster/nova/default.nix       | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/nova/default.nix

diff --git a/pkgs/applications/networking/cluster/nova/default.nix b/pkgs/applications/networking/cluster/nova/default.nix
new file mode 100644
index 000000000000..feabe332a15e
--- /dev/null
+++ b/pkgs/applications/networking/cluster/nova/default.nix
@@ -0,0 +1,30 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "nova";
+  version = "3.6.2";
+
+  src = fetchFromGitHub {
+    owner = "FairwindsOps";
+    repo = pname;
+    rev = version;
+    hash = "sha256-l2HBjM5DyeWkdAwQGzPp+A3UuXXc0OTizInsVL0k/0I=";
+  };
+
+  vendorHash = "sha256-YvYfSb2ZC86S2osFRG7Ep9nrgYJV0tB8fBgZQZ07t2U=";
+
+  ldflags = [ "-X main.version=${version}" "-s" "-w" ];
+
+  meta = with lib; {
+    description = "Find outdated or deprecated Helm charts running in your cluster";
+    longDescription = ''
+      Nova scans your cluster for installed Helm charts, then
+      cross-checks them against all known Helm repositories. If it
+      finds an updated version of the chart you're using, or notices
+      your current version is deprecated, it will let you know.
+    '';
+    homepage = "https://nova.docs.fairwinds.com/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ qjoly ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cba86cf44d7f..daa6be3af96f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10297,6 +10297,8 @@ with pkgs;
 
   nomad-pack = callPackage ../applications/networking/cluster/nomad-pack { };
 
+  nova = callPackage ../applications/networking/cluster/nova { };
+
   nomino = callPackage ../tools/misc/nomino { };
 
   nb = callPackage ../tools/misc/nb { };

From 1c3526fdd7b48b7fcb12ef9eafd3a7b39c2b93e3 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Wed, 19 Apr 2023 15:13:55 +0800
Subject: [PATCH 24/96] deepin.dde-file-manager: 6.0.14 -> 6.0.15

---
 .../deepin/core/dde-file-manager/default.nix         | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/deepin/core/dde-file-manager/default.nix b/pkgs/desktops/deepin/core/dde-file-manager/default.nix
index e7d8c67a2803..c34e2cc4f900 100644
--- a/pkgs/desktops/deepin/core/dde-file-manager/default.nix
+++ b/pkgs/desktops/deepin/core/dde-file-manager/default.nix
@@ -8,7 +8,6 @@
 , dde-qt-dbus-factory
 , docparser
 , dde-dock
-, deepin-movie-reborn
 , cmake
 , qttools
 , qtx11extras
@@ -43,13 +42,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dde-file-manager";
-  version = "6.0.14";
+  version = "6.0.15";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    sha256 = "sha256-88Ddc3986hyFMA0bYCxiupASI+pGLqjb3igOHLA8Q/g=";
+    sha256 = "sha256-tG3Wl1AvwWhHmIIHgexv3mVVrmOwNrwn8k/sD4+WZzk=";
   };
 
   nativeBuildInputs = [
@@ -91,14 +90,12 @@ stdenv.mkDerivation rec {
   buildInputs = [
     dtkwidget
     qt5platform-plugins
-    qt5integration
     deepin-pdfium
     util-dfm
     dde-qt-dbus-factory
     glibmm
     docparser
     dde-dock
-    deepin-movie-reborn
     qtx11extras
     qtmultimedia
     kcodecs
@@ -127,6 +124,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH
+  qtWrapperArgs = [
+    "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}"
+  ];
+
   preFixup = ''
     qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';

From cbc1884cdc24a33a7c92724d435a38ffa588e22d Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 19 Apr 2023 11:55:41 +0300
Subject: [PATCH 25/96] ocamlPackages.lablgl: unbreak on darwin

---
 pkgs/development/ocaml-modules/lablgl/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix
index 55dd88d7246b..cb885b7b069c 100644
--- a/pkgs/development/ocaml-modules/lablgl/default.nix
+++ b/pkgs/development/ocaml-modules/lablgl/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, ocaml, findlib, libGLU, libGL, freeglut } :
+{ lib, stdenv, fetchFromGitHub, ocaml, findlib, libGLU, libGL, freeglut, darwin } :
 
 if lib.versionOlder ocaml.version "4.03"
 then throw "lablgl is not available for OCaml ${ocaml.version}"
@@ -19,7 +19,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ ocaml findlib ];
   buildInputs = [ freeglut ];
-  propagatedBuildInputs = [ libGLU libGL ];
+  propagatedBuildInputs = [
+    libGLU
+    libGL
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.GLUT
+    darwin.apple_sdk.libs.Xplugin
+  ];
 
   patches = [ ./Makefile.config.patch ./META.patch ];
 
@@ -46,6 +52,5 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     maintainers = with maintainers; [ pSub vbgl ];
     mainProgram = "lablglut";
-    broken = stdenv.isDarwin;
   };
 }

From c2c0c070cf1c51a9b4865a7e6875519cc124ed35 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 19 Apr 2023 12:01:16 +0300
Subject: [PATCH 26/96] glsurf: update platforms

---
 pkgs/applications/science/math/glsurf/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix
index ec3bb4c795b3..b4e8c6fb23db 100644
--- a/pkgs/applications/science/math/glsurf/default.nix
+++ b/pkgs/applications/science/math/glsurf/default.nix
@@ -67,5 +67,6 @@ stdenv.mkDerivation rec {
     homepage = "https://raffalli.eu/~christophe/glsurf/";
     description = "A program to draw implicit surfaces and curves";
     license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.all;
   };
 }

From a895e7e8339ff163354dbfb09c8c7997124e4df9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Wed, 19 Apr 2023 12:58:11 +0200
Subject: [PATCH 27/96] filebot: 5.0.1 -> 5.0.2

---
 pkgs/applications/video/filebot/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix
index 014e009f2496..15a8161ed26f 100644
--- a/pkgs/applications/video/filebot/default.nix
+++ b/pkgs/applications/video/filebot/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "filebot";
-  version = "5.0.1";
+  version = "5.0.2";
 
   src = fetchurl {
-    url = "https://web.archive.org/web/20220305095926/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz";
-    sha256 = "sha256-0d0+o8ZiF1m83AasjoxUDNtUSquy69wFY1m1oYeybFw=";
+    url = "https://web.archive.org/web/20230418205553/https://get.filebot.net/filebot/FileBot_${version}/FileBot_${version}-portable.tar.xz";
+    hash = "sha256-XnzBXZy/gNA8qf7XairoviRmdQiXHbW19BgbHL52SP0=";
   };
 
   unpackPhase = "tar xvf $src";

From 0ddbe69156f9846c6e7f311cf69d1a7e97368c93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Wed, 19 Apr 2023 13:13:34 +0200
Subject: [PATCH 28/96] filebot: fix stty command in --mode interactive

---
 pkgs/applications/video/filebot/default.nix | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix
index 15a8161ed26f..09f99f400aa6 100644
--- a/pkgs/applications/video/filebot/default.nix
+++ b/pkgs/applications/video/filebot/default.nix
@@ -1,8 +1,13 @@
-{ lib, stdenv, fetchurl, openjdk17, makeWrapper, autoPatchelfHook
+{ lib, stdenv, fetchurl, coreutils, openjdk17, makeWrapper, autoPatchelfHook
 , zlib, libzen, libmediainfo, curlWithGnuTls, libmms, glib
 }:
 
-stdenv.mkDerivation rec {
+let
+  lanterna = fetchurl {
+    url = "https://search.maven.org/remotecontent?filepath=com/googlecode/lanterna/lanterna/3.1.1/lanterna-3.1.1.jar";
+    hash = "sha256-7zxCeXYW5v9ritnvkwRpPKdgSptCmkT3HJOaNgQHUmQ=";
+  };
+in stdenv.mkDerivation rec {
   pname = "filebot";
   version = "5.0.2";
 
@@ -17,6 +22,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib libzen libmediainfo curlWithGnuTls libmms glib ];
 
+  postPatch = ''
+    # replace lanterna.jar to be able to specify `com.googlecode.lanterna.terminal.UnixTerminal.sttyCommand`
+    cp ${lanterna} jar/lanterna.jar
+  '';
+
   dontBuild = true;
   installPhase = ''
     mkdir -p $out/opt $out/bin
@@ -25,7 +35,8 @@ stdenv.mkDerivation rec {
     # Filebot writes to $APP_DATA, which fails due to read-only filesystem. Using current user .local directory instead.
     substituteInPlace $out/opt/filebot.sh \
       --replace 'APP_DATA="$FILEBOT_HOME/data/$(id -u)"' 'APP_DATA=''${XDG_DATA_HOME:-$HOME/.local/share}/filebot/data' \
-      --replace '$FILEBOT_HOME/data/.license' '$APP_DATA/.license'
+      --replace '$FILEBOT_HOME/data/.license' '$APP_DATA/.license' \
+      --replace '-jar "$FILEBOT_HOME/jar/filebot.jar"' '-Dcom.googlecode.lanterna.terminal.UnixTerminal.sttyCommand=${coreutils}/bin/stty -jar "$FILEBOT_HOME/jar/filebot.jar"'
     wrapProgram $out/opt/filebot.sh \
       --prefix PATH : ${lib.makeBinPath [ openjdk17 ]}
     # Expose the binary in bin to make runnable.

From 0383f8de7716e44a23509c067a350dd04b5386f9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Apr 2023 11:32:24 +0000
Subject: [PATCH 29/96] grafana-dash-n-grab: 0.3.1 -> 0.4.3

---
 pkgs/servers/monitoring/grafana-dash-n-grab/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix b/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix
index ac9ec9f02d7b..238f497776ed 100644
--- a/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix
+++ b/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "grafana-dash-n-grab";
-  version = "0.3.1";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "esnet";
     repo = "gdg";
-    sha256 = "sha256-M4V4ybOizXCLxTTuS17M0y2tRmjQmTIBdXVbumzOoeA=";
+    sha256 = "sha256-L7EFDLCbXp8ooQY9QxbfT0ooL1oC+z8LwpEvH4CvivE=";
   };
 
-  vendorSha256 = "sha256-pXo80Tean5OkQ0Sv2+/RlRnAtaClwGP7tuDC2irsh+E=";
+  vendorHash = "sha256-7K2NTpknzJvKOfJ4gruV99BIvgtGgsre8ybqWTQ09tQ=";
 
   ldflags = [
     "-s"

From 14d7a73714ad66503941c877e99b141d0b60590c Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 19 Apr 2023 18:46:53 +0900
Subject: [PATCH 30/96] tandem-aligner: unstable-2022-09-17 -> 0.1

https://github.com/seryrzu/tandem_aligner/releases/tag/v0.1
---
 .../science/biology/tandem-aligner/default.nix            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/biology/tandem-aligner/default.nix b/pkgs/applications/science/biology/tandem-aligner/default.nix
index 53daffbe0677..151777a0ae94 100644
--- a/pkgs/applications/science/biology/tandem-aligner/default.nix
+++ b/pkgs/applications/science/biology/tandem-aligner/default.nix
@@ -6,14 +6,14 @@
 , zlib
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "TandemAligner";
-  version = "unstable-2022-09-17";
+  version = "0.1";
 
   src = fetchFromGitHub {
     owner = "seryrzu";
     repo = "tandem_aligner";
-    rev = "ac6004f108ad20477045f4d0b037d96051a9df70";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-iMDj1HZ8LzmZckuAM3lbG3eSJSd/5JGVA6SBs7+AgX8=";
   };
 
@@ -63,4 +63,4 @@ stdenv.mkDerivation {
     platforms = lib.platforms.linux;
     mainProgram = "tandem_aligner";
   };
-}
+})

From e201b1556f243664c7e20723fb0702360983f168 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 19 Apr 2023 18:51:54 +0900
Subject: [PATCH 31/96] tandem-aligner: add changelog to meta

---
 pkgs/applications/science/biology/tandem-aligner/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/science/biology/tandem-aligner/default.nix b/pkgs/applications/science/biology/tandem-aligner/default.nix
index 151777a0ae94..5f197bd7f79c 100644
--- a/pkgs/applications/science/biology/tandem-aligner/default.nix
+++ b/pkgs/applications/science/biology/tandem-aligner/default.nix
@@ -58,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "A parameter-free algorithm for sequence alignment";
     homepage = "https://github.com/seryrzu/tandem_aligner";
+    changelog = "https://github.com/seryrzu/tandem_aligner/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ amesgen ];
     platforms = lib.platforms.linux;

From 6fa82f8ec0f0e1a4b5c3612fde701709beca5a51 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 19 Apr 2023 16:48:38 +0300
Subject: [PATCH 32/96] utm: 4.1.5 -> 4.1.6

---
 pkgs/os-specific/darwin/utm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/darwin/utm/default.nix b/pkgs/os-specific/darwin/utm/default.nix
index c88005f09f29..da0a722c88fa 100644
--- a/pkgs/os-specific/darwin/utm/default.nix
+++ b/pkgs/os-specific/darwin/utm/default.nix
@@ -7,11 +7,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "utm";
-  version = "4.1.5";
+  version = "4.1.6";
 
   src = fetchurl {
     url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg";
-    hash = "sha256-YOmTf50UUvvh4noWnmV6WsoWSua0tpWTgLTg+Cdr3bQ=";
+    hash = "sha256-d0xEND95u/PFnKfogLwO2vLgv+tQubMea8XWSJRuZF4=";
   };
 
   nativeBuildInputs = [ undmg makeWrapper ];

From 15d14c53a76c8bdd1acbad5e425de4885fe471ec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Apr 2023 13:59:55 +0000
Subject: [PATCH 33/96] python310Packages.execnb: 0.1.4 -> 0.1.5

---
 pkgs/development/python-modules/execnb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/execnb/default.nix b/pkgs/development/python-modules/execnb/default.nix
index 22661c9ad07a..ef915d912a91 100644
--- a/pkgs/development/python-modules/execnb/default.nix
+++ b/pkgs/development/python-modules/execnb/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "execnb";
-  version = "0.1.4";
+  version = "0.1.5";
   format = "setuptools";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-y9gSvzJA8Fsh56HbA8SszlozsBBfTLfgWGDXm9uSBvA=";
+    sha256 = "sha256-nuAp4OMAfA3u3DJyORjFw7y7ZLsLCKEfxSFIXqNh+k0=";
   };
 
   propagatedBuildInputs = [ fastcore traitlets ipython ];

From ef9c46372c8804a1a330357696c57ddfcbc77909 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Apr 2023 14:17:34 +0000
Subject: [PATCH 34/96] tmux-mem-cpu-load: 3.6.2 -> 3.7.0

---
 pkgs/tools/misc/tmux-mem-cpu-load/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/tmux-mem-cpu-load/default.nix b/pkgs/tools/misc/tmux-mem-cpu-load/default.nix
index 2fcb42f9ab0c..048c94e3e94c 100644
--- a/pkgs/tools/misc/tmux-mem-cpu-load/default.nix
+++ b/pkgs/tools/misc/tmux-mem-cpu-load/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tmux-mem-cpu-load";
-  version = "3.6.2";
+  version = "3.7.0";
 
   src = fetchFromGitHub {
     owner = "thewtex";
     repo = "tmux-mem-cpu-load";
     rev = "v${version}";
-    sha256 = "sha256-PQFR0mkt6OhtFlIrJXriNv+aoI9d7Y6y2tBEZrKkRU8=";
+    sha256 = "sha256-4uSCYH31LO/69pxeur8byp9gYG6gaMYIiUxTmd7pag0=";
   };
 
   nativeBuildInputs = [ cmake ];

From 656f2b697937f6d1d35c4c98a822d6fb84d21acc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Apr 2023 14:31:07 +0000
Subject: [PATCH 35/96] pspg: 5.7.4 -> 5.7.5

---
 pkgs/tools/misc/pspg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix
index 7bfa19a28558..d29613af22ba 100644
--- a/pkgs/tools/misc/pspg/default.nix
+++ b/pkgs/tools/misc/pspg/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pspg";
-  version = "5.7.4";
+  version = "5.7.5";
 
   src = fetchFromGitHub {
     owner = "okbob";
     repo = pname;
     rev = version;
-    sha256 = "sha256-HZ771Q1UXnRds6o3EnZMyeu7Lt3IDFVFiUTc5snU0Bo=";
+    sha256 = "sha256-5XHT3Z40PUPO0c6bghDX547E6uEhBLZ6uRhJObVQazo=";
   };
 
   nativeBuildInputs = [ pkg-config installShellFiles ];

From 44ebd107ad1d47b7cd83a60cd4ff4cfa8f916b41 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Apr 2023 15:08:24 +0000
Subject: [PATCH 36/96] gopass-jsonapi: 1.15.4 -> 1.15.5

---
 pkgs/tools/security/gopass/jsonapi.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/tools/security/gopass/jsonapi.nix
index febe9abf0ea7..6617a43e7f21 100644
--- a/pkgs/tools/security/gopass/jsonapi.nix
+++ b/pkgs/tools/security/gopass/jsonapi.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "gopass-jsonapi";
-  version = "1.15.4";
+  version = "1.15.5";
 
   src = fetchFromGitHub {
     owner = "gopasspw";
     repo = "gopass-jsonapi";
     rev = "v${version}";
-    hash = "sha256-gizUFoe+oAmEKHMlua/zsR+fUltGw2cp98XAgXzCm0U=";
+    hash = "sha256-ZSX5g1agmnPU8Nlmptr3GVrjtPPKbDxouSjz9ulSW44=";
   };
 
-  vendorHash = "sha256-vMrP6rC0uPsRyFZdU2E9mPp031eob+36NcGueNP1Y7o=";
+  vendorHash = "sha256-JWOBGTJFzihoznYFzcgjayAzNof6Ob5u3Jfx2a6zwEk=";
 
   subPackages = [ "." ];
 

From 7a9f916d97a09b62e33e903da336f169714fe04c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Apr 2023 15:46:19 +0000
Subject: [PATCH 37/96] ergochat: 2.11.0 -> 2.11.1

---
 pkgs/servers/irc/ergochat/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/irc/ergochat/default.nix b/pkgs/servers/irc/ergochat/default.nix
index d89dd020d7e2..50fa9951a901 100644
--- a/pkgs/servers/irc/ergochat/default.nix
+++ b/pkgs/servers/irc/ergochat/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "ergo";
-  version = "2.11.0";
+  version = "2.11.1";
 
   src = fetchFromGitHub {
     owner = "ergochat";
     repo = "ergo";
     rev = "v${version}";
-    sha256 = "sha256-sZ2HSfYa7Xiu7dw8dUgqaf/tCh66bLlrXC+46J5i3iQ=";
+    sha256 = "sha256-LBKGwtprhtDHaghnU6YPQ4Pf2fqD8VN7OV9gzvFgLPY=";
   };
 
-  vendorSha256 = null;
+  vendorHash = null;
 
   passthru.tests.ergochat = nixosTests.ergochat;
 

From d01c2cb602b1d074ddf11600b58a07997b959b17 Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Wed, 19 Apr 2023 17:51:58 +0200
Subject: [PATCH 38/96] logseq: 0.9.2 -> 0.9.3

https://github.com/logseq/logseq/releases/tag/0.9.3
---
 pkgs/applications/misc/logseq/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix
index 80be280ab61a..eb2233c16310 100644
--- a/pkgs/applications/misc/logseq/default.nix
+++ b/pkgs/applications/misc/logseq/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "logseq";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchurl {
     url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
-    hash = "sha256-nXNzUHZXh2NGcg/OXRKhag/BWLB/YOAkCPITiBiMIIE=";
+    hash = "sha256-hwBTS6hjD66SPOPctcS2esybnVrgw77fFpt8phGt334=";
     name = "${pname}-${version}.AppImage";
   };
 

From 901994cd7a41f37ff9170619efd8ffe586b83678 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Apr 2023 15:58:42 +0000
Subject: [PATCH 39/96] cloud-nuke: 0.29.2 -> 0.29.4

---
 pkgs/development/tools/cloud-nuke/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix
index 6358d0bf6050..5ae0da1a1ef1 100644
--- a/pkgs/development/tools/cloud-nuke/default.nix
+++ b/pkgs/development/tools/cloud-nuke/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "cloud-nuke";
-  version = "0.29.2";
+  version = "0.29.4";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-hf86r5Q9fvk+vJsOjm6tqj6hT1eZpf8gtOmHA6wKwr0=";
+    hash = "sha256-qQrgeUmsCOLlmeU4kwtovo/3cK9Vqzeng7W9M+j+hdk=";
   };
 
   vendorHash = "sha256-6+uQAEp+fRlRrwfJR0eDMXs0mEQwzWadLxCrXrDREhs=";

From 85d9b0a3d5aa338b4eec8bd7940e7305f769e2b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Apr 2023 16:11:02 +0000
Subject: [PATCH 40/96] httplib: 0.12.1 -> 0.12.2

---
 pkgs/development/libraries/httplib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/httplib/default.nix b/pkgs/development/libraries/httplib/default.nix
index e18808b753d6..221b18961db1 100644
--- a/pkgs/development/libraries/httplib/default.nix
+++ b/pkgs/development/libraries/httplib/default.nix
@@ -5,13 +5,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "httplib";
-  version = "0.12.1";
+  version = "0.12.2";
 
   src = fetchFromGitHub {
     owner = "yhirose";
     repo = "cpp-httplib";
     rev = "v${version}";
-    hash = "sha256-F0MXuScZP2kmyCWv+DVXOB9rRk2T7hMgum7Zbs8X7QI=";
+    hash = "sha256-mpHw9fzGpYz04rgnfG/qTNrXIf6q+vFfIsjb56kJsLg=";
   };
 
   # Header-only library.

From 9a12bbff02966cbe098870e14d01333dac88bd24 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Apr 2023 17:00:15 +0000
Subject: [PATCH 41/96] flow: 0.203.1 -> 0.204.0

---
 pkgs/development/tools/analysis/flow/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 784a4256fe8e..052812ca973e 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flow";
-  version = "0.203.1";
+  version = "0.204.0";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     rev = "v${version}";
-    sha256 = "sha256-y06RI2g7W37HyY+wgGab6hoaskdq45NBxCFZYQmmctE=";
+    sha256 = "sha256-263ZbEDGiZI/2dSLxs966+wtSHG2QMnTtzJ7hPQ4Ix8=";
   };
 
   postPatch = ''

From bc79cb691c218c6cc03b43f3dddb5b0b933f0f22 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Apr 2023 17:14:15 +0000
Subject: [PATCH 42/96] fn-cli: 0.6.23 -> 0.6.24

---
 pkgs/applications/networking/cluster/fn-cli/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/fn-cli/default.nix b/pkgs/applications/networking/cluster/fn-cli/default.nix
index 601f2412a0af..7083a8b10c67 100644
--- a/pkgs/applications/networking/cluster/fn-cli/default.nix
+++ b/pkgs/applications/networking/cluster/fn-cli/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "fn";
-  version = "0.6.23";
+  version = "0.6.24";
 
   src = fetchFromGitHub {
     owner = "fnproject";
     repo = "cli";
     rev = version;
-    hash = "sha256-3g8S3cJ3RC06rvPMyQSKf8L4DkDTZ0Oe+6eh+rwyqg8=";
+    hash = "sha256-em9Bfrk7jJdmg3N+zH0VTpCdKPEOBK8vc297V5vmKzM=";
   };
 
-  vendorSha256 = null;
+  vendorHash = null;
 
   subPackages = ["."];
 

From 9000be6e0491816cff9765e8d1c6fbb46b09b630 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 19 Apr 2023 20:20:54 +0200
Subject: [PATCH 43/96] python310Packages.iocextract: 1.15.1 -> 1.15.2

Diff: https://github.com/InQuest/python-iocextract/compare/refs/tags/v1.15.1...v1.15.2

Changelog: https://github.com/InQuest/python-iocextract/releases/tag/v1.15.2
---
 pkgs/development/python-modules/iocextract/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iocextract/default.nix b/pkgs/development/python-modules/iocextract/default.nix
index 46ff17b9894b..9a2f5a2ec410 100644
--- a/pkgs/development/python-modules/iocextract/default.nix
+++ b/pkgs/development/python-modules/iocextract/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "iocextract";
-  version = "1.15.1";
+  version = "1.15.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "InQuest";
     repo = "python-iocextract";
     rev = "refs/tags/v${version}";
-    hash = "sha256-muto8lr3sP44bLFIoAuPeS8pRv7pNP1JFKaAJV01TZY=";
+    hash = "sha256-l0TGi3Y3/Dcwyp80eRWYYlDaDDJdpc31fcxdYEVvQas=";
   };
 
   propagatedBuildInputs = [

From 1794d84857664cc39a0ba0745c868350f1b2520f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 19 Apr 2023 20:22:48 +0200
Subject: [PATCH 44/96] python310Packages.renault-api: 0.1.12 -> 0.1.13

Diff: https://github.com/hacf-fr/renault-api/compare/refs/tags/v0.1.12...v0.1.13

Changelog: https://github.com/hacf-fr/renault-api/releases/tag/v0.1.13
---
 pkgs/development/python-modules/renault-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix
index 1a9c2b509fbb..71abe133044a 100644
--- a/pkgs/development/python-modules/renault-api/default.nix
+++ b/pkgs/development/python-modules/renault-api/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "renault-api";
-  version = "0.1.12";
+  version = "0.1.13";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "hacf-fr";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-uSyqAs0JqrsFuMpfuILoIGxLL+HVOGI/euCZziCgEdQ=";
+    hash = "sha256-BpPow6fZGAk0kzcEo5tOleyVMNUOl7RE2I5y76ntNRM=";
   };
 
   nativeBuildInputs = [

From 887edae254823a8428a7119c8f052aac9313836a Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 19 Apr 2023 18:34:47 +0000
Subject: [PATCH 45/96] tests.makeBinaryWrapper: avoid same-triple cross

We shouldn't try compiling to aarch64-unknown-linux-gnu from
aarch64-unknown-linux-gnu, because that tends to confuse things and is
not representative of actual cross compilation usage.
---
 pkgs/test/make-binary-wrapper/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/test/make-binary-wrapper/default.nix b/pkgs/test/make-binary-wrapper/default.nix
index afc2b41ff5a7..4c6fffd100a7 100644
--- a/pkgs/test/make-binary-wrapper/default.nix
+++ b/pkgs/test/make-binary-wrapper/default.nix
@@ -52,7 +52,7 @@ let
     "prefix"
     "suffix"
   ] makeGoldenTest // lib.optionalAttrs (! stdenv.isDarwin) {
-    cross = pkgsCross.aarch64-multiplatform.callPackage ./cross.nix { };
+    cross = pkgsCross.${if stdenv.buildPlatform.isAarch64 then "gnu64" else "aarch64-multiplatform"}.callPackage ./cross.nix { };
   };
 in
 

From 4025014f57e53f9b04754b4b5c22e632e7c4c06e Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 19 Apr 2023 18:36:05 +0000
Subject: [PATCH 46/96] systemd.tests.cross: fix on aarch64-linux

We shouldn't try compiling to aarch64-unknown-linux-gnu from
aarch64-unknown-linux-gnu, because that tends to confuse things and is
not representative of actual cross compilation usage.  In this case,
kexec-tools didn't compile.
---
 pkgs/os-specific/linux/systemd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index a3c59a5a6c9b..6c0fcfbc2763 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -736,7 +736,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     tests = {
       inherit (nixosTests) switchTest;
-      cross = pkgsCross.aarch64-multiplatform.systemd;
+      cross = pkgsCross.${if stdenv.buildPlatform.isAarch64 then "gnu64" else "aarch64-multiplatform"}.systemd;
     };
   };
 

From 33020fdd24c28815917b119fb248130507464564 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Wed, 19 Apr 2023 16:18:11 -0400
Subject: [PATCH 47/96] ruff: 0.0.261 -> 0.0.262

Diff: https://github.com/charliermarsh/ruff/compare/v0.0.261...v0.0.262

Changelog: https://github.com/charliermarsh/ruff/releases/tag/v0.0.262
---
 pkgs/development/tools/ruff/Cargo.lock  | 132 ++----------------------
 pkgs/development/tools/ruff/default.nix |   4 +-
 2 files changed, 12 insertions(+), 124 deletions(-)

diff --git a/pkgs/development/tools/ruff/Cargo.lock b/pkgs/development/tools/ruff/Cargo.lock
index 8b760b7642ad..4be6d60217fb 100644
--- a/pkgs/development/tools/ruff/Cargo.lock
+++ b/pkgs/development/tools/ruff/Cargo.lock
@@ -153,15 +153,6 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
-[[package]]
-name = "block-buffer"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "bstr"
 version = "0.2.17"
@@ -446,15 +437,6 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
 
-[[package]]
-name = "cpufeatures"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "crc32fast"
 version = "1.3.2"
@@ -549,16 +531,6 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
 [[package]]
 name = "ctor"
 version = "0.1.26"
@@ -625,16 +597,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
 
-[[package]]
-name = "digest"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
-dependencies = [
- "block-buffer",
- "crypto-common",
-]
-
 [[package]]
 name = "dirs"
 version = "4.0.0"
@@ -774,7 +736,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8-to-ruff"
-version = "0.0.261"
+version = "0.0.262"
 dependencies = [
  "anyhow",
  "clap 4.1.8",
@@ -825,16 +787,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "generic-array"
-version = "0.14.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
-dependencies = [
- "typenum",
- "version_check",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.8"
@@ -1018,9 +970,6 @@ dependencies = [
  "console",
  "lazy_static",
  "linked-hash-map",
- "pest",
- "pest_derive",
- "serde",
  "similar",
  "yaml-rust",
 ]
@@ -1560,50 +1509,6 @@ version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
 
-[[package]]
-name = "pest"
-version = "2.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "028accff104c4e513bad663bbcd2ad7cfd5304144404c31ed0a77ac103d00660"
-dependencies = [
- "thiserror",
- "ucd-trie",
-]
-
-[[package]]
-name = "pest_derive"
-version = "2.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ac3922aac69a40733080f53c1ce7f91dcf57e1a5f6c52f421fadec7fbdc4b69"
-dependencies = [
- "pest",
- "pest_generator",
-]
-
-[[package]]
-name = "pest_generator"
-version = "2.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d06646e185566b5961b4058dd107e0a7f56e77c3f484549fb119867773c0f202"
-dependencies = [
- "pest",
- "pest_meta",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pest_meta"
-version = "2.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6f60b2ba541577e2a0c307c8f39d1439108120eb7903adeb6497fa880c59616"
-dependencies = [
- "once_cell",
- "pest",
- "sha2",
-]
-
 [[package]]
 name = "petgraph"
 version = "0.6.3"
@@ -1977,8 +1882,9 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.261"
+version = "0.0.262"
 dependencies = [
+ "annotate-snippets 0.9.1",
  "anyhow",
  "bitflags",
  "chrono",
@@ -2004,6 +1910,7 @@ dependencies = [
  "pathdiff",
  "pep440_rs",
  "pretty_assertions",
+ "quick-junit",
  "regex",
  "result-like",
  "ruff_cache",
@@ -2013,6 +1920,7 @@ dependencies = [
  "ruff_python_semantic",
  "ruff_python_stdlib",
  "ruff_rustpython",
+ "ruff_text_size",
  "rustc-hash",
  "rustpython-common",
  "rustpython-parser",
@@ -2021,6 +1929,7 @@ dependencies = [
  "serde",
  "serde_json",
  "shellexpand",
+ "similar",
  "smallvec",
  "strum",
  "strum_macros",
@@ -2040,6 +1949,8 @@ dependencies = [
  "mimalloc",
  "once_cell",
  "ruff",
+ "ruff_python_ast",
+ "rustpython-parser",
  "serde",
  "serde_json",
  "tikv-jemallocator",
@@ -2060,7 +1971,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_cli"
-version = "0.0.261"
+version = "0.0.262"
 dependencies = [
  "annotate-snippets 0.9.1",
  "anyhow",
@@ -2082,7 +1993,6 @@ dependencies = [
  "mimalloc",
  "notify",
  "path-absolutize",
- "quick-junit",
  "rayon",
  "regex",
  "ruff",
@@ -2176,6 +2086,7 @@ dependencies = [
  "once_cell",
  "regex",
  "ruff_rustpython",
+ "ruff_text_size",
  "rustc-hash",
  "rustpython-common",
  "rustpython-parser",
@@ -2543,17 +2454,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "sha2"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
 [[package]]
 name = "shellexpand"
 version = "3.0.0"
@@ -2936,18 +2836,6 @@ version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
 
-[[package]]
-name = "typenum"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
-
-[[package]]
-name = "ucd-trie"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
-
 [[package]]
 name = "unic-char-property"
 version = "0.9.0"
diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix
index 6cccaeba4526..99aa917f48fa 100644
--- a/pkgs/development/tools/ruff/default.nix
+++ b/pkgs/development/tools/ruff/default.nix
@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ruff";
-  version = "0.0.261";
+  version = "0.0.262";
 
   src = fetchFromGitHub {
     owner = "charliermarsh";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-YFhMrmZ1Zv4nIWWxq6A7PU0VYayugmJKbbkz+AdGJ+I=";
+    hash = "sha256-G+Cz/5dL/5kOOJ1fGGecwGOiONYdwFWOPQ5KV0W2DVA=";
   };
 
   # We have to use importCargoLock here because `cargo vendor` currently doesn't support workspace

From 60cf24c600f5648a8ce2a9094dcfd03c08d3a98b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Apr 2023 20:47:47 +0000
Subject: [PATCH 48/96] python310Packages.niaclass: 0.1.3 -> 0.1.4

---
 pkgs/development/python-modules/niaclass/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/niaclass/default.nix b/pkgs/development/python-modules/niaclass/default.nix
index 749c49aba30e..89d8ae746aed 100644
--- a/pkgs/development/python-modules/niaclass/default.nix
+++ b/pkgs/development/python-modules/niaclass/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "niaclass";
-  version = "0.1.3";
+  version = "0.1.4";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -21,8 +21,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "lukapecnik";
     repo = "NiaClass";
-    rev = version;
-    sha256 = "sha256-BDGDcIlunnaH3J9sEuDrwWsBR4Wjcy6Kxpxy9Dr6BlM=";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-md1e/cOIOQKoB760E5hjzjCsC5tS1CzgqAPTeVtrmuo=";
   };
 
   nativeBuildInputs = [

From b0b53c21d6ca01492b143fcd1c3b6ec2fa934b32 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Apr 2023 20:58:09 +0000
Subject: [PATCH 49/96] pluto: 5.16.0 -> 5.16.1

---
 pkgs/applications/networking/cluster/pluto/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/pluto/default.nix b/pkgs/applications/networking/cluster/pluto/default.nix
index 5b75fc6d59b3..4371331a3f25 100644
--- a/pkgs/applications/networking/cluster/pluto/default.nix
+++ b/pkgs/applications/networking/cluster/pluto/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "pluto";
-  version = "5.16.0";
+  version = "5.16.1";
 
   src = fetchFromGitHub {
     owner = "FairwindsOps";
     repo = "pluto";
     rev = "v${version}";
-    sha256 = "sha256-M5zTnzuei/sECvRe89Dau72iIUuMtaLJyYTGeEF4GPo=";
+    sha256 = "sha256-UCq+aMUffvDWmPtSSc/PNbrak1LGWQe8Oe340O5q6LM=";
   };
 
-  vendorHash = "sha256-3wtE2Cz+AVF+zfsLH/+6KMHPihYcuYsrzTguHNnwT+U=";
+  vendorHash = "sha256-0VFCZ+U0W21tF35148Valpc7fDXkC9dPpz1O0+4D30U=";
 
   ldflags = [
     "-w" "-s"

From fd3438ab51a5f14a3265ed78500171b0cbaf7f92 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Apr 2023 21:59:34 +0000
Subject: [PATCH 50/96] mermerd: 0.6.1 -> 0.7.0

---
 pkgs/development/tools/database/mermerd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/database/mermerd/default.nix b/pkgs/development/tools/database/mermerd/default.nix
index 53291e2e0a03..4c7c0bfc42c5 100644
--- a/pkgs/development/tools/database/mermerd/default.nix
+++ b/pkgs/development/tools/database/mermerd/default.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "mermerd";
-  version = "0.6.1";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "KarnerTh";
     repo = "mermerd";
     rev = "refs/tags/v${version}";
-    hash = "sha256-8GXI5UEDGx5E+YzcAoguvKeNTwpC5ftReIvrKGg31ZA=";
+    hash = "sha256-nlertvmuP9Fiuc4uVrgKzfxjOY/sE9udKZLe51t0GEY=";
   };
 
   vendorHash = "sha256-RSCpkQymvUvY2bOkjhsyKnDa3vezUjC33Nwv0+O4OOQ=";

From a61421ec1ed6a351d36de76a3142b67271ed4e45 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Apr 2023 22:07:57 +0000
Subject: [PATCH 51/96] vals: 0.24.0 -> 0.25.0

---
 pkgs/tools/security/vals/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/vals/default.nix b/pkgs/tools/security/vals/default.nix
index 71252414ade0..e26cbda2aa8b 100644
--- a/pkgs/tools/security/vals/default.nix
+++ b/pkgs/tools/security/vals/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "vals";
-  version = "0.24.0";
+  version = "0.25.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "variantdev";
     repo = pname;
-    sha256 = "sha256-qUcNwpmWoJkrT4ClW8uq2ufFEgmiZQcDG446SSO6mR0=";
+    sha256 = "sha256-MofzTQM/dREw9b+IzjvexKoYZZ/ptbdWICROtwYK4X8=";
   };
 
   vendorHash = "sha256-6DJiqDEgEHQbyIt4iShoBnagBvspd3W3vD56/FGjESs=";

From d08b6c9e1215e39baddea5553cd7942e0dfa973e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Apr 2023 22:18:23 +0000
Subject: [PATCH 52/96] jet: 0.4.23 -> 0.4.24

---
 pkgs/development/tools/jet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/jet/default.nix b/pkgs/development/tools/jet/default.nix
index bf34d472be80..63c3d036cf87 100644
--- a/pkgs/development/tools/jet/default.nix
+++ b/pkgs/development/tools/jet/default.nix
@@ -2,11 +2,11 @@
 
 buildGraalvmNativeImage rec {
   pname = "jet";
-  version = "0.4.23";
+  version = "0.4.24";
 
   src = fetchurl {
     url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
-    sha256 = "sha256-ijqMyzmF1C3+5oT3ho1MSkoGuFJGvjhh7WWF/JDV/j8=";
+    sha256 = "sha256-8UIPDq+POe5Ss4H8ecHkheYKul4FpGzQgWGQ0N7h41M=";
   };
 
   extraNativeImageBuildArgs = [

From 8bd94a00c59af1ecde8ab032fba9832fb87994cd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Apr 2023 22:58:39 +0000
Subject: [PATCH 53/96] shipyard: 0.4.14 -> 0.5.2

---
 pkgs/tools/virtualization/shipyard/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/virtualization/shipyard/default.nix b/pkgs/tools/virtualization/shipyard/default.nix
index b67b6c949d74..6c268373f13f 100644
--- a/pkgs/tools/virtualization/shipyard/default.nix
+++ b/pkgs/tools/virtualization/shipyard/default.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "shipyard";
-  version = "0.4.14";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "shipyard-run";
     repo = pname;
-    sha256 = "sha256-uXpFLUTRm0urNd9dAUGqoC3vRkTvZd2kG+C9NkXFt/4=";
+    sha256 = "sha256-Fd0R067YGdigG9SyWjXQYyQEnJM7Oug7Qkb0v+zK09g=";
   };
-  vendorSha256 = "sha256-ATXM3+mi/R+/jS6Ds89J75nDVnc3d8iOGhjD3KQZkkA=";
+  vendorHash = "sha256-aE58XYgEWdPtq+DZKtn8Jbw2YIiiJSPutmVEOsG7urk=";
 
   ldflags = [
     "-s" "-w" "-X main.version=${version}"

From ae898cf2d7d699cd8de3fbbec8a66f0532eb5bc9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Apr 2023 23:26:24 +0000
Subject: [PATCH 54/96] cargo-chef: 0.1.52 -> 0.1.56

---
 pkgs/development/tools/rust/cargo-chef/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-chef/default.nix b/pkgs/development/tools/rust/cargo-chef/default.nix
index a6ac5c722792..47af138388ae 100644
--- a/pkgs/development/tools/rust/cargo-chef/default.nix
+++ b/pkgs/development/tools/rust/cargo-chef/default.nix
@@ -2,14 +2,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-chef";
-  version = "0.1.52";
+  version = "0.1.56";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "sha256-eUFQT2zYABRtTqWxMi+AyU1ZHdt8+B1nMC0Sz6IK6+w=";
+    sha256 = "sha256-WsK4hdV20IcG2bF8LumeII8e91330zCtR0+A3EPYtAk=";
   };
 
-  cargoHash = "sha256-uzuITRUvAOsuFaq+dkO8tRyozwUt4xB/3BP3mNCxr2g=";
+  cargoHash = "sha256-L/4m47TJHGSOC8/94qnjea5Febck7RtPaVVYi4/Pn5s=";
 
   meta = with lib; {
     description = "A cargo-subcommand to speed up Rust Docker builds using Docker layer caching";

From 8aec299c6ba3d6f9af9befbea735cdbf13ceb533 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Apr 2023 23:51:49 +0000
Subject: [PATCH 55/96] git-machete: 3.16.3 -> 3.17.0

---
 pkgs/applications/version-management/git-machete/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix
index d449e7f44eb1..66d0ef0d1b8e 100644
--- a/pkgs/applications/version-management/git-machete/default.nix
+++ b/pkgs/applications/version-management/git-machete/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonApplication rec {
   pname = "git-machete";
-  version = "3.16.3";
+  version = "3.17.0";
 
   src = fetchFromGitHub {
     owner = "virtuslab";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-pd+ZK34dPSCwl8bOwH388NZ6QNIlU5TqL7EabsWw7kk=";
+    hash = "sha256-F+2xbfMsc6izL0f8EjDfGaJs17xDNQn8/k8mvnLYzcM=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From a8f6d10169b085e8e48f6166d5a4ada681b7c54e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Apr 2023 00:21:50 +0000
Subject: [PATCH 56/96] nix-ld: 1.0.3 -> 1.1.0

---
 pkgs/os-specific/linux/nix-ld/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/nix-ld/default.nix b/pkgs/os-specific/linux/nix-ld/default.nix
index 0ce112e0a13d..6e0af1217219 100644
--- a/pkgs/os-specific/linux/nix-ld/default.nix
+++ b/pkgs/os-specific/linux/nix-ld/default.nix
@@ -12,13 +12,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "nix-ld";
-  version = "1.0.3";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "mic92";
     repo = "nix-ld";
     rev = version;
-    sha256 = "sha256-KmnT8YfU/KI4VxBlFMUltlAVLNvF7fTEQEsp41ZUHlA=";
+    sha256 = "sha256-dM9YPN+yq6sHmRhJQinYdAVXBkTgEtrVQcsd/mIIX0o=";
   };
 
   doCheck = true;

From 603e89eef935b22754e1406364ba0921997c71c4 Mon Sep 17 00:00:00 2001
From: Flakebi <flakebi@t-online.de>
Date: Wed, 19 Apr 2023 22:46:14 +0200
Subject: [PATCH 57/96] kanidm: BindMount certificate paths

Bind mount the base dirs of the tls key and chain into the service.

Make sure to bind every directory just once. The test failed on ofborg
when /nix/store and the certificate path in /nix/store/<some path> were
bound.
---
 nixos/modules/services/security/kanidm.nix | 102 ++++++++++++---------
 nixos/tests/kanidm.nix                     |   4 +-
 2 files changed, 61 insertions(+), 45 deletions(-)

diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix
index 5583c39368f7..2f19decb5cb1 100644
--- a/nixos/modules/services/security/kanidm.nix
+++ b/nixos/modules/services/security/kanidm.nix
@@ -7,6 +7,18 @@ let
   serverConfigFile = settingsFormat.generate "server.toml" (filterConfig cfg.serverSettings);
   clientConfigFile = settingsFormat.generate "kanidm-config.toml" (filterConfig cfg.clientSettings);
   unixConfigFile = settingsFormat.generate "kanidm-unixd.toml" (filterConfig cfg.unixSettings);
+  certPaths = builtins.map builtins.dirOf [ cfg.serverSettings.tls_chain cfg.serverSettings.tls_key ];
+
+  # Merge bind mount paths and remove paths where a prefix is already mounted.
+  # This makes sure that if e.g. the tls_chain is in the nix store and /nix/store is alread in the mount
+  # paths, no new bind mount is added. Adding subpaths caused problems on ofborg.
+  hasPrefixInList = list: newPath: lib.any (path: lib.hasPrefix (builtins.toString path) (builtins.toString newPath)) list;
+  mergePaths = lib.foldl' (merged: newPath: let
+      # If the new path is a prefix to some existing path, we need to filter it out
+      filteredPaths = lib.filter (p: !lib.hasPrefix (builtins.toString newPath) (builtins.toString p)) merged;
+      # If a prefix of the new path is already in the list, do not add it
+      filteredNew = if hasPrefixInList filteredPaths newPath then [] else [ newPath ];
+    in filteredPaths ++ filteredNew) [];
 
   defaultServiceConfig = {
     BindReadOnlyPaths = [
@@ -16,7 +28,7 @@ let
       "-/etc/hosts"
       "-/etc/localtime"
     ];
-    CapabilityBoundingSet = "";
+    CapabilityBoundingSet = [];
     # ProtectClock= adds DeviceAllow=char-rtc r
     DeviceAllow = "";
     # Implies ProtectSystem=strict, which re-mounts all paths
@@ -216,22 +228,28 @@ in
       description = "kanidm identity management daemon";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
-      serviceConfig = defaultServiceConfig // {
-        StateDirectory = "kanidm";
-        StateDirectoryMode = "0700";
-        ExecStart = "${pkgs.kanidm}/bin/kanidmd server -c ${serverConfigFile}";
-        User = "kanidm";
-        Group = "kanidm";
+      serviceConfig = lib.mkMerge [
+        # Merge paths and ignore existing prefixes needs to sidestep mkMerge
+        (defaultServiceConfig // {
+          BindReadOnlyPaths = mergePaths (defaultServiceConfig.BindReadOnlyPaths ++ certPaths);
+        })
+        {
+          StateDirectory = "kanidm";
+          StateDirectoryMode = "0700";
+          ExecStart = "${pkgs.kanidm}/bin/kanidmd server -c ${serverConfigFile}";
+          User = "kanidm";
+          Group = "kanidm";
 
-        AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
-        CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
-        # This would otherwise override the CAP_NET_BIND_SERVICE capability.
-        PrivateUsers = false;
-        # Port needs to be exposed to the host network
-        PrivateNetwork = false;
-        RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
-        TemporaryFileSystem = "/:ro";
-      };
+          AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
+          CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
+          # This would otherwise override the CAP_NET_BIND_SERVICE capability.
+          PrivateUsers = lib.mkForce false;
+          # Port needs to be exposed to the host network
+          PrivateNetwork = lib.mkForce false;
+          RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
+          TemporaryFileSystem = "/:ro";
+        }
+      ];
       environment.RUST_LOG = "info";
     };
 
@@ -240,34 +258,32 @@ in
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
       restartTriggers = [ unixConfigFile clientConfigFile ];
-      serviceConfig = defaultServiceConfig // {
-        CacheDirectory = "kanidm-unixd";
-        CacheDirectoryMode = "0700";
-        RuntimeDirectory = "kanidm-unixd";
-        ExecStart = "${pkgs.kanidm}/bin/kanidm_unixd";
-        User = "kanidm-unixd";
-        Group = "kanidm-unixd";
+      serviceConfig = lib.mkMerge [
+        defaultServiceConfig
+        {
+          CacheDirectory = "kanidm-unixd";
+          CacheDirectoryMode = "0700";
+          RuntimeDirectory = "kanidm-unixd";
+          ExecStart = "${pkgs.kanidm}/bin/kanidm_unixd";
+          User = "kanidm-unixd";
+          Group = "kanidm-unixd";
 
-        BindReadOnlyPaths = [
-          "/nix/store"
-          "-/etc/resolv.conf"
-          "-/etc/nsswitch.conf"
-          "-/etc/hosts"
-          "-/etc/localtime"
-          "-/etc/kanidm"
-          "-/etc/static/kanidm"
-          "-/etc/ssl"
-          "-/etc/static/ssl"
-        ];
-        BindPaths = [
-          # To create the socket
-          "/run/kanidm-unixd:/var/run/kanidm-unixd"
-        ];
-        # Needs to connect to kanidmd
-        PrivateNetwork = false;
-        RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ];
-        TemporaryFileSystem = "/:ro";
-      };
+          BindReadOnlyPaths = [
+            "-/etc/kanidm"
+            "-/etc/static/kanidm"
+            "-/etc/ssl"
+            "-/etc/static/ssl"
+          ];
+          BindPaths = [
+            # To create the socket
+            "/run/kanidm-unixd:/var/run/kanidm-unixd"
+          ];
+          # Needs to connect to kanidmd
+          PrivateNetwork = lib.mkForce false;
+          RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ];
+          TemporaryFileSystem = "/:ro";
+        }
+      ];
       environment.RUST_LOG = "info";
     };
 
diff --git a/nixos/tests/kanidm.nix b/nixos/tests/kanidm.nix
index 33c65026b9b1..d9c0542c4c2e 100644
--- a/nixos/tests/kanidm.nix
+++ b/nixos/tests/kanidm.nix
@@ -44,7 +44,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
         };
       };
 
-      networking.hosts."${nodes.server.config.networking.primaryIPAddress}" = [ serverDomain ];
+      networking.hosts."${nodes.server.networking.primaryIPAddress}" = [ serverDomain ];
 
       security.pki.certificateFiles = [ certs.ca.cert ];
     };
@@ -56,7 +56,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
         # We need access to the config file in the test script.
         filteredConfig = pkgs.lib.converge
           (pkgs.lib.filterAttrsRecursive (_: v: v != null))
-          nodes.server.config.services.kanidm.serverSettings;
+          nodes.server.services.kanidm.serverSettings;
         serverConfigFile = (pkgs.formats.toml { }).generate "server.toml" filteredConfig;
 
       in

From 3ed1e3b2686728050cab55f6309910ec9e960fa9 Mon Sep 17 00:00:00 2001
From: Casey Ransom <cransom@hubns.net>
Date: Tue, 18 Apr 2023 16:44:14 -0400
Subject: [PATCH 58/96] pcb2gcode: fix build on darwin

This version bumps gerbv as well.
---
 .../science/electronics/gerbv/default.nix     | 19 ++++++++++---------
 pkgs/tools/misc/pcb2gcode/default.nix         |  2 +-
 pkgs/top-level/all-packages.nix               |  4 +++-
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix
index f83cfa1bf04e..0c45184e31c7 100644
--- a/pkgs/applications/science/electronics/gerbv/default.nix
+++ b/pkgs/applications/science/electronics/gerbv/default.nix
@@ -1,13 +1,12 @@
-{ lib, stdenv, fetchgit, fetchpatch, pkg-config, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }:
+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, gettext, libtool, automake, autoconf, cairo, gtk2-x11, autoreconfHook }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "gerbv";
-  version = "2015-10-08";
+  version = "2.7.0";
 
-  src = fetchgit {
-    url = "git://git.geda-project.org/gerbv.git";
-    rev = "76b8b67bfa10823ce98f1c4c3b49a2afcadf7659";
-    sha256 = "00jn1xhf6kblxc5gac1wvk8zm12fy6sk81nj3jwdag0z6wk3z446";
+  src = fetchurl {
+    url = "mirror://sourceforge/gerbv/${pname}-${version}.tar.gz";
+    sha256 = "sha256-xe6AjEIwzmvjrRCrY8VHCYOG1DAicE3iXduTeOYgU7Q=";
   };
 
   patches = [
@@ -21,15 +20,17 @@ stdenv.mkDerivation {
   ];
 
   nativeBuildInputs = [ autoreconfHook pkg-config automake autoconf ];
-  buildInputs = [ gettext libtool cairo gtk2 ];
+  buildInputs = [ gettext libtool cairo gtk2-x11 ];
 
   configureFlags = ["--disable-update-desktop-database"];
 
+  env.NIX_CFLAGS_COMPILE = "-Wno-format-security";
+
   meta = with lib; {
     description = "A Gerber (RS-274X) viewer";
     homepage = "http://gerbv.geda-project.org/";
     maintainers = with maintainers; [ mog ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     license = licenses.gpl2;
   };
 }
diff --git a/pkgs/tools/misc/pcb2gcode/default.nix b/pkgs/tools/misc/pcb2gcode/default.nix
index 146233b2e029..9079817d9eb8 100644
--- a/pkgs/tools/misc/pcb2gcode/default.nix
+++ b/pkgs/tools/misc/pcb2gcode/default.nix
@@ -51,6 +51,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/pcb2gcode/pcb2gcode";
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ kritnich ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8b50fe4dc0ce..db0c6f59dfe4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -37845,7 +37845,9 @@ with pkgs;
     guile = guile_2_0;
   };
 
-  gerbv = callPackage ../applications/science/electronics/gerbv { };
+  gerbv = callPackage ../applications/science/electronics/gerbv {
+    cairo = cairo.override { x11Support = true; };
+  };
 
   gtkwave = callPackage ../applications/science/electronics/gtkwave { };
 

From d264df2b17bef80fde5b7cf2ad6f036e63fa4fea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Apr 2023 01:18:09 +0000
Subject: [PATCH 59/96] prometheus-artifactory-exporter: 1.12.0 -> 1.13.0

---
 pkgs/servers/monitoring/prometheus/artifactory-exporter.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix
index 17775b491c64..f4535624f5b6 100644
--- a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix
@@ -6,17 +6,17 @@
 
 buildGoModule rec {
   pname = "artifactory_exporter";
-  version = "1.12.0";
+  version = "1.13.0";
   rev = "v${version}";
 
   src = fetchFromGitHub {
     owner = "peimanja";
     repo = pname;
     rev = rev;
-    hash = "sha256-EFjWDoWPePbPX9j4vuI41TAlGcFRlUyPpSvJriZdR0U=";
+    hash = "sha256-URavjOb0OEFul4jM3VR0buIMXmNU7nLJ0R3e8vRUWQ8=";
   };
 
-  vendorHash = "sha256-5yzBKgjJCv4tgdBS6XmZUq1ebbka0LOuv6BARWO7kQg=";
+  vendorHash = "sha256-Gin134G4NPK8M2E2RrgH62ieiuCw15jwm9SJg03w9ts=";
 
   subPackages = [ "." ];
 

From 20ea88801c63ae145ec9100090192ebfd522f724 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Apr 2023 01:50:50 +0000
Subject: [PATCH 60/96] linkerd_stable: 2.12.4 -> 2.13.1

---
 pkgs/applications/networking/cluster/linkerd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix
index 7ac3f68b35ee..c538479ecd9f 100644
--- a/pkgs/applications/networking/cluster/linkerd/default.nix
+++ b/pkgs/applications/networking/cluster/linkerd/default.nix
@@ -2,7 +2,7 @@
 
 (callPackage ./generic.nix { }) {
   channel = "stable";
-  version = "2.12.4";
-  sha256 = "1nl831xjhxyw1r2zvdxy3455sfn1cnn6970n02q7aalmqgz9rpdd";
-  vendorSha256 = "sha256-c7x2vNO6ap5Ecx4+1hKy6PImFuclSQqvkBKr0LPdX4M=";
+  version = "2.13.1";
+  sha256 = "1qsf2d4haqs93qf88f2vvjsgm5a5gnmivkdpdbvpwy0q8bd8rfnj";
+  vendorSha256 = "sha256-6KuXEKuQJvRNUM+6Uo+J9D3eHI+1tt62C5XZsEDwkTc=";
 }

From 5b7bbca14c3627153bd305bec9a71f98b56c140c Mon Sep 17 00:00:00 2001
From: lucasew <lucas59356@gmail.com>
Date: Mon, 17 Apr 2023 14:00:01 -0300
Subject: [PATCH 61/96] whatsapp-emoji-linux: init at 2.22.8.79-1

Signed-off-by: lucasew <lucas59356@gmail.com>
---
 pkgs/data/fonts/whatsapp-emoji/default.nix | 46 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/data/fonts/whatsapp-emoji/default.nix

diff --git a/pkgs/data/fonts/whatsapp-emoji/default.nix b/pkgs/data/fonts/whatsapp-emoji/default.nix
new file mode 100644
index 000000000000..b118691fee1d
--- /dev/null
+++ b/pkgs/data/fonts/whatsapp-emoji/default.nix
@@ -0,0 +1,46 @@
+{ stdenvNoCC
+, lib
+, fetchFromGitHub
+, imagemagick
+, nix-update-script
+, pngquant
+, python3Packages
+, which
+, zopfli
+}:
+
+stdenvNoCC.mkDerivation rec {
+  pname = "whatsapp-emoji-linux";
+  version = "2.22.8.79-1";
+
+  src = fetchFromGitHub {
+    rev = "refs/tags/${version}";
+    owner = "dmlls";
+    repo = "whatsapp-emoji-linux";
+    hash = "sha256-AYdyNZYskBNT3v2wl+M0BAYi5piwmrVIDfucSZ3nfTE=";
+  };
+
+  makeFlags = [
+    "PREFIX=$(out)"
+  ];
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [
+    imagemagick
+    pngquant
+    python3Packages.nototools
+    which
+    zopfli
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "WhatsApp Emoji for GNU/Linux";
+    homepage = "https://github.com/dmlls/whatsapp-emoji-linux";
+    maintainers = [ lib.maintainers.lucasew ];
+    sourceProvenance = [ lib.sourceTypes.fromSource ];
+    license = lib.licenses.unfree;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16ed1640de17..2f5bc03d9f3a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28665,6 +28665,8 @@ with pkgs;
 
   vollkorn = callPackage ../data/fonts/vollkorn { };
 
+  whatsapp-emoji-font = callPackage ../data/fonts/whatsapp-emoji { };
+
   weather-icons = callPackage ../data/fonts/weather-icons { };
 
   whitesur-gtk-theme = callPackage ../data/themes/whitesur {

From 4684e594446d4f882132bfca9051804cf7282974 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 20 Apr 2023 03:05:35 +0000
Subject: [PATCH 62/96] terraform-providers.azuread: 2.37.1 -> 2.37.2

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 6f21a03f71da..b4f5c5819c1b 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -119,11 +119,11 @@
     "vendorHash": "sha256-t6Hg1FLCd4dh6d3J0uNsNKKnz5T8/yoIXFo7bRO+XHM="
   },
   "azuread": {
-    "hash": "sha256-qFDCGj1ZhLnqG3Vg1bI+cdbExIbmDZaig9VYg6caWd0=",
+    "hash": "sha256-bCnCj2pEd29aQVePGeaTbVhH6sF/Y+lj94SEw1+tROc=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/azuread",
     "owner": "hashicorp",
     "repo": "terraform-provider-azuread",
-    "rev": "v2.37.1",
+    "rev": "v2.37.2",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From fbc3790f1342e74ca19f156adfde14926b4c90a5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 20 Apr 2023 03:06:16 +0000
Subject: [PATCH 63/96] terraform-providers.cloudflare: 4.3.0 -> 4.4.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index b4f5c5819c1b..796d3a7ba42a 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -218,13 +218,13 @@
     "vendorHash": "sha256-w7Rsr3UgijW/3RMKzhMyWCvn5b1R1oqRs87/ZPO7jHs="
   },
   "cloudflare": {
-    "hash": "sha256-dhSjFeTkbiG/Gx/DS1WzW2b31u3apfXX4Safh29e6Fw=",
+    "hash": "sha256-DDoPVceQpRTN23JaQ79uXrEStBgtb7WWrKBIVpIpok4=",
     "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
     "owner": "cloudflare",
     "repo": "terraform-provider-cloudflare",
-    "rev": "v4.3.0",
+    "rev": "v4.4.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-sgJ1HhhWQpvOGFVEC43pymBKyVcqdn8jLlW5fR21mFE="
+    "vendorHash": "sha256-b7h8CI1NeFAAXGdDsZ4CRXcomceoijon8IGriqP6tko="
   },
   "cloudfoundry": {
     "hash": "sha256-MKhsUGuDpKfYFf9Vk0uVrP/Z4hnQyO+2WiqWXO9EAC0=",

From 4911c2c69df3a279e290f7e4a86729fbc5322d4e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 20 Apr 2023 03:07:28 +0000
Subject: [PATCH 64/96] terraform-providers.fastly: 4.2.0 -> 4.3.0

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 796d3a7ba42a..d08bc45e81ae 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -381,11 +381,11 @@
     "vendorHash": "sha256-E1gzdES/YVxQq2J47E2zosvud2C/ViBeQ8+RfNHMBAg="
   },
   "fastly": {
-    "hash": "sha256-YKF4aW+K5JffPd5b3Kh540ml0uc9q5WSvcNgj9g6/Bk=",
+    "hash": "sha256-Z38tG5Of+nYuIT3IxY/hxbV0HIgkITBnaXcr3oYIf6Y=",
     "homepage": "https://registry.terraform.io/providers/fastly/fastly",
     "owner": "fastly",
     "repo": "terraform-provider-fastly",
-    "rev": "v4.2.0",
+    "rev": "v4.3.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From c71d45e9a44815f052d3310f817c6922f0974cdd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 20 Apr 2023 03:07:46 +0000
Subject: [PATCH 65/96] terraform-providers.equinix: 1.13.0 -> 1.14.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index d08bc45e81ae..61bb4420f6a1 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -354,13 +354,13 @@
     "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw="
   },
   "equinix": {
-    "hash": "sha256-zyRPpAaDgjRafn5RcrzmbVTzO6gGS1HMmvLR8VFdKow=",
+    "hash": "sha256-GGJNfHizFc+wXNo7u/mqtonIs5D/S8RydBsIkftNcjc=",
     "homepage": "https://registry.terraform.io/providers/equinix/equinix",
     "owner": "equinix",
     "repo": "terraform-provider-equinix",
-    "rev": "v1.13.0",
+    "rev": "v1.14.0",
     "spdx": "MIT",
-    "vendorHash": "sha256-Zi2e/Vg9iKTrU8Mb37Y8xHYIBL+IfDnWMUUg5Vqrbfo="
+    "vendorHash": "sha256-rJev48aS0nd8DRWmUN4i0LgDYvfjdfoO67N6AiWeg+k="
   },
   "exoscale": {
     "hash": "sha256-XbuVvVOv8k7T/7smr73+lvhFMxKtJkaLN3WgvTWIkrA=",

From c9a2c3fe923891b6ab98234483298af0200ff7b5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 20 Apr 2023 03:12:22 +0000
Subject: [PATCH 66/96] terraform-providers.google: 4.62.0 -> 4.62.1

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 61bb4420f6a1..5a20296ced45 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -437,12 +437,12 @@
     "vendorHash": "sha256-s4FynUO6bT+8uZYkecbQCtFw1jFTAAYUkSzONI6Ba9g="
   },
   "google": {
-    "hash": "sha256-vfcRR8EKR/axaD2RJ+3r3B1pmX1XSBYTBYPmwUTx3E8=",
+    "hash": "sha256-rF68NnqyEY4BWl+oLOxfTaQw5zEGs6Ue/L9DwzsJ46M=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google",
     "owner": "hashicorp",
     "proxyVendor": true,
     "repo": "terraform-provider-google",
-    "rev": "v4.62.0",
+    "rev": "v4.62.1",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-Xm1P6P2tMLqjV9QFX6D7koBPzg4umTH6jCQesyt0A/A="
   },

From fcdc295bfff5668c5b6c8f912bd98cbec1b1562a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 20 Apr 2023 03:12:44 +0000
Subject: [PATCH 67/96] terraform-providers.google-beta: 4.62.0 -> 4.62.1

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 5a20296ced45..2921817b854d 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -447,12 +447,12 @@
     "vendorHash": "sha256-Xm1P6P2tMLqjV9QFX6D7koBPzg4umTH6jCQesyt0A/A="
   },
   "google-beta": {
-    "hash": "sha256-PksNHhTzIuZxTzFRheiNutEnQSJ2WRu/IgF+8b1w9Eg=",
+    "hash": "sha256-/wcNrCMaXjameyE3o09N+bPjL8r627BJy1vYy1u2iAI=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
     "owner": "hashicorp",
     "proxyVendor": true,
     "repo": "terraform-provider-google-beta",
-    "rev": "v4.62.0",
+    "rev": "v4.62.1",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-Xm1P6P2tMLqjV9QFX6D7koBPzg4umTH6jCQesyt0A/A="
   },

From c9f26fd0fe624dfaae9b00357dac0a899c54dc6b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 20 Apr 2023 03:16:13 +0000
Subject: [PATCH 68/96] terraform-providers.scaleway: 2.16.3 -> 2.17.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 2921817b854d..a271dd12be5e 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -963,13 +963,13 @@
     "vendorHash": null
   },
   "scaleway": {
-    "hash": "sha256-QIrIL0vqiZafggdfWchlSOzLRDCF5Zubh6MqwOzfr3Y=",
+    "hash": "sha256-b0prqlZNPrg0YjvLk3RdJ+4C6eL4Tzdzt7Berp6G32c=",
     "homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
     "owner": "scaleway",
     "repo": "terraform-provider-scaleway",
-    "rev": "v2.16.3",
+    "rev": "v2.17.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-KUbE00fajvs4p8QxmuKV5IoRfCdWtfZTrOftcRAPSws="
+    "vendorHash": "sha256-tnZy6uN/lZaW4d6uo/quVAuEZZrXEX7qLAas0GauRJI="
   },
   "secret": {
     "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=",

From ca080510cfe69c0a1d29abf5a1d01ff3286273c4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 20 Apr 2023 03:19:09 +0000
Subject: [PATCH 69/96] terraform-providers.snowflake: 0.61.0 -> 0.62.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index a271dd12be5e..44e0e09183af 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1026,13 +1026,13 @@
     "vendorHash": null
   },
   "snowflake": {
-    "hash": "sha256-IAS0IJwWBmZi0x32ZMWFRyiiPZrnL6z1SGQ3AxuFAd8=",
+    "hash": "sha256-/9TTK33XwMW8izM35y9sOZOKFc6/HC2/CCnX3JMzY3I=",
     "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake",
     "owner": "Snowflake-Labs",
     "repo": "terraform-provider-snowflake",
-    "rev": "v0.61.0",
+    "rev": "v0.62.0",
     "spdx": "MIT",
-    "vendorHash": "sha256-INAtZefgxjNpf/PWGLn8SS2PxKu3SBhY+06cEnr9V3g="
+    "vendorHash": "sha256-3Ry+XQxF39lXr3Ev+KOx0GatVbD0Sjs9Jai1VPjEDBE="
   },
   "sops": {
     "hash": "sha256-D1Yzs8hDimMP9y8ZRbizEhic3vGtLcZjOVSuSMUAqPk=",

From 72a70e88da03f8f31bca99b4e6d3e7cc3e813318 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 20 Apr 2023 03:20:02 +0000
Subject: [PATCH 70/96] terraform-providers.oci: 4.116.0 -> 4.117.0

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 44e0e09183af..e479c3e917cb 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -810,11 +810,11 @@
     "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
   },
   "oci": {
-    "hash": "sha256-27vdHG/FRWGPZclW9Q0z/6ntY+of/5/PGIsKsePhF4k=",
+    "hash": "sha256-9Qcwxi8TojsDIWeyqwQcagTeTwKS/hkPukjeHANHGfU=",
     "homepage": "https://registry.terraform.io/providers/oracle/oci",
     "owner": "oracle",
     "repo": "terraform-provider-oci",
-    "rev": "v4.116.0",
+    "rev": "v4.117.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 2ef6b7cb4dd1c1d07ce8ca44b98ca3cb68458e96 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 20 Apr 2023 03:21:40 +0000
Subject: [PATCH 71/96] terraform-providers.tfe: 0.43.0 -> 0.44.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index e479c3e917cb..4aa7d8916762 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1107,13 +1107,13 @@
     "vendorHash": null
   },
   "tfe": {
-    "hash": "sha256-K0l9oaYkgilz47ErUxio9oJtPHQTWZnKdPpjRZ1SDhg=",
+    "hash": "sha256-y2QBMxn8sXwtL1wASypbARLn80T2eVJuawoQ0XQlK38=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/tfe",
     "owner": "hashicorp",
     "repo": "terraform-provider-tfe",
-    "rev": "v0.43.0",
+    "rev": "v0.44.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-plYy3INLi/SeKu7R0lDLY1CvRDU7bmZsQKzFtMc2Wu4="
+    "vendorHash": "sha256-vKIbswlWQUIPeaFRAMPGygM/UlWiRIr66NuTNfnpGpc="
   },
   "thunder": {
     "hash": "sha256-amGtmE1i68K0ehhYBJ6wwcdUPuVGSWoVdYAb1PwhlAs=",

From 7ddf6698abe1eec2479590144701ca88fe2fcfe9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 20 Apr 2023 03:23:40 +0000
Subject: [PATCH 72/96] terraform-providers.tencentcloud: 1.80.3 -> 1.80.4

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 4aa7d8916762..83d0c2c38ffa 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1098,11 +1098,11 @@
     "vendorHash": "sha256-GkmUKSnqkabwGCl22/90529BWb0oJaIJHYHlS/h3KNY="
   },
   "tencentcloud": {
-    "hash": "sha256-j1PffTicdXiit3D+dX9HzkBZFmf8Ch7LxNVU3XGi5uY=",
+    "hash": "sha256-soskWCOJaPzm2m2ocv3N8hb52Jz/T3xw/sW9hCSsf2s=",
     "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
     "owner": "tencentcloudstack",
     "repo": "terraform-provider-tencentcloud",
-    "rev": "v1.80.3",
+    "rev": "v1.80.4",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 8533286f7ddef00301cc80c53bf357287736f259 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Apr 2023 04:24:34 +0000
Subject: [PATCH 73/96] ksmbd-tools: 3.4.7 -> 3.4.8

---
 pkgs/os-specific/linux/ksmbd-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/ksmbd-tools/default.nix b/pkgs/os-specific/linux/ksmbd-tools/default.nix
index 56cfb8ef9c21..2376dddbb34a 100644
--- a/pkgs/os-specific/linux/ksmbd-tools/default.nix
+++ b/pkgs/os-specific/linux/ksmbd-tools/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ksmbd-tools";
-  version = "3.4.7";
+  version = "3.4.8";
 
   src = fetchFromGitHub {
     owner = "cifsd-team";
     repo = pname;
     rev = version;
-    sha256 = "sha256-uYJhjxarAqJC/aY8UUy7sjhA89LVoCG6B7/APkE0ouk=";
+    sha256 = "sha256-R/OWZekAGtDxE71MrzjWsdpaWGBu0c+VP0VkPro6GEo=";
   };
 
   buildInputs = [ glib libnl ] ++ lib.optional withKerberos libkrb5;

From b293a401ebcb33b684a6a7156fd1551b63421cb5 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 20 Apr 2023 06:41:24 +0200
Subject: [PATCH 74/96] ocamlPackages.facile: pin Dune version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

and disable for OCaml ≥ 5.0
---
 pkgs/development/ocaml-modules/facile/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/facile/default.nix b/pkgs/development/ocaml-modules/facile/default.nix
index 3eab7d3417fc..488a7d151d1b 100644
--- a/pkgs/development/ocaml-modules/facile/default.nix
+++ b/pkgs/development/ocaml-modules/facile/default.nix
@@ -1,5 +1,8 @@
 { lib, fetchurl, buildDunePackage, ocaml }:
 
+lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
+  "facile is not available for OCaml ≥ 5.0"
+
 buildDunePackage rec {
   pname = "facile";
   version = "1.1.4";
@@ -11,8 +14,8 @@ buildDunePackage rec {
 
   doCheck = true;
 
-  useDune2 = lib.versionAtLeast ocaml.version "4.12";
-  postPatch = lib.optionalString useDune2 "dune upgrade";
+  duneVersion = if lib.versionAtLeast ocaml.version "4.12" then "2" else "1";
+  postPatch = lib.optionalString (duneVersion != "1") "dune upgrade";
 
   meta = {
     homepage = "http://opti.recherche.enac.fr/facile/";

From 6009fd8178150f827ddef88afb6b973b1cbdff22 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 20 Apr 2023 06:41:28 +0200
Subject: [PATCH 75/96] ocamlPackages.nonstd: pin Dune version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

and disable for OCaml ≥ 5.0
---
 pkgs/development/ocaml-modules/nonstd/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/nonstd/default.nix b/pkgs/development/ocaml-modules/nonstd/default.nix
index 696cdff52196..748196bf28e2 100644
--- a/pkgs/development/ocaml-modules/nonstd/default.nix
+++ b/pkgs/development/ocaml-modules/nonstd/default.nix
@@ -1,5 +1,8 @@
 { lib, fetchzip, buildDunePackage, ocaml }:
 
+lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
+  "nonstd is not available for OCaml ≥ 5.0"
+
 buildDunePackage rec {
   pname = "nonstd";
   version = "0.0.3";
@@ -11,8 +14,8 @@ buildDunePackage rec {
     sha256 = "0ccjwcriwm8fv29ij1cnbc9win054kb6pfga3ygzdbjpjb778j46";
   };
 
-  useDune2 = lib.versionAtLeast ocaml.version "4.12";
-  postPatch = lib.optionalString useDune2 "dune upgrade";
+  duneVersion = if lib.versionAtLeast ocaml.version "4.12" then "2" else "1";
+  postPatch = lib.optionalString (duneVersion != "1") "dune upgrade";
   doCheck = true;
 
   meta = with lib; {

From 4c414a833e45079c1dcea1b9e96bdc18600606f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Apr 2023 04:41:48 +0000
Subject: [PATCH 76/96] kubernetes-helm: 3.11.2 -> 3.11.3

---
 pkgs/applications/networking/cluster/helm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 5c8b9be54be2..15b0a443c915 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "kubernetes-helm";
-  version = "3.11.2";
+  version = "3.11.3";
 
   src = fetchFromGitHub {
     owner = "helm";
     repo = "helm";
     rev = "v${version}";
-    sha256 = "sha256-aUzVICPCxAUoPvnE7pqz+bscfukbEwB+iGmXAYuQ/eE=";
+    sha256 = "sha256-BIjbSHs0sOLYB+26EHy9f3YJtUYnzgdADIXB4n45Rv0=";
   };
-  vendorSha256 = "sha256-Hf4ElC3H5sJkzKFELeDygTmfuqBHLqRhaHG1bfnqigM=";
+  vendorHash = "sha256-uz3ZqCcT+rmhNCO+y3PuCXWjTxUx8u3XDgcJxt7A37g=";
 
   subPackages = [ "cmd/helm" ];
   ldflags = [

From 37bbb66efbc9cc174c298a9de233aa80fdbe637e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Apr 2023 04:56:25 +0000
Subject: [PATCH 77/96] tar2ext4: 0.9.6 -> 0.9.8

---
 pkgs/tools/filesystems/tar2ext4/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/tar2ext4/default.nix b/pkgs/tools/filesystems/tar2ext4/default.nix
index e92f82ad27a5..4ac3d777bc54 100644
--- a/pkgs/tools/filesystems/tar2ext4/default.nix
+++ b/pkgs/tools/filesystems/tar2ext4/default.nix
@@ -2,17 +2,17 @@
 
 buildGoModule rec {
   pname = "tar2ext4";
-  version = "0.9.6";
+  version = "0.9.8";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "hcsshim";
     rev = "v${version}";
-    sha256 = "sha256-sBcagAFjmnLfPFYwOhWIt6bnEXyOKYobvMI2rQf4S5A=";
+    sha256 = "sha256-CvXn5b1kEZ2gYqfKSFRNzqkyOAcfcI1/3etRJTKwqog=";
   };
 
   sourceRoot = "source/cmd/tar2ext4";
-  vendorSha256 = null;
+  vendorHash = null;
 
   meta = with lib; {
     description = "Convert a tar archive to an ext4 image";

From ad5b82d76a6826fe5b6738318eb77934e01693f3 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 20 Apr 2023 09:07:06 +0300
Subject: [PATCH 78/96] python310Packages.spacy: 3.5.1 -> 3.5.2

---
 .../python-modules/spacy/annotation-test/annotate.py          | 4 ++--
 pkgs/development/python-modules/spacy/default.nix             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/spacy/annotation-test/annotate.py b/pkgs/development/python-modules/spacy/annotation-test/annotate.py
index 515b8f57b7ef..5acc3ddc60fd 100644
--- a/pkgs/development/python-modules/spacy/annotation-test/annotate.py
+++ b/pkgs/development/python-modules/spacy/annotation-test/annotate.py
@@ -29,7 +29,8 @@ def test_entities(doc_en_core_web_sm):
         ('Google', 'ORG'),
         ('2007', 'DATE'),
         ('American', 'NORP'),
-        ('Thrun', 'GPE'),
+        ('Thrun', 'PERSON'),
+        ('Recode', 'ORG'),
         ('earlier this week', 'DATE'),
     ]
 
@@ -64,6 +65,5 @@ def test_verbs(doc_en_core_web_sm):
         'tell',
         'shake',
         'turn',
-        'be',
         'talk',
         'say']
diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index 9cf03ce4f2dd..f6ecf1d7ebe7 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -36,14 +36,14 @@
 
 buildPythonPackage rec {
   pname = "spacy";
-  version = "3.5.1";
+  version = "3.5.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-gRrhRoxYuX/JqjEYfWtVMXeEJY8KR+v2nYHKtjnj+hU=";
+    hash = "sha256-IsH/qrKFt0dwA9S1sDhBTMMkaKaQ1HkBW5ppjFMcgTs=";
   };
 
   propagatedBuildInputs = [

From 2e80c06347a9ac08d6863e702a64fe367c14ef94 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Apr 2023 06:11:57 +0000
Subject: [PATCH 79/96] emacsPackages.ebuild-mode: 1.61 -> 1.63

---
 .../elisp-packages/manual-packages/ebuild-mode/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix
index 7473a8587929..894f8b75cc84 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix
@@ -2,11 +2,11 @@
 
 trivialBuild rec {
   pname = "ebuild-mode";
-  version = "1.61";
+  version = "1.63";
 
   src = fetchurl {
     url = "https://dev.gentoo.org/~ulm/emacs/${pname}-${version}.tar.xz";
-    sha256 = "sha256-/n3gs99psdiCA1Kjtljfx9T5anGPphtsMIC2nOCv0wk=";
+    sha256 = "sha256-Ar11zz0IVMu0g9+PN9dXvj8yeKnUGi8M+CTJfGP3bd4=";
   };
 
   meta = with lib; {

From 67fcbcf33c93e7dc44ddd6164fddb3db10faf913 Mon Sep 17 00:00:00 2001
From: QJoly <quentinjoly@thoughtless.eu>
Date: Thu, 20 Apr 2023 10:22:33 +0200
Subject: [PATCH 80/96] ktop: init at 0.3.5

---
 .../networking/cluster/ktop/default.nix       | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/ktop/default.nix

diff --git a/pkgs/applications/networking/cluster/ktop/default.nix b/pkgs/applications/networking/cluster/ktop/default.nix
new file mode 100644
index 000000000000..58fca5221c0d
--- /dev/null
+++ b/pkgs/applications/networking/cluster/ktop/default.nix
@@ -0,0 +1,33 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "ktop";
+  version = "0.3.5";
+  excludedPackages = [".ci"];
+
+  src = fetchFromGitHub {
+    owner = "vladimirvivien";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-nkIRVt2kqsE9QBYvvHmupohnzH+OBcwWwV16rMePw4I=";
+  };
+
+  vendorHash = "sha256-IiAMmHOq69WMT2B1q9ZV2fGDnLr7AbRm1P7ACSde2FE=";
+  ldflags = [ "-s" "-w" "-X github.com/vladimirvivien/ktop/buildinfo.Version=v${version}" ];
+
+  postInstall = ''
+    rm $out/bin/hack
+  '';
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "A top-like tool for your Kubernetes cluster";
+    longDescription = ''
+      Following the tradition of Unix/Linux top tools, ktop is a tool that displays useful metrics information about nodes, pods, and other workload resources running in a Kubernetes cluster.
+    '';
+    homepage = "https://github.com/vladimirvivien/ktop/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ qjoly ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89d0a2fae172..dda76905d545 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31537,6 +31537,8 @@ with pkgs;
 
   ktunnel = callPackage ../applications/networking/cluster/ktunnel { };
 
+  ktop = callPackage ../applications/networking/cluster/ktop { };
+
   pinniped = callPackage ../applications/networking/cluster/pinniped { };
 
   kthxbye = callPackage ../servers/monitoring/prometheus/kthxbye.nix { };

From e98590cdf674079f44381d1e0fa7fc5c0e70cc4a Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 18 Mar 2023 01:39:35 +0300
Subject: [PATCH 81/96] kde/gear: 22.12.3 -> 23.04.0

Autogenerated, fixes to follow
---
 pkgs/applications/kde/fetch.sh |    2 +-
 pkgs/applications/kde/srcs.nix | 2048 +++++++++++++++++---------------
 2 files changed, 1113 insertions(+), 937 deletions(-)

diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index c20859f6dd00..f5b3561bc3d2 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/release-service/22.12.3/src -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/release-service/23.04.0/src -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 91f2e0be1cca..09fa4856ed93 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -4,1875 +4,2051 @@
 
 {
   akonadi = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/akonadi-22.12.3.tar.xz";
-      sha256 = "18w0rrdqawxsgzzv3a9f6fic0dcj3cgq58xa74d09s7150k377mp";
-      name = "akonadi-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/akonadi-23.04.0.tar.xz";
+      sha256 = "1kjf148mxlsq9gb1civic4vrgmv5izqp2nrlb7iv4hn76zbw6a75";
+      name = "akonadi-23.04.0.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/akonadi-calendar-22.12.3.tar.xz";
-      sha256 = "1bksdbghqzql055lz7k90npjd7ql925ykpprshdgsaf3kxrw9qpb";
-      name = "akonadi-calendar-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/akonadi-calendar-23.04.0.tar.xz";
+      sha256 = "1nkc1vdsm5mc26hslm96f3pwcwd1wjra88a1s58rrbr0x1vcyn7f";
+      name = "akonadi-calendar-23.04.0.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/akonadi-calendar-tools-22.12.3.tar.xz";
-      sha256 = "0fi96vdh92y9in1yzphc59zjnisd9i9wck1d28542c2s2qbmjmcn";
-      name = "akonadi-calendar-tools-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/akonadi-calendar-tools-23.04.0.tar.xz";
+      sha256 = "1wav48zg9hxh9s80w3096v7528cyskqjr0hq8vizgs3vbhdkk0db";
+      name = "akonadi-calendar-tools-23.04.0.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/akonadi-contacts-22.12.3.tar.xz";
-      sha256 = "1vh34g7665all7bxps3akxvlg40rhddrwk8mw9nfpv4gfzyqv33p";
-      name = "akonadi-contacts-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/akonadi-contacts-23.04.0.tar.xz";
+      sha256 = "0fzqsx0j26hwn8nm55cnd4ibhisdn99g1w31kfkzvm13hw2idn5g";
+      name = "akonadi-contacts-23.04.0.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/akonadi-import-wizard-22.12.3.tar.xz";
-      sha256 = "0j7jav3nymhajwwhixapip9dvw7gx8wcjrf94ap1d1xr44kvmh32";
-      name = "akonadi-import-wizard-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/akonadi-import-wizard-23.04.0.tar.xz";
+      sha256 = "16ym0dsvrrrax3araz0626sh6yja2apw2hv2z4mg2yh2gzcccs89";
+      name = "akonadi-import-wizard-23.04.0.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/akonadi-mime-22.12.3.tar.xz";
-      sha256 = "00y1w9nzvdy7124552gi587z320c17gfqghxacvc45hiwq4c5p45";
-      name = "akonadi-mime-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/akonadi-mime-23.04.0.tar.xz";
+      sha256 = "105pjp303jyc5x1j7d8cxvzr1snd50i0qhvnvb4yyzi7rv2pa4m9";
+      name = "akonadi-mime-23.04.0.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/akonadi-notes-22.12.3.tar.xz";
-      sha256 = "13gc8ihraqh80a467cw7q9yf9h4l5m55n27h38inj4aw503zb4j7";
-      name = "akonadi-notes-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/akonadi-notes-23.04.0.tar.xz";
+      sha256 = "0gzr9zcx1vyl8c273pb9mskfv6qxjyq2mq4kzkc19bhnk3w4zxn4";
+      name = "akonadi-notes-23.04.0.tar.xz";
     };
   };
   akonadi-search = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/akonadi-search-22.12.3.tar.xz";
-      sha256 = "1hp5aq4w85fwml8r45q6gxwss2ihh6rsb3hdhxsdsvyyx5lr0mqv";
-      name = "akonadi-search-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/akonadi-search-23.04.0.tar.xz";
+      sha256 = "18bg2qn041skiscqv63273g6hfz6nvl5dcjrnr8l51zc08wqkla6";
+      name = "akonadi-search-23.04.0.tar.xz";
     };
   };
   akonadiconsole = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/akonadiconsole-22.12.3.tar.xz";
-      sha256 = "0ch93g5dajgp96yzsrh9sj0xbhy494bci1xx8jrfz6zdl3m6l9hr";
-      name = "akonadiconsole-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/akonadiconsole-23.04.0.tar.xz";
+      sha256 = "018sdkd6fpca9jcdbapb9582ga3gzv4gxxp7yaxg3a5k03rmbp50";
+      name = "akonadiconsole-23.04.0.tar.xz";
     };
   };
   akregator = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/akregator-22.12.3.tar.xz";
-      sha256 = "1zrcfw9h8plrmba7ax0pg34mc8zgqc4yvb8bvqfcq635ahgb9cdm";
-      name = "akregator-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/akregator-23.04.0.tar.xz";
+      sha256 = "0zh05vbrac59j9fwrsnva0445m6r3345dd96ljyxi5w312nhkv9f";
+      name = "akregator-23.04.0.tar.xz";
+    };
+  };
+  alligator = {
+    version = "23.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/release-service/23.04.0/src/alligator-23.04.0.tar.xz";
+      sha256 = "1zdm37bzbczd5149zynd6wxk51ipccmifr1if0km2igg5ajw687s";
+      name = "alligator-23.04.0.tar.xz";
     };
   };
   analitza = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/analitza-22.12.3.tar.xz";
-      sha256 = "155rv5lg4acf5bpamv2ksw63m61zndmjybvh64mr9cdgpip2db3r";
-      name = "analitza-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/analitza-23.04.0.tar.xz";
+      sha256 = "137iq0mwyiy007kbm78xv3szzmr7zp89pc80lajng5q76c6ynybx";
+      name = "analitza-23.04.0.tar.xz";
+    };
+  };
+  angelfish = {
+    version = "23.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/release-service/23.04.0/src/angelfish-23.04.0.tar.xz";
+      sha256 = "06v9y3fn1i213rffvyrsj68pjpw76b5svlqvqvjkmp6q17rap543";
+      name = "angelfish-23.04.0.tar.xz";
     };
   };
   ark = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/ark-22.12.3.tar.xz";
-      sha256 = "06kw6l0r0ynfcaq0icw55xs3yimbl3ybw717i08ksg96ks9rggl2";
-      name = "ark-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/ark-23.04.0.tar.xz";
+      sha256 = "1r9haddbzbqzngv7867v49rffmv0z9w56sbg37y9gi2w1834armf";
+      name = "ark-23.04.0.tar.xz";
     };
   };
   artikulate = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/artikulate-22.12.3.tar.xz";
-      sha256 = "1lpx9rwcfsyhwxa9xzggy2l8kdbrjcfvccb4m309j2ww4n0ym6ij";
-      name = "artikulate-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/artikulate-23.04.0.tar.xz";
+      sha256 = "0kd1grmbp9q2ax0bzay19xqlv1hb66s58rsxvlhjdyz9lcn6y7fl";
+      name = "artikulate-23.04.0.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/audiocd-kio-22.12.3.tar.xz";
-      sha256 = "19fi0ph9h5hk2n55qmg3jygq8zzynjz8xxyca2k60z0d426m23mq";
-      name = "audiocd-kio-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/audiocd-kio-23.04.0.tar.xz";
+      sha256 = "11z7kdr4xi3361qds6glhs61i9szm08k2pi5bj07vd8rah5nigzy";
+      name = "audiocd-kio-23.04.0.tar.xz";
+    };
+  };
+  audiotube = {
+    version = "23.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/release-service/23.04.0/src/audiotube-23.04.0.tar.xz";
+      sha256 = "0lcxbsajdz34mnjchkbx8nj4iddyqhsjyclyfywknyn8w23vh8mi";
+      name = "audiotube-23.04.0.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/baloo-widgets-22.12.3.tar.xz";
-      sha256 = "0cl4n591yjw6i6wjav56pq0070cn514ydqcap1jhkpw7xhi0d785";
-      name = "baloo-widgets-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/baloo-widgets-23.04.0.tar.xz";
+      sha256 = "15aw2ark1nh99adk49lcj33fpci8g6f9d610xkd77rr786g3pbjf";
+      name = "baloo-widgets-23.04.0.tar.xz";
     };
   };
   blinken = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/blinken-22.12.3.tar.xz";
-      sha256 = "0kn04iagw9dkpn1l75c9djl20waiyay4dxfs8iq8r7l6ai36v806";
-      name = "blinken-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/blinken-23.04.0.tar.xz";
+      sha256 = "03snnh5cdqcjga525bjl5hnnhwbgv9khpqq32z5v9glp97qddp2x";
+      name = "blinken-23.04.0.tar.xz";
     };
   };
   bomber = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/bomber-22.12.3.tar.xz";
-      sha256 = "0jwgrca2lq3jg42kk2211040s0z8667ckmh32vip267h2zvs33jd";
-      name = "bomber-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/bomber-23.04.0.tar.xz";
+      sha256 = "0lrg5agkkxm0xfjgid2y3vvrbyc73vayfd5y5bhmvcc9j4962dqy";
+      name = "bomber-23.04.0.tar.xz";
     };
   };
   bovo = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/bovo-22.12.3.tar.xz";
-      sha256 = "12rffxwshsbmzi3cflx5dl1hpr3nwdx0680qpzpi86vsk46jj9zs";
-      name = "bovo-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/bovo-23.04.0.tar.xz";
+      sha256 = "1m7wf4mahcn41b3j6inil0wmwhazb96dbwky1czgplhvm3ijpv31";
+      name = "bovo-23.04.0.tar.xz";
     };
   };
   calendarsupport = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/calendarsupport-22.12.3.tar.xz";
-      sha256 = "1dbvn1n947r4miabh2hqfgfs2b02i0wdvd0dxlpmc44xm2r0a8ka";
-      name = "calendarsupport-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/calendarsupport-23.04.0.tar.xz";
+      sha256 = "1jij2a8dqhski6m2rs0r2vpbyn4bpw9m8mysfj5bbn68dv3crw1a";
+      name = "calendarsupport-23.04.0.tar.xz";
+    };
+  };
+  calindori = {
+    version = "23.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/release-service/23.04.0/src/calindori-23.04.0.tar.xz";
+      sha256 = "0c14gbf3h50g049kl4npirrdb3x20sr23r2la2nbgb2x057b65x6";
+      name = "calindori-23.04.0.tar.xz";
     };
   };
   cantor = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/cantor-22.12.3.tar.xz";
-      sha256 = "0awjlnqwvy003gpsmyhp3g865xfxfl1h3vmqgxhrjwwgnv0f4xxn";
-      name = "cantor-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/cantor-23.04.0.tar.xz";
+      sha256 = "19zw91v4snxh18l3n0i8mik8f1rczcd7n520m4rr7kay0v03p7j4";
+      name = "cantor-23.04.0.tar.xz";
     };
   };
   cervisia = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/cervisia-22.12.3.tar.xz";
-      sha256 = "0ksvidsvnzc678gar1dry5yv535x9q022c4cxspl02kyiaqwm2y2";
-      name = "cervisia-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/cervisia-23.04.0.tar.xz";
+      sha256 = "00p4x68zrh6njnaz6pjd0ai3h4z3ax5ic8w195dcymkd1s4jfvdj";
+      name = "cervisia-23.04.0.tar.xz";
     };
   };
   colord-kde = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/colord-kde-22.12.3.tar.xz";
-      sha256 = "0k2qjhlwdm4q7xhlzwxhafcf4fq88saq3v8m4m50xs2gipanmvxf";
-      name = "colord-kde-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/colord-kde-23.04.0.tar.xz";
+      sha256 = "1p4p7j6qswk99xzm99x1s2ci6qsvw38hnxzrp885cpfq85wkl02i";
+      name = "colord-kde-23.04.0.tar.xz";
     };
   };
   dolphin = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/dolphin-22.12.3.tar.xz";
-      sha256 = "0nhbfra4gkk5338fhv91gbndznr3mkki7m1kcvrzs91x067m79qs";
-      name = "dolphin-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/dolphin-23.04.0.tar.xz";
+      sha256 = "0l3c015z737l88m97rpp3nanrci5zvgzn96lhwsja2837f52cjfd";
+      name = "dolphin-23.04.0.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/dolphin-plugins-22.12.3.tar.xz";
-      sha256 = "0fglzs9gix4lqnrb4h3bw4dxxmzx6gmv1dbc5q52q3k1ihgi9fyb";
-      name = "dolphin-plugins-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/dolphin-plugins-23.04.0.tar.xz";
+      sha256 = "1mnhmv7zrnai8ns06cwsdmj7afhsbq1d32vsqy3w8h37kh9di938";
+      name = "dolphin-plugins-23.04.0.tar.xz";
     };
   };
   dragon = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/dragon-22.12.3.tar.xz";
-      sha256 = "1qiq626wm1skrcz2xvhadr8d3rxypvhal1f8ii9qgra1nwhbmxls";
-      name = "dragon-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/dragon-23.04.0.tar.xz";
+      sha256 = "1fx9r74y5hf1w8c9m3z7jk25l5sgx1gb8ji7pzpj7779igbw7if4";
+      name = "dragon-23.04.0.tar.xz";
     };
   };
   elisa = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/elisa-22.12.3.tar.xz";
-      sha256 = "0gxjrf5vxxaz3pwq2vnibxmsw0ppmp1cdkjysg6sl1zy5rj2zcbr";
-      name = "elisa-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/elisa-23.04.0.tar.xz";
+      sha256 = "0qsdg1bp2l1nb8spla1g200swxncq7kli1qs0x5868gps0n5g1m0";
+      name = "elisa-23.04.0.tar.xz";
     };
   };
   eventviews = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/eventviews-22.12.3.tar.xz";
-      sha256 = "0s9n7gq6s4dc5xrx1snc9c4qp79il1r55mjkcjjc7a38h1j0xzrn";
-      name = "eventviews-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/eventviews-23.04.0.tar.xz";
+      sha256 = "03a3yiyljiyzlwrxywyl3lp2fnzwdfs5fszvcmm3cw04ahzq7aqn";
+      name = "eventviews-23.04.0.tar.xz";
     };
   };
   falkon = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/falkon-22.12.3.tar.xz";
-      sha256 = "081cf6qs3ziimzmhx2m976i3cfn0d89ncaxnnmqbamalsdvs5hcf";
-      name = "falkon-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/falkon-23.04.0.tar.xz";
+      sha256 = "0x0jq3vr2w5fkqvbpvpw9zn072b9syf2yvxdy2kqn073x2yj86cz";
+      name = "falkon-23.04.0.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/ffmpegthumbs-22.12.3.tar.xz";
-      sha256 = "14y1w7v34ilmbs4hb1sypgmq67cxrik5yfa63z1wlvmx3ww37w7s";
-      name = "ffmpegthumbs-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/ffmpegthumbs-23.04.0.tar.xz";
+      sha256 = "0p3giicpp7a5vr7vq4lpsnan47g1k7s0v1jbiq6makjlyzch93fc";
+      name = "ffmpegthumbs-23.04.0.tar.xz";
     };
   };
   filelight = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/filelight-22.12.3.tar.xz";
-      sha256 = "105v861b8w3a89rng7agjhhcx4kh58djrpi6n0azd6r01f8yxhmc";
-      name = "filelight-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/filelight-23.04.0.tar.xz";
+      sha256 = "09hg0n9bm9v22g48jmfhh69j9dl0a6y56aqgq2hyzbpfsw74baic";
+      name = "filelight-23.04.0.tar.xz";
+    };
+  };
+  ghostwriter = {
+    version = "23.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/release-service/23.04.0/src/ghostwriter-23.04.0.tar.xz";
+      sha256 = "1ymwsg9a9x7a18kgir5ji76salll39llqkwsd4qwhnb4nfl7q31x";
+      name = "ghostwriter-23.04.0.tar.xz";
     };
   };
   granatier = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/granatier-22.12.3.tar.xz";
-      sha256 = "1l8w9frqnh6lqyq8345igilsabavg37wk8vaabzjh4bg5lv5ngxl";
-      name = "granatier-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/granatier-23.04.0.tar.xz";
+      sha256 = "0qp7d9hxzjqnr2ap9icbl99r33xn9d6yfzgi640bjri49607c1dh";
+      name = "granatier-23.04.0.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/grantlee-editor-22.12.3.tar.xz";
-      sha256 = "09rrgqwjk1430vl84bp3xm3wbfdm0kz952kk723jz9b7xhm0sz0k";
-      name = "grantlee-editor-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/grantlee-editor-23.04.0.tar.xz";
+      sha256 = "0mf2f08i1fabs3s23i1p0014c8rsphnksxq9r79rkmi96dzppg92";
+      name = "grantlee-editor-23.04.0.tar.xz";
     };
   };
   grantleetheme = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/grantleetheme-22.12.3.tar.xz";
-      sha256 = "0lpsjj8k3dq0b9i2q9psk1smgkh07kjc7bsha3z0kxwy7ldadaz4";
-      name = "grantleetheme-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/grantleetheme-23.04.0.tar.xz";
+      sha256 = "15bkmgkkg2paanva0hwgq8dlbqh43041jjfvc454cms8rga64r2w";
+      name = "grantleetheme-23.04.0.tar.xz";
     };
   };
   gwenview = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/gwenview-22.12.3.tar.xz";
-      sha256 = "0q2l01zapw6lnm6qcsp3vhvbfsq837hzszmmzb2w7xnpaq4wf7aa";
-      name = "gwenview-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/gwenview-23.04.0.tar.xz";
+      sha256 = "0355fsf5kaiv1p29qz7alp4n0gyzfcrji3ysn0k7blqv8ys82gdn";
+      name = "gwenview-23.04.0.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/incidenceeditor-22.12.3.tar.xz";
-      sha256 = "15g9432175wqrkl5s9mj558lyrc2bdc7w54skkwkaai14i14s0pm";
-      name = "incidenceeditor-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/incidenceeditor-23.04.0.tar.xz";
+      sha256 = "0j0c06yr86l5pmjpsdq144sga31fap51z0f2bp565c89wiia24ci";
+      name = "incidenceeditor-23.04.0.tar.xz";
     };
   };
   itinerary = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/itinerary-22.12.3.tar.xz";
-      sha256 = "1qlx401vw6xh6hdcypvzm7wbcw72ljkzaxp6sywpcdz4xfpkdml0";
-      name = "itinerary-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/itinerary-23.04.0.tar.xz";
+      sha256 = "0zpac80f56bmy90jhv6iwa3qn0vb3kaijyc5imbw4iiqdv1z32j3";
+      name = "itinerary-23.04.0.tar.xz";
     };
   };
   juk = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/juk-22.12.3.tar.xz";
-      sha256 = "0y3v0754ax0w6zn9rbydl0jfshgpm5czcckyz3vp7p2sv2bkmqmc";
-      name = "juk-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/juk-23.04.0.tar.xz";
+      sha256 = "0ij8galk8g8pcdy9ax4b6cyjrw6gpcwfka7fhj1jnzrxl5c2sbwq";
+      name = "juk-23.04.0.tar.xz";
     };
   };
   k3b = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/k3b-22.12.3.tar.xz";
-      sha256 = "0alavrz6rd8i1amb06b0fynadygqsh9pwx9njvli6gl959paj94r";
-      name = "k3b-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/k3b-23.04.0.tar.xz";
+      sha256 = "0gh1ib5q8l41891ba1lw89xhsfpq90z9dnyzahq9n3850d0i4m4b";
+      name = "k3b-23.04.0.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kaccounts-integration-22.12.3.tar.xz";
-      sha256 = "0rp8km77vbrjmxyg1sizq6cprl7hjx1x31qqj12pnr35vmzbi8fa";
-      name = "kaccounts-integration-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kaccounts-integration-23.04.0.tar.xz";
+      sha256 = "1676i8fw8cs8ibc09wni1054nm56nah1rqxygai7d8wwazvqq1ls";
+      name = "kaccounts-integration-23.04.0.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kaccounts-providers-22.12.3.tar.xz";
-      sha256 = "1x1lf24aw9phyr20cjfqhwmmlb6r1iqlb4kvk39hdjzapzw3g505";
-      name = "kaccounts-providers-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kaccounts-providers-23.04.0.tar.xz";
+      sha256 = "07kvahlnxgcqmnqb6yzgk2vxgk46y5h5qcfjlvara62vrwx82dyg";
+      name = "kaccounts-providers-23.04.0.tar.xz";
     };
   };
   kaddressbook = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kaddressbook-22.12.3.tar.xz";
-      sha256 = "1dhcifdm15q0har47z9xicjgk5rffr8q7l6bvzza5i281nkxbdby";
-      name = "kaddressbook-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kaddressbook-23.04.0.tar.xz";
+      sha256 = "0v69q1s1vwwqrifkwlrs28bbzyjf5dn0s20v0fadz9cq1mn7749w";
+      name = "kaddressbook-23.04.0.tar.xz";
     };
   };
   kajongg = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kajongg-22.12.3.tar.xz";
-      sha256 = "13bn6mgfbjxpp4xp6xn3nbxjrxfhxblvjnhjcvc3qxcbkjniqzlh";
-      name = "kajongg-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kajongg-23.04.0.tar.xz";
+      sha256 = "013p7smfsmdp6j7cwdca0n0616jyn8y2rrq3lxgv997ngb4bsc9h";
+      name = "kajongg-23.04.0.tar.xz";
     };
   };
   kalarm = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kalarm-22.12.3.tar.xz";
-      sha256 = "074c99an6hawvklgpm6jc415cffa8fadv7r1c5sbiydl7jxkwlh5";
-      name = "kalarm-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kalarm-23.04.0.tar.xz";
+      sha256 = "0cd1b8jhnkizj9yy77gd0hz8r5ya8fqng91ggxc0xicqk4w4db9s";
+      name = "kalarm-23.04.0.tar.xz";
     };
   };
   kalendar = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kalendar-22.12.3.tar.xz";
-      sha256 = "1d82hs7dlrpixfp097i7kh3s1hi23h61cb491rbx0y76c2kp9ian";
-      name = "kalendar-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kalendar-23.04.0.tar.xz";
+      sha256 = "0rl7yrknvbipn04f4rznqgddic3rhyxip5ljv3qmgis49gxk2qzf";
+      name = "kalendar-23.04.0.tar.xz";
     };
   };
   kalgebra = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kalgebra-22.12.3.tar.xz";
-      sha256 = "1rv72c3z1zwbym4lrmd1k9mnsh6bk3jhgwg9jynlsbn68wwk2d6y";
-      name = "kalgebra-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kalgebra-23.04.0.tar.xz";
+      sha256 = "16pvs4qbwx7k7sz1wk7dl2p1d90clgzpcn9xg0vwqg9qzs7f31dl";
+      name = "kalgebra-23.04.0.tar.xz";
+    };
+  };
+  kalk = {
+    version = "23.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/release-service/23.04.0/src/kalk-23.04.0.tar.xz";
+      sha256 = "1xhz1igya9b3g6p3xs90p6ax663biszh27i5biw954h2vjyx3csb";
+      name = "kalk-23.04.0.tar.xz";
     };
   };
   kalzium = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kalzium-22.12.3.tar.xz";
-      sha256 = "0vd6r2n3vlszwn4qnapasczgkmi7llh8izk1mn4cfc3dprp2jq8b";
-      name = "kalzium-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kalzium-23.04.0.tar.xz";
+      sha256 = "0vl17ni60q8y2rh8ihh9gvqq6f231aclvyiv110bqxhhlmy63jrp";
+      name = "kalzium-23.04.0.tar.xz";
     };
   };
   kamera = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kamera-22.12.3.tar.xz";
-      sha256 = "03hfc8rb3ykkmcgyjvm8ywxr5cs98zr6yk468n380pax523c958h";
-      name = "kamera-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kamera-23.04.0.tar.xz";
+      sha256 = "1a0x92xm9c62mvav2w7iymjyabzw34d6l5ia4p2aji761lynzghj";
+      name = "kamera-23.04.0.tar.xz";
     };
   };
   kamoso = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kamoso-22.12.3.tar.xz";
-      sha256 = "1pisjv5c8d79j8hvssajwc60w1dkp0xnmlask15qaywk1a8ql7p4";
-      name = "kamoso-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kamoso-23.04.0.tar.xz";
+      sha256 = "1whj3h328vmnfxw4fn4g223sia17rjn81z670pi8fq318l76kf3a";
+      name = "kamoso-23.04.0.tar.xz";
     };
   };
   kanagram = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kanagram-22.12.3.tar.xz";
-      sha256 = "1cliapj1lshs153h012wkqsl6366x96pp69wrn5k70bkxa2pr7hl";
-      name = "kanagram-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kanagram-23.04.0.tar.xz";
+      sha256 = "1jhx5l0d15pajpw30v7gpxp9rlhg38sk8sm05lwmzvw41r5jqcas";
+      name = "kanagram-23.04.0.tar.xz";
     };
   };
   kapman = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kapman-22.12.3.tar.xz";
-      sha256 = "0wy1b60gpwl6495kq06jxrc604y5k0cglhg9brvqd15yqvrpiwm7";
-      name = "kapman-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kapman-23.04.0.tar.xz";
+      sha256 = "0d3078sy9zlnqfz1wdvyfcgf09awz3xajm9xyk4bcgk4viyb7748";
+      name = "kapman-23.04.0.tar.xz";
     };
   };
   kapptemplate = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kapptemplate-22.12.3.tar.xz";
-      sha256 = "0v115r2b108l22bf4vyqhw71mnqzkb30vsy7k385hjirzkpfjx1h";
-      name = "kapptemplate-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kapptemplate-23.04.0.tar.xz";
+      sha256 = "0yq3z8mfai1b1h4w59f0nzkr7sxh33cr1zmzmv02rp4i96bvm2ak";
+      name = "kapptemplate-23.04.0.tar.xz";
+    };
+  };
+  kasts = {
+    version = "23.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/release-service/23.04.0/src/kasts-23.04.0.tar.xz";
+      sha256 = "0kqkx5i8yw0139kycxy51akrxxi2zikhvqcjzfnncn7pr8bkcpwq";
+      name = "kasts-23.04.0.tar.xz";
     };
   };
   kate = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kate-22.12.3.tar.xz";
-      sha256 = "0gj4iwc5bs5kb4m92h4gq47cyyny866rk8d03lqcghyhvaw0bysv";
-      name = "kate-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kate-23.04.0.tar.xz";
+      sha256 = "038w3kyca2dm498g3rg4dis1z8r2bqamq1z3lwvpkylq3x83772q";
+      name = "kate-23.04.0.tar.xz";
     };
   };
   katomic = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/katomic-22.12.3.tar.xz";
-      sha256 = "064khd6c2zrw02f0jjp52qmx073p0zrlzn9vbqbq6rswpzbskam8";
-      name = "katomic-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/katomic-23.04.0.tar.xz";
+      sha256 = "16ym7c4w58krdxq0qplfyz9bifdbc5phz4dd69p4zwrl5bq7ibfk";
+      name = "katomic-23.04.0.tar.xz";
     };
   };
   kbackup = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kbackup-22.12.3.tar.xz";
-      sha256 = "04nq7sfynk9bsb1jhra7qrhiyc8hm2gwyb4x68jsqajszl3krjqg";
-      name = "kbackup-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kbackup-23.04.0.tar.xz";
+      sha256 = "1wzdkcnbqxzwwjvya7ii3fm65p0kmmbsbxpys9cwd5q4cjk9fjvc";
+      name = "kbackup-23.04.0.tar.xz";
     };
   };
   kblackbox = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kblackbox-22.12.3.tar.xz";
-      sha256 = "0gn1kj5az1i35jfcsj2dbx8h2ndq5iiqjwhv3v0gil98vfk11zxi";
-      name = "kblackbox-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kblackbox-23.04.0.tar.xz";
+      sha256 = "1qmkfvgnx9kmvb9cl3jkqpicwxgrvy6irpgbwwxnncphbcpchja9";
+      name = "kblackbox-23.04.0.tar.xz";
     };
   };
   kblocks = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kblocks-22.12.3.tar.xz";
-      sha256 = "0pnad7p16cfb8arffn0b019ciq0li6bnb7qmwr32jad6gvjhnbx4";
-      name = "kblocks-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kblocks-23.04.0.tar.xz";
+      sha256 = "04kxwsw9xm8a45ynz6ja0zzkgh4wy3kl9ryghhyklffy2q8q3w2j";
+      name = "kblocks-23.04.0.tar.xz";
     };
   };
   kbounce = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kbounce-22.12.3.tar.xz";
-      sha256 = "1hjw9g0wivxyr6qd08dfbqlfhynvaxg5hfr2zrl6kh0fh7wywzpi";
-      name = "kbounce-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kbounce-23.04.0.tar.xz";
+      sha256 = "0mdzn74bbg11mzzmgfn7yd97qss8ciqb4cgwpj7y1z4br64k9ywr";
+      name = "kbounce-23.04.0.tar.xz";
     };
   };
   kbreakout = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kbreakout-22.12.3.tar.xz";
-      sha256 = "0s32fq3dlakql44db4grizgs0gaavm4scsn8vjj7rabqwmqx2nxs";
-      name = "kbreakout-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kbreakout-23.04.0.tar.xz";
+      sha256 = "0i5a8zpj3kqcwm3w6ipb2y0030li487wr287ks0gam9wbgmsw2ck";
+      name = "kbreakout-23.04.0.tar.xz";
     };
   };
   kbruch = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kbruch-22.12.3.tar.xz";
-      sha256 = "0pr1440p8cwwf9pixli5si1imj0sxlhkpadjmzy58hdwi5yf8dxg";
-      name = "kbruch-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kbruch-23.04.0.tar.xz";
+      sha256 = "0mgn7iylpsw2hcy2cqvs4s70jqnf1x0346r2zdsbfv1nzn5g8m3h";
+      name = "kbruch-23.04.0.tar.xz";
     };
   };
   kcachegrind = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kcachegrind-22.12.3.tar.xz";
-      sha256 = "1c2azm416xn33val3bf3q9ffa2bva0hqngfh6kd28x96vrj7chr7";
-      name = "kcachegrind-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kcachegrind-23.04.0.tar.xz";
+      sha256 = "1i1840imhh76rwxrw0f404da4k5mj48ra220j5v6hxfajicz88g7";
+      name = "kcachegrind-23.04.0.tar.xz";
     };
   };
   kcalc = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kcalc-22.12.3.tar.xz";
-      sha256 = "16gxpxnydqcg59i15dsrbz85wcy7jrr9bqbdcnbl03jiwqjkkrjj";
-      name = "kcalc-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kcalc-23.04.0.tar.xz";
+      sha256 = "0snsfzlw6nsn01lin9nqg8rpiqwldbsbhyh0l7nnp8lg7kab6sfj";
+      name = "kcalc-23.04.0.tar.xz";
     };
   };
   kcalutils = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kcalutils-22.12.3.tar.xz";
-      sha256 = "0szw42iyrqxfxq8hy5fnn0iyjxj9l9dwy1z3r6v578390z98gqig";
-      name = "kcalutils-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kcalutils-23.04.0.tar.xz";
+      sha256 = "0yakkg08190ynpxk3q0pbci6dqi3ifiwwvknwhggfla1z21xqqlv";
+      name = "kcalutils-23.04.0.tar.xz";
     };
   };
   kcharselect = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kcharselect-22.12.3.tar.xz";
-      sha256 = "1pd3f9vcjfdqfrniz3adksvjq3hkdpdxvhx04qrv0dbq05qzah1l";
-      name = "kcharselect-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kcharselect-23.04.0.tar.xz";
+      sha256 = "08jdn9gnvpn3jqflkvk66a46m45n62cz83i2jvj0bfsq8binajs7";
+      name = "kcharselect-23.04.0.tar.xz";
+    };
+  };
+  kclock = {
+    version = "23.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/release-service/23.04.0/src/kclock-23.04.0.tar.xz";
+      sha256 = "17hw14rsv289ri40y0mc240znvyhkyw237qn7jsvg26y6llflxvx";
+      name = "kclock-23.04.0.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kcolorchooser-22.12.3.tar.xz";
-      sha256 = "0h6s4r739n1s54kvn2vsq825qigpdyan2jma9195xf2w5ix42im0";
-      name = "kcolorchooser-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kcolorchooser-23.04.0.tar.xz";
+      sha256 = "0hlkr3haq998bqrp8hhidvizbvfp997wl4vb6v5k66x9r8jwz5ir";
+      name = "kcolorchooser-23.04.0.tar.xz";
     };
   };
   kcron = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kcron-22.12.3.tar.xz";
-      sha256 = "0khqkdgzbxckksy95p4hqqjyk0gv6vi508gf40zy7mwsjzg04jgb";
-      name = "kcron-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kcron-23.04.0.tar.xz";
+      sha256 = "0nav7lw81v4nd83nrb7g4526zd31cxfc0ja4d6c35m731jycpd70";
+      name = "kcron-23.04.0.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kde-dev-scripts-22.12.3.tar.xz";
-      sha256 = "0y8jhxcbdmb3kq6aq4zpq80p6flgfxqw12v3phqrma7jzxfbi79c";
-      name = "kde-dev-scripts-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kde-dev-scripts-23.04.0.tar.xz";
+      sha256 = "1018mlw151bsn9cbxkvalwqwv7r9gyysldzk6mv5xy0y0zvqr04n";
+      name = "kde-dev-scripts-23.04.0.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kde-dev-utils-22.12.3.tar.xz";
-      sha256 = "022vx350xn8kmwvfniclc06qdixw5gi5v70n5alcrw5h7j3l0y10";
-      name = "kde-dev-utils-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kde-dev-utils-23.04.0.tar.xz";
+      sha256 = "1hqwrx7qf9ff02yk2psn0zsmby3qh7mvlhsw39nnnqr6gy9kcgg2";
+      name = "kde-dev-utils-23.04.0.tar.xz";
+    };
+  };
+  kde-inotify-survey = {
+    version = "23.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/release-service/23.04.0/src/kde-inotify-survey-23.04.0.tar.xz";
+      sha256 = "1g8xw6ir75la212mwp5pq3m99qc3x25sdh7hc6k4ilnsarxinn34";
+      name = "kde-inotify-survey-23.04.0.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kdebugsettings-22.12.3.tar.xz";
-      sha256 = "12hhimcclp5xm9wpb027d5j25k9n9q6iqyclpgd4gdcclmzcgmiv";
-      name = "kdebugsettings-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kdebugsettings-23.04.0.tar.xz";
+      sha256 = "0sycqjlm1109p2rp8079m9529i0zxjwsmvl1xyh40yw2wy5is5gy";
+      name = "kdebugsettings-23.04.0.tar.xz";
     };
   };
   kdeconnect-kde = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kdeconnect-kde-22.12.3.tar.xz";
-      sha256 = "16c0p8liq8mw56yczq1zckwbpys874f9i43ii9y6j0avfvldxnib";
-      name = "kdeconnect-kde-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kdeconnect-kde-23.04.0.tar.xz";
+      sha256 = "178139w3y9g9gnqjvjl6dmm3947n9ah2wbl7nwqfx26n7z8f1fl0";
+      name = "kdeconnect-kde-23.04.0.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kdeedu-data-22.12.3.tar.xz";
-      sha256 = "1j4x84qhrx5qhp87xmhy11szjx8mzvyg824dxvh9rr7aqycr8543";
-      name = "kdeedu-data-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kdeedu-data-23.04.0.tar.xz";
+      sha256 = "0njslxdvk9b3h0mpkmck23v6zxy7cz6g42rh2qf1gmhgwkb8p2xg";
+      name = "kdeedu-data-23.04.0.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kdegraphics-mobipocket-22.12.3.tar.xz";
-      sha256 = "1wd8z2jkcys91wghp2xfvxm3dhps13agyq98k71069xi77b26h2g";
-      name = "kdegraphics-mobipocket-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kdegraphics-mobipocket-23.04.0.tar.xz";
+      sha256 = "1hmh88ax4d5z12yaqnl39j29j7dz8n8nh783c3y9hh31hfikjy15";
+      name = "kdegraphics-mobipocket-23.04.0.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kdegraphics-thumbnailers-22.12.3.tar.xz";
-      sha256 = "027hlv38f9185pvkjaalyffciskcpahrj1l541sykrbdl9pqy0h7";
-      name = "kdegraphics-thumbnailers-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kdegraphics-thumbnailers-23.04.0.tar.xz";
+      sha256 = "0qnm6v8bbpm6zfxnvg74f7a677i0jj5x2qfnmc0093ra81rligxx";
+      name = "kdegraphics-thumbnailers-23.04.0.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kdenetwork-filesharing-22.12.3.tar.xz";
-      sha256 = "1yr7lh46x20b6ra5ax8ikvwy3cr5whz9jmyg7282niw1vjk52pj8";
-      name = "kdenetwork-filesharing-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kdenetwork-filesharing-23.04.0.tar.xz";
+      sha256 = "0hdw3cis6380l8vvj5gng18qxylpan2i74vq3v1byrdbpzp6f9wl";
+      name = "kdenetwork-filesharing-23.04.0.tar.xz";
     };
   };
   kdenlive = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kdenlive-22.12.3.tar.xz";
-      sha256 = "0s9wgii294irbxcg9rgnjpwpq0d54zjf1h2900bh6brhwfxhrvkj";
-      name = "kdenlive-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kdenlive-23.04.0.tar.xz";
+      sha256 = "0slfqjpxkc2nlwshfsw7qrvpcrdhv9cxb69l8fwnxr8l4yv7v8gb";
+      name = "kdenlive-23.04.0.tar.xz";
     };
   };
   kdepim-addons = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kdepim-addons-22.12.3.tar.xz";
-      sha256 = "0yapb2mq5jk6pysdi95s4ivrdlxap08lh97r2kd95v06028b95bd";
-      name = "kdepim-addons-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kdepim-addons-23.04.0.tar.xz";
+      sha256 = "1m9785hy7lfwm4m3499c67vi1c6a23y5dcd5pskhaxg5ii4hdd4z";
+      name = "kdepim-addons-23.04.0.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kdepim-runtime-22.12.3.tar.xz";
-      sha256 = "0mvjnzncx52dsr54g6ra8hj06gayxw85chc8ywdv154sch3pbc3x";
-      name = "kdepim-runtime-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kdepim-runtime-23.04.0.tar.xz";
+      sha256 = "0jbrg70949bqbx1mlfqqak21dg81jvbll6wpb0f4fmai4fj3kjvf";
+      name = "kdepim-runtime-23.04.0.tar.xz";
     };
   };
   kdesdk-kio = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kdesdk-kio-22.12.3.tar.xz";
-      sha256 = "0j3bh7dxgx2javsb3v4c53i15a85x6k00kq0myj9l9272jl9wqbb";
-      name = "kdesdk-kio-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kdesdk-kio-23.04.0.tar.xz";
+      sha256 = "1bbrh0zyvkyxfb35hh3qdpnfqgjc1qdyc6z9mrn22bgjb73bd8iz";
+      name = "kdesdk-kio-23.04.0.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kdesdk-thumbnailers-22.12.3.tar.xz";
-      sha256 = "0l1hhygdvqcp9rxwwvl0y1is8z86vsqppijvmjvhyyfm6fn5kkg6";
-      name = "kdesdk-thumbnailers-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kdesdk-thumbnailers-23.04.0.tar.xz";
+      sha256 = "1zb341mwra444bg4bgn1dr9kb9di66hv7kr60pvmdkbf8nqk7q6y";
+      name = "kdesdk-thumbnailers-23.04.0.tar.xz";
     };
   };
   kdev-php = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kdev-php-22.12.3.tar.xz";
-      sha256 = "1iki8zj4a5z69wv7nvycn3fqfndxgqrcaxy9nn4xd97i7bdfzrm8";
-      name = "kdev-php-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kdev-php-23.04.0.tar.xz";
+      sha256 = "0zjbv33c8f9z0mcij7r6jm4q41n98c6m2k91dxxhvalvygrxslmy";
+      name = "kdev-php-23.04.0.tar.xz";
     };
   };
   kdev-python = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kdev-python-22.12.3.tar.xz";
-      sha256 = "0ybfjgdbfwk9hhvh2h1grzkl3zzkqd6bysbrbfkpbhi3kx8l0rps";
-      name = "kdev-python-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kdev-python-23.04.0.tar.xz";
+      sha256 = "0rldq0x019vbp2r490bamqv8cl64zxi15xl3piczqivw01wjvnv5";
+      name = "kdev-python-23.04.0.tar.xz";
     };
   };
   kdevelop = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kdevelop-22.12.3.tar.xz";
-      sha256 = "0hq6y0qf572fsqxf5h4k7jxqxdp08d57hx1gw2v6ca5dl69dmrfa";
-      name = "kdevelop-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kdevelop-23.04.0.tar.xz";
+      sha256 = "1l5lpmd3q0b5h0r4mfmp3fxmc4hv2hhy8cilzzig5gb8xj3x27wd";
+      name = "kdevelop-23.04.0.tar.xz";
     };
   };
   kdf = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kdf-22.12.3.tar.xz";
-      sha256 = "157bk2mgn7dqn97lnnbhcy9aanymdzx6lgp4wf9camrlkpzlmv20";
-      name = "kdf-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kdf-23.04.0.tar.xz";
+      sha256 = "1cksxdm63y0k4vkyvjmrwrzmbh4zf6k90bazmrhl1nmhla5lcvnf";
+      name = "kdf-23.04.0.tar.xz";
     };
   };
   kdialog = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kdialog-22.12.3.tar.xz";
-      sha256 = "0bgcrc0dqjqc4i2c965bkv4jckmj2v4vgga3s7wa1hx8j1qwm323";
-      name = "kdialog-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kdialog-23.04.0.tar.xz";
+      sha256 = "1binhhlj3wazkiyy6sa9vxwqcn2q607gagi97w94sl4in6yim8sa";
+      name = "kdialog-23.04.0.tar.xz";
     };
   };
   kdiamond = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kdiamond-22.12.3.tar.xz";
-      sha256 = "0xf4ganqm6wvzvqi1sy4wy8nh53779fx894kn0khawxivav69r6c";
-      name = "kdiamond-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kdiamond-23.04.0.tar.xz";
+      sha256 = "1zxdaqyskqr247yd2850y68difr3wmxik6wn5jx5g65wpi5jimqd";
+      name = "kdiamond-23.04.0.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/keditbookmarks-22.12.3.tar.xz";
-      sha256 = "0b1bpqaf3v4y668sspzangsh6jw9hp3li8a9smkg61qnpxlv0ix6";
-      name = "keditbookmarks-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/keditbookmarks-23.04.0.tar.xz";
+      sha256 = "12jmqccr8j1kn2mxs3gc7ymvdb4q4lrg4vxrxfgf73dchp69c0nx";
+      name = "keditbookmarks-23.04.0.tar.xz";
+    };
+  };
+  keysmith = {
+    version = "23.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/release-service/23.04.0/src/keysmith-23.04.0.tar.xz";
+      sha256 = "19vliz3v8ba9i5v8zx5x001xj51z38cfzsap4b1vmyvhni7pywg8";
+      name = "keysmith-23.04.0.tar.xz";
     };
   };
   kfind = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kfind-22.12.3.tar.xz";
-      sha256 = "1a0ms6cnzbq3p20q6vfc0m1zddpsdxsaw0y6dsfz804gy1lswk7x";
-      name = "kfind-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kfind-23.04.0.tar.xz";
+      sha256 = "1ssc6vslqad56wbfqygws78qvqyzh453crh0vmxrls7dx0vz61p8";
+      name = "kfind-23.04.0.tar.xz";
     };
   };
   kfloppy = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kfloppy-22.12.3.tar.xz";
-      sha256 = "119m06av50fj5sbbhdcwcjkwxz7jmzhdl74x7g6k742bzf6nn2b6";
-      name = "kfloppy-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kfloppy-23.04.0.tar.xz";
+      sha256 = "0rjz3lw13d9yx0s994fm4lhzb3h3fzcfgxkisjrmgi4dq7x4psd9";
+      name = "kfloppy-23.04.0.tar.xz";
     };
   };
   kfourinline = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kfourinline-22.12.3.tar.xz";
-      sha256 = "1b8w96n788md83r8kjk21wjc3wplbsfq385jrcxq1ivjfyzjzzps";
-      name = "kfourinline-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kfourinline-23.04.0.tar.xz";
+      sha256 = "1dic48qy2ppapxy8pn819x0wb6b5hmyp3wlqyqz4a5zsqhz170yc";
+      name = "kfourinline-23.04.0.tar.xz";
     };
   };
   kgeography = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kgeography-22.12.3.tar.xz";
-      sha256 = "0i7d2n3a2phgvlr3zw2w8lq4mfw2l818z52fqc4y30n85gvzs0m2";
-      name = "kgeography-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kgeography-23.04.0.tar.xz";
+      sha256 = "10mmfpmpazmh7qln1y891h33asqbfrkgpascpi8wyfcfsf1cjgvz";
+      name = "kgeography-23.04.0.tar.xz";
     };
   };
   kget = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kget-22.12.3.tar.xz";
-      sha256 = "048i7ny857k8fsx3ybmcq316pfxlrag06b11l868hrhxnj361mk1";
-      name = "kget-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kget-23.04.0.tar.xz";
+      sha256 = "1wj500xkhlq5kcqnlnn04x3j30p0z1pm7fjpq9j8l64nv3rb451b";
+      name = "kget-23.04.0.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kgoldrunner-22.12.3.tar.xz";
-      sha256 = "10g85x4hks3p35smvfj69g1gfaaggzsms3nqrpmqp5b949z6zjrn";
-      name = "kgoldrunner-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kgoldrunner-23.04.0.tar.xz";
+      sha256 = "13wvxvjlqxni6kr3n7fsxy17s9cxylnwj2jwbnayhsp8n971gb2h";
+      name = "kgoldrunner-23.04.0.tar.xz";
     };
   };
   kgpg = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kgpg-22.12.3.tar.xz";
-      sha256 = "1qrkgq4q391s20azrs8d2nm9x1raz8fbx7yxkg13mcc4gp7zzvp6";
-      name = "kgpg-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kgpg-23.04.0.tar.xz";
+      sha256 = "11qh9h65ww419cv4cj9ypbdfmbp783ybjjswsll0kv95r5myz18b";
+      name = "kgpg-23.04.0.tar.xz";
     };
   };
   khangman = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/khangman-22.12.3.tar.xz";
-      sha256 = "1p1szzisdhsbbid6nb7cngapvpw025263d1lfp03r0x767r5w9zx";
-      name = "khangman-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/khangman-23.04.0.tar.xz";
+      sha256 = "18dqgkylxyicr4d2ycpjy9ap2r4pz69m9zpvpj3mhx51qywb8cd2";
+      name = "khangman-23.04.0.tar.xz";
     };
   };
   khelpcenter = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/khelpcenter-22.12.3.tar.xz";
-      sha256 = "1sv1rpdr57rp2yyfvyfw2iy1k2cq0k0bszd40gb009r0f6zywy0i";
-      name = "khelpcenter-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/khelpcenter-23.04.0.tar.xz";
+      sha256 = "1gxm6fm0hr99mb7jphb4hx80k8n8jx8frrawnkw9nwkq0815vq5n";
+      name = "khelpcenter-23.04.0.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kidentitymanagement-22.12.3.tar.xz";
-      sha256 = "0nr1172ajn4n09zk7dxd1zfsmcrcy50mlmisv9bby7c0lmwzv1pf";
-      name = "kidentitymanagement-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kidentitymanagement-23.04.0.tar.xz";
+      sha256 = "167hzf079qi13siy36g4ljjfzirh1182ra63z4lsvpi4sh7nva2r";
+      name = "kidentitymanagement-23.04.0.tar.xz";
     };
   };
   kig = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kig-22.12.3.tar.xz";
-      sha256 = "1ndiwmgg2bawq2is4sspdrssfwamnkpghpq81bs5lxazi0ixnyk5";
-      name = "kig-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kig-23.04.0.tar.xz";
+      sha256 = "0rb2qfh9l16nk8yfg1xzlc5nf0vdh9mrxi3804h0xcy0ck081np4";
+      name = "kig-23.04.0.tar.xz";
     };
   };
   kigo = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kigo-22.12.3.tar.xz";
-      sha256 = "1j5pplhyb6cq76b4avflw0rb4r8lmkas38mh70s2mjw5c8mj19gg";
-      name = "kigo-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kigo-23.04.0.tar.xz";
+      sha256 = "0348lmd84gv5qz2d0pk2wrhmkam14737016hdxn8fm1g14q81qgq";
+      name = "kigo-23.04.0.tar.xz";
     };
   };
   killbots = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/killbots-22.12.3.tar.xz";
-      sha256 = "1xchgipbs61azzcf0qjm1liwdkppg7nml9ga0mwswhzpw9ylp5yi";
-      name = "killbots-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/killbots-23.04.0.tar.xz";
+      sha256 = "0fpsxs10vx65wk48iskmf3x3spf1zcpjg710lm50anwakc2v4kzp";
+      name = "killbots-23.04.0.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kimagemapeditor-22.12.3.tar.xz";
-      sha256 = "0f2nif2wlcgql345xfg1h0x31ms2l6w1i8wwc2iy0a679971w8mx";
-      name = "kimagemapeditor-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kimagemapeditor-23.04.0.tar.xz";
+      sha256 = "0fagwdhm706lnyrj8q0przpvzas6xsajwwvc2gr3gfc12f2mgv3b";
+      name = "kimagemapeditor-23.04.0.tar.xz";
     };
   };
   kimap = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kimap-22.12.3.tar.xz";
-      sha256 = "1xn5gmry4fgm9yc5z6dn9g7yp2hyjry5r5fvkdhm3jh3n11bgq6j";
-      name = "kimap-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kimap-23.04.0.tar.xz";
+      sha256 = "0r5izw3rscmynj72f7a6v3ra5mi6vgw24scvmak6h8ya4zwhzhk4";
+      name = "kimap-23.04.0.tar.xz";
+    };
+  };
+  kio-admin = {
+    version = "23.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/release-service/23.04.0/src/kio-admin-23.04.0.tar.xz";
+      sha256 = "1s5a21biixvcfsdfasfqpig54waifzcyds5w99in1zxd59kg7qwi";
+      name = "kio-admin-23.04.0.tar.xz";
     };
   };
   kio-extras = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kio-extras-22.12.3.tar.xz";
-      sha256 = "15qh2w6fm1j33scvlb2cjjimvfvisa0vp7d5n4mwm82s15a7ahv5";
-      name = "kio-extras-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kio-extras-23.04.0.tar.xz";
+      sha256 = "1lb0gfyyqs5d7xxvzxg4x0q063q04jf3zgmc0cn9qq3d4xj73f8d";
+      name = "kio-extras-23.04.0.tar.xz";
     };
   };
   kio-gdrive = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kio-gdrive-22.12.3.tar.xz";
-      sha256 = "12r44b68vyzc1yhfm4pmp7g1af2ysqybvjzr12pl8xw4zgyd3qd3";
-      name = "kio-gdrive-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kio-gdrive-23.04.0.tar.xz";
+      sha256 = "0hjlbdw7cm75hrj5nxxfjn2fxscjqrs9chz2cc4wkk40sf5fx61r";
+      name = "kio-gdrive-23.04.0.tar.xz";
     };
   };
   kio-zeroconf = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kio-zeroconf-22.12.3.tar.xz";
-      sha256 = "1azx6f6dh2nwmzp4vbn4qwxlh4f4zxq211p4pqvf29yi2fyp8ix1";
-      name = "kio-zeroconf-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kio-zeroconf-23.04.0.tar.xz";
+      sha256 = "0n78qkn9pjm63pb9p2xngyma3aplhhrw47j3g4gq7izhpmwxzisz";
+      name = "kio-zeroconf-23.04.0.tar.xz";
     };
   };
   kipi-plugins = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kipi-plugins-22.12.3.tar.xz";
-      sha256 = "1zfp05biddxpggl3b158dg2sdjrqp8rdbymqfbr9p3w7gl6hk7av";
-      name = "kipi-plugins-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kipi-plugins-23.04.0.tar.xz";
+      sha256 = "19jrr20b3h1yh6gvjpbnr9902lwll16pf5m277kin6sc4n1lwlah";
+      name = "kipi-plugins-23.04.0.tar.xz";
     };
   };
   kirigami-gallery = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kirigami-gallery-22.12.3.tar.xz";
-      sha256 = "1zbsnfs25nqkwfqhkjn7idcypzhzfb0ldjxarlp104ycjh70v5ls";
-      name = "kirigami-gallery-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kirigami-gallery-23.04.0.tar.xz";
+      sha256 = "1bfh6ynx5jk5216mmms6ll0md7phcpjwcjs8g3k99cbnccfgh80h";
+      name = "kirigami-gallery-23.04.0.tar.xz";
     };
   };
   kiriki = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kiriki-22.12.3.tar.xz";
-      sha256 = "05csmqy7kdn5kga1lrg6bf7qjg36w7wyd23c0nnizzh51d7h13f7";
-      name = "kiriki-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kiriki-23.04.0.tar.xz";
+      sha256 = "0ify2g0cd5aagbl3q27k57zlcrcswgsnsp3ii732fywwi6mgllv7";
+      name = "kiriki-23.04.0.tar.xz";
     };
   };
   kiten = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kiten-22.12.3.tar.xz";
-      sha256 = "0xqj62hwlqsar1ziwgzrmk7bj9hqwwxpfwhrfm661vib0qsn82kn";
-      name = "kiten-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kiten-23.04.0.tar.xz";
+      sha256 = "1aa37is7l09phn6r8pi6xcdpzmdmd1c1i06cshxnklqsh0186a3f";
+      name = "kiten-23.04.0.tar.xz";
     };
   };
   kitinerary = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kitinerary-22.12.3.tar.xz";
-      sha256 = "0qrfhrf9fgslagds6qr46a9p5iwzy5d07ilk8r29xcvm6l9s95x6";
-      name = "kitinerary-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kitinerary-23.04.0.tar.xz";
+      sha256 = "07xb25q4r5w8yzxm1r9x1ra9lffqrh2h29nc9v6r2mcbjm388yds";
+      name = "kitinerary-23.04.0.tar.xz";
+    };
+  };
+  kjournald = {
+    version = "23.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/release-service/23.04.0/src/kjournald-23.04.0.tar.xz";
+      sha256 = "1dnbpvs3cdj9bbp1xayprhh0y03wlkbxs7ch7j63082dk8ps345s";
+      name = "kjournald-23.04.0.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kjumpingcube-22.12.3.tar.xz";
-      sha256 = "09wg0k92yb4wfqfq3hhai2rbviwpj7kwgi3m19dv1xr40n7kfgaz";
-      name = "kjumpingcube-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kjumpingcube-23.04.0.tar.xz";
+      sha256 = "0swgngmqf87d87xrah8ipzr3xljrbm5w4rl2q3sj5l7cw4f09ldw";
+      name = "kjumpingcube-23.04.0.tar.xz";
     };
   };
   kldap = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kldap-22.12.3.tar.xz";
-      sha256 = "0a0cmr7vjpk7c0mkgvbnf65qq24dqwx8f1cyv6phfb6yr8ffwcqd";
-      name = "kldap-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kldap-23.04.0.tar.xz";
+      sha256 = "0cafm0llr46lmzravgfkh1rgy55xix4sp3jb6fpqq6820l66jymj";
+      name = "kldap-23.04.0.tar.xz";
     };
   };
   kleopatra = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kleopatra-22.12.3.tar.xz";
-      sha256 = "15nrg63xyb2jaxix8ijnp3ikbnj74d430ilvxa9k7kbzjp59kw9i";
-      name = "kleopatra-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kleopatra-23.04.0.tar.xz";
+      sha256 = "1xpr2q5718jyhdgrnpkq52177fr4nhmskac87p5s2q8yc22m0jwq";
+      name = "kleopatra-23.04.0.tar.xz";
     };
   };
   klettres = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/klettres-22.12.3.tar.xz";
-      sha256 = "09s2fiyqhbr9jhm76v84rlzvrbcbwrra1m3ajbf2vkrk7fiwaav2";
-      name = "klettres-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/klettres-23.04.0.tar.xz";
+      sha256 = "0a2ifnhnsmvsl8vs118mjb43bfq5hx5c4w3zalx5jlq8f9q7wy7j";
+      name = "klettres-23.04.0.tar.xz";
     };
   };
   klickety = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/klickety-22.12.3.tar.xz";
-      sha256 = "10xiwd1yr1y7gfw7hb8qsxs2x689xsxcimwdnwyi6bcy5kcj63zi";
-      name = "klickety-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/klickety-23.04.0.tar.xz";
+      sha256 = "1addg9797bpzi3a1hnq1xva50bq5vv0w0v97hp1qncg1jh8b0ffk";
+      name = "klickety-23.04.0.tar.xz";
     };
   };
   klines = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/klines-22.12.3.tar.xz";
-      sha256 = "1l3j4ig2sjga64vrl75z409dy0kgc2f784ggza94v6hklq39p06z";
-      name = "klines-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/klines-23.04.0.tar.xz";
+      sha256 = "087sh57kyq37kmxpxsiqh4yxpv7j59wq69k576bwcl7hlqknbz29";
+      name = "klines-23.04.0.tar.xz";
     };
   };
   kmag = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kmag-22.12.3.tar.xz";
-      sha256 = "0lj6glichvs0wk9fdzznplas3mdvi98m6m92whimgvkj4fslwknv";
-      name = "kmag-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kmag-23.04.0.tar.xz";
+      sha256 = "01xjs7bvdra5gigcvgnx71yqqqhhxjzr5nzrpwlck1z9378xirkg";
+      name = "kmag-23.04.0.tar.xz";
     };
   };
   kmahjongg = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kmahjongg-22.12.3.tar.xz";
-      sha256 = "1rsvk0vy85z27g0ldli8lm6bqywggvwp0kkz860yfjnlbi0wznxr";
-      name = "kmahjongg-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kmahjongg-23.04.0.tar.xz";
+      sha256 = "1r4rwhy3m25002qnc2l35my2hla9xzhmsjbikv6n7r9wfvmyr0nm";
+      name = "kmahjongg-23.04.0.tar.xz";
     };
   };
   kmail = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kmail-22.12.3.tar.xz";
-      sha256 = "13h2s78bsmzbdc45iixvpc6ba23zng2f579s81935pvcb412lvbq";
-      name = "kmail-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kmail-23.04.0.tar.xz";
+      sha256 = "1fyr3w6c1plm41px97vma2yf7n5f6jrh68plk1w507ggvm5ws1ja";
+      name = "kmail-23.04.0.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kmail-account-wizard-22.12.3.tar.xz";
-      sha256 = "0ij54xx7clz7nxgfzw3kf9xjb84qn1llm041x0l6cydfhw60bjw8";
-      name = "kmail-account-wizard-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kmail-account-wizard-23.04.0.tar.xz";
+      sha256 = "1i0q6pkfz7lra5921fmcbwli4qna6slhph74f21ggmbhj2zw66hz";
+      name = "kmail-account-wizard-23.04.0.tar.xz";
     };
   };
   kmailtransport = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kmailtransport-22.12.3.tar.xz";
-      sha256 = "1h53mmd25ydyqdazn4h9k2gq24d694khdbwsb0dpw7fv4x9ihvyk";
-      name = "kmailtransport-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kmailtransport-23.04.0.tar.xz";
+      sha256 = "1by6jsrry5s8xb510m14bknryviwhsk6yak9igh7s6xlcgbd2723";
+      name = "kmailtransport-23.04.0.tar.xz";
     };
   };
   kmbox = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kmbox-22.12.3.tar.xz";
-      sha256 = "0wshp1i789j3ijn6p230xx0bdkpx439imaif5acxw0m9bjrvbfrd";
-      name = "kmbox-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kmbox-23.04.0.tar.xz";
+      sha256 = "0srq4rf18cs0zmqplf3i6vilsjpavzkfkiwm0izqv3imnmzzi1ym";
+      name = "kmbox-23.04.0.tar.xz";
     };
   };
   kmime = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kmime-22.12.3.tar.xz";
-      sha256 = "1n6353diasl50xd280ydpdmg3c1966q5sxfx8h96gbjfcqgiyg4v";
-      name = "kmime-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kmime-23.04.0.tar.xz";
+      sha256 = "0jxjj60ba7hvm51lhaamra09qpvgjj7ky8salhrs6q20cjnv1kx3";
+      name = "kmime-23.04.0.tar.xz";
     };
   };
   kmines = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kmines-22.12.3.tar.xz";
-      sha256 = "05zmhzh09bdgi3jx2hv2m1lycnj6ifhgr86l2jkqfby6yl6n7sf6";
-      name = "kmines-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kmines-23.04.0.tar.xz";
+      sha256 = "1hvq88gp3dd2gpklv1zfsr1yskvkr79r2zkmlbwa2fdls5nqlgxf";
+      name = "kmines-23.04.0.tar.xz";
     };
   };
   kmix = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kmix-22.12.3.tar.xz";
-      sha256 = "0s8ff91daa9gf90vz39hzryv19biy4jlvn1slimqvbrlpvii7p2v";
-      name = "kmix-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kmix-23.04.0.tar.xz";
+      sha256 = "1f3gwkpdn0zzigx1kw74gpxwsvpy72k2pfiy5nb3nhdk5ji0lgjj";
+      name = "kmix-23.04.0.tar.xz";
     };
   };
   kmousetool = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kmousetool-22.12.3.tar.xz";
-      sha256 = "1j2gqdbrif78cp0jvxhq1dmj5vrqdmnqaipx478h50r8ykzc8yfs";
-      name = "kmousetool-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kmousetool-23.04.0.tar.xz";
+      sha256 = "0151fwjzlcpkgiadq18hx6x0rrab2zakd6rzcwvzijqj4hdqlgfd";
+      name = "kmousetool-23.04.0.tar.xz";
     };
   };
   kmouth = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kmouth-22.12.3.tar.xz";
-      sha256 = "1kp03hr07qk8707zqvlh3w6hsdmv6ry9gaydi3klc832w57y21b9";
-      name = "kmouth-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kmouth-23.04.0.tar.xz";
+      sha256 = "0z2xjn1dg15nwxib2lj84k7sjhv8vjddy0m902mw8mfa5hhrd5ic";
+      name = "kmouth-23.04.0.tar.xz";
     };
   };
   kmplot = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kmplot-22.12.3.tar.xz";
-      sha256 = "0hg77qg6yzhk7d7jfbp1544qlmw5wwgv97p9p992lxcm234h560j";
-      name = "kmplot-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kmplot-23.04.0.tar.xz";
+      sha256 = "1g3n6mwa0ysrm1f0l9j6klm59d8hb9dz93mfzvni5ffj9d0p1ksx";
+      name = "kmplot-23.04.0.tar.xz";
     };
   };
   knavalbattle = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/knavalbattle-22.12.3.tar.xz";
-      sha256 = "17zsmk7n2cxdfaxk63c958aydparcca2dw10yfdafq4a3wjhnqqf";
-      name = "knavalbattle-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/knavalbattle-23.04.0.tar.xz";
+      sha256 = "12hqw8p5c5v8vq5y8d3kbxw0jwsnzkszh6b5gpk2xi1jif9r9yih";
+      name = "knavalbattle-23.04.0.tar.xz";
     };
   };
   knetwalk = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/knetwalk-22.12.3.tar.xz";
-      sha256 = "16p57ixq1h8wfv4ggv91m8d8pfjy486phi2yvsxnkib12yiv13yj";
-      name = "knetwalk-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/knetwalk-23.04.0.tar.xz";
+      sha256 = "0b2r4x5lbv9bgxfa4nq0rm0lfcjw9s8gqnpiivxc5m1p61db2cms";
+      name = "knetwalk-23.04.0.tar.xz";
     };
   };
   knights = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/knights-22.12.3.tar.xz";
-      sha256 = "1rc2xrb6s1ncqnbbxr5c3ccy98mk2ljhxp32nmfzxd6l97qm0mnj";
-      name = "knights-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/knights-23.04.0.tar.xz";
+      sha256 = "09cqh1m371s021f9pp9bagblbbkxx69v30c9yzhf2s417q64fzq6";
+      name = "knights-23.04.0.tar.xz";
     };
   };
   knotes = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/knotes-22.12.3.tar.xz";
-      sha256 = "1nav1c1q65f3zsrwyq2j5nikhxp4mz45yg0zfymw24n4qi2b9xc2";
-      name = "knotes-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/knotes-23.04.0.tar.xz";
+      sha256 = "148wsjp2m76sh90swrijy4zn5dm0r7ss5jynjwrxdvij6bf700v8";
+      name = "knotes-23.04.0.tar.xz";
+    };
+  };
+  koko = {
+    version = "23.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/release-service/23.04.0/src/koko-23.04.0.tar.xz";
+      sha256 = "1rk7m9n8icqn5yamfnna491vllmkb15k32vvi4ggp70apxqnv6lk";
+      name = "koko-23.04.0.tar.xz";
     };
   };
   kolf = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kolf-22.12.3.tar.xz";
-      sha256 = "01czns2gqvjnydc2bz8y2gq4m4lz50l9z71i0nf3nidihvgs96vl";
-      name = "kolf-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kolf-23.04.0.tar.xz";
+      sha256 = "19gai1l7wp78gz07ix0d576n0ysr56xavsr11ag9hbs8fzca0zlg";
+      name = "kolf-23.04.0.tar.xz";
     };
   };
   kollision = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kollision-22.12.3.tar.xz";
-      sha256 = "1dfr4ghg9yly0fv8fyjcs4ahf2xp9c08sssli1kph6qspvpmd8qq";
-      name = "kollision-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kollision-23.04.0.tar.xz";
+      sha256 = "0lnk289967gxgpxk2jzm55vf96znpdpqqd50wshhxybmgg0kcfdc";
+      name = "kollision-23.04.0.tar.xz";
     };
   };
   kolourpaint = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kolourpaint-22.12.3.tar.xz";
-      sha256 = "1gwpf5rb1hx49a18d5hd4l4p72bpgamy4yqiyixa75hmxhj09kwq";
-      name = "kolourpaint-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kolourpaint-23.04.0.tar.xz";
+      sha256 = "0s12glgh9sh3k82kk0yh7vkm3gkwyc8dnpllx9kv6qmc8r3l60wf";
+      name = "kolourpaint-23.04.0.tar.xz";
     };
   };
   kompare = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kompare-22.12.3.tar.xz";
-      sha256 = "0bg76vgz6b6dx0zrnh92r4ny1dh0bdakkyb17jl4fd28crixy4ds";
-      name = "kompare-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kompare-23.04.0.tar.xz";
+      sha256 = "0qamyq45k25ny2rzw2fg7573509r85mxwyrjrrqmlp291p043bx4";
+      name = "kompare-23.04.0.tar.xz";
+    };
+  };
+  kongress = {
+    version = "23.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/release-service/23.04.0/src/kongress-23.04.0.tar.xz";
+      sha256 = "11lsf9pz0289h650y09b7ivg18kbvsv0cqb4jb437pjz3jmr5yb9";
+      name = "kongress-23.04.0.tar.xz";
     };
   };
   konqueror = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/konqueror-22.12.3.tar.xz";
-      sha256 = "1m4szi3jskcjzqdgqqhniydrv8qcbq0p0s8cb6q3b1iap9b509xh";
-      name = "konqueror-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/konqueror-23.04.0.tar.xz";
+      sha256 = "11nv9vn2xzbmvi37v56pbfqmmvwkfsm6jcpvwp5p6wf8sjckfn77";
+      name = "konqueror-23.04.0.tar.xz";
     };
   };
   konquest = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/konquest-22.12.3.tar.xz";
-      sha256 = "0p2h1vj90p7xg30b5d002kfk724apj0zifi1nk4nlrmnb2iwmani";
-      name = "konquest-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/konquest-23.04.0.tar.xz";
+      sha256 = "001zdm2y7358n17h791b5ap4my3nn0694s51vln3ljcdss043pig";
+      name = "konquest-23.04.0.tar.xz";
     };
   };
   konsole = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/konsole-22.12.3.tar.xz";
-      sha256 = "0vzqmdn2pl3nxdsvx7db8ah9wklkap729cq41jifpjkf8javraar";
-      name = "konsole-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/konsole-23.04.0.tar.xz";
+      sha256 = "1755ny73v8n7vv96c9bxdq81q03ibym352kvq8rimpcsphy6zki1";
+      name = "konsole-23.04.0.tar.xz";
     };
   };
   kontact = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kontact-22.12.3.tar.xz";
-      sha256 = "1j10hnp4lk9wsa2m5w00h198wafzvbhz3z28rg2xgwf426q7hp91";
-      name = "kontact-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kontact-23.04.0.tar.xz";
+      sha256 = "0vh0z43yr4j941bjlmc0cmvd6ffwzrsqa1fr551m45mfxf62dnqm";
+      name = "kontact-23.04.0.tar.xz";
     };
   };
   kontactinterface = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kontactinterface-22.12.3.tar.xz";
-      sha256 = "1nx06c08xi3as8kms9fdbkc35d2m8f0vdskg31khl9wi2c8skxya";
-      name = "kontactinterface-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kontactinterface-23.04.0.tar.xz";
+      sha256 = "1fww09n3zmry1pvia05ars28s4gmjsnc8y5aynm9x05lpnd5yiyp";
+      name = "kontactinterface-23.04.0.tar.xz";
     };
   };
   kontrast = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kontrast-22.12.3.tar.xz";
-      sha256 = "1hhmjjdpb8ppsv7djxi8dlzmz2chivw9wjpx83vghlyx8463gicc";
-      name = "kontrast-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kontrast-23.04.0.tar.xz";
+      sha256 = "0m0j2cmgdiypb292wavln4pw8ddzfbx3lg4cpl0km5i4qh3rs0di";
+      name = "kontrast-23.04.0.tar.xz";
     };
   };
   konversation = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/konversation-22.12.3.tar.xz";
-      sha256 = "0p404wpdhsiz9w04kgwx8smmsbnh2szikdkf3c74krcl7w1ksckl";
-      name = "konversation-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/konversation-23.04.0.tar.xz";
+      sha256 = "0ra7mb461lnxh4liiq9lpqyxsylyp2wf6n9xislml6cwc164qr4v";
+      name = "konversation-23.04.0.tar.xz";
     };
   };
   kopeninghours = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kopeninghours-22.12.3.tar.xz";
-      sha256 = "1p55w3h300gjpyd970l5ka2lfa5srbiprzc50rsanl1z8l9k9zic";
-      name = "kopeninghours-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kopeninghours-23.04.0.tar.xz";
+      sha256 = "0vzsrbkxpz4bqgi6vlvz10q61klrpd9iijkvjwziwjkr51wjc55v";
+      name = "kopeninghours-23.04.0.tar.xz";
     };
   };
   kopete = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kopete-22.12.3.tar.xz";
-      sha256 = "1r87rck04jws5khim95mq70c7g2yr4kzf5hf8icv5nc4c820im0m";
-      name = "kopete-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kopete-23.04.0.tar.xz";
+      sha256 = "0w63si67zm7y9qlakjyywdbwsi5r0s52n79f934239zld3r14piz";
+      name = "kopete-23.04.0.tar.xz";
     };
   };
   korganizer = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/korganizer-22.12.3.tar.xz";
-      sha256 = "0hmdmg7njvm12xz64xcasz9bvx72s0f2s1430d6h75b6f2x8fhmc";
-      name = "korganizer-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/korganizer-23.04.0.tar.xz";
+      sha256 = "0fibb2y1j6crj7qj4qjk46chi09irki1m16asqd2a6qyspghidj6";
+      name = "korganizer-23.04.0.tar.xz";
     };
   };
   kosmindoormap = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kosmindoormap-22.12.3.tar.xz";
-      sha256 = "1m2cyp4irr1r4fssx6pw78f273i6hlzjdqcrrcsh1r01z0klpbzp";
-      name = "kosmindoormap-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kosmindoormap-23.04.0.tar.xz";
+      sha256 = "1d5i4m1sjr6nx6q8i9hzrp01593nakjlyfas0hmkqgvfl17ky1bf";
+      name = "kosmindoormap-23.04.0.tar.xz";
     };
   };
   kpat = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kpat-22.12.3.tar.xz";
-      sha256 = "0m8kwcf69wxl7x7z6bjkwyf34dwd7qw55pwbsh77wv0l9mk2v8gf";
-      name = "kpat-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kpat-23.04.0.tar.xz";
+      sha256 = "0fajsdm523wad5m8mc5y73ijpvxnaakcwkpia53p2i2bca38pblz";
+      name = "kpat-23.04.0.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kpimtextedit-22.12.3.tar.xz";
-      sha256 = "0z4j02g73lrc88rf3b1vjyav6nsqkfwsfw8nxcyf8x51skczchy7";
-      name = "kpimtextedit-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kpimtextedit-23.04.0.tar.xz";
+      sha256 = "1wcw644zh7mxg0g4bw69p79z2jfgg6dngw5qnglslwsy9l01js6c";
+      name = "kpimtextedit-23.04.0.tar.xz";
     };
   };
   kpkpass = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kpkpass-22.12.3.tar.xz";
-      sha256 = "1pg6p3b41vpg07bf6xfxqw98x8s681h18x0bm5b031ais0p10dv8";
-      name = "kpkpass-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kpkpass-23.04.0.tar.xz";
+      sha256 = "0f2bgp977i3p4bcvdc1zvj8971dhqw48glnqh8r99kvjbvri0l7n";
+      name = "kpkpass-23.04.0.tar.xz";
     };
   };
   kpmcore = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kpmcore-22.12.3.tar.xz";
-      sha256 = "07mzxb7qjbqkz5khafmyj16yj7221c6pwp0p72ayilwykwwrylsi";
-      name = "kpmcore-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kpmcore-23.04.0.tar.xz";
+      sha256 = "0vkiqj203n2s2nlkiiwblnw4zflrfkhbbijd1m72l446ddgn3j0d";
+      name = "kpmcore-23.04.0.tar.xz";
     };
   };
   kpublictransport = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kpublictransport-22.12.3.tar.xz";
-      sha256 = "1ljxz5dl4rpkdbm1jqlhnzls1cjmcyya1q5q7pzdwr99czs7jpwc";
-      name = "kpublictransport-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kpublictransport-23.04.0.tar.xz";
+      sha256 = "00q6cmjdcjff4xiz4ca0hq45z36ni0nw2v22km75f2jjsnxk040z";
+      name = "kpublictransport-23.04.0.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kqtquickcharts-22.12.3.tar.xz";
-      sha256 = "1rv4fava7zjhvdxgj1l6lh823fz93dpawmgdkjw95y1h2fc85jd1";
-      name = "kqtquickcharts-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kqtquickcharts-23.04.0.tar.xz";
+      sha256 = "0bcshq397av63k32ql55c2zrlgwdmjpmds30a0wgx4r3qd97ay91";
+      name = "kqtquickcharts-23.04.0.tar.xz";
     };
   };
   krdc = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/krdc-22.12.3.tar.xz";
-      sha256 = "1pyxx48vkjidzrivccpz55ys1b3bipdd8pkfz1sn3b70vw4h3rs2";
-      name = "krdc-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/krdc-23.04.0.tar.xz";
+      sha256 = "1njzm3lszdv3jfs4m8sh4pjv7c9a3a518cz9w1063df63cpp4fbi";
+      name = "krdc-23.04.0.tar.xz";
+    };
+  };
+  krecorder = {
+    version = "23.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/release-service/23.04.0/src/krecorder-23.04.0.tar.xz";
+      sha256 = "05npzjm3qpaj6dkffyijmc4kxwpf7hfb7pyc9dxmq1szgd05cz39";
+      name = "krecorder-23.04.0.tar.xz";
     };
   };
   kreversi = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kreversi-22.12.3.tar.xz";
-      sha256 = "1cwl9yhl54nd7wqasfic09a6lwjz65w72kmracknrvihpz4b3ilk";
-      name = "kreversi-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kreversi-23.04.0.tar.xz";
+      sha256 = "05sdgjdllqfihirycrd1j90r40cmj2l4fvfphckpjwmlp4x9llcd";
+      name = "kreversi-23.04.0.tar.xz";
     };
   };
   krfb = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/krfb-22.12.3.tar.xz";
-      sha256 = "1r4n66abm01n5vkxzpw93f4rgxh963azq8jpkhhhsdlz22wjd3fw";
-      name = "krfb-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/krfb-23.04.0.tar.xz";
+      sha256 = "1dmh4yp4mvx5wk6r6vd5dcvs3and328rriy2ng30xg7lg6bs27rj";
+      name = "krfb-23.04.0.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kross-interpreters-22.12.3.tar.xz";
-      sha256 = "1ypi1r62nmw023xr6zsgs9iigmkxpbzmr2j9ibxdpidm2nnjw2w8";
-      name = "kross-interpreters-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kross-interpreters-23.04.0.tar.xz";
+      sha256 = "0dyyaj6wdaf0ij1xkf6asxc50nh1wjqlsq3gc4j8s7h1mwbd7asy";
+      name = "kross-interpreters-23.04.0.tar.xz";
     };
   };
   kruler = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kruler-22.12.3.tar.xz";
-      sha256 = "0v8qmrgvc8k4cc8rxjvypsfb8j13whpz036kn144hr8jfzb6mb3g";
-      name = "kruler-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kruler-23.04.0.tar.xz";
+      sha256 = "0j8b5y7x117phkc4jhq7k8s8jkfl90hfxrdw7ii9imh3h1h0xn37";
+      name = "kruler-23.04.0.tar.xz";
     };
   };
   ksanecore = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/ksanecore-22.12.3.tar.xz";
-      sha256 = "0m3dbx1vww11qg7ydixb75xpazdgxss9fbxhpjpi4m1vv6siq6zg";
-      name = "ksanecore-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/ksanecore-23.04.0.tar.xz";
+      sha256 = "1n42yhvq57873mc5f6ka7f6gqbz5w6n6h1f9l69q5wvwwq7lcd14";
+      name = "ksanecore-23.04.0.tar.xz";
     };
   };
   kshisen = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kshisen-22.12.3.tar.xz";
-      sha256 = "0n7vq7qvh0sdnxwv9fvbna4cimbb9002pnx6a56f6i6v0f6i5gyb";
-      name = "kshisen-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kshisen-23.04.0.tar.xz";
+      sha256 = "1wmq2b78iqpcg8z1pady3xczqjib6qf71d0d7931lfv4lg145iis";
+      name = "kshisen-23.04.0.tar.xz";
     };
   };
   ksirk = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/ksirk-22.12.3.tar.xz";
-      sha256 = "0vyrlqxp026i8i6f111fsh290jkhdvzhm19s488bdrfm0xhh8y71";
-      name = "ksirk-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/ksirk-23.04.0.tar.xz";
+      sha256 = "04qds90n481j8kkgawyplazhfvpz9vqi5hif2jd68svy1f5jyx52";
+      name = "ksirk-23.04.0.tar.xz";
     };
   };
   ksmtp = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/ksmtp-22.12.3.tar.xz";
-      sha256 = "1yzhf02fn6h7xx7kl9hghbd8ppzx1favgkr0jd7nf6i479n03cw8";
-      name = "ksmtp-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/ksmtp-23.04.0.tar.xz";
+      sha256 = "0lzvg13g6x7gha56f0qvv8wrnrc1wf9mw0mxrb7v4n61bvy8pym0";
+      name = "ksmtp-23.04.0.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/ksnakeduel-22.12.3.tar.xz";
-      sha256 = "1s8iiknfpi0k1577ywm6d6y4fm92sp7zpwjylf8mys0a6yqbwbfc";
-      name = "ksnakeduel-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/ksnakeduel-23.04.0.tar.xz";
+      sha256 = "06670nks1brkvfvph39qnn48pga1gcwijphpgqxv5rpvcgiapvkd";
+      name = "ksnakeduel-23.04.0.tar.xz";
     };
   };
   kspaceduel = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kspaceduel-22.12.3.tar.xz";
-      sha256 = "1lkz6w2is3pjzn1is3zv2yy1vy5pga5jv4y955inm194b94v8amp";
-      name = "kspaceduel-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kspaceduel-23.04.0.tar.xz";
+      sha256 = "0058ixgb0d4slp6nsfd85z5icbh7im0p7dvvw391ixcdf72xgv1r";
+      name = "kspaceduel-23.04.0.tar.xz";
     };
   };
   ksquares = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/ksquares-22.12.3.tar.xz";
-      sha256 = "1dqc16bibpykya03104inr8pvn86m174ilrs94y4wc26w21a4i3i";
-      name = "ksquares-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/ksquares-23.04.0.tar.xz";
+      sha256 = "0fv9lv6xkmaa9rbwvjlznmahc6yc0v25aca32da0qy9ck68hqd57";
+      name = "ksquares-23.04.0.tar.xz";
     };
   };
   ksudoku = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/ksudoku-22.12.3.tar.xz";
-      sha256 = "1sk7cs521jgdlr51wpm9vdxv8m83nwgd02y4qkx705f0hvqmwwb9";
-      name = "ksudoku-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/ksudoku-23.04.0.tar.xz";
+      sha256 = "0s0g5x8qp45k3havp48s7bp98afy10dmnlh7n2g54mwn807my55h";
+      name = "ksudoku-23.04.0.tar.xz";
     };
   };
   ksystemlog = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/ksystemlog-22.12.3.tar.xz";
-      sha256 = "0plf5p34l8727xdy5mlvv7wlkfb15xip7jdraifnvkiy9x82gk05";
-      name = "ksystemlog-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/ksystemlog-23.04.0.tar.xz";
+      sha256 = "0hkzirpc3mfxm264fm6r51d3qjcs3gn4jqiz7b48g821jr99rxqc";
+      name = "ksystemlog-23.04.0.tar.xz";
     };
   };
   kteatime = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kteatime-22.12.3.tar.xz";
-      sha256 = "1wjr2nndrflly27dvp9gbgvk25cvm2nd32h0whb399dwl3niva1f";
-      name = "kteatime-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kteatime-23.04.0.tar.xz";
+      sha256 = "1abwks7hwlcvrzl8j9q4v279kvi99m8vlf2fw371mzv9pxifbwfq";
+      name = "kteatime-23.04.0.tar.xz";
     };
   };
   ktimer = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/ktimer-22.12.3.tar.xz";
-      sha256 = "1kxpnlz8k5hxbp4irbnhnz52jxfwh1yz9d63l8dxhw3likcbp52j";
-      name = "ktimer-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/ktimer-23.04.0.tar.xz";
+      sha256 = "1fd8bwj0k5qdppjbx6hhk6cxp1hh9g97cdllbqgy9i8g5n9inzx4";
+      name = "ktimer-23.04.0.tar.xz";
     };
   };
   ktnef = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/ktnef-22.12.3.tar.xz";
-      sha256 = "08j7a0lzkqxb2s2fzm5h26i560lk4l1f3r4wjb24znf1rk9zjslj";
-      name = "ktnef-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/ktnef-23.04.0.tar.xz";
+      sha256 = "1a3b8j6yhld0jhmblxajjy1f2iqcfnp21cc8cknffyylb0yjbp2a";
+      name = "ktnef-23.04.0.tar.xz";
     };
   };
   ktorrent = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/ktorrent-22.12.3.tar.xz";
-      sha256 = "07ppw041zwywkkjd87n6bwr37a2a6va78nr5yxshlxckz8x17bl5";
-      name = "ktorrent-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/ktorrent-23.04.0.tar.xz";
+      sha256 = "0gmmgy6ypw9y9hw8c3wyifvrd0zbxf9p8ixy7da8mnx0lgp26sm0";
+      name = "ktorrent-23.04.0.tar.xz";
     };
   };
   ktouch = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/ktouch-22.12.3.tar.xz";
-      sha256 = "0hzz0lnx4w0bl7kd52n01z8h165icycfx9kw8rgaidq1r5csp2fm";
-      name = "ktouch-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/ktouch-23.04.0.tar.xz";
+      sha256 = "01fq2lb0kyhh1a7rkxg6mc26ans5vvmqp2icf8bxifvq2ggd17b2";
+      name = "ktouch-23.04.0.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/ktp-accounts-kcm-22.12.3.tar.xz";
-      sha256 = "04g68x1xl9s46sinnwknb43pgvz6w71f8pn1j9bpgmg3qmmqx84g";
-      name = "ktp-accounts-kcm-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/ktp-accounts-kcm-23.04.0.tar.xz";
+      sha256 = "1d61fmcs3bsjdnxfpcnsyxfw3lbcsqrx0yjh6a551g2gm1gwf2wn";
+      name = "ktp-accounts-kcm-23.04.0.tar.xz";
     };
   };
   ktp-approver = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/ktp-approver-22.12.3.tar.xz";
-      sha256 = "06a856xx2xnw7ryazcyhwwwwhc23w22wrrjvbxs8ram54pzvphyh";
-      name = "ktp-approver-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/ktp-approver-23.04.0.tar.xz";
+      sha256 = "087psblyqxg4scvwilqb6mva484n5iyzmhyb64hjbhb633vcszhq";
+      name = "ktp-approver-23.04.0.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/ktp-auth-handler-22.12.3.tar.xz";
-      sha256 = "0mrj12c7igs8z6904ishx5zv5qvsasv3c4i7zyrr9i5f6ncdgrh6";
-      name = "ktp-auth-handler-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/ktp-auth-handler-23.04.0.tar.xz";
+      sha256 = "09fzc8xgj3p4mfha0s2y6hcik28bi3zgf4wd4kz7fdcp06mgim6q";
+      name = "ktp-auth-handler-23.04.0.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/ktp-call-ui-22.12.3.tar.xz";
-      sha256 = "1a2gys0p42kmar7mxxwzwmcjfvdcwa6b23cb913c1ficwx4rbma2";
-      name = "ktp-call-ui-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/ktp-call-ui-23.04.0.tar.xz";
+      sha256 = "08pqj2r6dlsa2x92ay1h3956gdxjhajf3rd508dpgkabsiq1d107";
+      name = "ktp-call-ui-23.04.0.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/ktp-common-internals-22.12.3.tar.xz";
-      sha256 = "0rapw141bvrgaaa9wb7vbs1m0z01pky8c0pdsm294i72kiadrcw3";
-      name = "ktp-common-internals-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/ktp-common-internals-23.04.0.tar.xz";
+      sha256 = "139wfb7mz7d9ikwq5n1y8dcyaa1ysmzvx1fpp180fdzmr277sv15";
+      name = "ktp-common-internals-23.04.0.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/ktp-contact-list-22.12.3.tar.xz";
-      sha256 = "171d48s1dh2i8zk43sd7xl3nrialij0nvn0ib82f45fag2wa4f8v";
-      name = "ktp-contact-list-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/ktp-contact-list-23.04.0.tar.xz";
+      sha256 = "0hpnlpailgx4wkbb78fp4738qj63a308405grpckf39jwfz2pz4c";
+      name = "ktp-contact-list-23.04.0.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/ktp-contact-runner-22.12.3.tar.xz";
-      sha256 = "0a4bhaq3jc9290lf1cgnlaysw2jszdfqwk9l6fi0bmdk2mx0xl3d";
-      name = "ktp-contact-runner-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/ktp-contact-runner-23.04.0.tar.xz";
+      sha256 = "0s00g6dqh6rpz2is7hyjx2piblpd1m60v7hi03zjihnwyq8a3iq4";
+      name = "ktp-contact-runner-23.04.0.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/ktp-desktop-applets-22.12.3.tar.xz";
-      sha256 = "18w4dq676yxhmgwmq5bv7nnfcai18xiy1hwyj7pxmb45f42vxzh2";
-      name = "ktp-desktop-applets-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/ktp-desktop-applets-23.04.0.tar.xz";
+      sha256 = "0d60fcyhaq2cjllc8xsrn3xa4wpd617a6x5zs150pj97vavf9dks";
+      name = "ktp-desktop-applets-23.04.0.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/ktp-filetransfer-handler-22.12.3.tar.xz";
-      sha256 = "1qlx2bhm22nzrizcyvxn355g3m3fkmcr4ics8gl0m2m80mgr70v0";
-      name = "ktp-filetransfer-handler-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/ktp-filetransfer-handler-23.04.0.tar.xz";
+      sha256 = "147vq0cf5a0hb8ybl773q9v6wlhz5gwcqhf5hg2cbz86w4gdb4pm";
+      name = "ktp-filetransfer-handler-23.04.0.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/ktp-kded-module-22.12.3.tar.xz";
-      sha256 = "1rhq3ry126ds5kd3jdjsla6q1185xhs1zni24vdkvx045f7l9ppd";
-      name = "ktp-kded-module-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/ktp-kded-module-23.04.0.tar.xz";
+      sha256 = "1grs5sqznsqq7aawp99mxgc9y5h387fgm11w7kmkab89md1g01rh";
+      name = "ktp-kded-module-23.04.0.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/ktp-send-file-22.12.3.tar.xz";
-      sha256 = "0qlw5z1im54sl3n1ysgz58f66chph35q5hf7831dnva8ahnzaa6w";
-      name = "ktp-send-file-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/ktp-send-file-23.04.0.tar.xz";
+      sha256 = "145c80d4wjzq9s9iqnygxg0l8ddx0q0svlmwg2cyy66bqrxl7052";
+      name = "ktp-send-file-23.04.0.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/ktp-text-ui-22.12.3.tar.xz";
-      sha256 = "0ypasdncgljjy5hg4na1lrxql8rjqfwyawhsb4gif8ihfvc8ibw1";
-      name = "ktp-text-ui-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/ktp-text-ui-23.04.0.tar.xz";
+      sha256 = "11r4f23k0ag9gyqlacmkk2r5jnvdd4z998104a44jmxjd4kg2cfb";
+      name = "ktp-text-ui-23.04.0.tar.xz";
+    };
+  };
+  ktrip = {
+    version = "23.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/release-service/23.04.0/src/ktrip-23.04.0.tar.xz";
+      sha256 = "1xi3lk142cgx3l04w1p891k77zgn8mz91qmbr1qbzx66nw5d5psf";
+      name = "ktrip-23.04.0.tar.xz";
     };
   };
   ktuberling = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/ktuberling-22.12.3.tar.xz";
-      sha256 = "0njl3g7pygk5v8cirmjg7pmlpyrhalpgwywr8na55cv5ib54m3s9";
-      name = "ktuberling-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/ktuberling-23.04.0.tar.xz";
+      sha256 = "04fv6izvi9n5xill120934miacf1p707mqw4wv3cr5aj7nz6n9sz";
+      name = "ktuberling-23.04.0.tar.xz";
     };
   };
   kturtle = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kturtle-22.12.3.tar.xz";
-      sha256 = "0idbfmxz3fx23xcssdvfhs6xyrv0y56k3jl7g4f22p0yvcp0lkb2";
-      name = "kturtle-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kturtle-23.04.0.tar.xz";
+      sha256 = "12r5hm9s78pwpwc9ira3ymh93pl7fg7fb5agyrjml3yx4h1mimcf";
+      name = "kturtle-23.04.0.tar.xz";
     };
   };
   kubrick = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kubrick-22.12.3.tar.xz";
-      sha256 = "0b3v5daa6h0rr4gwp605rvn1ygnx29z49h2lv8mcdpd8k4wm5jac";
-      name = "kubrick-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kubrick-23.04.0.tar.xz";
+      sha256 = "153g46alm996pndnl3vw7bibikgb5cs2kv1ipwwjclk0sp584hha";
+      name = "kubrick-23.04.0.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kwalletmanager-22.12.3.tar.xz";
-      sha256 = "1vilih22nfhavqkcbjphkwz978w2alqw2nic3nfvxwdnpa17j6hb";
-      name = "kwalletmanager-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kwalletmanager-23.04.0.tar.xz";
+      sha256 = "1262mjg6vyf2bb2xw34dpy3f7pd0i0rn46jdy07dqbrslpm45n7y";
+      name = "kwalletmanager-23.04.0.tar.xz";
     };
   };
   kwave = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kwave-22.12.3.tar.xz";
-      sha256 = "0dyyd5pddk4gp3gpzsfjgwhj6s8i04cgx916hyaxac75wpffbbv1";
-      name = "kwave-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kwave-23.04.0.tar.xz";
+      sha256 = "0c6kiah32v3pjrkjl8wy2wfkd7a4ap3gdqzir1xaqlk1rq7jscw8";
+      name = "kwave-23.04.0.tar.xz";
+    };
+  };
+  kweather = {
+    version = "23.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/release-service/23.04.0/src/kweather-23.04.0.tar.xz";
+      sha256 = "130wiwss0plls5rrla5csjxsmd9c7vv5rcpislpk1vv683ndip9h";
+      name = "kweather-23.04.0.tar.xz";
     };
   };
   kwordquiz = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/kwordquiz-22.12.3.tar.xz";
-      sha256 = "176hxsfcgjb5x4a6mk0q5azv7466y861xa64vskss2f5ivznx26j";
-      name = "kwordquiz-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/kwordquiz-23.04.0.tar.xz";
+      sha256 = "170zkc2lw141wxp7jwjz6i9sx483xyf6yhy16gghsp3bxrjcdlqh";
+      name = "kwordquiz-23.04.0.tar.xz";
     };
   };
   libgravatar = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/libgravatar-22.12.3.tar.xz";
-      sha256 = "0a7954m4i78nqf50yp81a3nlzx4pa5i9i44xn7lcxpglkl9qgd9r";
-      name = "libgravatar-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/libgravatar-23.04.0.tar.xz";
+      sha256 = "096gwscc4mddhyb9b1ir8s9d2bml4309d8iqz5v6dnpfxghbr4b8";
+      name = "libgravatar-23.04.0.tar.xz";
     };
   };
   libkcddb = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/libkcddb-22.12.3.tar.xz";
-      sha256 = "06ks0lggbaimj8c42cm273z4j3aif7xqx6vqzv40jm6mgcvmw2jk";
-      name = "libkcddb-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/libkcddb-23.04.0.tar.xz";
+      sha256 = "052rwidi1i2k49qqs4jyin403f5fcyq88jjcmq2z7ixd2gh781cq";
+      name = "libkcddb-23.04.0.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/libkcompactdisc-22.12.3.tar.xz";
-      sha256 = "0wh89q2lf0fvly9bpg4b7aflb7bmaz0bd4v8gvslkff5nzi01y5h";
-      name = "libkcompactdisc-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/libkcompactdisc-23.04.0.tar.xz";
+      sha256 = "05d24a2za2692v7qgvbhz9vc9xf7hql8504pcb6x12z7w1y8q80v";
+      name = "libkcompactdisc-23.04.0.tar.xz";
     };
   };
   libkdcraw = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/libkdcraw-22.12.3.tar.xz";
-      sha256 = "1287jjnw0x869bxhd34vmb83igskhx98nmyp6gs136rdms8war0f";
-      name = "libkdcraw-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/libkdcraw-23.04.0.tar.xz";
+      sha256 = "1a0vj0m5hw3l9mhn85dfx8is4sxdyxlsjxd8dhim520wf98mvbzp";
+      name = "libkdcraw-23.04.0.tar.xz";
     };
   };
   libkdegames = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/libkdegames-22.12.3.tar.xz";
-      sha256 = "072zabp7ss6x8241fl3gnvxx0ihw68h8znzk6wf277idj296x3ww";
-      name = "libkdegames-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/libkdegames-23.04.0.tar.xz";
+      sha256 = "1wjmpy05l6d5krdiwa4hnb7gxmybgsxdlfdqxd0zw7jbsbzszhr6";
+      name = "libkdegames-23.04.0.tar.xz";
     };
   };
   libkdepim = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/libkdepim-22.12.3.tar.xz";
-      sha256 = "13p6j3vk0rg2hhxvv7b21lvz52ciwwwsb1rfd0nvyw6qc6b9a97v";
-      name = "libkdepim-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/libkdepim-23.04.0.tar.xz";
+      sha256 = "1jzb83a86a3mvmwxxrsmwnwswk1m34qnx89yzwb60rfwq8jifnv0";
+      name = "libkdepim-23.04.0.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/libkeduvocdocument-22.12.3.tar.xz";
-      sha256 = "04igxxmp5y2pwj914wf14shfaa38q0aif1is634j9yibja874x2g";
-      name = "libkeduvocdocument-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/libkeduvocdocument-23.04.0.tar.xz";
+      sha256 = "1y2bsmc34vlags1l99xxll1rj4y9vgyndwcpyv8mn4vf0j7bf3vp";
+      name = "libkeduvocdocument-23.04.0.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/libkexiv2-22.12.3.tar.xz";
-      sha256 = "151a6dkww9k150xh52jn2s335nkaidw0y2xvpcycfvbfpcl6x7bg";
-      name = "libkexiv2-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/libkexiv2-23.04.0.tar.xz";
+      sha256 = "14fkh1dmbnrvrnl1jvl5s1va3aq5wf3riv9lhhfy7lgrdp8fxlqq";
+      name = "libkexiv2-23.04.0.tar.xz";
     };
   };
   libkgapi = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/libkgapi-22.12.3.tar.xz";
-      sha256 = "0f2phhcmmbx60rfh5qjl990mjxrz871jgk6wisfv9ndylkxk3k4p";
-      name = "libkgapi-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/libkgapi-23.04.0.tar.xz";
+      sha256 = "0lb5kmqb2vc9qcha9r4n87lh0hp90qz7p98yzn4fxjn7nxnibsxc";
+      name = "libkgapi-23.04.0.tar.xz";
     };
   };
   libkipi = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/libkipi-22.12.3.tar.xz";
-      sha256 = "0p96cgivrsilam8laagc2imlh0966fiqn4mhpy1l0il2iwka8rsl";
-      name = "libkipi-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/libkipi-23.04.0.tar.xz";
+      sha256 = "19ncx8np5ji6krhbw4sxfcpa75f83s61n7xwd851776bspp5jy50";
+      name = "libkipi-23.04.0.tar.xz";
     };
   };
   libkleo = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/libkleo-22.12.3.tar.xz";
-      sha256 = "0na8155w79kgzqby1xl1v35sc2ragmx0cjbp7jhx9dfrprz4q544";
-      name = "libkleo-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/libkleo-23.04.0.tar.xz";
+      sha256 = "0sbfvank4j9jlf8wja19fa8vw2g28qkvkiwcfyz48l1r94w0w8df";
+      name = "libkleo-23.04.0.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/libkmahjongg-22.12.3.tar.xz";
-      sha256 = "04sc6362nsdbihy9w00ppp0x9dkllf0gj45cxi9mxg8q1nbn86m0";
-      name = "libkmahjongg-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/libkmahjongg-23.04.0.tar.xz";
+      sha256 = "1yn3krnm21vch9ggnxamwsanrfqgkxyjbh4d5w4xx4sjl674snwr";
+      name = "libkmahjongg-23.04.0.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/libkomparediff2-22.12.3.tar.xz";
-      sha256 = "1m7n25b7hlrkspq59n54gxfid4jjj28fa2dya5mc21r5z6jxn3jr";
-      name = "libkomparediff2-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/libkomparediff2-23.04.0.tar.xz";
+      sha256 = "0591h5l64mn44sfs6y4jk92kndf57hx91h53qndm8gr0cgv58nih";
+      name = "libkomparediff2-23.04.0.tar.xz";
     };
   };
   libksane = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/libksane-22.12.3.tar.xz";
-      sha256 = "1kfvh4ggdrwj5gbzc9x20b7qahjklvq0qshraf3nyjp1fh237l6d";
-      name = "libksane-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/libksane-23.04.0.tar.xz";
+      sha256 = "0pn7mqfrr6v2hdxw0czmxkbmaf9pi9iqkhj407j9zc1lzjd6w3cy";
+      name = "libksane-23.04.0.tar.xz";
     };
   };
   libksieve = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/libksieve-22.12.3.tar.xz";
-      sha256 = "04ch9ffscmbfwmq0s173bz8pxnssqr87zwiqrz4sl2jy446r3a04";
-      name = "libksieve-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/libksieve-23.04.0.tar.xz";
+      sha256 = "06szca9s6vflas5q71hiy121mfdfhp9lm8v6frpinw8csfmfjsql";
+      name = "libksieve-23.04.0.tar.xz";
     };
   };
   libktorrent = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/libktorrent-22.12.3.tar.xz";
-      sha256 = "0rf9q4gy3l3mqs88kckwcicabrzz5hm1nsff259i9bzvbzhbzhlw";
-      name = "libktorrent-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/libktorrent-23.04.0.tar.xz";
+      sha256 = "16ks5wwmxpyl7is7s2ralfa3yaqbzl58aid34akjympx4jf8lhlj";
+      name = "libktorrent-23.04.0.tar.xz";
     };
   };
   lokalize = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/lokalize-22.12.3.tar.xz";
-      sha256 = "0cqpikx65mpz2as8idlcq5hy149vpqlhx7jq58pkjaj0dnig8hf1";
-      name = "lokalize-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/lokalize-23.04.0.tar.xz";
+      sha256 = "01q7r4m4yl08jhnx4vblcfrv6fpbfm7ppq9zkkx2s4zjb3102rgv";
+      name = "lokalize-23.04.0.tar.xz";
     };
   };
   lskat = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/lskat-22.12.3.tar.xz";
-      sha256 = "0rld0xljg4pxja2qzp7qw9dylcv4d455qihd1hapy1gf8mpdc2dn";
-      name = "lskat-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/lskat-23.04.0.tar.xz";
+      sha256 = "13krjmlnpyrln6h4ky9inlhdcfs688d0lyaiszz57v5ql9lsnwh9";
+      name = "lskat-23.04.0.tar.xz";
     };
   };
   mailcommon = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/mailcommon-22.12.3.tar.xz";
-      sha256 = "03ffsh5b1w70bywyifbirsmiv0kxxbx1x0szg7xw9aw4nfvnmzaf";
-      name = "mailcommon-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/mailcommon-23.04.0.tar.xz";
+      sha256 = "0larqz7m39458s1n3rnn5flw4h3fip502kipdswmrhzmrb64vspl";
+      name = "mailcommon-23.04.0.tar.xz";
     };
   };
   mailimporter = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/mailimporter-22.12.3.tar.xz";
-      sha256 = "0i740gn18z4lmc5c4vgqq6gjvz9v7vpk88xf954rd100b21wlvj8";
-      name = "mailimporter-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/mailimporter-23.04.0.tar.xz";
+      sha256 = "1k020h86lwzjs0fpryls6q5qfkf00xrxq9jah9av3ydil4kqkbaj";
+      name = "mailimporter-23.04.0.tar.xz";
     };
   };
   marble = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/marble-22.12.3.tar.xz";
-      sha256 = "0wcdjqvmiiy8fwl3yxnmq0wi585zck5g1fxaqy4w7jvvn4qislc8";
-      name = "marble-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/marble-23.04.0.tar.xz";
+      sha256 = "0m5ffy187syah4qxphkz417h95yd8nzp6h6zs7i99x0n3j97spqr";
+      name = "marble-23.04.0.tar.xz";
     };
   };
   markdownpart = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/markdownpart-22.12.3.tar.xz";
-      sha256 = "1jzzgm666pmgxgas73mm611k19lg2593j5ffq53l1wwiva3278j9";
-      name = "markdownpart-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/markdownpart-23.04.0.tar.xz";
+      sha256 = "1h2vknqmc8fngwpki97crq3spg5dlpbswwhcasizqsdanbkg8h6v";
+      name = "markdownpart-23.04.0.tar.xz";
     };
   };
   mbox-importer = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/mbox-importer-22.12.3.tar.xz";
-      sha256 = "09aglnys5j5imjn8yhk5jay3sqlhkiza7p9x877s3lyy3xlfch5x";
-      name = "mbox-importer-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/mbox-importer-23.04.0.tar.xz";
+      sha256 = "1xa3i9g7rfimxlw5aa9sg51li89m2k9fq59xz18da08135fpkmak";
+      name = "mbox-importer-23.04.0.tar.xz";
     };
   };
   messagelib = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/messagelib-22.12.3.tar.xz";
-      sha256 = "19l27l5qbp0cfjpqcbw5dvi2granzrj1293dahf9z77v0m9bxmjm";
-      name = "messagelib-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/messagelib-23.04.0.tar.xz";
+      sha256 = "1pmgy501iircnrznpx1001rap1vm8xpxls3fryi3vyg86bq66qlz";
+      name = "messagelib-23.04.0.tar.xz";
     };
   };
   minuet = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/minuet-22.12.3.tar.xz";
-      sha256 = "0m3w3vcg3i532i0rza8igx5sp344k9jlm4wmhzkmw1mln1nqynnl";
-      name = "minuet-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/minuet-23.04.0.tar.xz";
+      sha256 = "01wbfsrqrxnnka536k12rzfhm9py752zy5yg8r6k3w4drhr0bwd1";
+      name = "minuet-23.04.0.tar.xz";
+    };
+  };
+  neochat = {
+    version = "23.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/release-service/23.04.0/src/neochat-23.04.0.tar.xz";
+      sha256 = "1a6pmqim9xdxy73h7xdk1d37c5my4yam55zxdk858x727zi9lh5s";
+      name = "neochat-23.04.0.tar.xz";
     };
   };
   okular = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/okular-22.12.3.tar.xz";
-      sha256 = "00ns8qmf6vpp1fxqg71rzhzq2za9h1fs5a12rmd0vklkb5sjivq1";
-      name = "okular-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/okular-23.04.0.tar.xz";
+      sha256 = "036lpjply4557jmh3a6cl9skfqy2vb8k2zbfv24dz1mzk8lzy3bc";
+      name = "okular-23.04.0.tar.xz";
     };
   };
   palapeli = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/palapeli-22.12.3.tar.xz";
-      sha256 = "0wlr086374fg4kj827xcnqn6zk00sxpb36jdzc62q3w0sjzw1irj";
-      name = "palapeli-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/palapeli-23.04.0.tar.xz";
+      sha256 = "0vn9128fsvb3vmcap7v2l6az6ljq8nl79g06md5z4sp60v80wwyi";
+      name = "palapeli-23.04.0.tar.xz";
     };
   };
   parley = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/parley-22.12.3.tar.xz";
-      sha256 = "0jrddgfwc77lpdmfmydwmgpcqa0figv6rmmjw0xlw2f8dd4i2ghd";
-      name = "parley-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/parley-23.04.0.tar.xz";
+      sha256 = "159x0a4fjiql72ifcmyhqzxp5hnfjyld4pl55wkm37jxwn7zwjy2";
+      name = "parley-23.04.0.tar.xz";
     };
   };
   partitionmanager = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/partitionmanager-22.12.3.tar.xz";
-      sha256 = "0bdxf19yb4wnrb50vapabqjqwxccfvp3gaspagh4wgcyz7p5icjp";
-      name = "partitionmanager-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/partitionmanager-23.04.0.tar.xz";
+      sha256 = "0xqha9bai2hrl12w3xi7xjs8lyn0krzzc7s3l8hwmwvg3ds909ds";
+      name = "partitionmanager-23.04.0.tar.xz";
     };
   };
   picmi = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/picmi-22.12.3.tar.xz";
-      sha256 = "0ygryzl5x94icgr0p1qvwp4fmk51wiqzk2frj9768m4pzk0b6y50";
-      name = "picmi-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/picmi-23.04.0.tar.xz";
+      sha256 = "12fwv2blpavf8mcc1w3cj6wk7wqzksm2hapmmbfad2p7nrcssc4p";
+      name = "picmi-23.04.0.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/pim-data-exporter-22.12.3.tar.xz";
-      sha256 = "113yfrz68wab4bmzncwqmzh5bz18lidp0naax4kbaa30p95qd40b";
-      name = "pim-data-exporter-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/pim-data-exporter-23.04.0.tar.xz";
+      sha256 = "17xf5ghsxbqv0mr1pjx07lzrbqlrdanykqk39l5hk40izwmxn8a1";
+      name = "pim-data-exporter-23.04.0.tar.xz";
     };
   };
   pim-sieve-editor = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/pim-sieve-editor-22.12.3.tar.xz";
-      sha256 = "19wgpgzmmpfakm249val3fjxjx4wzb3ip4yk9m00aa0d2lb99ysn";
-      name = "pim-sieve-editor-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/pim-sieve-editor-23.04.0.tar.xz";
+      sha256 = "179cy1a7saqq1ryxxvq7c0qqkv9z5dcgwm5fvglm8wndf01ym21d";
+      name = "pim-sieve-editor-23.04.0.tar.xz";
     };
   };
   pimcommon = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/pimcommon-22.12.3.tar.xz";
-      sha256 = "1yp0h8rp9nqgwc70f4knp05jnqhygb78z8sbdxq5dn5k09ciqr8v";
-      name = "pimcommon-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/pimcommon-23.04.0.tar.xz";
+      sha256 = "1b41csnqw1ws7nqcda9hr8df5a3dprl778pyis249r2g2m5k8iil";
+      name = "pimcommon-23.04.0.tar.xz";
+    };
+  };
+  plasmatube = {
+    version = "23.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/release-service/23.04.0/src/plasmatube-23.04.0.tar.xz";
+      sha256 = "0zjvlgv7jf476lk31ahb0hrj840kcgbz7vcqinn05dd5m135hglq";
+      name = "plasmatube-23.04.0.tar.xz";
     };
   };
   poxml = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/poxml-22.12.3.tar.xz";
-      sha256 = "03ymrkqp8ysmnc10brqp83zq58mjcrksafjwlpd3sqcc2crpjy90";
-      name = "poxml-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/poxml-23.04.0.tar.xz";
+      sha256 = "1y8kn6cjqlc2hxw2bi5fc9j8dgwrkg08rc3zjarzwclvrxcljj3a";
+      name = "poxml-23.04.0.tar.xz";
     };
   };
   print-manager = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/print-manager-22.12.3.tar.xz";
-      sha256 = "0rblnlv95zxdflnd7wb63wp8j45k2ysmykyh5l3vkyni1k2127mm";
-      name = "print-manager-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/print-manager-23.04.0.tar.xz";
+      sha256 = "1gf5ia39nq5vnmh6casgjvdd73sd17z2ikiqhjw0ma2kyvn2dqxb";
+      name = "print-manager-23.04.0.tar.xz";
+    };
+  };
+  qmlkonsole = {
+    version = "23.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/release-service/23.04.0/src/qmlkonsole-23.04.0.tar.xz";
+      sha256 = "0ninw5bvdrgq72vc5m0q342jv25gf3w2f6n8jxw1rl1ixfhbs910";
+      name = "qmlkonsole-23.04.0.tar.xz";
     };
   };
   rocs = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/rocs-22.12.3.tar.xz";
-      sha256 = "0pgsvvdq5qnsfhh9a48ww6sbk5194c1h52dvmvz0gqgsp8k1kd47";
-      name = "rocs-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/rocs-23.04.0.tar.xz";
+      sha256 = "1mlzxqm47ia391xb4imih91xb40r9gwsdgbw0f3cl6rxzjzmv83h";
+      name = "rocs-23.04.0.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/signon-kwallet-extension-22.12.3.tar.xz";
-      sha256 = "0afzrn88nl3hn33a5zqhz8zf0dsg1n4i53ml0xw4ri57p9yfz6wm";
-      name = "signon-kwallet-extension-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/signon-kwallet-extension-23.04.0.tar.xz";
+      sha256 = "1yz85pdps997bm2074n9gq3xbg5dla716q8np3hx930d8zjdpj87";
+      name = "signon-kwallet-extension-23.04.0.tar.xz";
     };
   };
   skanlite = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/skanlite-22.12.3.tar.xz";
-      sha256 = "1kf776842hdq1jiln3dvk2qa0xh1ak96cag5lpc0yg344lvarvrz";
-      name = "skanlite-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/skanlite-23.04.0.tar.xz";
+      sha256 = "136xswpr98xd9cd19rg82iv1243lzyy2rgwplmgf6xdjbv99i0cz";
+      name = "skanlite-23.04.0.tar.xz";
     };
   };
   skanpage = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/skanpage-22.12.3.tar.xz";
-      sha256 = "0hazx7i09gs3gmglv33pnch99s17lji7vbww875lq8jsyad12rzz";
-      name = "skanpage-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/skanpage-23.04.0.tar.xz";
+      sha256 = "1r149qkjvxs3ywdqjhb52d66j9dllbn3fd3s9dkaqr89hib9yfcr";
+      name = "skanpage-23.04.0.tar.xz";
     };
   };
   spectacle = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/spectacle-22.12.3.tar.xz";
-      sha256 = "01yd2x3k019bzjk4m4hc0k1w6c9brnrnv9hkc92j0fyayiqlnzj9";
-      name = "spectacle-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/spectacle-23.04.0.tar.xz";
+      sha256 = "05sbs4qq2s99zr0fp12h1dh2sgf889xh6f0h0fq4fa2kidk4m3fv";
+      name = "spectacle-23.04.0.tar.xz";
     };
   };
   step = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/step-22.12.3.tar.xz";
-      sha256 = "08gk72l57c9x7malksg76aclxh6bmmikpnn7bg8adm92jl0jlmpy";
-      name = "step-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/step-23.04.0.tar.xz";
+      sha256 = "0jnv8y5lb0bfszx4yrl2bm480js6njjb9db7qzhgdbyh2r0lqgpx";
+      name = "step-23.04.0.tar.xz";
     };
   };
   svgpart = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/svgpart-22.12.3.tar.xz";
-      sha256 = "0x0ynzjq550f0k79rm9zrqikhv6bp4a49m5ngg556kzfhzvswlxk";
-      name = "svgpart-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/svgpart-23.04.0.tar.xz";
+      sha256 = "1jwqna54852pa3zjmcayvkwf64cgh4r4238kipf4x2yin47g5j2i";
+      name = "svgpart-23.04.0.tar.xz";
     };
   };
   sweeper = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/sweeper-22.12.3.tar.xz";
-      sha256 = "0cr92xzdirwwb8v30r5qkr7n54gn47sjspbig2czrzh8jrmr9dc0";
-      name = "sweeper-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/sweeper-23.04.0.tar.xz";
+      sha256 = "0zzc78g4ka4jvnmjkf3yqcni58gy6cjm795nhf6s5yjjgfg436vj";
+      name = "sweeper-23.04.0.tar.xz";
+    };
+  };
+  telly-skout = {
+    version = "23.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/release-service/23.04.0/src/telly-skout-23.04.0.tar.xz";
+      sha256 = "148smsx6sz5zlsa27g3qqzq8qzw0a1pd2a9kagdiarfcv9ifhhc2";
+      name = "telly-skout-23.04.0.tar.xz";
+    };
+  };
+  tokodon = {
+    version = "23.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/release-service/23.04.0/src/tokodon-23.04.0.tar.xz";
+      sha256 = "1ajqf0irjlvmqzlw2v4ybl79g3j4qc9fclh6dillxakwdcn76j40";
+      name = "tokodon-23.04.0.tar.xz";
     };
   };
   umbrello = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/umbrello-22.12.3.tar.xz";
-      sha256 = "0i7h9nfljc860hyfy7xxrk4w3y5f6pqviylz7qs6gzmq4yi0q45b";
-      name = "umbrello-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/umbrello-23.04.0.tar.xz";
+      sha256 = "0id4cjs7pc0b5j901gnnj8cai9x0c6ly7nplw4b3164yazc9w878";
+      name = "umbrello-23.04.0.tar.xz";
     };
   };
   yakuake = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/yakuake-22.12.3.tar.xz";
-      sha256 = "1nqdixfdha1gxq0zhzq347v5s6ym90aj25gq8jb5df0qp0w432mx";
-      name = "yakuake-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/yakuake-23.04.0.tar.xz";
+      sha256 = "0qf02amikwwdviaw5yr5bgww2s1s83q1bd42sh1gai3g4axrnxhg";
+      name = "yakuake-23.04.0.tar.xz";
     };
   };
   zanshin = {
-    version = "22.12.3";
+    version = "23.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/22.12.3/src/zanshin-22.12.3.tar.xz";
-      sha256 = "0mx4wazlqp6aw2lgg5fmyr2x4yvfigds6j5ibvplzhz05d64clzj";
-      name = "zanshin-22.12.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.0/src/zanshin-23.04.0.tar.xz";
+      sha256 = "1g8bngw3xllw8wgvc2f8qnkgg2kxnfhmfzk6f54h798ynva13vvn";
+      name = "zanshin-23.04.0.tar.xz";
     };
   };
 }

From f5968d6601de86f822bb5af2ae44cba45a0e7d50 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 18 Mar 2023 01:39:35 +0300
Subject: [PATCH 82/96] ghostwriter: absorb into kde/gear

---
 .../editors/ghostwriter/default.nix           | 43 -------------------
 pkgs/applications/kde/default.nix             |  1 +
 pkgs/applications/kde/ghostwriter.nix         | 41 ++++++++++++++++++
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 5 files changed, 43 insertions(+), 45 deletions(-)
 delete mode 100644 pkgs/applications/editors/ghostwriter/default.nix
 create mode 100644 pkgs/applications/kde/ghostwriter.nix

diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix
deleted file mode 100644
index bcb7e066bfc6..000000000000
--- a/pkgs/applications/editors/ghostwriter/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ lib
-, stdenv
-, mkDerivation
-, fetchFromGitHub
-, qmake
-, pkg-config
-, qttools
-, qtwebengine
-, hunspell
-, cmark
-, multimarkdown
-, pandoc
-}:
-
-mkDerivation rec {
-  pname = "ghostwriter";
-  version = "2.2.0";
-
-  src = fetchFromGitHub {
-    owner = "KDE";
-    repo = pname;
-    rev = version;
-    hash = "sha256-8JtCO5jrkbZ4uEM7SALg64L4HSzdzzh7r1pldxzaXeI=";
-  };
-
-  nativeBuildInputs = [ qmake pkg-config qttools ];
-
-  buildInputs = [ qtwebengine hunspell ];
-
-  qtWrapperArgs = [
-    "--prefix" "PATH" ":" (lib.makeBinPath [ cmark multimarkdown pandoc ])
-  ];
-
-  meta = with lib; {
-    description = "A cross-platform, aesthetic, distraction-free Markdown editor";
-    homepage = "https://kde.github.io/ghostwriter";
-    changelog = "https://github.com/KDE/ghostwriter/blob/${src.rev}/CHANGELOG.md";
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ dotlambda erictapen ];
-    broken = stdenv.isDarwin;
-  };
-}
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index c121d0fb5399..fed0e84de737 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -86,6 +86,7 @@ let
       falkon = callPackage ./falkon.nix {};
       ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
       filelight = callPackage ./filelight.nix {};
+      ghostwriter = callPackage ./ghostwriter.nix {};
       granatier = callPackage ./granatier.nix {};
       grantleetheme = callPackage ./grantleetheme {};
       gwenview = callPackage ./gwenview.nix {};
diff --git a/pkgs/applications/kde/ghostwriter.nix b/pkgs/applications/kde/ghostwriter.nix
new file mode 100644
index 000000000000..1fad4669dc62
--- /dev/null
+++ b/pkgs/applications/kde/ghostwriter.nix
@@ -0,0 +1,41 @@
+{ lib
+, mkDerivation
+, extra-cmake-modules
+, qttools
+, qtwebengine
+, kcoreaddons
+, kconfigwidgets
+, sonnet
+, kxmlgui
+, hunspell
+, cmark
+, multimarkdown
+, pandoc
+}:
+
+mkDerivation {
+  pname = "ghostwriter";
+
+  nativeBuildInputs = [ extra-cmake-modules qttools ];
+
+  buildInputs = [
+    qtwebengine
+    hunspell
+    kcoreaddons
+    kconfigwidgets
+    sonnet
+    kxmlgui
+  ];
+
+  qtWrapperArgs = [
+    "--prefix" "PATH" ":" (lib.makeBinPath [ cmark multimarkdown pandoc ])
+  ];
+
+  meta = with lib; {
+    description = "A cross-platform, aesthetic, distraction-free Markdown editor";
+    homepage = "https://ghostwriter.kde.org/";
+    changelog = "https://invent.kde.org/office/ghostwriter/-/blob/master/CHANGELOG.md";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ dotlambda erictapen ];
+  };
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 86d4c23a252b..ee87c750db94 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -545,6 +545,7 @@ mapAliases ({
   getmail = throw "getmail has been removed from nixpkgs, migrate to getmail6"; # Added 2022-01-12
   gettextWithExpat = throw "'gettextWithExpat' has been renamed to/replaced by 'gettext'"; # Converted to throw 2022-02-22
   gfm = throw "gfm has been removed"; # Added 2021-01-15
+  ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18
   giblib = throw " giblib has been removed from nixpkgs because upstream is gone"; # Added 2022-01-23
   giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # Added 2020-02-12
   git-annex-remote-b2 = throw "git-annex-remote-b2 has been dropped due to the lack of maintanence from upstream since 2016"; # Added 2022-06-02
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 93290034e458..d0db95eda950 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30079,8 +30079,6 @@ with pkgs;
 
   geoipupdate = callPackage ../applications/misc/geoipupdate { };
 
-  ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { };
-
   globe-cli = callPackage ../applications/misc/globe-cli { };
 
   gnss-sdr = callPackage ../applications/radio/gnss-sdr { };

From 590436c1ca3aac4ab6afa388d22779add6d0a5cb Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 18 Mar 2023 01:39:35 +0300
Subject: [PATCH 83/96] kio-admin: absorb into kde/gear

---
 pkgs/applications/kde/default.nix            |  1 +
 pkgs/applications/kde/kio-admin.nix          | 16 +++++++++++++
 pkgs/tools/filesystems/kio-admin/default.nix | 25 --------------------
 pkgs/top-level/aliases.nix                   |  1 +
 pkgs/top-level/all-packages.nix              |  2 --
 5 files changed, 18 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/applications/kde/kio-admin.nix
 delete mode 100644 pkgs/tools/filesystems/kio-admin/default.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index fed0e84de737..6a57ccf9ee6e 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -141,6 +141,7 @@ let
       kigo = callPackage ./kigo.nix {};
       killbots = callPackage ./killbots.nix {};
       kimap = callPackage ./kimap.nix {};
+      kio-admin = callPackage ./kio-admin.nix {};
       kio-extras = callPackage ./kio-extras.nix {};
       kio-gdrive = callPackage ./kio-gdrive.nix {};
       kipi-plugins = callPackage ./kipi-plugins.nix {};
diff --git a/pkgs/applications/kde/kio-admin.nix b/pkgs/applications/kde/kio-admin.nix
new file mode 100644
index 000000000000..4734d447a1ac
--- /dev/null
+++ b/pkgs/applications/kde/kio-admin.nix
@@ -0,0 +1,16 @@
+{ mkDerivation, lib, extra-cmake-modules, qtbase, kio, ki18n, polkit-qt }:
+
+mkDerivation {
+  pname = "kio-admin";
+
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtbase kio ki18n polkit-qt ];
+
+  meta = with lib; {
+    description = "Manage files as administrator using the admin:// KIO protocol.";
+    homepage = "https://invent.kde.org/system/kio-admin";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ k900 ];
+  };
+}
diff --git a/pkgs/tools/filesystems/kio-admin/default.nix b/pkgs/tools/filesystems/kio-admin/default.nix
deleted file mode 100644
index 7e4a97fa255a..000000000000
--- a/pkgs/tools/filesystems/kio-admin/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, stdenv, fetchFromGitLab, cmake, extra-cmake-modules, qtbase, wrapQtAppsHook, kio, ki18n, polkit-qt }:
-
-stdenv.mkDerivation rec {
-  pname = "kio-admin";
-  version = "1.0.0";
-
-  src = fetchFromGitLab {
-    domain = "invent.kde.org";
-    owner = "system";
-    repo = "kio-admin";
-    rev = "v${version}";
-    hash = "sha256-llnUsOttqFJVArJdZS9s6qHS9eGbdtdoaPMXKHtsUn4=";
-  };
-
-  nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ];
-  buildInputs = [ qtbase kio ki18n polkit-qt ];
-
-  meta = with lib; {
-    description = "Manage files as administrator using the admin:// KIO protocol.";
-    homepage = "https://invent.kde.org/system/kio-admin";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ k900 ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ee87c750db94..60bd366de97a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -789,6 +789,7 @@ mapAliases ({
   kindlegen = throw "kindlegen has been removed from nixpkgs, as it's abandoned and no longer available for download"; # Added 2021-03-09
   kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned"; # Added 2020-04-28
   kino = throw "kino has been removed because it was broken and abandoned"; # Added 2021-04-25
+  kio-admin = libsForQt5.kdeGear.kio-admin; # Added 2023-03-18
   knockknock = throw "knockknock has been removed from nixpkgs because the upstream project is abandoned"; # Added 2022-01-01
   kodestudio = throw "kodestudio has been removed from nixpkgs, as the nix package has been long unmaintained and out of date."; # Added 2022-06-07
   kodiGBM = kodi-gbm;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d0db95eda950..4db46c431657 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8963,8 +8963,6 @@ with pkgs;
 
   kibi = callPackage ../applications/editors/kibi { };
 
-  kio-admin = libsForQt5.callPackage ../tools/filesystems/kio-admin { };
-
   kio-fuse = libsForQt5.callPackage ../tools/filesystems/kio-fuse { };
 
   kismet = callPackage ../applications/networking/sniffers/kismet { };

From 9f5fbf001faab4f57118064d8bca27c12c623a9d Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 18 Mar 2023 01:39:35 +0300
Subject: [PATCH 84/96] plasma-mobile: 23.1 -> 23.04.0, (partially) absorb into
 kde/gear

---
 .../{plasma-mobile => kde}/alligator.nix      |  0
 .../{plasma-mobile => kde}/angelfish.nix      |  8 +++---
 .../{plasma-mobile => kde}/audiotube.nix      |  4 +--
 .../{plasma-mobile => kde}/calindori.nix      |  0
 pkgs/applications/kde/default.nix             | 18 +++++++++++++
 .../{plasma-mobile => kde}/kalk.nix           |  0
 .../{plasma-mobile => kde}/kasts.nix          |  0
 .../{plasma-mobile => kde}/kclock.nix         |  0
 .../{plasma-mobile => kde}/keysmith.nix       |  0
 .../{plasma-mobile => kde}/koko.nix           |  0
 .../{plasma-mobile => kde}/krecorder.nix      |  0
 .../{plasma-mobile => kde}/ktrip.nix          |  0
 .../{plasma-mobile => kde}/kweather.nix       |  0
 .../{plasma-mobile => kde}/neochat.nix        |  7 ++----
 .../plasmatube/default.nix                    | 10 --------
 .../{plasma-mobile => kde}/qmlkonsole.nix     |  0
 .../{plasma-mobile => kde}/tokodon.nix        | 21 +---------------
 pkgs/applications/plasma-mobile/default.nix   | 16 ------------
 ...laceholders-for-runtime-dependencies.patch | 25 -------------------
 pkgs/top-level/aliases.nix                    |  6 ++---
 20 files changed, 30 insertions(+), 85 deletions(-)
 rename pkgs/applications/{plasma-mobile => kde}/alligator.nix (100%)
 rename pkgs/applications/{plasma-mobile => kde}/angelfish.nix (90%)
 rename pkgs/applications/{plasma-mobile => kde}/audiotube.nix (94%)
 rename pkgs/applications/{plasma-mobile => kde}/calindori.nix (100%)
 rename pkgs/applications/{plasma-mobile => kde}/kalk.nix (100%)
 rename pkgs/applications/{plasma-mobile => kde}/kasts.nix (100%)
 rename pkgs/applications/{plasma-mobile => kde}/kclock.nix (100%)
 rename pkgs/applications/{plasma-mobile => kde}/keysmith.nix (100%)
 rename pkgs/applications/{plasma-mobile => kde}/koko.nix (100%)
 rename pkgs/applications/{plasma-mobile => kde}/krecorder.nix (100%)
 rename pkgs/applications/{plasma-mobile => kde}/ktrip.nix (100%)
 rename pkgs/applications/{plasma-mobile => kde}/kweather.nix (100%)
 rename pkgs/applications/{plasma-mobile => kde}/neochat.nix (88%)
 rename pkgs/applications/{plasma-mobile => kde}/plasmatube/default.nix (80%)
 rename pkgs/applications/{plasma-mobile => kde}/qmlkonsole.nix (100%)
 rename pkgs/applications/{plasma-mobile => kde}/tokodon.nix (56%)
 delete mode 100644 pkgs/applications/plasma-mobile/plasmatube/0001-Add-placeholders-for-runtime-dependencies.patch

diff --git a/pkgs/applications/plasma-mobile/alligator.nix b/pkgs/applications/kde/alligator.nix
similarity index 100%
rename from pkgs/applications/plasma-mobile/alligator.nix
rename to pkgs/applications/kde/alligator.nix
diff --git a/pkgs/applications/plasma-mobile/angelfish.nix b/pkgs/applications/kde/angelfish.nix
similarity index 90%
rename from pkgs/applications/plasma-mobile/angelfish.nix
rename to pkgs/applications/kde/angelfish.nix
index 7a7e48d736d0..6de8e703bd70 100644
--- a/pkgs/applications/plasma-mobile/angelfish.nix
+++ b/pkgs/applications/kde/angelfish.nix
@@ -3,7 +3,6 @@
 , cmake
 , corrosion
 , extra-cmake-modules
-, gcc12
 , kconfig
 , kcoreaddons
 , kdbusaddons
@@ -15,13 +14,14 @@
 , kwindowsystem
 , qtfeedback
 , qtquickcontrols2
+, qqc2-desktop-style
 , qtwebengine
 , rustPlatform
 , srcs
 
 # These must be updated in tandem with package updates.
-, cargoShaForVersion ? "23.01.0"
-, cargoSha256 ? "sha256-dIXA875HsG56baHrTWw9L560n4s0wRv6Ag/2oj1x0gk="
+, cargoShaForVersion ? "23.03.80"
+, cargoSha256 ? "sha256-nXWQNXVlPWRQdDPXR5NsHJR6kaLxV7UxPC0OIubH/4c="
 }:
 
 # Guard against incomplete updates.
@@ -46,7 +46,6 @@ mkDerivation rec {
     cmake
     corrosion
     extra-cmake-modules
-    gcc12 # doesn't build with GCC 9 from stdenv on aarch64
   ] ++ (with rustPlatform; [
     cargoSetupHook
     rust.cargo
@@ -65,6 +64,7 @@ mkDerivation rec {
     kwindowsystem
     qtfeedback
     qtquickcontrols2
+    qqc2-desktop-style
     qtwebengine
   ];
 
diff --git a/pkgs/applications/plasma-mobile/audiotube.nix b/pkgs/applications/kde/audiotube.nix
similarity index 94%
rename from pkgs/applications/plasma-mobile/audiotube.nix
rename to pkgs/applications/kde/audiotube.nix
index 14bfc6d18917..0bd22ee06f63 100644
--- a/pkgs/applications/plasma-mobile/audiotube.nix
+++ b/pkgs/applications/kde/audiotube.nix
@@ -2,7 +2,6 @@
 , mkDerivation
 
 , extra-cmake-modules
-, gcc12
 , wrapGAppsHook
 
 , gst_all_1
@@ -10,6 +9,7 @@
 , kcrash
 , ki18n
 , kirigami2
+, kirigami-addons
 , qtimageformats
 , qtmultimedia
 , qtquickcontrols2
@@ -22,7 +22,6 @@ mkDerivation rec {
   nativeBuildInputs = [
     extra-cmake-modules
     wrapGAppsHook
-    gcc12 # doesn't build with GCC 9 from stdenv on aarch64
     python3Packages.wrapPython
     python3Packages.pybind11
   ];
@@ -32,6 +31,7 @@ mkDerivation rec {
     kcrash
     ki18n
     kirigami2
+    kirigami-addons
     qtimageformats
     qtmultimedia
     qtquickcontrols2
diff --git a/pkgs/applications/plasma-mobile/calindori.nix b/pkgs/applications/kde/calindori.nix
similarity index 100%
rename from pkgs/applications/plasma-mobile/calindori.nix
rename to pkgs/applications/kde/calindori.nix
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 6a57ccf9ee6e..3ffb345a3477 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -235,6 +235,24 @@ let
       umbrello = callPackage ./umbrello.nix {};
       yakuake = callPackage ./yakuake.nix {};
       zanshin = callPackage ./zanshin.nix {};
+
+      # Plasma Mobile Gear
+      alligator = callPackage ./alligator.nix {};
+      angelfish = callPackage ./angelfish.nix { inherit srcs; };
+      audiotube = callPackage ./audiotube.nix {};
+      calindori = callPackage ./calindori.nix {};
+      kalk = callPackage ./kalk.nix {};
+      kasts = callPackage ./kasts.nix {};
+      kclock = callPackage ./kclock.nix {};
+      keysmith = callPackage ./keysmith.nix {};
+      koko = callPackage ./koko.nix {};
+      krecorder = callPackage ./krecorder.nix {};
+      ktrip = callPackage ./ktrip.nix {};
+      kweather = callPackage ./kweather.nix {};
+      neochat = callPackage ./neochat.nix {};
+      plasmatube = callPackage ./plasmatube {};
+      qmlkonsole = callPackage ./qmlkonsole.nix {};
+      tokodon = callPackage ./tokodon.nix {};
     };
 
 in lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/applications/plasma-mobile/kalk.nix b/pkgs/applications/kde/kalk.nix
similarity index 100%
rename from pkgs/applications/plasma-mobile/kalk.nix
rename to pkgs/applications/kde/kalk.nix
diff --git a/pkgs/applications/plasma-mobile/kasts.nix b/pkgs/applications/kde/kasts.nix
similarity index 100%
rename from pkgs/applications/plasma-mobile/kasts.nix
rename to pkgs/applications/kde/kasts.nix
diff --git a/pkgs/applications/plasma-mobile/kclock.nix b/pkgs/applications/kde/kclock.nix
similarity index 100%
rename from pkgs/applications/plasma-mobile/kclock.nix
rename to pkgs/applications/kde/kclock.nix
diff --git a/pkgs/applications/plasma-mobile/keysmith.nix b/pkgs/applications/kde/keysmith.nix
similarity index 100%
rename from pkgs/applications/plasma-mobile/keysmith.nix
rename to pkgs/applications/kde/keysmith.nix
diff --git a/pkgs/applications/plasma-mobile/koko.nix b/pkgs/applications/kde/koko.nix
similarity index 100%
rename from pkgs/applications/plasma-mobile/koko.nix
rename to pkgs/applications/kde/koko.nix
diff --git a/pkgs/applications/plasma-mobile/krecorder.nix b/pkgs/applications/kde/krecorder.nix
similarity index 100%
rename from pkgs/applications/plasma-mobile/krecorder.nix
rename to pkgs/applications/kde/krecorder.nix
diff --git a/pkgs/applications/plasma-mobile/ktrip.nix b/pkgs/applications/kde/ktrip.nix
similarity index 100%
rename from pkgs/applications/plasma-mobile/ktrip.nix
rename to pkgs/applications/kde/ktrip.nix
diff --git a/pkgs/applications/plasma-mobile/kweather.nix b/pkgs/applications/kde/kweather.nix
similarity index 100%
rename from pkgs/applications/plasma-mobile/kweather.nix
rename to pkgs/applications/kde/kweather.nix
diff --git a/pkgs/applications/plasma-mobile/neochat.nix b/pkgs/applications/kde/neochat.nix
similarity index 88%
rename from pkgs/applications/plasma-mobile/neochat.nix
rename to pkgs/applications/kde/neochat.nix
index 8b3da82b8b88..4df33add6795 100644
--- a/pkgs/applications/plasma-mobile/neochat.nix
+++ b/pkgs/applications/kde/neochat.nix
@@ -1,6 +1,5 @@
-{ gcc12Stdenv
+{ mkDerivation
 , lib
-, srcs
 
 , cmake
 , extra-cmake-modules
@@ -30,10 +29,8 @@
 , sonnet
 }:
 
-# Workaround for AArch64 not using GCC11 yet.
-gcc12Stdenv.mkDerivation rec {
+mkDerivation {
   pname = "neochat";
-  inherit (srcs.neochat) version src;
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/applications/plasma-mobile/plasmatube/default.nix b/pkgs/applications/kde/plasmatube/default.nix
similarity index 80%
rename from pkgs/applications/plasma-mobile/plasmatube/default.nix
rename to pkgs/applications/kde/plasmatube/default.nix
index c9753babeaaf..555b9f801c22 100644
--- a/pkgs/applications/plasma-mobile/plasmatube/default.nix
+++ b/pkgs/applications/kde/plasmatube/default.nix
@@ -11,7 +11,6 @@
 , mpv
 , qtmultimedia
 , qtquickcontrols2
-, yt-dlp
 }:
 
 mkDerivation {
@@ -37,15 +36,6 @@ mkDerivation {
     gstreamer
   ]);
 
-  patches = [
-    ./0001-Add-placeholders-for-runtime-dependencies.patch
-  ];
-
-  postPatch = ''
-    substituteInPlace src/videomodel.cpp \
-      --replace "@yt-dlp@" "${yt-dlp}/bin/yt-dlp"
-  '';
-
   preFixup = ''
     qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
diff --git a/pkgs/applications/plasma-mobile/qmlkonsole.nix b/pkgs/applications/kde/qmlkonsole.nix
similarity index 100%
rename from pkgs/applications/plasma-mobile/qmlkonsole.nix
rename to pkgs/applications/kde/qmlkonsole.nix
diff --git a/pkgs/applications/plasma-mobile/tokodon.nix b/pkgs/applications/kde/tokodon.nix
similarity index 56%
rename from pkgs/applications/plasma-mobile/tokodon.nix
rename to pkgs/applications/kde/tokodon.nix
index f93336d40fa8..bf40a5a00155 100644
--- a/pkgs/applications/plasma-mobile/tokodon.nix
+++ b/pkgs/applications/kde/tokodon.nix
@@ -11,7 +11,6 @@
 , kirigami2
 , kirigami-addons
 , knotifications
-, libwebsockets
 , qqc2-desktop-style
 , qtbase
 , qtkeychain
@@ -21,29 +20,11 @@
 , qtwebsockets
 , kitemmodels
 , pimcommon
-
-# Workarounds for the point release being missing.
-, libsForQt5
-, fetchFromGitLab
 }:
 
-# NOTE: we cannot use `mkDerivation` injected by the Plasma Mobile package
-#       set for the point release, as the point release was not uploaded to
-#       the Plasma Mobile gear repo, and the injected `mkDerivation` only can
-#       use the src (and version) from the `srcs` set.
-libsForQt5.mkDerivation rec {
+mkDerivation {
   pname = "tokodon";
 
-  version = "23.01.0";
-  # NOTE: the tokodon point release was not uploaded to the Plasma Mobile gear repo.
-  src = fetchFromGitLab {
-    domain = "invent.kde.org";
-    owner = "network";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-iJRyKEFdoWtZLZ/nkMvy2S7EF+JRHXi3O0DswfrClDU=";
-  };
-
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix
index 255b3828f768..97076070ae60 100644
--- a/pkgs/applications/plasma-mobile/default.nix
+++ b/pkgs/applications/plasma-mobile/default.nix
@@ -57,26 +57,10 @@ let
         inherit mkDerivation;
       };
     in {
-      alligator = callPackage ./alligator.nix {};
-      angelfish = callPackage ./angelfish.nix { inherit srcs; };
-      audiotube = callPackage ./audiotube.nix {};
-      calindori = callPackage ./calindori.nix {};
-      kalk = callPackage ./kalk.nix {};
-      kasts = callPackage ./kasts.nix {};
-      kclock = callPackage ./kclock.nix {};
-      keysmith = callPackage ./keysmith.nix {};
-      koko = callPackage ./koko.nix {};
-      krecorder = callPackage ./krecorder.nix {};
-      ktrip = callPackage ./ktrip.nix {};
-      kweather = callPackage ./kweather.nix {};
-      neochat = callPackage ./neochat.nix { inherit srcs; };
       plasma-dialer = callPackage ./plasma-dialer.nix {};
       plasma-phonebook = callPackage ./plasma-phonebook.nix {};
       plasma-settings = callPackage ./plasma-settings.nix {};
-      plasmatube = callPackage ./plasmatube {};
-      qmlkonsole = callPackage ./qmlkonsole.nix {};
       spacebar = callPackage ./spacebar.nix {};
-      tokodon = callPackage ./tokodon.nix {};
     };
 
 in lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/applications/plasma-mobile/plasmatube/0001-Add-placeholders-for-runtime-dependencies.patch b/pkgs/applications/plasma-mobile/plasmatube/0001-Add-placeholders-for-runtime-dependencies.patch
deleted file mode 100644
index 704b92b2b01a..000000000000
--- a/pkgs/applications/plasma-mobile/plasmatube/0001-Add-placeholders-for-runtime-dependencies.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7a9405ed02b0d86839644a2c237ca7ca8b891b76 Mon Sep 17 00:00:00 2001
-From: Samuel Dionne-Riel <samuel@dionne-riel.com>
-Date: Wed, 30 Nov 2022 21:07:56 -0500
-Subject: [PATCH] Add placeholders for runtime dependencies
-
----
- src/videomodel.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/videomodel.cpp b/src/videomodel.cpp
-index 4bb3451..b558f31 100644
---- a/src/videomodel.cpp
-+++ b/src/videomodel.cpp
-@@ -121,7 +121,7 @@ QString VideoModel::remoteUrl()
-         return {};
-     }
- 
--    QString youtubeDl = QStringLiteral("yt-dlp");
-+    QString youtubeDl = QStringLiteral("@yt-dlp@");
-     QStringList arguments;
-     arguments << QLatin1String("--dump-json")
-               << m_videoId;
--- 
-2.38.0
-
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 60bd366de97a..27010136f5e1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -80,7 +80,7 @@ mapAliases ({
   amuleDaemon = throw "amuleDaemon was renamed to amule-daemon"; # Added 2022-02-11
   amuleGui = throw "amuleGui was renamed to amule-gui"; # Added 2022-02-11
   amsn = throw "amsn has been removed due to being unmaintained"; # Added 2020-12-09
-  angelfish = libsForQt5.plasmaMobileGear.angelfish; # Added 2021-10-06
+  angelfish = libsForQt5.kdeGear.angelfish; # Added 2021-10-06
   ansible_2_11 = throw "Ansible 2.11 goes end of life in 2022/11 and can't be supported throughout the 22.05 release cycle"; # Added 2022-03-30
   ansible_2_10 = throw "Ansible 2.10 went end of life in 2022/05 and has subsequently been dropped"; # Added 2022-03-30
   ansible_2_9 = throw "Ansible 2.9 went end of life in 2022/05 and has subsequently been dropped"; # Added 2022-03-30
@@ -782,7 +782,7 @@ mapAliases ({
   kexectools = kexec-tools; # Added 2021-09-03
   kexpand = "kexpand awless has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-01
   keybase-go = throw "'keybase-go' has been renamed to/replaced by 'keybase'"; # Converted to throw 2022-02-22
-  keysmith = libsForQt5.plasmaMobileGear.keysmith; # Added 2021-07-14
+  keysmith = libsForQt5.kdeGear.keysmith; # Added 2021-07-14
   kgx = gnome-console; # Added 2022-02-19
   kibana7-oss = throw "kibana7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09
   kicad-with-packages3d = kicad; # Added 2019-11-25
@@ -1087,7 +1087,7 @@ mapAliases ({
   navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # Added 2021-06-07
   ncat = throw "'ncat' has been renamed to/replaced by 'nmap'"; # Converted to throw 2022-02-22
   neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12
-  neochat = libsForQt5.plasmaMobileGear.neochat; # added 2022-05-10
+  neochat = libsForQt5.kdeGear.neochat; # added 2022-05-10
   netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # Added 2020-08-31
   nettools_mptcp = throw "'nettools_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04
   networkmanager_fortisslvpn = throw "'networkmanager_fortisslvpn' has been renamed to/replaced by 'networkmanager-fortisslvpn'"; # Converted to throw 2022-02-22

From df92bdf3fb55ed6de71e3e6be41d4569b3e0dd5e Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 18 Mar 2023 01:39:35 +0300
Subject: [PATCH 85/96] kde/gear: add new dependencies

---
 pkgs/applications/kde/colord-kde.nix             | 8 ++++----
 pkgs/applications/kde/dolphin.nix                | 4 ++--
 pkgs/applications/kde/gwenview.nix               | 4 +++-
 pkgs/applications/kde/kaccounts-integration.nix  | 3 ++-
 pkgs/applications/kde/kate.nix                   | 6 ++----
 pkgs/applications/kde/kdebugsettings.nix         | 4 ++--
 pkgs/applications/kde/kdeconnect-kde.nix         | 4 ++++
 pkgs/applications/kde/kdenetwork-filesharing.nix | 4 ++--
 pkgs/applications/kde/kimap.nix                  | 4 ++--
 pkgs/applications/kde/kitinerary.nix             | 8 ++------
 pkgs/applications/kde/kleopatra.nix              | 4 ++--
 pkgs/applications/kde/konsole.nix                | 4 ++--
 pkgs/applications/kde/kontactinterface.nix       | 5 +++--
 pkgs/applications/kde/kpublictransport.nix       | 9 +++++++++
 pkgs/applications/kde/krfb.nix                   | 4 ++--
 pkgs/applications/kde/libkcddb.nix               | 4 ++--
 pkgs/applications/kde/okular.nix                 | 4 ++--
 pkgs/applications/kde/pimcommon.nix              | 4 ++--
 pkgs/applications/kde/spectacle.nix              | 4 +++-
 19 files changed, 52 insertions(+), 39 deletions(-)

diff --git a/pkgs/applications/kde/colord-kde.nix b/pkgs/applications/kde/colord-kde.nix
index e250df5633f7..07f34c84d6f1 100644
--- a/pkgs/applications/kde/colord-kde.nix
+++ b/pkgs/applications/kde/colord-kde.nix
@@ -1,11 +1,11 @@
-{ mkDerivation, lib, fetchurl
+{ mkDerivation, lib
 , extra-cmake-modules, ki18n
 , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils
 , kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem
-, kitemviews, lcms2, libXrandr, qtx11extras
+, kitemmodels, kitemviews, lcms2, libXrandr, qtx11extras
 }:
 
-mkDerivation rec {
+mkDerivation {
   pname = "colord-kde";
 
   nativeBuildInputs = [ extra-cmake-modules ];
@@ -13,7 +13,7 @@ mkDerivation rec {
   buildInputs = [
     kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes
     kcmutils ki18n kio knotifications plasma-framework kwidgetsaddons
-    kwindowsystem kitemviews lcms2 libXrandr qtx11extras
+    kwindowsystem kitemmodels kitemviews lcms2 libXrandr qtx11extras
   ];
 
   meta = with lib; {
diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix
index b15c6fea4a0e..d5340eaf379e 100644
--- a/pkgs/applications/kde/dolphin.nix
+++ b/pkgs/applications/kde/dolphin.nix
@@ -5,8 +5,7 @@
   kcompletion, kconfig, kcoreaddons, kdbusaddons,
   kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications,
   kparts, ktexteditor, kwindowsystem, phonon, solid,
-  kuserfeedback,
-  wayland, qtwayland
+  kuserfeedback, wayland, qtwayland, qtx11extras
 }:
 
 mkDerivation {
@@ -26,6 +25,7 @@ mkDerivation {
     phonon solid
     kuserfeedback
     wayland qtwayland
+    qtx11extras
   ];
   outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix
index 545b1a2b69e7..c4dc46f38afb 100644
--- a/pkgs/applications/kde/gwenview.nix
+++ b/pkgs/applications/kde/gwenview.nix
@@ -3,7 +3,8 @@
   extra-cmake-modules, kdoctools,
   exiv2, lcms2, cfitsio,
   baloo, kactivities, kio, kipi-plugins, kitemmodels, kparts, libkdcraw, libkipi,
-  phonon, qtimageformats, qtsvg, qtx11extras, kinit, kpurpose, kcolorpicker, kimageannotator
+  phonon, qtimageformats, qtsvg, qtx11extras, kinit, kpurpose, kcolorpicker, kimageannotator,
+  wayland, wayland-protocols
 }:
 
 mkDerivation {
@@ -19,6 +20,7 @@ mkDerivation {
     baloo kactivities kio kitemmodels kparts libkdcraw libkipi phonon
     exiv2 lcms2 cfitsio
     qtimageformats qtsvg qtx11extras kpurpose kcolorpicker kimageannotator
+    wayland wayland-protocols
   ];
   propagatedUserEnvPkgs = [ kipi-plugins libkipi (lib.getBin kinit) ];
 }
diff --git a/pkgs/applications/kde/kaccounts-integration.nix b/pkgs/applications/kde/kaccounts-integration.nix
index ef69f564f128..069bedcb53b2 100644
--- a/pkgs/applications/kde/kaccounts-integration.nix
+++ b/pkgs/applications/kde/kaccounts-integration.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, extra-cmake-modules, kdoctools, kcmutils, kcoreaddons, kwallet, accounts-qt, signond }:
+{ mkDerivation, lib, extra-cmake-modules, kdoctools, kcmutils, kcoreaddons, kwallet, accounts-qt, signond, qcoro }:
 
 mkDerivation {
   pname = "kaccounts-integration";
@@ -19,5 +19,6 @@ mkDerivation {
     kwallet
     accounts-qt
     signond
+    qcoro
   ];
 }
diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix
index de76a476df06..646fedba158f 100644
--- a/pkgs/applications/kde/kate.nix
+++ b/pkgs/applications/kde/kate.nix
@@ -4,8 +4,7 @@
   kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n,
   kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole,
   kparts, ktexteditor, kwindowsystem, kwallet, kxmlgui, libgit2,
-  kuserfeedback,
-  plasma-framework, qtscript, threadweaver
+  kuserfeedback, plasma-framework, qtscript, threadweaver, qtx11extras
 }:
 
 mkDerivation {
@@ -33,8 +32,7 @@ mkDerivation {
     kactivities ki18n kio ktexteditor kwindowsystem plasma-framework
     qtscript kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts
     kxmlgui kdbusaddons kwallet kitemmodels knotifications threadweaver
-    knewstuff
-    kuserfeedback
+    knewstuff kuserfeedback qtx11extras
   ];
   propagatedUserEnvPkgs = [ konsole ];
 }
diff --git a/pkgs/applications/kde/kdebugsettings.nix b/pkgs/applications/kde/kdebugsettings.nix
index 2ebf9c889448..829f7a26eb30 100644
--- a/pkgs/applications/kde/kdebugsettings.nix
+++ b/pkgs/applications/kde/kdebugsettings.nix
@@ -2,7 +2,7 @@
   mkDerivation, lib,
   extra-cmake-modules, kdoctools,
   gettext,
-  kcoreaddons, kconfig, kdbusaddons, kwidgetsaddons, kitemviews, kcompletion,
+  kcoreaddons, kconfig, kdbusaddons, kwidgetsaddons, kitemviews, kcompletion, kxmlgui,
   python3
 }:
 
@@ -16,7 +16,7 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    gettext kcoreaddons kconfig kdbusaddons kwidgetsaddons kitemviews kcompletion python3
+    gettext kcoreaddons kconfig kdbusaddons kwidgetsaddons kitemviews kcompletion kxmlgui python3
   ];
   propagatedUserEnvPkgs = [ ];
 }
diff --git a/pkgs/applications/kde/kdeconnect-kde.nix b/pkgs/applications/kde/kdeconnect-kde.nix
index 157ca73ecfc1..f67a338b3495 100644
--- a/pkgs/applications/kde/kdeconnect-kde.nix
+++ b/pkgs/applications/kde/kdeconnect-kde.nix
@@ -16,6 +16,7 @@
 , libXtst
 , libfakekey
 , makeWrapper
+, modemmanager-qt
 , pulseaudio-qt
 , qca-qt5
 , qqc2-desktop-style
@@ -26,6 +27,7 @@
 , breeze-icons
 , sshfs
 , wayland
+, wayland-protocols
 , wayland-scanner
 , plasma-wayland-protocols
 }:
@@ -47,6 +49,7 @@ mkDerivation {
     kwayland
     libXtst
     libfakekey
+    modemmanager-qt
     pulseaudio-qt
     qca-qt5
     qqc2-desktop-style
@@ -55,6 +58,7 @@ mkDerivation {
     qtquickcontrols2
     qtx11extras
     wayland
+    wayland-protocols
     wayland-scanner
     plasma-wayland-protocols
     # otherwise buttons are blank on non-kde
diff --git a/pkgs/applications/kde/kdenetwork-filesharing.nix b/pkgs/applications/kde/kdenetwork-filesharing.nix
index 74ed9386cf05..4cff4a84fc40 100644
--- a/pkgs/applications/kde/kdenetwork-filesharing.nix
+++ b/pkgs/applications/kde/kdenetwork-filesharing.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib,
   extra-cmake-modules, kdoctools,
-  kcoreaddons, kdeclarative, ki18n, kio, kwidgetsaddons, samba,
+  kcoreaddons, kdeclarative, ki18n, kio, kwidgetsaddons, samba, qcoro
 }:
 
 mkDerivation {
@@ -11,5 +11,5 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ kcoreaddons kdeclarative ki18n kio kwidgetsaddons samba ];
+  buildInputs = [ kcoreaddons kdeclarative ki18n kio kwidgetsaddons samba qcoro ];
 }
diff --git a/pkgs/applications/kde/kimap.nix b/pkgs/applications/kde/kimap.nix
index ece32e3ee057..8abaa1714294 100644
--- a/pkgs/applications/kde/kimap.nix
+++ b/pkgs/applications/kde/kimap.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib, kdepimTeam,
   extra-cmake-modules, kdoctools,
-  cyrus_sasl, kcoreaddons, ki18n, kio, kmime
+  cyrus_sasl, kcoreaddons, ki18n, kio, kmime, kitemmodels
 }:
 
 mkDerivation {
@@ -12,6 +12,6 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [ ki18n kio ];
-  propagatedBuildInputs = [ cyrus_sasl kcoreaddons kmime ];
+  propagatedBuildInputs = [ cyrus_sasl kcoreaddons kmime kitemmodels ];
   outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/applications/kde/kitinerary.nix b/pkgs/applications/kde/kitinerary.nix
index f69e705bb2f9..d795e4fac4c8 100644
--- a/pkgs/applications/kde/kitinerary.nix
+++ b/pkgs/applications/kde/kitinerary.nix
@@ -1,7 +1,7 @@
 { mkDerivation, lib, extra-cmake-modules
 , qtdeclarative, ki18n, kmime, kpkpass
 , poppler, kcontacts, kcalendarcore
-, shared-mime-info
+, shared-mime-info, zxing-cpp
 }:
 
 mkDerivation {
@@ -16,11 +16,7 @@ mkDerivation {
   ];
   buildInputs = [
     qtdeclarative kmime kpkpass poppler
-    kcontacts kcalendarcore
-  ];
-
-  CXXFLAGS = [
-    "-I${lib.getDev ki18n}/include/KF5"  # Fixes: ki18n_version.h: No such file or directory
+    kcontacts kcalendarcore ki18n zxing-cpp
   ];
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/applications/kde/kleopatra.nix b/pkgs/applications/kde/kleopatra.nix
index a02e7b08aa65..fc844796acd0 100644
--- a/pkgs/applications/kde/kleopatra.nix
+++ b/pkgs/applications/kde/kleopatra.nix
@@ -2,7 +2,7 @@
   mkDerivation, lib, kdepimTeam,
   extra-cmake-modules, kdoctools,
   boost, gpgme, kcmutils, kdbusaddons, kiconthemes, kitemmodels, kmime,
-  knotifications, kwindowsystem, kxmlgui, libkleo, kcrash
+  knotifications, kwindowsystem, kxmlgui, libkleo, kcrash, kpipewire
 }:
 
 mkDerivation {
@@ -12,7 +12,7 @@ mkDerivation {
 
   buildInputs = [
     boost gpgme kcmutils kdbusaddons kiconthemes kitemmodels kmime
-    knotifications kwindowsystem kxmlgui libkleo kcrash
+    knotifications kwindowsystem kxmlgui libkleo kcrash kpipewire
   ];
 
   meta = {
diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix
index 220cd6a16d57..9771e269faaf 100644
--- a/pkgs/applications/kde/konsole.nix
+++ b/pkgs/applications/kde/konsole.nix
@@ -4,7 +4,7 @@
   kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons,
   ki18n, kiconthemes, kinit, kio, knotifications,
   knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons,
-  kwindowsystem, kxmlgui, qtscript, knewstuff
+  kwindowsystem, kxmlgui, qtscript, knewstuff, qtmultimedia
 }:
 
 mkDerivation {
@@ -19,7 +19,7 @@ mkDerivation {
   buildInputs = [
     kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons
     kguiaddons ki18n kiconthemes kinit kio knotifications knotifyconfig kparts kpty
-    kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript knewstuff
+    kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript knewstuff qtmultimedia
   ];
 
   passthru.tests.test = nixosTests.terminal-emulators.konsole;
diff --git a/pkgs/applications/kde/kontactinterface.nix b/pkgs/applications/kde/kontactinterface.nix
index b680a088a6ea..292a21e32c2c 100644
--- a/pkgs/applications/kde/kontactinterface.nix
+++ b/pkgs/applications/kde/kontactinterface.nix
@@ -1,7 +1,8 @@
 {
   mkDerivation, lib, kdepimTeam,
   extra-cmake-modules, kdoctools,
-  kiconthemes, kparts, kwindowsystem, kxmlgui
+  kiconthemes, kparts, kwindowsystem, kxmlgui,
+  qtx11extras
 }:
 
 mkDerivation {
@@ -12,7 +13,7 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    kiconthemes kwindowsystem kxmlgui
+    kiconthemes kwindowsystem kxmlgui qtx11extras
   ];
   propagatedBuildInputs = [ kparts ];
 }
diff --git a/pkgs/applications/kde/kpublictransport.nix b/pkgs/applications/kde/kpublictransport.nix
index fbfd3fcc8a46..0678aa10daff 100644
--- a/pkgs/applications/kde/kpublictransport.nix
+++ b/pkgs/applications/kde/kpublictransport.nix
@@ -1,6 +1,9 @@
 { mkDerivation
 , lib
 , extra-cmake-modules
+, qtquickcontrols2
+, networkmanager-qt
+, ki18n
 }:
 
 mkDerivation {
@@ -10,4 +13,10 @@ mkDerivation {
     maintainers = [ maintainers.samueldr ];
   };
   nativeBuildInputs = [ extra-cmake-modules ];
+
+  buildInputs = [
+    qtquickcontrols2
+    networkmanager-qt
+    ki18n
+  ];
 }
diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix
index 65213fa15afb..367e9ab01081 100644
--- a/pkgs/applications/kde/krfb.nix
+++ b/pkgs/applications/kde/krfb.nix
@@ -1,7 +1,7 @@
 { mkDerivation, lib
 , extra-cmake-modules, kdoctools
 , kconfig, kcoreaddons, kcrash, kdbusaddons, kdnssd, knotifications, kwallet
-, kwidgetsaddons, kwindowsystem, kxmlgui, kwayland
+, kwidgetsaddons, kwindowsystem, kxmlgui, kwayland, kpipewire
 , libvncserver, libXtst, libXdamage
 , qtx11extras, pipewire, plasma-wayland-protocols, wayland
 }:
@@ -18,7 +18,7 @@ mkDerivation {
   buildInputs = [
     libvncserver libXtst libXdamage
     kconfig kcoreaddons kcrash kdbusaddons knotifications kwallet kwidgetsaddons
-    kwindowsystem kxmlgui kwayland
+    kwindowsystem kxmlgui kwayland kpipewire
     qtx11extras
     pipewire
     plasma-wayland-protocols
diff --git a/pkgs/applications/kde/libkcddb.nix b/pkgs/applications/kde/libkcddb.nix
index 3dde49605025..d7523de0db8a 100644
--- a/pkgs/applications/kde/libkcddb.nix
+++ b/pkgs/applications/kde/libkcddb.nix
@@ -1,5 +1,5 @@
 { mkDerivation, lib, extra-cmake-modules, qtbase, kdoctools
-, kcodecs, ki18n, kio, kwidgetsaddons
+, kcodecs, ki18n, kio, kwidgetsaddons, kcmutils
 , libmusicbrainz5 }:
 
 mkDerivation {
@@ -9,7 +9,7 @@ mkDerivation {
     maintainers = with maintainers; [ peterhoeg ];
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ qtbase ];
+  buildInputs = [ qtbase kcmutils ];
   propagatedBuildInputs = [
     kcodecs ki18n kio kwidgetsaddons
     libmusicbrainz5
diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix
index e2d468b4ff7b..727fc673b174 100644
--- a/pkgs/applications/kde/okular.nix
+++ b/pkgs/applications/kde/okular.nix
@@ -5,7 +5,7 @@
 , kdbusaddons, kdegraphics-mobipocket, kiconthemes, kjs, khtml, kio, kparts
 , kpty, kpurpose, kwallet, kwindowsystem, libkexiv2, libspectre, libzip, phonon, poppler
 , qca-qt5, qtdeclarative, qtsvg, threadweaver, kcrash
-, withSpeech ? true, qtspeech
+, withSpeech ? true, qtspeech, qtx11extras
 }:
 
 mkDerivation {
@@ -18,7 +18,7 @@ mkDerivation {
     kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons
     kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kpurpose kwallet
     kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5
-    qtdeclarative qtsvg threadweaver kcrash chmlib
+    qtdeclarative qtsvg threadweaver kcrash chmlib qtx11extras
   ] ++ lib.optional withSpeech qtspeech;
 
   # InitialPreference values are too high and end up making okular
diff --git a/pkgs/applications/kde/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix
index 896c202529a6..d82bc3f506b5 100644
--- a/pkgs/applications/kde/pimcommon.nix
+++ b/pkgs/applications/kde/pimcommon.nix
@@ -4,7 +4,7 @@
   akonadi, akonadi-contacts, akonadi-mime, akonadi-search, grantlee, karchive, kcmutils, kcodecs,
   kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons,
   kiconthemes, kimap, kio, kitemmodels, kjobwidgets, kldap, knewstuff, kpimtextedit,
-  kpurpose, kwallet, kwindowsystem, libkdepim, qtwebengine
+  kpurpose, kwallet, kwindowsystem, libkdepim, qtwebengine, ktextaddons
 }:
 
 mkDerivation {
@@ -17,7 +17,7 @@ mkDerivation {
   buildInputs = [
     akonadi-mime grantlee karchive kcmutils kcodecs kcompletion kconfigwidgets
     kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kldap
-    kpurpose kwallet kwindowsystem libkdepim qtwebengine
+    kpurpose kwallet kwindowsystem libkdepim qtwebengine ktextaddons
   ];
   propagatedBuildInputs = [
     akonadi akonadi-contacts akonadi-search kconfig kcontacts kimap kpimtextedit
diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix
index cbba15beebc7..db819ba41f97 100644
--- a/pkgs/applications/kde/spectacle.nix
+++ b/pkgs/applications/kde/spectacle.nix
@@ -4,6 +4,7 @@
 , kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins
 , knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi
 , qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator
+, qcoro, qtquickcontrols2, wayland, plasma-wayland-protocols, kpurpose, kpipewire
 }:
 
 mkDerivation {
@@ -12,7 +13,8 @@ mkDerivation {
   buildInputs = [
     kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
     kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor
-    knewstuff kwayland kcolorpicker kimageannotator
+    knewstuff kwayland kcolorpicker kimageannotator qcoro qtquickcontrols2
+    wayland plasma-wayland-protocols kpurpose kpipewire
   ];
   postPatch = ''
     substituteInPlace desktop/org.kde.spectacle.desktop.cmake \

From 1da2d9962df53bc285a260f33f378b2a63c5ef68 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 18 Mar 2023 01:39:35 +0300
Subject: [PATCH 86/96] akonadi: refresh patch

---
 .../0003-akonadi-revert-make-relocatable.patch       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch b/pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch
index 73d69c5e69af..6d4d5a4b363b 100644
--- a/pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch
+++ b/pkgs/applications/kde/akonadi/0003-akonadi-revert-make-relocatable.patch
@@ -5,7 +5,7 @@ Subject: [PATCH 3/3] akonadi revert make relocatable
 
 ---
  CMakeLists.txt            | 3 ---
- KF5AkonadiConfig.cmake.in | 6 +++---
+ KPimAkonadiConfig.cmake.in | 6 +++---
  2 files changed, 3 insertions(+), 6 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,8 +13,8 @@ index 4e8cc81..63161b7 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -368,9 +368,6 @@ configure_package_config_file(
-     "${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in"
-     "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake"
+     "${CMAKE_CURRENT_SOURCE_DIR}/KPimAkonadiConfig.cmake.in"
+     "${CMAKE_CURRENT_BINARY_DIR}/KPimAkonadiConfig.cmake"
      INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
 -    PATH_VARS AKONADI_DBUS_INTERFACES_INSTALL_DIR
 -              AKONADI_INCLUDE_DIR
@@ -22,10 +22,10 @@ index 4e8cc81..63161b7 100644
  )
  
  install(FILES
-diff --git a/KF5AkonadiConfig.cmake.in b/KF5AkonadiConfig.cmake.in
+diff --git a/KPimAkonadiConfig.cmake.in b/KPimAkonadiConfig.cmake.in
 index bcf7320..1574319 100644
---- a/KF5AkonadiConfig.cmake.in
-+++ b/KF5AkonadiConfig.cmake.in
+--- a/KPimAkonadiConfig.cmake.in
++++ b/KPimAkonadiConfig.cmake.in
 @@ -1,10 +1,10 @@
  @PACKAGE_INIT@
  

From b26bcd8dd305cf1247dcfb677dbbb34c8109548c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 18 Mar 2023 01:39:35 +0300
Subject: [PATCH 87/96] ksmtp: drop unused patch

---
 ...TARGETS_DEFAULT_ARGS-when-installing.patch | 25 -------------------
 pkgs/applications/kde/ksmtp/default.nix       |  1 -
 2 files changed, 26 deletions(-)
 delete mode 100644 pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch

diff --git a/pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch b/pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch
deleted file mode 100644
index 5f0ad9fac261..000000000000
--- a/pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 749769232e7387ec8c8f2d3da845d8a6ae7d5977 Mon Sep 17 00:00:00 2001
-From: gnidorah <gnidorah@users.noreply.github.com>
-Date: Fri, 22 Dec 2017 19:32:47 +0300
-Subject: [PATCH] Use KDE_INSTALL_TARGETS_DEFAULT_ARGS when installing targets
-
----
- src/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 83c2bcb..5f6d47c 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -51,7 +51,7 @@ ecm_generate_headers(KSMTP_CamelCase_HEADERS
-     REQUIRED_HEADERS KSMTP_HEADERS
- )
- 
--install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS})
-+install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
- 
- install(FILES
-     ${CMAKE_CURRENT_BINARY_DIR}/ksmtp_export.h
--- 
-2.15.1
-
diff --git a/pkgs/applications/kde/ksmtp/default.nix b/pkgs/applications/kde/ksmtp/default.nix
index 1e5a43f35213..b088bbc4577d 100644
--- a/pkgs/applications/kde/ksmtp/default.nix
+++ b/pkgs/applications/kde/ksmtp/default.nix
@@ -13,5 +13,4 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [ kcoreaddons kio kmime ];
   propagatedBuildInputs = [ cyrus_sasl ];
-  patches = [ ./0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch ];
 }

From 0f538b4dff0b242b40d4409c6b0f313f28932923 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 18 Mar 2023 01:39:35 +0300
Subject: [PATCH 88/96] kongress: init

---
 pkgs/applications/kde/default.nix  |  1 +
 pkgs/applications/kde/kongress.nix | 36 ++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/applications/kde/kongress.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 3ffb345a3477..1ab8d2035147 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -246,6 +246,7 @@ let
       kclock = callPackage ./kclock.nix {};
       keysmith = callPackage ./keysmith.nix {};
       koko = callPackage ./koko.nix {};
+      kongress = callPackage ./kongress.nix {};
       krecorder = callPackage ./krecorder.nix {};
       ktrip = callPackage ./ktrip.nix {};
       kweather = callPackage ./kweather.nix {};
diff --git a/pkgs/applications/kde/kongress.nix b/pkgs/applications/kde/kongress.nix
new file mode 100644
index 000000000000..be5efcdb9e23
--- /dev/null
+++ b/pkgs/applications/kde/kongress.nix
@@ -0,0 +1,36 @@
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, qtquickcontrols2
+, kcalendarcore
+, kconfig
+, kcoreaddons
+, kdbusaddons
+, kirigami2
+, ki18n
+, knotifications
+}:
+
+mkDerivation {
+  pname = "kongress";
+
+  nativeBuildInputs = [ extra-cmake-modules ];
+
+  buildInputs = [
+    qtquickcontrols2
+    kcalendarcore
+    kconfig
+    kcoreaddons
+    kdbusaddons
+    kirigami2
+    ki18n
+    knotifications
+  ];
+
+  meta = {
+    description = "A companion application for conferences";
+    homepage = "https://apps.kde.org/kongress/";
+    license = lib.licenses.gpl3;
+    maintainers = [];
+  };
+}

From c38151aa5e3a11dd6867d49fd7d39949b339879c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 18 Mar 2023 01:39:35 +0300
Subject: [PATCH 89/96] telly-skout: init

---
 pkgs/applications/kde/default.nix     |  1 +
 pkgs/applications/kde/telly-skout.nix | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/applications/kde/telly-skout.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 1ab8d2035147..24f5d50c1535 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -253,6 +253,7 @@ let
       neochat = callPackage ./neochat.nix {};
       plasmatube = callPackage ./plasmatube {};
       qmlkonsole = callPackage ./qmlkonsole.nix {};
+      telly-skout = callPackage ./telly-skout.nix {};
       tokodon = callPackage ./tokodon.nix {};
     };
 
diff --git a/pkgs/applications/kde/telly-skout.nix b/pkgs/applications/kde/telly-skout.nix
new file mode 100644
index 000000000000..4c84768a693a
--- /dev/null
+++ b/pkgs/applications/kde/telly-skout.nix
@@ -0,0 +1,24 @@
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, qtquickcontrols2
+, kcoreaddons
+, kconfig
+, ki18n
+, kirigami2
+}:
+
+mkDerivation {
+  pname = "telly-skout";
+
+  nativeBuildInputs = [ extra-cmake-modules ];
+
+  buildInputs = [ qtquickcontrols2 kcoreaddons kconfig ki18n kirigami2 ];
+
+  meta = {
+    description = "A convergent Kirigami TV guide";
+    homepage = "https://apps.kde.org/telly-skout/";
+    license = lib.licenses.gpl2Plus;
+    maintainers = [];
+  };
+}

From eab21608dee657d15e64dbb3a965f382cccec467 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 18 Mar 2023 01:39:35 +0300
Subject: [PATCH 90/96] kde-inotify-survey: init

---
 pkgs/applications/kde/default.nix            |  1 +
 pkgs/applications/kde/kde-inotify-survey.nix | 30 ++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/applications/kde/kde-inotify-survey.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 24f5d50c1535..3e3f31c3a70b 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -113,6 +113,7 @@ let
       kcalutils = callPackage ./kcalutils.nix {};
       kcharselect = callPackage ./kcharselect.nix {};
       kcolorchooser = callPackage ./kcolorchooser.nix {};
+      kde-inotify-survey = callPackage ./kde-inotify-survey.nix {};
       kdebugsettings = callPackage ./kdebugsettings.nix {};
       kdeconnect-kde = callPackage ./kdeconnect-kde.nix {};
       kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
diff --git a/pkgs/applications/kde/kde-inotify-survey.nix b/pkgs/applications/kde/kde-inotify-survey.nix
new file mode 100644
index 000000000000..d90d789c5776
--- /dev/null
+++ b/pkgs/applications/kde/kde-inotify-survey.nix
@@ -0,0 +1,30 @@
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, kauth
+, kcoreaddons
+, kdbusaddons
+, ki18n
+, knotifications
+}:
+
+mkDerivation {
+  pname = "kde-inotify-survey";
+
+  nativeBuildInputs = [ extra-cmake-modules ];
+
+  buildInputs = [
+    kauth
+    kcoreaddons
+    kdbusaddons
+    ki18n
+    knotifications
+  ];
+
+  meta = {
+    description = "Tooling for monitoring inotify limits and informing the user when they have been or about to be reached";
+    homepage = "https://invent.kde.org/system/kde-inotify-survey";
+    license = lib.licenses.gpl2Plus;
+    maintainers = [];
+  };
+}

From 7b52754edb79054aee841ed3cbb3835612946ee0 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 18 Mar 2023 01:39:35 +0300
Subject: [PATCH 91/96] kde/pim: create missing include directories to avoid
 cmake errors

This is a hack and should be removed once upstream fixes this.
---
 pkgs/applications/kde/akonadi-calendar.nix      | 4 ++++
 pkgs/applications/kde/akonadi-contacts.nix      | 4 ++++
 pkgs/applications/kde/akonadi-mime.nix          | 4 ++++
 pkgs/applications/kde/akonadi-notes.nix         | 4 ++++
 pkgs/applications/kde/akonadi-search.nix        | 4 ++++
 pkgs/applications/kde/akonadi/default.nix       | 6 ++----
 pkgs/applications/kde/calendarsupport.nix       | 4 ++++
 pkgs/applications/kde/eventviews.nix            | 4 ++++
 pkgs/applications/kde/grantleetheme/default.nix | 4 ++++
 pkgs/applications/kde/incidenceeditor.nix       | 4 ++++
 pkgs/applications/kde/kcalutils.nix             | 4 ++++
 pkgs/applications/kde/kidentitymanagement.nix   | 4 ++++
 pkgs/applications/kde/kimap.nix                 | 4 ++++
 pkgs/applications/kde/kldap.nix                 | 4 ++++
 pkgs/applications/kde/kmailtransport.nix        | 4 ++++
 pkgs/applications/kde/kmbox.nix                 | 4 ++++
 pkgs/applications/kde/kmime.nix                 | 4 ++++
 pkgs/applications/kde/kontactinterface.nix      | 4 ++++
 pkgs/applications/kde/kpimtextedit.nix          | 4 ++++
 pkgs/applications/kde/ksmtp/default.nix         | 4 ++++
 pkgs/applications/kde/ktnef.nix                 | 4 ++++
 pkgs/applications/kde/libgravatar.nix           | 4 ++++
 pkgs/applications/kde/libkdepim.nix             | 4 ++++
 pkgs/applications/kde/libkleo.nix               | 4 ++++
 pkgs/applications/kde/mailcommon.nix            | 4 ++++
 pkgs/applications/kde/mailimporter.nix          | 4 ++++
 pkgs/applications/kde/messagelib.nix            | 4 ++++
 27 files changed, 106 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/kde/akonadi-calendar.nix b/pkgs/applications/kde/akonadi-calendar.nix
index 474672dfd7d9..95ee121b59f1 100644
--- a/pkgs/applications/kde/akonadi-calendar.nix
+++ b/pkgs/applications/kde/akonadi-calendar.nix
@@ -17,4 +17,8 @@ mkDerivation {
     kio kmailtransport
   ];
   outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
diff --git a/pkgs/applications/kde/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix
index d89670d7719c..2486019ac69a 100644
--- a/pkgs/applications/kde/akonadi-contacts.nix
+++ b/pkgs/applications/kde/akonadi-contacts.nix
@@ -22,4 +22,8 @@ mkDerivation {
   ];
   propagatedBuildInputs = [ akonadi grantleetheme ];
   outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix
index fbd028b1ec28..b498fde26dfa 100644
--- a/pkgs/applications/kde/akonadi-mime.nix
+++ b/pkgs/applications/kde/akonadi-mime.nix
@@ -13,4 +13,8 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
   buildInputs = [ akonadi kdbusaddons ki18n kio kitemmodels kmime ];
   outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
diff --git a/pkgs/applications/kde/akonadi-notes.nix b/pkgs/applications/kde/akonadi-notes.nix
index 1ab0ca74819f..411f71440a0d 100644
--- a/pkgs/applications/kde/akonadi-notes.nix
+++ b/pkgs/applications/kde/akonadi-notes.nix
@@ -15,4 +15,8 @@ mkDerivation {
     akonadi kcompletion ki18n kitemmodels kmime kxmlgui
   ];
   outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
diff --git a/pkgs/applications/kde/akonadi-search.nix b/pkgs/applications/kde/akonadi-search.nix
index 84657177f891..2908748e474d 100644
--- a/pkgs/applications/kde/akonadi-search.nix
+++ b/pkgs/applications/kde/akonadi-search.nix
@@ -17,4 +17,8 @@ mkDerivation {
     akonadi akonadi-mime kcalendarcore kcontacts kcoreaddons kmime qtbase
   ];
   outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix
index e816d3eeb41e..ade8ebbcf421 100644
--- a/pkgs/applications/kde/akonadi/default.nix
+++ b/pkgs/applications/kde/akonadi/default.nix
@@ -44,10 +44,8 @@ mkDerivation {
 
   cmakeFlags = lib.optional (defaultDriver != "MYSQL") "-DDATABASE_BACKEND=${defaultDriver}";
 
-  # compatibility symlinks for kmymoney, can probably be removed in next kde bump
   postInstall = ''
-    ln -s $dev/include/KF5/AkonadiCore/Akonadi/Collection $dev/include/KF5/AkonadiCore/Collection
-    ln -s $dev/include/KF5/AkonadiCore/Akonadi/ItemFetchScope $dev/include/KF5/AkonadiCore/ItemFetchScope
-    ln -s $dev/include/KF5/AkonadiCore/Akonadi/RecursiveItemFetchJob $dev/include/KF5/AkonadiCore/RecursiveItemFetchJob
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
   '';
 }
diff --git a/pkgs/applications/kde/calendarsupport.nix b/pkgs/applications/kde/calendarsupport.nix
index c6a4e36c82d4..4cc1bb1f1c6c 100644
--- a/pkgs/applications/kde/calendarsupport.nix
+++ b/pkgs/applications/kde/calendarsupport.nix
@@ -17,4 +17,8 @@ mkDerivation {
   ];
   propagatedBuildInputs = [ akonadi-calendar kidentitymanagement kmime ];
   outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
diff --git a/pkgs/applications/kde/eventviews.nix b/pkgs/applications/kde/eventviews.nix
index 001c1e6cbcb9..382f0ee48b1d 100644
--- a/pkgs/applications/kde/eventviews.nix
+++ b/pkgs/applications/kde/eventviews.nix
@@ -17,4 +17,8 @@ mkDerivation {
     libkdepim qtbase qttools kholidays
   ];
   outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/pkgs/applications/kde/grantleetheme/default.nix
index 92499645e7f4..2cc532d25104 100644
--- a/pkgs/applications/kde/grantleetheme/default.nix
+++ b/pkgs/applications/kde/grantleetheme/default.nix
@@ -16,4 +16,8 @@ mkDerivation {
     grantlee ki18n kiconthemes knewstuff kservice kxmlgui qtbase
   ];
   propagatedBuildInputs = [ grantlee kiconthemes knewstuff ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
diff --git a/pkgs/applications/kde/incidenceeditor.nix b/pkgs/applications/kde/incidenceeditor.nix
index 9c248f199a5d..2e10c129eefd 100644
--- a/pkgs/applications/kde/incidenceeditor.nix
+++ b/pkgs/applications/kde/incidenceeditor.nix
@@ -17,4 +17,8 @@ mkDerivation {
     kldap kmime pimcommon qtbase
   ];
   outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
diff --git a/pkgs/applications/kde/kcalutils.nix b/pkgs/applications/kde/kcalutils.nix
index 7da9739aad1d..591e28cd737f 100644
--- a/pkgs/applications/kde/kcalutils.nix
+++ b/pkgs/applications/kde/kcalutils.nix
@@ -17,4 +17,8 @@ mkDerivation {
     kidentitymanagement kpimtextedit
   ];
   outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
diff --git a/pkgs/applications/kde/kidentitymanagement.nix b/pkgs/applications/kde/kidentitymanagement.nix
index c2f2abcd32d0..6316a86024b2 100644
--- a/pkgs/applications/kde/kidentitymanagement.nix
+++ b/pkgs/applications/kde/kidentitymanagement.nix
@@ -17,4 +17,8 @@ mkDerivation {
   ];
   propagatedBuildInputs = [ kcoreaddons kpimtextedit ];
   outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
diff --git a/pkgs/applications/kde/kimap.nix b/pkgs/applications/kde/kimap.nix
index 8abaa1714294..b910328c2cad 100644
--- a/pkgs/applications/kde/kimap.nix
+++ b/pkgs/applications/kde/kimap.nix
@@ -14,4 +14,8 @@ mkDerivation {
   buildInputs = [ ki18n kio ];
   propagatedBuildInputs = [ cyrus_sasl kcoreaddons kmime kitemmodels ];
   outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
diff --git a/pkgs/applications/kde/kldap.nix b/pkgs/applications/kde/kldap.nix
index 6016cfd090c8..b7c7777a9a5e 100644
--- a/pkgs/applications/kde/kldap.nix
+++ b/pkgs/applications/kde/kldap.nix
@@ -14,4 +14,8 @@ mkDerivation {
   buildInputs = [ ki18n kio kmbox libsecret qtkeychain ];
   propagatedBuildInputs = [ cyrus_sasl openldap ];
   outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
diff --git a/pkgs/applications/kde/kmailtransport.nix b/pkgs/applications/kde/kmailtransport.nix
index 577beb8d5ec8..ab6700144a81 100644
--- a/pkgs/applications/kde/kmailtransport.nix
+++ b/pkgs/applications/kde/kmailtransport.nix
@@ -19,4 +19,8 @@ mkDerivation {
   ];
   propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ];
   outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
diff --git a/pkgs/applications/kde/kmbox.nix b/pkgs/applications/kde/kmbox.nix
index d2b4dbde8ac4..9a835116c42f 100644
--- a/pkgs/applications/kde/kmbox.nix
+++ b/pkgs/applications/kde/kmbox.nix
@@ -13,4 +13,8 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [ kmime qtbase kcodecs ];
   outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix
index 8dfd910eeded..fe8442e9d19d 100644
--- a/pkgs/applications/kde/kmime.nix
+++ b/pkgs/applications/kde/kmime.nix
@@ -13,4 +13,8 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ kcodecs ki18n qtbase ];
   outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
diff --git a/pkgs/applications/kde/kontactinterface.nix b/pkgs/applications/kde/kontactinterface.nix
index 292a21e32c2c..43e09777bddd 100644
--- a/pkgs/applications/kde/kontactinterface.nix
+++ b/pkgs/applications/kde/kontactinterface.nix
@@ -16,4 +16,8 @@ mkDerivation {
     kiconthemes kwindowsystem kxmlgui qtx11extras
   ];
   propagatedBuildInputs = [ kparts ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$out/include/KF5"
+  '';
 }
diff --git a/pkgs/applications/kde/kpimtextedit.nix b/pkgs/applications/kde/kpimtextedit.nix
index 040fbd122ef8..de5afb72d1fa 100644
--- a/pkgs/applications/kde/kpimtextedit.nix
+++ b/pkgs/applications/kde/kpimtextedit.nix
@@ -19,4 +19,8 @@ mkDerivation {
   ];
   propagatedBuildInputs = [ ktextwidgets ];
   outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
diff --git a/pkgs/applications/kde/ksmtp/default.nix b/pkgs/applications/kde/ksmtp/default.nix
index b088bbc4577d..591426e141e0 100644
--- a/pkgs/applications/kde/ksmtp/default.nix
+++ b/pkgs/applications/kde/ksmtp/default.nix
@@ -13,4 +13,8 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [ kcoreaddons kio kmime ];
   propagatedBuildInputs = [ cyrus_sasl ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$out/include/KF5"
+  '';
 }
diff --git a/pkgs/applications/kde/ktnef.nix b/pkgs/applications/kde/ktnef.nix
index fec85644aa71..4b0e751734e1 100644
--- a/pkgs/applications/kde/ktnef.nix
+++ b/pkgs/applications/kde/ktnef.nix
@@ -15,4 +15,8 @@ mkDerivation {
     kcalendarcore kcalutils kcontacts
   ];
   outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
diff --git a/pkgs/applications/kde/libgravatar.nix b/pkgs/applications/kde/libgravatar.nix
index 2055d7bd36b3..0335ded00652 100644
--- a/pkgs/applications/kde/libgravatar.nix
+++ b/pkgs/applications/kde/libgravatar.nix
@@ -15,4 +15,8 @@ mkDerivation {
     kconfig kio ktextwidgets kwidgetsaddons pimcommon
   ];
   outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
diff --git a/pkgs/applications/kde/libkdepim.nix b/pkgs/applications/kde/libkdepim.nix
index 5fafd2e1effc..7e66a17e5dc4 100644
--- a/pkgs/applications/kde/libkdepim.nix
+++ b/pkgs/applications/kde/libkdepim.nix
@@ -18,4 +18,8 @@ mkDerivation {
     kconfigwidgets kcontacts ki18n kiconthemes kio kitemviews kjobwidgets kldap
     kwallet
   ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$out/include/KF5"
+  '';
 }
diff --git a/pkgs/applications/kde/libkleo.nix b/pkgs/applications/kde/libkleo.nix
index 0cd858ea6e0a..32369495aefa 100644
--- a/pkgs/applications/kde/libkleo.nix
+++ b/pkgs/applications/kde/libkleo.nix
@@ -18,4 +18,8 @@ mkDerivation {
   ];
   propagatedBuildInputs = [ qgpgme ];
   outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
diff --git a/pkgs/applications/kde/mailcommon.nix b/pkgs/applications/kde/mailcommon.nix
index af29ff41681e..d9885058ef89 100644
--- a/pkgs/applications/kde/mailcommon.nix
+++ b/pkgs/applications/kde/mailcommon.nix
@@ -19,4 +19,8 @@ mkDerivation {
     kwindowsystem mailimporter messagelib phonon libkdepim
   ];
   outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }
diff --git a/pkgs/applications/kde/mailimporter.nix b/pkgs/applications/kde/mailimporter.nix
index 745316fbaf9a..08503ba9e831 100644
--- a/pkgs/applications/kde/mailimporter.nix
+++ b/pkgs/applications/kde/mailimporter.nix
@@ -16,4 +16,8 @@ mkDerivation {
     akonadi akonadi-mime karchive kcompletion kconfig kcoreaddons ki18n kmime
     kxmlgui libkdepim pimcommon
   ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$out/include/KF5"
+  '';
 }
diff --git a/pkgs/applications/kde/messagelib.nix b/pkgs/applications/kde/messagelib.nix
index d52989d3ffc0..abd9382a1f0f 100644
--- a/pkgs/applications/kde/messagelib.nix
+++ b/pkgs/applications/kde/messagelib.nix
@@ -26,4 +26,8 @@ mkDerivation {
     qtwebengine
   ];
   outputs = [ "out" "dev" ];
+  postInstall = ''
+    # added as an include directory by cmake files and fails to compile if it's missing
+    mkdir -p "$dev/include/KF5"
+  '';
 }

From 449e8cd8d1fa878f0071943450b75754c525e61e Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 28 Mar 2023 16:30:32 +0300
Subject: [PATCH 92/96] nixos/plasma5: install kde-inotify-survey

---
 nixos/modules/services/x11/desktop-managers/plasma5.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 73a864bb95fe..38f932ffb420 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -429,7 +429,8 @@ in
             dolphin-plugins
             ffmpegthumbs
             kdegraphics-thumbnailers
-            pkgs.kio-admin
+            kde-inotify-survey
+            kio-admin
             kio-extras
           ];
           optionalPackages = [

From 1843807ba323a50bef6a45b4d7f7b840d23d6b22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Thu, 20 Apr 2023 11:17:50 +0200
Subject: [PATCH 93/96] sad: remove old, unmaintained package

The package isn't maintained and hasn't been exposed for a while.
Meanwhile there's been added a new package with the same name.
This change doesn't touch the new package.
---
 .../science/logic/sad/default.nix             |  41 ----
 .../science/logic/sad/monoid.patch            |  51 -----
 .../science/logic/sad/patch.patch             | 200 ------------------
 pkgs/top-level/all-packages.nix               |   8 -
 4 files changed, 300 deletions(-)
 delete mode 100644 pkgs/applications/science/logic/sad/default.nix
 delete mode 100644 pkgs/applications/science/logic/sad/monoid.patch
 delete mode 100644 pkgs/applications/science/logic/sad/patch.patch

diff --git a/pkgs/applications/science/logic/sad/default.nix b/pkgs/applications/science/logic/sad/default.nix
deleted file mode 100644
index a509d70ed462..000000000000
--- a/pkgs/applications/science/logic/sad/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib, stdenv, fetchurl, haskell, spass }:
-
-stdenv.mkDerivation rec {
-  pname = "system-for-automated-deduction";
-  version = "2.3.25";
-  src = fetchurl {
-    url = "http://nevidal.org/download/sad-${version}.tar.gz";
-    sha256 = "10jd93xgarik7xwys5lq7fx4vqp7c0yg1gfin9cqfch1k1v8ap4b";
-  };
-  buildInputs = [ haskell.compiler.ghc844 spass ];
-  patches = [
-    ./patch.patch
-    # Since the LTS 12.0 update, <> is an operator in Prelude, colliding with
-    # the <> operator with a different meaning defined by this package
-    ./monoid.patch
-  ];
-  postPatch = ''
-    substituteInPlace Alice/Main.hs --replace init.opt $out/init.opt
-  '';
-  installPhase = ''
-    mkdir -p $out/{bin,provers}
-    install alice $out/bin
-    install provers/moses $out/provers
-    substituteAll provers/provers.dat $out/provers/provers.dat
-    substituteAll init.opt $out/init.opt
-    cp -r examples $out
-  '';
-  inherit spass;
-  meta = {
-    description = "A program for automated proving of mathematical texts";
-    longDescription = ''
-      The system for automated deduction is intended for automated processing of formal mathematical texts
-      written in a special language called ForTheL (FORmal THEory Language) or in a traditional first-order language
-    '';
-    license = lib.licenses.gpl3Plus;
-    maintainers = [ lib.maintainers.schmitthenner ];
-    homepage = "http://nevidal.org/sad.en.html";
-    platforms = lib.platforms.linux;
-    broken = true; # ghc-8.4.4 is gone from Nixpkgs
-  };
-}
diff --git a/pkgs/applications/science/logic/sad/monoid.patch b/pkgs/applications/science/logic/sad/monoid.patch
deleted file mode 100644
index da9c21bcae91..000000000000
--- a/pkgs/applications/science/logic/sad/monoid.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/Alice/Core/Check.hs b/Alice/Core/Check.hs
-index 0700fa0388f..69815864710 100644
---- a/Alice/Core/Check.hs
-+++ b/Alice/Core/Check.hs
-@@ -18,8 +18,12 @@
-  -  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -}
- 
-+{-# LANGUAGE NoImplicitPrelude #-}
-+
- module Alice.Core.Check (fillDef) where
- 
-+import Prelude hiding ((<>))
-+
- import Control.Monad
- import Data.Maybe
- 
-diff --git a/Alice/Core/Reason.hs b/Alice/Core/Reason.hs
-index c361bcf220d..4e493d8c91b 100644
---- a/Alice/Core/Reason.hs
-+++ b/Alice/Core/Reason.hs
-@@ -17,9 +17,12 @@
-  -  You should have received a copy of the GNU General Public License
-  -  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -}
-+{-# LANGUAGE NoImplicitPrelude #-}
- 
- module Alice.Core.Reason where
- 
-+import Prelude hiding ((<>))
-+
- import Control.Monad
- 
- import Alice.Core.Base
-diff --git a/Alice/Core/Verify.hs b/Alice/Core/Verify.hs
-index 4f8550bdf11..0f59d135b16 100644
---- a/Alice/Core/Verify.hs
-+++ b/Alice/Core/Verify.hs
-@@ -18,8 +18,12 @@
-  -  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -}
- 
-+{-# LANGUAGE NoImplicitPrelude #-}
-+
- module Alice.Core.Verify (verify) where
- 
-+import Prelude hiding ((<>))
-+
- import Control.Monad
- import Data.IORef
- import Data.Maybe
diff --git a/pkgs/applications/science/logic/sad/patch.patch b/pkgs/applications/science/logic/sad/patch.patch
deleted file mode 100644
index a5b1d6177083..000000000000
--- a/pkgs/applications/science/logic/sad/patch.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-diff -aur serious/sad-2.3-25/Alice/Core/Base.hs sad-2.3-25/Alice/Core/Base.hs
---- serious/sad-2.3-25/Alice/Core/Base.hs	2008-03-29 18:24:12.000000000 +0000
-+++ sad-2.3-25/Alice/Core/Base.hs	2015-11-27 06:38:28.740840823 +0000
-@@ -21,6 +21,7 @@
- module Alice.Core.Base where
- 
- import Control.Monad
-+import Control.Applicative
- import Data.IORef
- import Data.List
- import Data.Time
-@@ -61,10 +62,21 @@
- type CRMC a b = IORef RState -> IO a -> (b -> IO a) -> IO a
- newtype CRM b = CRM { runCRM :: forall a . CRMC a b }
- 
-+instance Functor CRM where
-+  fmap = liftM
-+  
-+instance Applicative CRM where
-+  pure = return
-+  (<*>) = ap
-+
- instance Monad CRM where
-   return r  = CRM $ \ _ _ k -> k r
-   m >>= n   = CRM $ \ s z k -> runCRM m s z (\ r -> runCRM (n r) s z k)
- 
-+instance Alternative CRM where
-+  (<|>) = mplus
-+  empty = mzero
-+  
- instance MonadPlus CRM where
-   mzero     = CRM $ \ _ z _ -> z
-   mplus m n = CRM $ \ s z k -> runCRM m s (runCRM n s z k) k
-diff -aur serious/sad-2.3-25/Alice/Core/Thesis.hs sad-2.3-25/Alice/Core/Thesis.hs
---- serious/sad-2.3-25/Alice/Core/Thesis.hs	2008-03-05 13:10:50.000000000 +0000
-+++ sad-2.3-25/Alice/Core/Thesis.hs	2015-11-27 06:35:08.311015166 +0000
-@@ -21,6 +21,7 @@
- module Alice.Core.Thesis (thesis) where
- 
- import Control.Monad
-+import Control.Applicative
- import Data.List
- import Data.Maybe
- 
-@@ -126,11 +127,22 @@
- 
- newtype TM res = TM { runTM :: [String] -> [([String], res)] }
- 
-+instance Functor TM where
-+  fmap = liftM
-+
-+instance Applicative TM where
-+  pure = return
-+  (<*>) = ap
-+
- instance Monad TM where
-   return r  = TM $ \ s -> [(s, r)]
-   m >>= k   = TM $ \ s -> concatMap apply (runTM m s)
-     where apply (s, r) = runTM (k r) s
- 
-+instance Alternative TM where
-+  (<|>) = mplus
-+  empty = mzero
-+    
- instance MonadPlus TM where
-   mzero     = TM $ \ _ -> []
-   mplus m k = TM $ \ s -> runTM m s ++ runTM k s
-diff -aur serious/sad-2.3-25/Alice/Export/Base.hs sad-2.3-25/Alice/Export/Base.hs
---- serious/sad-2.3-25/Alice/Export/Base.hs	2008-03-09 09:36:39.000000000 +0000
-+++ sad-2.3-25/Alice/Export/Base.hs	2015-11-27 06:32:47.782738005 +0000
-@@ -39,7 +39,7 @@
- -- Database reader
- 
- readPrDB :: String -> IO [Prover]
--readPrDB file = do  inp <- catch (readFile file) $ die . ioeGetErrorString
-+readPrDB file = do  inp <- catchIOError (readFile file) $ die . ioeGetErrorString
- 
-                     let dws = dropWhile isSpace
-                         cln = reverse . dws . reverse . dws
-diff -aur serious/sad-2.3-25/Alice/Export/Prover.hs sad-2.3-25/Alice/Export/Prover.hs
---- serious/sad-2.3-25/Alice/Export/Prover.hs	2008-03-09 09:36:39.000000000 +0000
-+++ sad-2.3-25/Alice/Export/Prover.hs	2015-11-27 06:36:47.632919161 +0000
-@@ -60,7 +60,7 @@
-       when (askIB IBPdmp False ins) $ putStrLn tsk
- 
-       seq (length tsk) $ return $
--        do  (wh,rh,eh,ph) <- catch run
-+        do  (wh,rh,eh,ph) <- catchIOError run
-                 $ \ e -> die $ "run error: " ++ ioeGetErrorString e
- 
-             hPutStrLn wh tsk ; hClose wh
-diff -aur serious/sad-2.3-25/Alice/ForTheL/Base.hs sad-2.3-25/Alice/ForTheL/Base.hs
---- serious/sad-2.3-25/Alice/ForTheL/Base.hs	2008-03-09 09:36:39.000000000 +0000
-+++ sad-2.3-25/Alice/ForTheL/Base.hs	2015-11-27 06:31:51.921230428 +0000
-@@ -226,7 +226,7 @@
- varlist = do  vs <- chainEx (char ',') var
-               nodups vs ; return vs
- 
--nodups vs = unless (null $ dups vs) $
-+nodups vs = unless ((null :: [a] -> Bool) $ dups vs) $
-               fail $ "duplicate names: " ++ show vs
- 
- hidden  = askPS psOffs >>= \ n -> return ('h':show n)
-diff -aur serious/sad-2.3-25/Alice/Import/Reader.hs sad-2.3-25/Alice/Import/Reader.hs
---- serious/sad-2.3-25/Alice/Import/Reader.hs	2008-03-09 09:36:39.000000000 +0000
-+++ sad-2.3-25/Alice/Import/Reader.hs	2015-11-27 06:36:41.818866167 +0000
-@@ -24,7 +24,7 @@
- import Control.Monad
- import System.IO
- import System.IO.Error
--import System.Exit
-+import System.Exit hiding (die)
- 
- import Alice.Data.Text
- import Alice.Data.Instr
-@@ -44,7 +44,7 @@
- readInit ""   = return []
- 
- readInit file =
--  do  input <- catch (readFile file) $ die file . ioeGetErrorString
-+  do  input <- catchIOError (readFile file) $ die file . ioeGetErrorString
-       let tkn = tokenize input ; ips = initPS ()
-           inp = ips { psRest = tkn, psFile = file, psLang = "Init" }
-       liftM fst $ fireLPM instf inp
-@@ -74,7 +74,7 @@
- reader lb fs (ps:ss) [TI (InStr ISfile file)] =
-   do  let gfl = if null file  then hGetContents stdin
-                               else readFile file
--      input <- catch gfl $ die file . ioeGetErrorString
-+      input <- catchIOError gfl $ die file . ioeGetErrorString
-       let tkn = tokenize input
-           ips = initPS $ (psProp ps) { tvr_expr = [] }
-           sps = ips { psRest = tkn, psFile = file, psOffs = psOffs ps }
-diff -aur serious/sad-2.3-25/Alice/Parser/Base.hs sad-2.3-25/Alice/Parser/Base.hs
---- serious/sad-2.3-25/Alice/Parser/Base.hs	2008-03-09 09:36:40.000000000 +0000
-+++ sad-2.3-25/Alice/Parser/Base.hs	2015-11-27 06:14:28.616734527 +0000
-@@ -20,6 +20,7 @@
- 
- module Alice.Parser.Base where
- 
-+import Control.Applicative
- import Control.Monad
- import Data.List
- 
-@@ -45,11 +46,22 @@
- type CPMC a b c = (c -> CPMS a b) -> (String -> CPMS a b) -> CPMS a b
- newtype CPM a c = CPM { runCPM :: forall b . CPMC a b c }
- 
-+instance Functor (CPM a) where
-+  fmap = liftM
-+
-+instance Applicative (CPM a) where
-+  pure = return
-+  (<*>) = ap
-+
- instance Monad (CPM a) where
-   return r  = CPM $ \ k _ -> k r
-   m >>= n   = CPM $ \ k l -> runCPM m (\ b -> runCPM (n b) k l) l
-   fail e    = CPM $ \ _ l -> l e
- 
-+instance Alternative (CPM a) where
-+    (<|>) = mplus
-+    empty = mzero
-+  
- instance MonadPlus (CPM a) where
-   mzero     = CPM $ \ _ _ _ z -> z
-   mplus m n = CPM $ \ k l s -> runCPM m k l s . runCPM n k l s
-diff -aur serious/sad-2.3-25/init.opt sad-2.3-25/init.opt
---- serious/sad-2.3-25/init.opt	2007-10-11 15:25:45.000000000 +0000
-+++ sad-2.3-25/init.opt	2015-11-27 07:23:41.372816854 +0000
-@@ -1,6 +1,6 @@
- # Alice init options
--[library examples]
--[provers provers/provers.dat]
-+[library @out@/examples]
-+[provers @out@/provers/provers.dat]
- [prover spass]
- [timelimit 3]
- [depthlimit 7]
-diff -aur serious/sad-2.3-25/provers/provers.dat sad-2.3-25/provers/provers.dat
---- serious/sad-2.3-25/provers/provers.dat	2008-08-26 21:20:25.000000000 +0000
-+++ sad-2.3-25/provers/provers.dat	2015-11-27 07:24:18.878169702 +0000
-@@ -3,7 +3,7 @@
- Pmoses
- LMoses
- Fmoses
--Cprovers/moses
-+C@out@/provers/moses
- Yproved in
- Nfound unprovable in
- Utimeout in
-@@ -12,7 +12,7 @@
- Pspass
- LSPASS
- Fdfg
--Cprovers/SPASS -CNFOptSkolem=0 -PProblem=0 -PGiven=0 -Stdin -TimeLimit=%d
-+C@spass@/bin/SPASS -CNFOptSkolem=0 -PProblem=0 -PGiven=0 -Stdin -TimeLimit=%d
- YSPASS beiseite: Proof found.
- NSPASS beiseite: Completion found.
- USPASS beiseite: Ran out of time.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 93290034e458..3ffd97556dfd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23484,14 +23484,6 @@ with pkgs;
 
   s2geometry = callPackage ../development/libraries/s2geometry { };
 
-  /*  This package references ghc844, which we no longer have. Unfortunately, I
-      have been unable to mark it as "broken" in a way that the ofBorg bot
-      recognizes. Since I don't want to merge code into master that generates
-      evaluation errors, I have no other idea but to comment it out entirely.
-
-  sad = callPackage ../applications/science/logic/sad { };
-  */
-
   safefile = callPackage ../development/libraries/safefile { };
 
   sbc = callPackage ../development/libraries/sbc { };

From df8e7b62b251761b47babb11d75e9def24bef431 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euank@euank.com>
Date: Wed, 19 Apr 2023 22:04:11 +0900
Subject: [PATCH 94/96] qt6.qtwebengine: patch to fix xkb layout crash

See https://github.com/NixOS/nixpkgs/issues/226484
---
 .../libraries/qt-6/modules/qtwebengine.nix           |  9 +++++----
 .../qt-6/patches/qtwebengine-xkb-includes.patch      | 12 ++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/qt-6/patches/qtwebengine-xkb-includes.patch

diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix
index 3741b7c6b6f0..fadbc5d2bfa3 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix
@@ -127,10 +127,14 @@ qtModule {
   # which cannot be set at the same time as -Wformat-security
   hardeningDisable = [ "format" ];
 
-  # removes macOS 12+ dependencies
   patches = [
+    # removes macOS 12+ dependencies
     ../patches/qtwebengine-darwin-no-low-latency-flag.patch
     ../patches/qtwebengine-darwin-no-copy-certificate-chain.patch
+    # Don't assume /usr/share/X11, and also respect the XKB_CONFIG_ROOT
+    # environment variable, since NixOS relies on it working.
+    # See https://github.com/NixOS/nixpkgs/issues/226484 for more context.
+    ../patches/qtwebengine-xkb-includes.patch
   ];
 
   postPatch = ''
@@ -161,9 +165,6 @@ qtModule {
 
     sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
       src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
-
-    substituteInPlace src/3rdparty/chromium/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc \
-      --replace "/usr/share/X11/xkb" "${xkeyboard_config}/share/X11/xkb"
   ''
   + lib.optionalString stdenv.isDarwin ''
     substituteInPlace configure.cmake \
diff --git a/pkgs/development/libraries/qt-6/patches/qtwebengine-xkb-includes.patch b/pkgs/development/libraries/qt-6/patches/qtwebengine-xkb-includes.patch
new file mode 100644
index 000000000000..5056550ccecd
--- /dev/null
+++ b/pkgs/development/libraries/qt-6/patches/qtwebengine-xkb-includes.patch
@@ -0,0 +1,12 @@
+--- a/src/3rdparty/chromium/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc	2023-04-19 21:58:29.127258300 +0900
++++ b/src/3rdparty/chromium/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc	2023-04-19 22:01:35.860196284 +0900
+@@ -637,8 +637,7 @@
+                           .variant = layout_variant.c_str(),
+                           .options = ""};
+   std::unique_ptr<xkb_context, XkbContextDeleter> context;
+-  context.reset(xkb_context_new(XKB_CONTEXT_NO_DEFAULT_INCLUDES));
+-  xkb_context_include_path_append(context.get(), "/usr/share/X11/xkb");
++  context.reset(xkb_context_new(XKB_CONTEXT_NO_FLAGS));
+   std::unique_ptr<xkb_keymap, XkbKeymapDeleter> keymap;
+   keymap.reset(xkb_keymap_new_from_names(context.get(), &names,
+                                          XKB_KEYMAP_COMPILE_NO_FLAGS));

From e61a9650eed57e17e54e0b04aede7ecebe87f787 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 20 Apr 2023 12:41:57 +0300
Subject: [PATCH 95/96] mauikit-calendar: fix missing dependency specification

---
 pkgs/applications/maui/default.nix                     |  2 +-
 .../maui/mauikit-calendar/add-akonadi-calendar.patch   | 10 ++++++++++
 .../default.nix}                                       |  4 ++++
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/maui/mauikit-calendar/add-akonadi-calendar.patch
 rename pkgs/applications/maui/{mauikit-calendar.nix => mauikit-calendar/default.nix} (87%)

diff --git a/pkgs/applications/maui/default.nix b/pkgs/applications/maui/default.nix
index b91f13d12594..3f5d1d499af5 100644
--- a/pkgs/applications/maui/default.nix
+++ b/pkgs/applications/maui/default.nix
@@ -60,7 +60,7 @@ let
       # libraries
       mauikit = callPackage ./mauikit.nix { };
       mauikit-accounts = callPackage ./mauikit-accounts.nix { };
-      mauikit-calendar = callPackage ./mauikit-calendar.nix { };
+      mauikit-calendar = callPackage ./mauikit-calendar { };
       mauikit-filebrowsing = callPackage ./mauikit-filebrowsing.nix { };
       mauikit-imagetools = callPackage ./mauikit-imagetools.nix { };
       mauikit-texteditor = callPackage ./mauikit-texteditor.nix { };
diff --git a/pkgs/applications/maui/mauikit-calendar/add-akonadi-calendar.patch b/pkgs/applications/maui/mauikit-calendar/add-akonadi-calendar.patch
new file mode 100644
index 000000000000..0feb15b615fe
--- /dev/null
+++ b/pkgs/applications/maui/mauikit-calendar/add-akonadi-calendar.patch
@@ -0,0 +1,10 @@
+--- 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.nix b/pkgs/applications/maui/mauikit-calendar/default.nix
similarity index 87%
rename from pkgs/applications/maui/mauikit-calendar.nix
rename to pkgs/applications/maui/mauikit-calendar/default.nix
index 508319f1616d..e9ea61592c0d 100644
--- a/pkgs/applications/maui/mauikit-calendar.nix
+++ b/pkgs/applications/maui/mauikit-calendar/default.nix
@@ -6,6 +6,7 @@
 , qtquickcontrols2
 , akonadi
 , akonadi-contacts
+, akonadi-calendar
 , calendarsupport
 , eventviews
 }:
@@ -13,6 +14,8 @@
 mkDerivation {
   pname = "mauikit-calendar";
 
+  patches = [ ./add-akonadi-calendar.patch ];
+
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
@@ -21,6 +24,7 @@ mkDerivation {
   buildInputs = [
     akonadi
     akonadi-contacts
+    akonadi-calendar
     calendarsupport
     eventviews
     mauikit

From 0d3141ea854d6d40c5b04eb5515712116a97cab3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 19 Apr 2023 21:11:08 +0000
Subject: [PATCH 96/96] limitcpu: 2.8 -> 2.9

---
 pkgs/tools/misc/limitcpu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/limitcpu/default.nix b/pkgs/tools/misc/limitcpu/default.nix
index 75e50d8a78b1..b33f01dca90a 100644
--- a/pkgs/tools/misc/limitcpu/default.nix
+++ b/pkgs/tools/misc/limitcpu/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "limitcpu";
-  version = "2.8";
+  version = "2.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/limitcpu/cpulimit-${version}.tar.gz";
-    sha256 = "sha256-fjGbCR9QEVTmAFxd+WoEAGbuhtsiAdWDXQq9mOO2t/8=";
+    sha256 = "sha256-W7fbTscqArOy0SfViQaGTgE1iw81pvGQuAlwN4ovjPY=";
   };
 
   buildFlags = with stdenv; [ (