From 7e26c8d097778f073c8d975951e226762ec76e84 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Wed, 12 Jul 2023 00:32:17 +0200
Subject: [PATCH 01/54] prometheus-exporter-nextcloud: support for auth tokens

Fixes #176849
---
 .../prometheus/exporters/nextcloud.nix        | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix b/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix
index 7808c8861a76..28add020f5cc 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix
@@ -33,6 +33,15 @@ in
         Make sure that this file is readable by the exporter user.
       '';
     };
+    tokenFile = mkOption {
+      type = types.path;
+      example = "/path/to/token-file";
+      default = "";
+      description = lib.mdDoc ''
+        File containing the token for connecting to Nextcloud.
+        Make sure that this file is readable by the exporter user.
+      '';
+    };
     timeout = mkOption {
       type = types.str;
       default = "5s";
@@ -47,12 +56,14 @@ in
       ExecStart = ''
         ${pkgs.prometheus-nextcloud-exporter}/bin/nextcloud-exporter \
           --addr ${cfg.listenAddress}:${toString cfg.port} \
-          --username ${cfg.username} \
           --timeout ${cfg.timeout} \
           --server ${cfg.url} \
-          --password ${escapeShellArg "@${cfg.passwordFile}"} \
-          ${concatStringsSep " \\\n  " cfg.extraFlags}
-      '';
+          ${if cfg.tokenFile == "" then ''
+            --username ${cfg.username} \
+            --password ${escapeShellArg "@${cfg.passwordFile}"} \
+         '' else ''
+            --auth-token ${escapeShellArg "@${cfg.tokenFile}"} \
+         ''} ${concatStringsSep " \\\n  " cfg.extraFlags}'';
     };
   };
 }

From c77a7929bfc7ce89a85b96c94edf4314965c18ac Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 10 Aug 2023 04:20:00 +0000
Subject: [PATCH 02/54] openturns: 1.20 -> 1.21

Diff: https://github.com/openturns/openturns/compare/v1.20...v1.21

Changelog: https://github.com/openturns/openturns/raw/v1.21/ChangeLog
---
 pkgs/development/libraries/openturns/default.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/openturns/default.nix b/pkgs/development/libraries/openturns/default.nix
index 4c80c4b9ac81..d6735e77d460 100644
--- a/pkgs/development/libraries/openturns/default.nix
+++ b/pkgs/development/libraries/openturns/default.nix
@@ -26,24 +26,15 @@
 
 stdenv.mkDerivation rec {
   pname = "openturns";
-  version = "1.20";
+  version = "1.21";
 
   src = fetchFromGitHub {
     owner = "openturns";
     repo = "openturns";
     rev = "v${version}";
-    sha256 = "sha256-QeapH937yGnK6oD+rgIERePxz6ooxGpOx6x9LyFDt2A=";
+    sha256 = "sha256-zWCwuxJEiyhnllVCsfm3zNz2Xorvuj2Vl2fufS3qixY=";
   };
 
-  patches = [
-    # Fix build with primesieve 11, https://github.com/openturns/openturns/pull/2187
-    # Remove with next version update.
-    (fetchpatch {
-      url = "https://github.com/openturns/openturns/commit/a85061f89a5763061467beac516c1355fe81b9be.patch";
-      hash = "sha256-z28ipBuX3b5UFEnKuDfp+kMI5cUcwXVz/8WZHlICnvE=";
-    })
-  ];
-
   nativeBuildInputs = [ cmake ] ++ lib.optional enablePython python3Packages.sphinx;
   buildInputs = [
     swig
@@ -84,6 +75,7 @@ stdenv.mkDerivation rec {
     description = "Multivariate probabilistic modeling and uncertainty treatment library";
     license = with licenses; [ lgpl3 gpl3 ];
     homepage = "https://openturns.github.io/www/";
+    changelog = "https://github.com/openturns/openturns/raw/v${version}/ChangeLog";
     maintainers = with maintainers; [ gdinh ];
     platforms = platforms.unix;
   };

From 44c0e453edffb021808f4db883dbeec41bd91319 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 13 Aug 2023 11:33:47 +0200
Subject: [PATCH 03/54] python311Packages.aioquic: 0.9.20 -> 0.9.21

---
 .../python-modules/aioquic/default.nix        | 45 ++++++++-----------
 1 file changed, 18 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/python-modules/aioquic/default.nix b/pkgs/development/python-modules/aioquic/default.nix
index 753ce73fb2dc..9aeb06a1382d 100644
--- a/pkgs/development/python-modules/aioquic/default.nix
+++ b/pkgs/development/python-modules/aioquic/default.nix
@@ -1,52 +1,43 @@
 { lib
-, fetchPypi
-, fetchpatch
 , buildPythonPackage
+, certifi
+, fetchPypi
 , openssl
 , pylsqpack
-, certifi
-, pytestCheckHook
 , pyopenssl
+, pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "aioquic";
-  version = "0.9.20";
+  version = "0.9.21";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7ENqqs6Ze4RrAeUgDtv34+VrkYJqFE77l0j9jd0zK74=";
+    hash = "sha256-ecfsBjGOeFYnZlyk6HI63zR7ciW30AbjMtJXWh9RbvU=";
   };
 
-  patches = [
-    # This patch is here because it's required by the next patch.
-    (fetchpatch {
-      url = "https://github.com/aiortc/aioquic/commit/3930580b50831a034d21ee4689362188b21a4d6a.patch";
-      hash = "sha256-XjhyajDawN/G1nPtkMbNe66iJCo76UpdA7PqwtxO5ag=";
-    })
-    # https://github.com/aiortc/aioquic/pull/349, fixes test failure due pyopenssl==22
-    (fetchpatch {
-      url = "https://github.com/aiortc/aioquic/commit/c3b72be85868d67ee32d49ab9bd98a4357cbcde9.patch";
-      hash = "sha256-AjW+U9DpNXgA5yqKkWnx0OYpY2sZR9KIdQ3pSzxU+uY=";
-    })
-    # AssertionError: 'self-signed certificate' != 'self signed certificate'
-    (fetchpatch {
-      url = "https://github.com/aiortc/aioquic/commit/cfcd3ce12fb27f5b26deb011a82f66b5d68d521a.patch";
-      hash = "sha256-bCW817Z7jCxYySfUukNR4cibURH3qZWEQjeeyvRIqZY=";
-    })
-  ];
-
   propagatedBuildInputs = [
     certifi
     pylsqpack
     pyopenssl
   ];
 
-  buildInputs = [ openssl ];
+  buildInputs = [
+    openssl
+  ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
 
-  pythonImportsCheck = [ "aioquic" ];
+  pythonImportsCheck = [
+    "aioquic"
+  ];
 
   __darwinAllowLocalNetworking = true;
 

From 6bcf6a8d4f4070e2f5a64ca4ee6f3c44d4f0f168 Mon Sep 17 00:00:00 2001
From: Leandro Reina <leandro.reina@ororatech.com>
Date: Mon, 14 Aug 2023 13:07:07 +0200
Subject: [PATCH 04/54] python3Packages.pillow: Fix cross compilation

Fixes the build time error:
`ModuleNotFoundError: No module named 'setuptools'`.
---
 pkgs/development/python-modules/pillow/default.nix | 2 +-
 pkgs/development/python-modules/pillow/generic.nix | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix
index f1489e1f458d..d7edcc18d0ae 100644
--- a/pkgs/development/python-modules/pillow/default.nix
+++ b/pkgs/development/python-modules/pillow/default.nix
@@ -6,7 +6,7 @@
 , fetchpatch
 , isPyPy
 , defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2, tk, libX11
-, libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook
+, libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook, setuptools
 # for passthru.tests
 , imageio, matplotlib, pilkit, pydicom, reportlab
 }@args:
diff --git a/pkgs/development/python-modules/pillow/generic.nix b/pkgs/development/python-modules/pillow/generic.nix
index 95ecce0522c3..5186e8a476bb 100644
--- a/pkgs/development/python-modules/pillow/generic.nix
+++ b/pkgs/development/python-modules/pillow/generic.nix
@@ -39,6 +39,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook pyroma numpy ];
 
+  nativeBuildInputs = [ setuptools ];
+
   buildInputs = [ freetype libjpeg openjpeg libimagequant zlib libtiff libwebp libxcrypt tcl lcms2 ]
     ++ lib.optionals (lib.versionAtLeast version "7.1.0") [ libxcb ]
     ++ lib.optionals (isPyPy) [ tk libX11 ];

From db7d49573f8ec1af4cdd0e5b203fe7b1fba0043e Mon Sep 17 00:00:00 2001
From: Leandro Reina <leandro.reina@ororatech.com>
Date: Mon, 14 Aug 2023 15:41:26 +0200
Subject: [PATCH 05/54] python3Packages.pillow-simd: Fix cross compilation

---
 pkgs/development/python-modules/pillow-simd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pillow-simd/default.nix b/pkgs/development/python-modules/pillow-simd/default.nix
index 4573e25a22b2..ca0d947d37b1 100644
--- a/pkgs/development/python-modules/pillow-simd/default.nix
+++ b/pkgs/development/python-modules/pillow-simd/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, buildPythonPackage, fetchFromGitHub, isPyPy, isPy3k
 , olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2
 , libxcb, tk, libX11, openjpeg, libimagequant, pyroma, numpy, defusedxml
-, pytestCheckHook
+, pytestCheckHook, setuptools
 }@args:
 
 import ../pillow/generic.nix (rec {

From 022b0152c4ff3e82aa2c8c20fc8118a9c92cd48a Mon Sep 17 00:00:00 2001
From: Sven Friedrich <sven@autumnal.de>
Date: Wed, 23 Aug 2023 11:11:54 +0200
Subject: [PATCH 06/54] libgourou: 0.8.1 -> 0.8.2

---
 pkgs/development/libraries/libgourou/default.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libgourou/default.nix b/pkgs/development/libraries/libgourou/default.nix
index 2d1b90675590..78b5654873bd 100644
--- a/pkgs/development/libraries/libgourou/default.nix
+++ b/pkgs/development/libraries/libgourou/default.nix
@@ -1,13 +1,21 @@
-{ lib, stdenv, fetchzip, pugixml, updfparser, curl, openssl, libzip
-, installShellFiles }:
+{ lib
+, stdenv
+, fetchzip
+, pugixml
+, updfparser
+, curl
+, openssl
+, libzip
+, installShellFiles
+}:
 
 stdenv.mkDerivation rec {
   name = "libgourou";
-  version = "0.8.1";
+  version = "0.8.2";
 
   src = fetchzip {
     url = "https://indefero.soutade.fr/p/${name}/source/download/v${version}/";
-    sha256 = "sha256-X56K4z1+k62Q9pxnN8kx35oc7+uJJN/o/tpnKx1FjwE=";
+    sha256 = "sha256-adkrvBCgN07Ir+J3JFCy+X9p9609lj1w8nElrlHXTxc";
     extension = "zip";
   };
 

From cc8283b5c4d5b038f3cbd27d40259157bc13f06d Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun, 20 Aug 2023 22:20:05 +0200
Subject: [PATCH 07/54] vencord: 1.3.4 -> 1.4.5

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/misc/vencord/default.nix              |  35 ++++--
 pkgs/misc/vencord/disable-updater-ui.patch |  35 ------
 pkgs/misc/vencord/package-lock.json        | 134 ++++++++++-----------
 pkgs/misc/vencord/replace-git.patch        |  26 ----
 4 files changed, 93 insertions(+), 137 deletions(-)
 delete mode 100644 pkgs/misc/vencord/disable-updater-ui.patch
 delete mode 100644 pkgs/misc/vencord/replace-git.patch

diff --git a/pkgs/misc/vencord/default.nix b/pkgs/misc/vencord/default.nix
index 99d11b06976f..73a4b2cf5ea2 100644
--- a/pkgs/misc/vencord/default.nix
+++ b/pkgs/misc/vencord/default.nix
@@ -1,20 +1,24 @@
 { buildNpmPackage
 , fetchFromGitHub
+, fetchpatch2
 , lib
-, substituteAll
 , esbuild
 , buildGoModule
 , buildWebExtension ? false
 }:
+let
+  version = "1.4.5";
+  gitHash = "98a03c8";
+in
 buildNpmPackage rec {
   pname = "vencord";
-  version = "1.3.4";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "Vendicated";
     repo = "Vencord";
     rev = "v${version}";
-    sha256 = "sha256-r+VgxXwsBOfMggcVlr5q1/ONfp13CpX4ssrLQtmdLe8=";
+    sha256 = "sha256-ZoHOCl0j+RBSl2lL9wO2rJ8VR+GNIeWJYe65c3lVoz8=";
   };
 
   ESBUILD_BINARY_PATH = lib.getExe (esbuild.override {
@@ -33,23 +37,36 @@ buildNpmPackage rec {
   # Supresses an error about esbuild's version.
   npmRebuildFlags = [ "|| true" ];
 
-  npmDepsHash = "sha256-HJK88z4Gs8mqd28zKrsTtk34VcRqIyb6aURbvRZLN0I=";
+  npmDepsHash = "sha256-51IK95QY9YX0WerGu4GuOrYKoj8Uoo0R1b6WZpC5v4U=";
   npmFlags = [ "--legacy-peer-deps" ];
   npmBuildScript = if buildWebExtension then "buildWeb" else "build";
-  npmBuildFlags = [ "--" "--standalone" ];
+  npmBuildFlags = [ "--" "--standalone" "--disable-updater" ];
 
   prePatch = ''
     cp ${./package-lock.json} ./package-lock.json
   '';
 
   patches = [
-    (substituteAll {
-      src = ./replace-git.patch;
-      inherit version;
+    (fetchpatch2 {
+      name = "allow-git-hash-remote-preset.patch";
+      url = "https://github.com/Vendicated/Vencord/commit/d9f55664428007199348123b05818f9e08c4f64d.patch";
+      hash = "sha256-l4PP8nVtyQJYUqtU9xYGT4j1Oayy08DE6TfbwPun0pY=";
+    })
+    (fetchpatch2 {
+      name = "use-source-date-epoch.patch";
+      url = "https://github.com/Vendicated/Vencord/commit/28247c88a949eeaac75b13a8d6653164d9659f56.patch";
+      hash = "sha256-mMpsB3GkI9LUiMQ/NFOiRw4z+wVkktmWgUHNTgxUFPU=";
+    })
+    (fetchpatch2 {
+      name = "allow-disabling-updater.patch";
+      url = "https://github.com/Vendicated/Vencord/commit/bad1fa0c766b2d42cd2eb0e0d1ab2e0c381bab98.patch";
+      hash = "sha256-yp453kFvVC02QEB3Op8PfopnLt3xGkjp4WfP6kPeIJ0=";
     })
-    ./disable-updater-ui.patch
   ];
 
+  VENCORD_HASH = gitHash;
+  VENCORD_REMOTE = "${src.owner}/${src.repo}";
+
   installPhase =
     if buildWebExtension then ''
       cp -r dist/chromium-unpacked/ $out
diff --git a/pkgs/misc/vencord/disable-updater-ui.patch b/pkgs/misc/vencord/disable-updater-ui.patch
deleted file mode 100644
index 6682d814b862..000000000000
--- a/pkgs/misc/vencord/disable-updater-ui.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/src/components/VencordSettings/UpdaterTab.tsx b/src/components/VencordSettings/UpdaterTab.tsx
-index 4d0b86c..0f1d87f 100644
---- a/src/components/VencordSettings/UpdaterTab.tsx
-+++ b/src/components/VencordSettings/UpdaterTab.tsx
-@@ -249,4 +249,4 @@ function Updater() {
-     );
- }
- 
--export default IS_WEB ? null : wrapTab(Updater, "Updater");
-+export default null;
-diff --git a/src/plugins/_core/settings.tsx b/src/plugins/_core/settings.tsx
-index 3ea5a43..da63213 100644
---- a/src/plugins/_core/settings.tsx
-+++ b/src/plugins/_core/settings.tsx
-@@ -105,7 +105,7 @@ export default definePlugin({
-                 label: "Themes",
-                 element: require("@components/VencordSettings/ThemesTab").default,
-             },
--            !IS_WEB && {
-+            false && !IS_WEB && {
-                 section: "VencordUpdater",
-                 label: "Updater",
-                 element: require("@components/VencordSettings/UpdaterTab").default,
-diff --git a/src/utils/updater.ts b/src/utils/updater.ts
-index 2e2bfe1..5ebd06e 100644
---- a/src/utils/updater.ts
-+++ b/src/utils/updater.ts
-@@ -38,6 +38,7 @@ async function Unwrap<T>(p: Promise<IpcRes<T>>) {
- }
- 
- export async function checkForUpdates() {
-+    return false;
-     changes = await Unwrap(VencordNative.updater.getUpdates());
-     if (changes.some(c => c.hash === gitHash)) {
-         isNewer = true;
diff --git a/pkgs/misc/vencord/package-lock.json b/pkgs/misc/vencord/package-lock.json
index c75130a7e6fa..e53695d7098c 100644
--- a/pkgs/misc/vencord/package-lock.json
+++ b/pkgs/misc/vencord/package-lock.json
@@ -1,16 +1,18 @@
 {
     "name": "vencord",
-    "version": "1.3.4",
+    "version": "1.4.5",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "vencord",
-            "version": "1.3.4",
-            "license": "GPL-3.0",
+            "version": "1.4.5",
+            "license": "GPL-3.0-or-later",
             "dependencies": {
+                "@sapphi-red/web-noise-suppressor": "0.3.3",
                 "@vap/core": "0.0.12",
                 "@vap/shiki": "0.10.5",
+                "eslint-plugin-simple-header": "^1.0.2",
                 "fflate": "^0.7.4",
                 "nanoid": "^4.0.2",
                 "virtual-merge": "^1.0.1"
@@ -27,9 +29,8 @@
                 "diff": "^5.1.0",
                 "discord-types": "^1.3.26",
                 "esbuild": "^0.15.18",
-                "eslint": "^8.28.0",
+                "eslint": "^8.46.0",
                 "eslint-import-resolver-alias": "^1.1.2",
-                "eslint-plugin-header": "^3.1.1",
                 "eslint-plugin-path-alias": "^1.0.0",
                 "eslint-plugin-simple-import-sort": "^10.0.0",
                 "eslint-plugin-unused-imports": "^2.0.0",
@@ -48,6 +49,15 @@
                 "pnpm": ">=8"
             }
         },
+        "node_modules/@aashutoshrathi/word-wrap": {
+            "version": "1.2.6",
+            "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+            "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
         "node_modules/@babel/code-frame": {
             "version": "7.22.5",
             "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz",
@@ -695,23 +705,23 @@
             }
         },
         "node_modules/@eslint-community/regexpp": {
-            "version": "4.5.1",
-            "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.1.tgz",
-            "integrity": "sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==",
+            "version": "4.6.2",
+            "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz",
+            "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==",
             "dev": true,
             "engines": {
                 "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
             }
         },
         "node_modules/@eslint/eslintrc": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.3.tgz",
-            "integrity": "sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ==",
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
+            "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
             "dev": true,
             "dependencies": {
                 "ajv": "^6.12.4",
                 "debug": "^4.3.2",
-                "espree": "^9.5.2",
+                "espree": "^9.6.0",
                 "globals": "^13.19.0",
                 "ignore": "^5.2.0",
                 "import-fresh": "^3.2.1",
@@ -727,9 +737,9 @@
             }
         },
         "node_modules/@eslint/js": {
-            "version": "8.43.0",
-            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.43.0.tgz",
-            "integrity": "sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg==",
+            "version": "8.47.0",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.47.0.tgz",
+            "integrity": "sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==",
             "dev": true,
             "engines": {
                 "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -833,6 +843,11 @@
                 }
             }
         },
+        "node_modules/@sapphi-red/web-noise-suppressor": {
+            "version": "0.3.3",
+            "resolved": "https://registry.npmjs.org/@sapphi-red/web-noise-suppressor/-/web-noise-suppressor-0.3.3.tgz",
+            "integrity": "sha512-gAC33DCXYwNTI/k1PxOVHmbbzakUSMbb/DHpoV6rn4pKZtPI1dduULSmAAm/y1ipgIlArnk2JcnQzw4n2tCZHw=="
+        },
         "node_modules/@types/diff": {
             "version": "5.0.3",
             "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.0.3.tgz",
@@ -1133,9 +1148,9 @@
             }
         },
         "node_modules/acorn": {
-            "version": "8.9.0",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz",
-            "integrity": "sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==",
+            "version": "8.10.0",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
+            "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
             "dev": true,
             "bin": {
                 "acorn": "bin/acorn"
@@ -2295,27 +2310,27 @@
             }
         },
         "node_modules/eslint": {
-            "version": "8.43.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.43.0.tgz",
-            "integrity": "sha512-aaCpf2JqqKesMFGgmRPessmVKjcGXqdlAYLLC3THM8t5nBRZRQ+st5WM/hoJXkdioEXLLbXgclUpM0TXo5HX5Q==",
+            "version": "8.47.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.47.0.tgz",
+            "integrity": "sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==",
             "dev": true,
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.2.0",
-                "@eslint-community/regexpp": "^4.4.0",
-                "@eslint/eslintrc": "^2.0.3",
-                "@eslint/js": "8.43.0",
+                "@eslint-community/regexpp": "^4.6.1",
+                "@eslint/eslintrc": "^2.1.2",
+                "@eslint/js": "^8.47.0",
                 "@humanwhocodes/config-array": "^0.11.10",
                 "@humanwhocodes/module-importer": "^1.0.1",
                 "@nodelib/fs.walk": "^1.2.8",
-                "ajv": "^6.10.0",
+                "ajv": "^6.12.4",
                 "chalk": "^4.0.0",
                 "cross-spawn": "^7.0.2",
                 "debug": "^4.3.2",
                 "doctrine": "^3.0.0",
                 "escape-string-regexp": "^4.0.0",
-                "eslint-scope": "^7.2.0",
-                "eslint-visitor-keys": "^3.4.1",
-                "espree": "^9.5.2",
+                "eslint-scope": "^7.2.2",
+                "eslint-visitor-keys": "^3.4.3",
+                "espree": "^9.6.1",
                 "esquery": "^1.4.2",
                 "esutils": "^2.0.2",
                 "fast-deep-equal": "^3.1.3",
@@ -2325,7 +2340,6 @@
                 "globals": "^13.19.0",
                 "graphemer": "^1.4.0",
                 "ignore": "^5.2.0",
-                "import-fresh": "^3.0.0",
                 "imurmurhash": "^0.1.4",
                 "is-glob": "^4.0.0",
                 "is-path-inside": "^3.0.3",
@@ -2335,9 +2349,8 @@
                 "lodash.merge": "^4.6.2",
                 "minimatch": "^3.1.2",
                 "natural-compare": "^1.4.0",
-                "optionator": "^0.9.1",
+                "optionator": "^0.9.3",
                 "strip-ansi": "^6.0.1",
-                "strip-json-comments": "^3.1.0",
                 "text-table": "^0.2.0"
             },
             "bin": {
@@ -2362,15 +2375,6 @@
                 "eslint-plugin-import": ">=1.4.0"
             }
         },
-        "node_modules/eslint-plugin-header": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-header/-/eslint-plugin-header-3.1.1.tgz",
-            "integrity": "sha512-9vlKxuJ4qf793CmeeSrZUvVClw6amtpghq3CuWcB5cUNnWHQhgcqy5eF8oVKFk1G3Y/CbchGfEaw3wiIJaNmVg==",
-            "dev": true,
-            "peerDependencies": {
-                "eslint": ">=7.7.0"
-            }
-        },
         "node_modules/eslint-plugin-path-alias": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/eslint-plugin-path-alias/-/eslint-plugin-path-alias-1.0.0.tgz",
@@ -2383,6 +2387,11 @@
                 "eslint": "^7"
             }
         },
+        "node_modules/eslint-plugin-simple-header": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-simple-header/-/eslint-plugin-simple-header-1.0.2.tgz",
+            "integrity": "sha512-K1EJ/ueBIjPRA8qR44Ymo+GDmPYYmfoODtainGxVr7PSbX6QiaY+pTuGCrOhO+AtVsYJs8GLSVdGUTXyAxAtOA=="
+        },
         "node_modules/eslint-plugin-simple-import-sort": {
             "version": "10.0.0",
             "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-10.0.0.tgz",
@@ -2436,9 +2445,9 @@
             }
         },
         "node_modules/eslint-visitor-keys": {
-            "version": "3.4.1",
-            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
-            "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+            "version": "3.4.3",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+            "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
             "dev": true,
             "engines": {
                 "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -2448,9 +2457,9 @@
             }
         },
         "node_modules/eslint/node_modules/eslint-scope": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
-            "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
+            "version": "7.2.2",
+            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+            "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
             "dev": true,
             "dependencies": {
                 "esrecurse": "^4.3.0",
@@ -2473,12 +2482,12 @@
             }
         },
         "node_modules/espree": {
-            "version": "9.5.2",
-            "resolved": "https://registry.npmjs.org/espree/-/espree-9.5.2.tgz",
-            "integrity": "sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==",
+            "version": "9.6.1",
+            "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+            "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
             "dev": true,
             "dependencies": {
-                "acorn": "^8.8.0",
+                "acorn": "^8.9.0",
                 "acorn-jsx": "^5.3.2",
                 "eslint-visitor-keys": "^3.4.1"
             },
@@ -2893,9 +2902,9 @@
             }
         },
         "node_modules/globals": {
-            "version": "13.20.0",
-            "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-            "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+            "version": "13.21.0",
+            "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
+            "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
             "dev": true,
             "dependencies": {
                 "type-fest": "^0.20.2"
@@ -3866,17 +3875,17 @@
             }
         },
         "node_modules/optionator": {
-            "version": "0.9.1",
-            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-            "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+            "version": "0.9.3",
+            "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+            "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
             "dev": true,
             "dependencies": {
+                "@aashutoshrathi/word-wrap": "^1.2.3",
                 "deep-is": "^0.1.3",
                 "fast-levenshtein": "^2.0.6",
                 "levn": "^0.4.1",
                 "prelude-ls": "^1.2.1",
-                "type-check": "^0.4.0",
-                "word-wrap": "^1.2.3"
+                "type-check": "^0.4.0"
             },
             "engines": {
                 "node": ">= 0.8.0"
@@ -5600,15 +5609,6 @@
                 "node": ">= 8"
             }
         },
-        "node_modules/word-wrap": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/wrap-ansi": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
diff --git a/pkgs/misc/vencord/replace-git.patch b/pkgs/misc/vencord/replace-git.patch
deleted file mode 100644
index 829321638bf2..000000000000
--- a/pkgs/misc/vencord/replace-git.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/scripts/build/common.mjs b/scripts/build/common.mjs
-index 7ff599a..85b3bfa 100644
---- a/scripts/build/common.mjs
-+++ b/scripts/build/common.mjs
-@@ -24,7 +24,7 @@ import { promisify } from "util";
- 
- export const watch = process.argv.includes("--watch");
- export const isStandalone = JSON.stringify(process.argv.includes("--standalone"));
--export const gitHash = execSync("git rev-parse --short HEAD", { encoding: "utf-8" }).trim();
-+export const gitHash = "v@version@";
- export const banner = {
-     js: `
- // Vencord ${gitHash}
-@@ -124,11 +124,7 @@ export const gitRemotePlugin = {
-             namespace: "git-remote", path: args.path
-         }));
-         build.onLoad({ filter, namespace: "git-remote" }, async () => {
--            const res = await promisify(exec)("git remote get-url origin", { encoding: "utf-8" });
--            const remote = res.stdout.trim()
--                .replace("https://github.com/", "")
--                .replace("git@github.com:", "")
--                .replace(/.git$/, "");
-+            const remote = "Vendicated/Vencord";
- 
-             return { contents: `export default "${remote}"` };
-         });

From 287a344f366859cda0b803270a9d24b382e65ef0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 24 Aug 2023 09:54:30 +0200
Subject: [PATCH 08/54] imdshift: init at 1.0.0

---
 pkgs/tools/security/imdshift/default.nix | 39 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/tools/security/imdshift/default.nix

diff --git a/pkgs/tools/security/imdshift/default.nix b/pkgs/tools/security/imdshift/default.nix
new file mode 100644
index 000000000000..c33e0878cd4d
--- /dev/null
+++ b/pkgs/tools/security/imdshift/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, fetchFromGitHub
+, python3
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "imdshift";
+  version = "1.0.0";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "ayushpriya10";
+    repo = "IMDShift";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-Uoa0uNOhCkT622Yy8GEg8jz9k5zmtXwGmvdb3MVTLX8=";
+  };
+
+  propagatedBuildInputs = with python3.pkgs; [
+    boto3
+    click
+    prettytable
+    tqdm
+  ];
+
+  # Project has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "IMDShift"
+  ];
+
+  meta = with lib; {
+    description = "Tool to migrate workloads to IMDSv2";
+    homepage = "https://github.com/ayushpriya10/IMDShift";
+    changelog = "https://github.com/ayushpriya10/IMDShift/releases/tag/v${version}";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ec514346dfc..3f153f169e8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32899,6 +32899,8 @@ with pkgs;
 
   inherit (nodePackages) imapnotify;
 
+  imdshift = callPackage ../tools/security/imdshift { };
+
   img2pdf = with python3Packages; toPythonApplication img2pdf;
 
   imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber { };

From 359eb2190d783b80daea6c584062ba4459b126f0 Mon Sep 17 00:00:00 2001
From: Pavel Sobolev <paveloom@riseup.net>
Date: Thu, 24 Aug 2023 11:55:18 +0300
Subject: [PATCH 09/54] wireshark: 4.0.7 -> 4.0.8

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

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index ce01fec02e18..99839d9c99d2 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -49,7 +49,7 @@
 assert withQt -> qt6 != null;
 
 let
-  version = "4.0.7";
+  version = "4.0.8";
   variant = if withQt then "qt" else "cli";
 in
 stdenv.mkDerivation {
@@ -61,7 +61,7 @@ stdenv.mkDerivation {
     repo = "wireshark";
     owner = "wireshark";
     rev = "v${version}";
-    hash = "sha256-CjSf4CfzgiXvmraM3lYBVLSfdDBSuFNIgeatj0OjYSQ=";
+    hash = "sha256-bNg0yhNb1GRsTclNWWO+Bamm2wOnUjVKU+JftJu+LTo=";
   };
 
   cmakeFlags = [

From 7b89c04b4fe767014394c5b7badd325bdb00e261 Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@redhat.com>
Date: Thu, 24 Aug 2023 16:29:11 +0200
Subject: [PATCH 10/54] conmon: 2.1.7 -> 2.1.8

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
---
 pkgs/applications/virtualization/conmon/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix
index a27930fcb4ac..d0eceae70525 100644
--- a/pkgs/applications/virtualization/conmon/default.nix
+++ b/pkgs/applications/virtualization/conmon/default.nix
@@ -11,18 +11,18 @@
 
 stdenv.mkDerivation rec {
   pname = "conmon";
-  version = "2.1.7";
+  version = "2.1.8";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-W6nqhSEoP2mDp7fCoXqwYAafjfESxymYXAdC3BnJJno=";
+    hash = "sha256-gdMNAU+w4u+9DZL9x96OAZihShkQdvSiqPCA+eNf600=";
   };
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ glib libseccomp systemd ]
-  ++ lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];
+    ++ lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ];
 
   # manpage requires building the vendored go-md2man
   makeFlags = [ "bin/conmon" ];

From e50edcb50693ef73a2eef9adfd1614b0f9a82370 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 24 Aug 2023 13:59:41 +0300
Subject: [PATCH 11/54] kde/gear: 23.04.3 -> 23.08.0

---
 pkgs/applications/kde/akonadi-calendar.nix    |    4 +-
 pkgs/applications/kde/angelfish.nix           |    6 +-
 .../arianna/default.nix => kde/arianna.nix}   |   57 +-
 pkgs/applications/kde/audiotube.nix           |    4 +
 pkgs/applications/kde/cantor.nix              |    7 +-
 pkgs/applications/kde/default.nix             |    4 +-
 pkgs/applications/kde/fetch.sh                |    2 +-
 pkgs/applications/kde/kdenlive/default.nix    |    8 +-
 .../kde/kdenlive/dependency-paths.patch       |   46 +
 .../kde/kdenlive/ffmpeg-path.patch            |   25 -
 pkgs/applications/kde/kdenlive/mlt-path.patch |   22 -
 pkgs/applications/kde/kfloppy.nix             |   20 -
 .../kde/{kalendar.nix => merkuro.nix}         |   11 +-
 pkgs/applications/kde/neochat.nix             |    9 -
 pkgs/applications/kde/skanpage.nix            |    6 +-
 pkgs/applications/kde/spectacle.nix           |   11 +-
 pkgs/applications/kde/srcs.nix                | 2066 ++++++++---------
 pkgs/applications/kde/tokodon.nix             |    2 +
 pkgs/applications/misc/tellico/default.nix    |    5 -
 .../libraries/futuresql/default.nix           |   16 +
 pkgs/top-level/aliases.nix                    |   11 +-
 pkgs/top-level/all-packages.nix               |    4 +-
 22 files changed, 1116 insertions(+), 1230 deletions(-)
 rename pkgs/applications/{misc/arianna/default.nix => kde/arianna.nix} (68%)
 create mode 100644 pkgs/applications/kde/kdenlive/dependency-paths.patch
 delete mode 100644 pkgs/applications/kde/kdenlive/ffmpeg-path.patch
 delete mode 100644 pkgs/applications/kde/kdenlive/mlt-path.patch
 delete mode 100644 pkgs/applications/kde/kfloppy.nix
 rename pkgs/applications/kde/{kalendar.nix => merkuro.nix} (86%)
 create mode 100644 pkgs/development/libraries/futuresql/default.nix

diff --git a/pkgs/applications/kde/akonadi-calendar.nix b/pkgs/applications/kde/akonadi-calendar.nix
index 95ee121b59f1..c149ac905dd8 100644
--- a/pkgs/applications/kde/akonadi-calendar.nix
+++ b/pkgs/applications/kde/akonadi-calendar.nix
@@ -2,7 +2,7 @@
   mkDerivation, lib, kdepimTeam,
   extra-cmake-modules, kdoctools,
   akonadi, akonadi-contacts, kcalendarcore, kcalutils, kcontacts,
-  kidentitymanagement, kio, kmailtransport,
+  kidentitymanagement, kio, kmailtransport, messagelib
 }:
 
 mkDerivation {
@@ -14,7 +14,7 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     akonadi akonadi-contacts kcalendarcore kcalutils kcontacts kidentitymanagement
-    kio kmailtransport
+    kio kmailtransport messagelib
   ];
   outputs = [ "out" "dev" ];
   postInstall = ''
diff --git a/pkgs/applications/kde/angelfish.nix b/pkgs/applications/kde/angelfish.nix
index f5fa9f66412b..7e187fe5c3fd 100644
--- a/pkgs/applications/kde/angelfish.nix
+++ b/pkgs/applications/kde/angelfish.nix
@@ -4,6 +4,7 @@
 , cmake
 , corrosion
 , extra-cmake-modules
+, futuresql
 , kconfig
 , kcoreaddons
 , kdbusaddons
@@ -13,6 +14,7 @@
 , knotifications
 , kpurpose
 , kwindowsystem
+, qcoro
 , qtfeedback
 , qtquickcontrols2
 , qqc2-desktop-style
@@ -22,7 +24,7 @@
 , srcs
 
 # provided as callPackage input to enable easier overrides through overlays
-, cargoSha256 ? "sha256-Wthw7foadXO6jYJO1TB4OOYtpwnp8iCdda4tdiYg41A="
+, cargoSha256 ? "sha256-FI94TU3MgIl1tcjwJnzb2PKO1rbZ3uRB1mzXXkNU95I="
 }:
 
 mkDerivation rec {
@@ -45,6 +47,7 @@ mkDerivation rec {
   ];
 
   buildInputs = [
+    futuresql
     kconfig
     kcoreaddons
     kdbusaddons
@@ -54,6 +57,7 @@ mkDerivation rec {
     knotifications
     kpurpose
     kwindowsystem
+    qcoro
     qtfeedback
     qtquickcontrols2
     qqc2-desktop-style
diff --git a/pkgs/applications/misc/arianna/default.nix b/pkgs/applications/kde/arianna.nix
similarity index 68%
rename from pkgs/applications/misc/arianna/default.nix
rename to pkgs/applications/kde/arianna.nix
index d8faf1e9a292..e1a099800380 100644
--- a/pkgs/applications/misc/arianna/default.nix
+++ b/pkgs/applications/kde/arianna.nix
@@ -1,51 +1,52 @@
 { lib
 , mkDerivation
-, fetchurl
 , cmake
 , extra-cmake-modules
-, pkg-config
-, baloo
-, kfilemetadata
-, kirigami2
-, kirigami-addons
-, kitemmodels
-, kquickcharts
-, plasma-framework
-, qqc2-desktop-style
 , qtbase
+, qtdeclarative
 , qtquickcontrols2
-, qtwebsockets
+, qtwebchannel
 , qtwebengine
+, qtwebsockets
+, baloo
+, karchive
+, kconfig
+, kcoreaddons
+, kdbusaddons
+, kfilemetadata
+, ki18n
+, kirigami-addons
+, kquickcharts
+, kwindowsystem
+, qqc2-desktop-style
 }:
 
-mkDerivation rec {
+mkDerivation {
   pname = "arianna";
-  version = "1.1.0";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/arianna/arianna-${version}.tar.xz";
-    hash = "sha256-C60PujiUTyw2DwImu8PVmU687CP9CuWZ+d8LuZKthKY=";
-  };
 
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
-    pkg-config
   ];
 
   buildInputs = [
-    baloo
-    kfilemetadata
-    kirigami2
-    kirigami-addons
-    kitemmodels
-    kquickcharts
-    plasma-framework
-    qqc2-desktop-style
     qtbase
+    qtdeclarative
     qtquickcontrols2
-    qtwebsockets
+    qtwebchannel
     qtwebengine
+    qtwebsockets
+    baloo
+    karchive
+    kconfig
+    kcoreaddons
+    kdbusaddons
+    kfilemetadata
+    ki18n
+    kirigami-addons
+    kquickcharts
+    kwindowsystem
+    qqc2-desktop-style
   ];
 
   meta = with lib; {
diff --git a/pkgs/applications/kde/audiotube.nix b/pkgs/applications/kde/audiotube.nix
index 0bd22ee06f63..ca36d51ac3c9 100644
--- a/pkgs/applications/kde/audiotube.nix
+++ b/pkgs/applications/kde/audiotube.nix
@@ -4,12 +4,14 @@
 , extra-cmake-modules
 , wrapGAppsHook
 
+, futuresql
 , gst_all_1
 , kcoreaddons
 , kcrash
 , ki18n
 , kirigami2
 , kirigami-addons
+, qcoro
 , qtimageformats
 , qtmultimedia
 , qtquickcontrols2
@@ -27,11 +29,13 @@ mkDerivation rec {
   ];
 
   buildInputs = [
+    futuresql
     kcoreaddons
     kcrash
     ki18n
     kirigami2
     kirigami-addons
+    qcoro
     qtimageformats
     qtmultimedia
     qtquickcontrols2
diff --git a/pkgs/applications/kde/cantor.nix b/pkgs/applications/kde/cantor.nix
index 1c9a9f718a76..0acfa430eaa7 100644
--- a/pkgs/applications/kde/cantor.nix
+++ b/pkgs/applications/kde/cantor.nix
@@ -93,12 +93,7 @@ mkDerivation {
 
   qtWrapperArgs = [
     "--prefix PATH : ${placeholder "out"}/bin"
-  ];
-
-  postInstall = lib.optionalString withSage ''
-    wrapProgram $out/share/cantor/sagebackend/cantor-execsage \
-      --prefix PATH : ${sage-with-env}/bin
-  '';
+  ] ++ lib.optional withSage "--prefix PATH : ${sage-with-env}/bin";
 
   meta = with lib; {
     description = "Front end to powerful mathematics and statistics packages";
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index f6988f9831df..e61e99751d0d 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -73,6 +73,7 @@ let
       akonadiconsole = callPackage ./akonadiconsole.nix {};
       akregator = callPackage ./akregator.nix {};
       analitza = callPackage ./analitza.nix {};
+      arianna = callPackage ./arianna.nix {};
       ark = callPackage ./ark {};
       baloo-widgets = callPackage ./baloo-widgets.nix {};
       bomber = callPackage ./bomber.nix {};
@@ -99,7 +100,7 @@ let
       kaccounts-providers = callPackage ./kaccounts-providers.nix {};
       kaddressbook = callPackage ./kaddressbook.nix {};
       kalarm = callPackage ./kalarm.nix {};
-      kalendar = callPackage ./kalendar.nix {};
+      merkuro = callPackage ./merkuro.nix {};
       kalzium = callPackage ./kalzium.nix {};
       kamoso = callPackage ./kamoso.nix {};
       kapman = callPackage ./kapman.nix {};
@@ -134,7 +135,6 @@ let
       kdiamond = callPackage ./kdiamond.nix {};
       keditbookmarks = callPackage ./keditbookmarks.nix {};
       kfind = callPackage ./kfind.nix {};
-      kfloppy = callPackage ./kfloppy.nix {};
       kgeography = callPackage ./kgeography.nix {};
       kget = callPackage ./kget.nix {};
       kgpg = callPackage ./kgpg.nix {};
diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index 0acdb529fc38..393a3a440d26 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/release-service/23.04.3/src -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/release-service/23.08.0/src -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/kdenlive/default.nix b/pkgs/applications/kde/kdenlive/default.nix
index 885b1c1d8cc4..bcd8ba360a82 100644
--- a/pkgs/applications/kde/kdenlive/default.nix
+++ b/pkgs/applications/kde/kdenlive/default.nix
@@ -17,6 +17,7 @@
 , knotifyconfig
 , kplotting
 , ktextwidgets
+, mediainfo
 , mlt
 , shared-mime-info
 , libv4l
@@ -58,6 +59,7 @@ mkDerivation {
     knotifyconfig
     kplotting
     ktextwidgets
+    mediainfo
     mlt
     phonon-backend-gstreamer
     qtdeclarative
@@ -77,9 +79,11 @@ mkDerivation {
   # Both MLT and FFMpeg paths must be set or Kdenlive will complain that it
   # doesn't find them. See:
   # https://github.com/NixOS/nixpkgs/issues/83885
-  patches = [ ./mlt-path.patch ./ffmpeg-path.patch ];
-  inherit mlt;
+  patches = [ ./dependency-paths.patch ];
+
+  inherit mlt mediainfo;
   ffmpeg = ffmpeg-full;
+
   postPatch =
     # Module Qt5::Concurrent must be included in `find_package` before it is used.
     ''
diff --git a/pkgs/applications/kde/kdenlive/dependency-paths.patch b/pkgs/applications/kde/kdenlive/dependency-paths.patch
new file mode 100644
index 000000000000..ba3f7e6c8de9
--- /dev/null
+++ b/pkgs/applications/kde/kdenlive/dependency-paths.patch
@@ -0,0 +1,46 @@
+diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
+index 029849e5f..8befe4888 100644
+--- a/src/kdenlivesettings.kcfg
++++ b/src/kdenlivesettings.kcfg
+@@ -517,7 +517,7 @@
+   <group name="env">
+     <entry name="mltpath" type="Path">
+       <label>Mlt framework install path.</label>
+-      <default></default>
++      <default>@mlt@/share/mlt/profiles</default>
+     </entry>
+ 
+     <entry name="kdenliverendererpath" type="Path">
+@@ -527,27 +527,27 @@
+ 
+     <entry name="meltpath" type="Path">
+       <label>Mlt melt renderer install path.</label>
+-      <default></default>
++      <default>@mlt@/bin/melt</default>
+     </entry>
+ 
+     <entry name="ffmpegpath" type="Path">
+       <label>FFmpeg / Libav binary path.</label>
+-      <default></default>
++      <default>@ffmpeg@/bin/ffmpeg</default>
+     </entry>
+ 
+     <entry name="ffplaypath" type="Path">
+       <label>FFplay / avplay binary path.</label>
+-      <default></default>
++      <default>@ffmpeg@/bin/ffplay</default>
+     </entry>
+ 
+     <entry name="ffprobepath" type="Path">
+       <label>FFprobe / avprobe binary path.</label>
+-      <default></default>
++      <default>@ffmpeg@/bin/ffprobe</default>
+     </entry>
+ 
+     <entry name="mediainfopath" type="Path">
+       <label>mediaInfo binary path.</label>
+-      <default></default>
++      <default>@mediainfo@/bin/mediainfo</default>
+     </entry>
+ 
+     <entry name="processingthreads" type="Int">
diff --git a/pkgs/applications/kde/kdenlive/ffmpeg-path.patch b/pkgs/applications/kde/kdenlive/ffmpeg-path.patch
deleted file mode 100644
index a0cef882f596..000000000000
--- a/pkgs/applications/kde/kdenlive/ffmpeg-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
-index 5edad5ae7..d35347a40 100644
---- a/src/kdenlivesettings.kcfg
-+++ b/src/kdenlivesettings.kcfg
-@@ -403,17 +403,17 @@
- 
-     <entry name="ffmpegpath" type="Path">
-       <label>FFmpeg / Libav binary path.</label>
--      <default></default>
-+      <default>@ffmpeg@/bin/ffmpeg</default>
-     </entry>
- 
-     <entry name="ffplaypath" type="Path">
-       <label>FFplay / avplay binary path.</label>
--      <default></default>
-+      <default>@ffmpeg@/bin/ffplay</default>
-     </entry>
- 
-     <entry name="ffprobepath" type="Path">
-       <label>FFprobe / avprobe binary path.</label>
--      <default></default>
-+      <default>@ffmpeg@/bin/ffprobe</default>
-     </entry>
- 
-     <entry name="mltthreads" type="Int">
diff --git a/pkgs/applications/kde/kdenlive/mlt-path.patch b/pkgs/applications/kde/kdenlive/mlt-path.patch
deleted file mode 100644
index 9bfb66c1a839..000000000000
--- a/pkgs/applications/kde/kdenlive/mlt-path.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ruN old/src/kdenlivesettings.kcfg new/src/kdenlivesettings.kcfg
---- old/src/kdenlivesettings.kcfg	2019-09-10 23:20:27.555392353 -0400
-+++ new/src/kdenlivesettings.kcfg	2019-09-10 23:25:47.533964155 -0400
-@@ -378,14 +378,14 @@
- </group>
- 
-   <group name="env">
--    <entry name="mltpath" type="Path">
-+    <entry name="mltpath" type="Path" hidden="true">
-       <label>Mlt framework install path.</label>
--      <default></default>
-+      <default>@mlt@/share/mlt/profiles</default>
-     </entry>
- 
--    <entry name="rendererpath" type="Path">
-+    <entry name="rendererpath" type="Path" hidden="true">
-       <label>Mlt melt renderer install path.</label>
--      <default></default>
-+      <default>@mlt@/bin/melt</default>
-     </entry>
- 
-     <entry name="ffmpegpath" type="Path">
diff --git a/pkgs/applications/kde/kfloppy.nix b/pkgs/applications/kde/kfloppy.nix
deleted file mode 100644
index a88fd9283e06..000000000000
--- a/pkgs/applications/kde/kfloppy.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, lib, extra-cmake-modules, kdoctools, kcompletion, kxmlgui }:
-
-mkDerivation {
-  pname = "kfloppy";
-  meta = with lib; {
-    homepage = "https://kde.org/applications/en/utilities/org.kde.kfloppy";
-    description = "Utility to format 3.5\" and 5.25\" floppy disks";
-    maintainers = with maintainers; [ freezeboy ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    kdoctools
-    kcompletion
-    kxmlgui
-  ];
-}
diff --git a/pkgs/applications/kde/kalendar.nix b/pkgs/applications/kde/merkuro.nix
similarity index 86%
rename from pkgs/applications/kde/kalendar.nix
rename to pkgs/applications/kde/merkuro.nix
index 30303cc497b2..b8d3107eb614 100644
--- a/pkgs/applications/kde/kalendar.nix
+++ b/pkgs/applications/kde/merkuro.nix
@@ -41,8 +41,8 @@
 , messagelib
 }:
 
-mkDerivation rec {
-  pname = "kalendar";
+mkDerivation {
+  pname = "merkuro";
 
   nativeBuildInputs = [
     cmake
@@ -89,14 +89,11 @@ mkDerivation rec {
   ];
 
   propagatedUserEnvPkgs = [ akonadi kdepim-runtime akonadi-search ];
-  postFixup = ''
-    wrapProgram "$out/bin/kalendar" \
-      --prefix PATH : "${lib.makeBinPath [ akonadi kdepim-runtime akonadi-search ]}"
-  '';
+  qtWrapperArgs = [''--prefix PATH : "${lib.makeBinPath [ akonadi kdepim-runtime akonadi-search ]}"''];
 
   meta = with lib; {
     description = "A calendar application using Akonadi to sync with external services (Nextcloud, GMail, ...)";
-    homepage = "https://apps.kde.org/kalendar/";
+    homepage = "https://invent.kde.org/pim/merkuro";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ Thra11 ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/kde/neochat.nix b/pkgs/applications/kde/neochat.nix
index 0b9f3c57f610..4df33add6795 100644
--- a/pkgs/applications/kde/neochat.nix
+++ b/pkgs/applications/kde/neochat.nix
@@ -1,6 +1,5 @@
 { mkDerivation
 , lib
-, fetchpatch
 
 , cmake
 , extra-cmake-modules
@@ -33,14 +32,6 @@
 mkDerivation {
   pname = "neochat";
 
-  patches = [
-    (fetchpatch {
-      name = "libquotient-0.8.patch";
-      url = "https://invent.kde.org/network/neochat/-/commit/d9d5e17be2a2057ab2ee545561fab721cb211f7f.patch";
-      hash = "sha256-y1PEehFCW+69OH8YvL3SUGOb8Hhyf8xwRvSZzJ5J5Wc=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
diff --git a/pkgs/applications/kde/skanpage.nix b/pkgs/applications/kde/skanpage.nix
index d06ff7746bb9..fc16723ce4de 100644
--- a/pkgs/applications/kde/skanpage.nix
+++ b/pkgs/applications/kde/skanpage.nix
@@ -1,15 +1,15 @@
 { lib
 , mkDerivation
-, fetchurl
 , extra-cmake-modules
 , kirigami2
 , ktextwidgets
 , libksane
 , qtquickcontrols2
 , kpurpose
+, kquickimageedit
 }:
 
-mkDerivation rec {
+mkDerivation {
   pname = "skanpage";
 
   nativeBuildInputs = [ extra-cmake-modules ];
@@ -20,13 +20,13 @@ mkDerivation rec {
     libksane
     qtquickcontrols2
     kpurpose
+    kquickimageedit
   ];
 
   meta = with lib; {
     description = "KDE utility to scan images and multi-page documents";
     homepage = "https://apps.kde.org/skanpage";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix
index 7e9c80cd64ab..8505e34920df 100644
--- a/pkgs/applications/kde/spectacle.nix
+++ b/pkgs/applications/kde/spectacle.nix
@@ -5,21 +5,12 @@
 , knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi
 , qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator
 , qcoro, qtquickcontrols2, wayland, plasma-wayland-protocols, kpurpose, kpipewire
-, wrapGAppsHook, fetchpatch
+, wrapGAppsHook
 }:
 
 mkDerivation {
   pname = "spectacle";
 
-  patches = [
-    # backport fix for region capture with multi-display high-dpi setups
-    # FIXME: remove in 23.08
-    (fetchpatch {
-      url = "https://invent.kde.org/graphics/spectacle/-/commit/d0886c85445fad227b256152a549cb33bd97b776.patch";
-      hash = "sha256-t0+X1pzjlS2OWduMwQBoYbjh+o/SF4hOkAqzz/MJw3E=";
-    })
-  ];
-
   nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
   buildInputs = [
     kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 32de119a7b14..26f1ceb121f5 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -1,2054 +1,1958 @@
 # DO NOT EDIT! This file is generated automatically.
-# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/kde
+# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/kde/fetch.sh
 { fetchurl, mirror }:
 
 {
   akonadi = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/akonadi-23.04.3.tar.xz";
-      sha256 = "0jpp91d5rlblq6r981wxizmsv512kc43lfk8y29bdky6j4idflrb";
-      name = "akonadi-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/akonadi-23.08.0.tar.xz";
+      sha256 = "1qv1fwjmqxwwfp4xvrvv60jyy1vvayc9x320jgmr78rp2cizi602";
+      name = "akonadi-23.08.0.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/akonadi-calendar-23.04.3.tar.xz";
-      sha256 = "166xm57jcy7d2dv2pfy4lllzic4giin31szxz7xq3a7ixsd6g7cs";
-      name = "akonadi-calendar-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/akonadi-calendar-23.08.0.tar.xz";
+      sha256 = "1a7s5rd2h50i1wxl0fl99139c4alday69j13gdmw87v5swn0lskf";
+      name = "akonadi-calendar-23.08.0.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/akonadi-calendar-tools-23.04.3.tar.xz";
-      sha256 = "1msbvmq664wij1rcivmgw14kpw5x4xz57567xl0q60j584v2wq07";
-      name = "akonadi-calendar-tools-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/akonadi-calendar-tools-23.08.0.tar.xz";
+      sha256 = "02mjbncx66bw64i0n2kmfk7b3w5ki7b54jhc3wvqlk8bd8rbswx4";
+      name = "akonadi-calendar-tools-23.08.0.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/akonadi-contacts-23.04.3.tar.xz";
-      sha256 = "10vlzj56ps1pysf7g6i14v8wp2wkxh53055r2v4iq4cpq3mzayc6";
-      name = "akonadi-contacts-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/akonadi-contacts-23.08.0.tar.xz";
+      sha256 = "01r7h5dxqjq4lzjf5lw52hcli6gapvnixhksj8igl279pm33p4kp";
+      name = "akonadi-contacts-23.08.0.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/akonadi-import-wizard-23.04.3.tar.xz";
-      sha256 = "0dj7cvxnvld2h9nbg6v0bn3p81fx73dgj6kbpginavci52kgk240";
-      name = "akonadi-import-wizard-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/akonadi-import-wizard-23.08.0.tar.xz";
+      sha256 = "01rsc25vfm4iwiyan27780lim0jiqfrszkkh0a14cg93kmakndsm";
+      name = "akonadi-import-wizard-23.08.0.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/akonadi-mime-23.04.3.tar.xz";
-      sha256 = "1r33v2q49s7l90id4jqg0lar9p1j5k0cbnzsaqdksavzpzkcklh5";
-      name = "akonadi-mime-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/akonadi-mime-23.08.0.tar.xz";
+      sha256 = "0lbkygq2hrpb2yz5mwchnxzzr09m7lvl4y115bg33yp4iqb1bvwa";
+      name = "akonadi-mime-23.08.0.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/akonadi-notes-23.04.3.tar.xz";
-      sha256 = "0s5a414cdcz37srys2w3c2z5c63ha9ivsqj0srnfwwv0pxix266v";
-      name = "akonadi-notes-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/akonadi-notes-23.08.0.tar.xz";
+      sha256 = "0gb8pydmh484n7ds6vwb3pblhjbbwip747vflnsf749c21vhqn5c";
+      name = "akonadi-notes-23.08.0.tar.xz";
     };
   };
   akonadi-search = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/akonadi-search-23.04.3.tar.xz";
-      sha256 = "1hpclfcb7almvajscm2az36bw9rrhkp3ywb9h0j9h8ims2gm60m7";
-      name = "akonadi-search-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/akonadi-search-23.08.0.tar.xz";
+      sha256 = "1vvb65a290zarhb7jzga9d0xyg1xpz52ln83ygf95m6awwjprl59";
+      name = "akonadi-search-23.08.0.tar.xz";
     };
   };
   akonadiconsole = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/akonadiconsole-23.04.3.tar.xz";
-      sha256 = "005wq3rxgi37zb2gg6vawyav473q23q0d6l6pilnzsjw5rc1r3lk";
-      name = "akonadiconsole-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/akonadiconsole-23.08.0.tar.xz";
+      sha256 = "1af0s3jwn5vgl88rvavqgnzx7mbqxdp3kxraqhhi8h3ngxdf0l6y";
+      name = "akonadiconsole-23.08.0.tar.xz";
     };
   };
   akregator = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/akregator-23.04.3.tar.xz";
-      sha256 = "0g916453zip8i5g61pf8ib68fiqfbmr1i1lhbnwmsv1cryx035w9";
-      name = "akregator-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/akregator-23.08.0.tar.xz";
+      sha256 = "0l6ycd8dygy46s1g0cy5harj4wqll1pklcp8zb3bc751jfcrajr8";
+      name = "akregator-23.08.0.tar.xz";
     };
   };
   alligator = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/alligator-23.04.3.tar.xz";
-      sha256 = "0xnykm6m4mab9vdlbc0dfik6iizb032n1rcyj6mxkj2q5k0gl8h4";
-      name = "alligator-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/alligator-23.08.0.tar.xz";
+      sha256 = "014d43ivaql21mz6jxdbyg1j2gccpv2d39cmn55dm08djv22xk1d";
+      name = "alligator-23.08.0.tar.xz";
     };
   };
   analitza = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/analitza-23.04.3.tar.xz";
-      sha256 = "1lcs0bncn8pl593dh0kki7knwbzyyai5dz3kf2gb7wp4liz48k1m";
-      name = "analitza-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/analitza-23.08.0.tar.xz";
+      sha256 = "00b2cgksy1whn42li6ky3jdznwkxaa9ndncw1rfydg220db6zi6v";
+      name = "analitza-23.08.0.tar.xz";
     };
   };
   angelfish = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/angelfish-23.04.3.tar.xz";
-      sha256 = "0pk6rzy0i5sx2yg8pdc36jvamxah7j2czxb0njjycx760pzn61ah";
-      name = "angelfish-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/angelfish-23.08.0.tar.xz";
+      sha256 = "00xvpi3jba8gxp3hzlm1rb4m3qf1fx2ixz1lyvamkyvm8rp6b9pj";
+      name = "angelfish-23.08.0.tar.xz";
+    };
+  };
+  arianna = {
+    version = "23.08.0";
+    src = fetchurl {
+      url = "${mirror}/stable/release-service/23.08.0/src/arianna-23.08.0.tar.xz";
+      sha256 = "1iyzsa10750dyw5l4mhsz11la6i2217kzj7alkz258nai3bj69s4";
+      name = "arianna-23.08.0.tar.xz";
     };
   };
   ark = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/ark-23.04.3.tar.xz";
-      sha256 = "081swq9f87yxg4dxdl5i4hszhr0q4ph402in397zfa5vpyspzy41";
-      name = "ark-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/ark-23.08.0.tar.xz";
+      sha256 = "09i58hzn83g30zln3wgwcjp2k0ygkgabnfq4izhsvgkkm4bgkz21";
+      name = "ark-23.08.0.tar.xz";
     };
   };
   artikulate = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/artikulate-23.04.3.tar.xz";
-      sha256 = "0klp20clcpdm14wc2r14h6f7zrma34a22cz16mdc5c9k8dmalsz9";
-      name = "artikulate-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/artikulate-23.08.0.tar.xz";
+      sha256 = "1rwyxg7h4bfmd3mb9ddv818sq78k84clb0kdz4jacs0601vycp89";
+      name = "artikulate-23.08.0.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/audiocd-kio-23.04.3.tar.xz";
-      sha256 = "0kl0j5qy54q88cbclwqj0rn8hj3gzjhzk7bimjgw5w0xy3cw6kql";
-      name = "audiocd-kio-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/audiocd-kio-23.08.0.tar.xz";
+      sha256 = "1kkcny6dqd7a64j60znbadx6s6wa6jriah8a7dggr4kzr9p6fbx2";
+      name = "audiocd-kio-23.08.0.tar.xz";
     };
   };
   audiotube = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/audiotube-23.04.3.tar.xz";
-      sha256 = "1qbb34qi81j2r2sblgs0qry9diijizlbs12gwg9hmiybrdkk6qh4";
-      name = "audiotube-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/audiotube-23.08.0.tar.xz";
+      sha256 = "1y06c0qyl1amll2dwjwaffnjag6lz9fypwl20rzwd1k2ivsssv0v";
+      name = "audiotube-23.08.0.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/baloo-widgets-23.04.3.tar.xz";
-      sha256 = "01k8kmzr2vgd567v4js080cnyl2i43zh6zz25ml76z77lywlfzz6";
-      name = "baloo-widgets-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/baloo-widgets-23.08.0.tar.xz";
+      sha256 = "0p6n05v92rb8dnss3zx08xqhadg8vf2cd0n80xq169flvvf6syzl";
+      name = "baloo-widgets-23.08.0.tar.xz";
     };
   };
   blinken = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/blinken-23.04.3.tar.xz";
-      sha256 = "1bxw0bp6cj93gcwcb19ansz6xz4y53rah2pa6kq18xzafkrzrihm";
-      name = "blinken-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/blinken-23.08.0.tar.xz";
+      sha256 = "1wlyybv1x2qcffiq0hx9pcsc8zc4iiswa8390apcr415shrfd334";
+      name = "blinken-23.08.0.tar.xz";
     };
   };
   bomber = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/bomber-23.04.3.tar.xz";
-      sha256 = "0qgixhmlkcjni5i9391hjg3sfc3ps24lmk9v8199lmnplrybklqj";
-      name = "bomber-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/bomber-23.08.0.tar.xz";
+      sha256 = "19n0n4m4jr9x5jf35w5ylhh2ip7ax3vymjsma868z27kidpkssc2";
+      name = "bomber-23.08.0.tar.xz";
     };
   };
   bovo = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/bovo-23.04.3.tar.xz";
-      sha256 = "1zds6d4rmcf4sa2sfhyp1i5n7s7cgslikvbra4pz2kpi0hmvihi1";
-      name = "bovo-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/bovo-23.08.0.tar.xz";
+      sha256 = "01glqz3qfd4mpq6wmhqwr0gx2dxbgzsi9jwfqvzwp3ch3snpri38";
+      name = "bovo-23.08.0.tar.xz";
     };
   };
   calendarsupport = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/calendarsupport-23.04.3.tar.xz";
-      sha256 = "1zk6kv5nhcd7a5llzh31890xpqdg522ahjdgbwsm7pcp62y0nbsj";
-      name = "calendarsupport-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/calendarsupport-23.08.0.tar.xz";
+      sha256 = "0cqjmq1v9g87z0qmjwk5k32i0kg2dzr1dsvpyhkgr022gd02qxdr";
+      name = "calendarsupport-23.08.0.tar.xz";
     };
   };
   calindori = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/calindori-23.04.3.tar.xz";
-      sha256 = "1vadyrpf0f6mkgplwpfyn8z13fj7ny2zac85583czhnjci3aqvdd";
-      name = "calindori-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/calindori-23.08.0.tar.xz";
+      sha256 = "17dzlgs3n5404iaq6c6ghyvh8pp0myxmjzwwqk9l0k10wq8zr3df";
+      name = "calindori-23.08.0.tar.xz";
     };
   };
   cantor = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/cantor-23.04.3.tar.xz";
-      sha256 = "0c1drzkvmk4ifxzhch8qz5la14nbv7q0scx0vldp9k78ldgliwlw";
-      name = "cantor-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/cantor-23.08.0.tar.xz";
+      sha256 = "04yzh8i61nj0s1qpiry0qhjpjj5z1qqv6vpslyw365sx737mklz5";
+      name = "cantor-23.08.0.tar.xz";
     };
   };
   cervisia = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/cervisia-23.04.3.tar.xz";
-      sha256 = "18dc0441lq87cz9xwwph5vqbqkhq291r3dpkik8894rkxsmkja1c";
-      name = "cervisia-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/cervisia-23.08.0.tar.xz";
+      sha256 = "0qiv9klnkrxf5vrcjxz4b29hyi52w1dgb1fvw22p0sqpkc8gph68";
+      name = "cervisia-23.08.0.tar.xz";
     };
   };
   colord-kde = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/colord-kde-23.04.3.tar.xz";
-      sha256 = "19hnmlwmms1jlk6b7z88fsibf80sl462wgx1gin8czp0f7v5pkz0";
-      name = "colord-kde-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/colord-kde-23.08.0.tar.xz";
+      sha256 = "0nz76ikygvwvjjjx3sc3abq2aafq8fr5hhfb7gmcjpcz6w8vgw7z";
+      name = "colord-kde-23.08.0.tar.xz";
     };
   };
   dolphin = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/dolphin-23.04.3.tar.xz";
-      sha256 = "0bys24i2a3a65ahq5p3q1zr2px8jqip1gjn5m7rngq4hcddb1ji8";
-      name = "dolphin-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/dolphin-23.08.0.tar.xz";
+      sha256 = "1pjrzzj0hrzsmlzxxhl5clph1m2pdba805q38rrjzin0hgpg7c2a";
+      name = "dolphin-23.08.0.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/dolphin-plugins-23.04.3.tar.xz";
-      sha256 = "0h1b559icj5g3xrx5697a9rncpdcmsjg774c6m36ild56bwc048v";
-      name = "dolphin-plugins-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/dolphin-plugins-23.08.0.tar.xz";
+      sha256 = "1piz4jqxz2smn3fkyaqg48jbk76s4vsrgnhskvib515cfr4hhhy4";
+      name = "dolphin-plugins-23.08.0.tar.xz";
     };
   };
   dragon = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/dragon-23.04.3.tar.xz";
-      sha256 = "0mliddp0nyxz91wzy8md0p0i45mlhffip4zqjl4db55x4p6wh4y8";
-      name = "dragon-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/dragon-23.08.0.tar.xz";
+      sha256 = "185rwi0l49spnbrzcafv4z90zj10c38r5li53aba3pqsk6ff6n0p";
+      name = "dragon-23.08.0.tar.xz";
     };
   };
   elisa = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/elisa-23.04.3.tar.xz";
-      sha256 = "1ry4mhj7wc31xq9fip3amv8fj631m213zz0qg44h68q77sik4422";
-      name = "elisa-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/elisa-23.08.0.tar.xz";
+      sha256 = "19kdchfcw3pvcyaib2fac46zsfa6gnj2sw5wjm7wwbks5af7kck4";
+      name = "elisa-23.08.0.tar.xz";
     };
   };
   eventviews = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/eventviews-23.04.3.tar.xz";
-      sha256 = "1nh8a7jy0sjsyi41pxhxwjkq6fr4yy9rqgcjjbj01dnx1ykz3d7l";
-      name = "eventviews-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/eventviews-23.08.0.tar.xz";
+      sha256 = "0ghilcv9m8q2k0myc6l14nz5rg1nkvp2aypb58lma6fi8x8111b2";
+      name = "eventviews-23.08.0.tar.xz";
     };
   };
   falkon = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/falkon-23.04.3.tar.xz";
-      sha256 = "11r1iwimdzabfah68gsvw6xi67cj539anqa6s1rg33agsi5y56d3";
-      name = "falkon-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/falkon-23.08.0.tar.xz";
+      sha256 = "0wg5n53si1ybajzh5nnsfx9z9dkhrzl05l1q19004m62z3l8d9b2";
+      name = "falkon-23.08.0.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/ffmpegthumbs-23.04.3.tar.xz";
-      sha256 = "02wvhjqqird55xcs4kkj0s7nam4vqh3khjz5f1mjqfnk62sj1plx";
-      name = "ffmpegthumbs-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/ffmpegthumbs-23.08.0.tar.xz";
+      sha256 = "1vdywm5r21ag287xihhzzrybni9p3kcy45d0a1nn65ll2285mqnh";
+      name = "ffmpegthumbs-23.08.0.tar.xz";
     };
   };
   filelight = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/filelight-23.04.3.tar.xz";
-      sha256 = "1mwl1dkknvqw9hd5jsh4cdx1zd8f6rxca0vyq01wrx44q9p6dn1n";
-      name = "filelight-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/filelight-23.08.0.tar.xz";
+      sha256 = "1qknny5jivzm9ac7r4z957hprnj1qq08ghi42l395lmqfpwwy5ic";
+      name = "filelight-23.08.0.tar.xz";
     };
   };
   ghostwriter = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/ghostwriter-23.04.3.tar.xz";
-      sha256 = "1q3rhm6jnkbfylifj5km7hiygyib9c3m718kdsmyxas6k6vjx9rp";
-      name = "ghostwriter-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/ghostwriter-23.08.0.tar.xz";
+      sha256 = "1bxcb1dx3xf0lv13wk3qkzq071gwl9p1npmkmdbjx2q6vrrfzxy4";
+      name = "ghostwriter-23.08.0.tar.xz";
     };
   };
   granatier = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/granatier-23.04.3.tar.xz";
-      sha256 = "1zyadmgnpgsx728gzd55qyijsm13pb9cxs1y4l4c4m9lnz4y183v";
-      name = "granatier-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/granatier-23.08.0.tar.xz";
+      sha256 = "0hyv3jv0bcmilmd28bhpah0lm0si34n27lmwm4fm80wkcr3n7jwr";
+      name = "granatier-23.08.0.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/grantlee-editor-23.04.3.tar.xz";
-      sha256 = "1skv2hki0rck7596ci026bi3kss5fl4zrh3walsh44422yqkbj2a";
-      name = "grantlee-editor-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/grantlee-editor-23.08.0.tar.xz";
+      sha256 = "0pbdl2n1ym1cksv5j5ifhi10p5hhnmrismrrhq8v9xpw7bpc627b";
+      name = "grantlee-editor-23.08.0.tar.xz";
     };
   };
   grantleetheme = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/grantleetheme-23.04.3.tar.xz";
-      sha256 = "01kkj3y6xhc792jaxnkglkwvlqx9ckn5yhlfrpqff5hlf5x9vn4w";
-      name = "grantleetheme-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/grantleetheme-23.08.0.tar.xz";
+      sha256 = "1mq0afzqgid2vkpdskkdbcx1ylfmcrbw4m9gzkfaa7c8ffmlp57s";
+      name = "grantleetheme-23.08.0.tar.xz";
     };
   };
   gwenview = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/gwenview-23.04.3.tar.xz";
-      sha256 = "0vijsq4174p4asdjq47bzdp2xkfn8hpg7b4dgp3yvapfxwjgp148";
-      name = "gwenview-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/gwenview-23.08.0.tar.xz";
+      sha256 = "19wa33r1vk45dbnr64l3nlixr5vppypk2h11limvm2ndhwzxwzq2";
+      name = "gwenview-23.08.0.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/incidenceeditor-23.04.3.tar.xz";
-      sha256 = "1pqfl7gqz7ibpns2gpwqpvzhsba7xj4ilhi4ax1vn3m086iyh3a0";
-      name = "incidenceeditor-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/incidenceeditor-23.08.0.tar.xz";
+      sha256 = "1p1v65qglrwf0q4brwvmq4328i9dfnjspv001ip56bnxrps2kfpn";
+      name = "incidenceeditor-23.08.0.tar.xz";
     };
   };
   itinerary = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/itinerary-23.04.3.tar.xz";
-      sha256 = "132x68wc4pallxgkvridfsimfq5m2g47fj9lcgz1kq4gdsidzf6i";
-      name = "itinerary-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/itinerary-23.08.0.tar.xz";
+      sha256 = "0y87md72yd6f9yn31kj09ibfril5pj3cyds5cq3j3z59yhhgd665";
+      name = "itinerary-23.08.0.tar.xz";
     };
   };
   juk = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/juk-23.04.3.tar.xz";
-      sha256 = "1q0r0iv4nn6jd0g8db54r7xdw7kdw1ja0z1ggxl1sy0k60m9c4q3";
-      name = "juk-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/juk-23.08.0.tar.xz";
+      sha256 = "04dppr21vj4nnb0jmbnc9afk4jwhfj3dj0cf375l1kdglxa4ncc1";
+      name = "juk-23.08.0.tar.xz";
     };
   };
   k3b = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/k3b-23.04.3.tar.xz";
-      sha256 = "1kr1hw4pws87zzwyrwrg2ysdn11qf0qhwi1vc9b0k8jkjmmdplmb";
-      name = "k3b-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/k3b-23.08.0.tar.xz";
+      sha256 = "1zvwlxf3k63b29d0xzq4bgi206g0wnp5j0z00lxy9rnm275gwhz6";
+      name = "k3b-23.08.0.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kaccounts-integration-23.04.3.tar.xz";
-      sha256 = "1mn64xw5r2magy5y0qmg5r907jz1y8jar0qqkc6s1zjjr3s3knac";
-      name = "kaccounts-integration-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kaccounts-integration-23.08.0.tar.xz";
+      sha256 = "1by9pjjd6zpjjd9j5w8h8aqhzib5d0l3xp9dgvlw4afhbp5dv73g";
+      name = "kaccounts-integration-23.08.0.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kaccounts-providers-23.04.3.tar.xz";
-      sha256 = "1lrmj6r09ypnpl2s586i4rd3fk3760qlxyrhh91k43wkb8i6m8f0";
-      name = "kaccounts-providers-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kaccounts-providers-23.08.0.tar.xz";
+      sha256 = "08jv0z1586rfwrd9jrs7fk2xwjfmkmia1kaz904linxmmhv97zsh";
+      name = "kaccounts-providers-23.08.0.tar.xz";
     };
   };
   kaddressbook = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kaddressbook-23.04.3.tar.xz";
-      sha256 = "0zjbri91dh9vnwi6jqkbmyq667yzn8g4kw5v47qn8id2629zj6jq";
-      name = "kaddressbook-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kaddressbook-23.08.0.tar.xz";
+      sha256 = "1aw3zwjxyml6bvsld1qndkarvr11y43dif296qr21cplns48d5r1";
+      name = "kaddressbook-23.08.0.tar.xz";
     };
   };
   kajongg = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kajongg-23.04.3.tar.xz";
-      sha256 = "16v87x0qikfk9jpp8dfxnb7mnjzzi0qlkp5lbn2xypkfhqaz99fi";
-      name = "kajongg-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kajongg-23.08.0.tar.xz";
+      sha256 = "1x7gx6fg1irdrwp7lbgm5m2vair2zyijcj1bbabvm4kl28d3r85j";
+      name = "kajongg-23.08.0.tar.xz";
     };
   };
   kalarm = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kalarm-23.04.3.tar.xz";
-      sha256 = "120q5y889i9wdg9mxl51v8wz6nvdbhv178bhpscrb307ing538g0";
-      name = "kalarm-23.04.3.tar.xz";
-    };
-  };
-  kalendar = {
-    version = "23.04.3";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kalendar-23.04.3.tar.xz";
-      sha256 = "1w56glv8m1rlk86v78h69d21ydxb6i61g1dk6mcizjr5rvi4liy0";
-      name = "kalendar-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kalarm-23.08.0.tar.xz";
+      sha256 = "0wghnj5g3sq7vg9r328dqkqzl0hizxs93l9kma8h85hnf5ns9any";
+      name = "kalarm-23.08.0.tar.xz";
     };
   };
   kalgebra = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kalgebra-23.04.3.tar.xz";
-      sha256 = "04ygs073za4jjfp38am962jmyycx3hs8yswcnl91v9nx2lcpzdw5";
-      name = "kalgebra-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kalgebra-23.08.0.tar.xz";
+      sha256 = "0rrzhnrjmc0fjgbpbw3mpfbspbyfa4gr6pqkhgy3sb313wamvk9r";
+      name = "kalgebra-23.08.0.tar.xz";
     };
   };
   kalk = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kalk-23.04.3.tar.xz";
-      sha256 = "191x0vgbbq26qm36fph246alhyw3afdbbnyjg95mh3y0f3lw1n8d";
-      name = "kalk-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kalk-23.08.0.tar.xz";
+      sha256 = "15jig1y7s21aiv3dg2702qvdxy6k6k5yrrz9nhq5n839kgy3jn8g";
+      name = "kalk-23.08.0.tar.xz";
     };
   };
   kalzium = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kalzium-23.04.3.tar.xz";
-      sha256 = "041mrly5yzdxxlj9r04s10a6i4amlslw57j1ysj0k4vzh5js27zw";
-      name = "kalzium-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kalzium-23.08.0.tar.xz";
+      sha256 = "0vj69kc4svw3c0l7j7kasrcn8dj7ky5qryg6aydmbbckbikj778y";
+      name = "kalzium-23.08.0.tar.xz";
     };
   };
   kamera = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kamera-23.04.3.tar.xz";
-      sha256 = "09qqigcklp8d2pqibf8kxfras025zhpviwaaky69sd7nmqqd7gi9";
-      name = "kamera-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kamera-23.08.0.tar.xz";
+      sha256 = "1i4rchmj188acavi9yx7w8pmpqsdkz0iza60w2p3x32p5saw5arq";
+      name = "kamera-23.08.0.tar.xz";
     };
   };
   kamoso = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kamoso-23.04.3.tar.xz";
-      sha256 = "1f06331qigf5wi6lgir5ij8h1fsdn54v32fyw2mgf0hg05xndrcl";
-      name = "kamoso-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kamoso-23.08.0.tar.xz";
+      sha256 = "1izvgzsxy680cqz1j9j9haj5lfr9nas7xzjlwj1p7zfhawrqb75j";
+      name = "kamoso-23.08.0.tar.xz";
     };
   };
   kanagram = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kanagram-23.04.3.tar.xz";
-      sha256 = "1w6qmm32m9j0ffqlqhn95q899pxvgx2xckd1s11n8v8f4s193p9k";
-      name = "kanagram-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kanagram-23.08.0.tar.xz";
+      sha256 = "18yajg5mx9frab79amgxdf096kkn91hcfh04b0bipbn6k36kkl9n";
+      name = "kanagram-23.08.0.tar.xz";
     };
   };
   kapman = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kapman-23.04.3.tar.xz";
-      sha256 = "0ildsd7pig3lm9n616kw5mpl8hbwidsnbzdfifx8nnffslrr4bv7";
-      name = "kapman-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kapman-23.08.0.tar.xz";
+      sha256 = "027c2w72ljy8xlb3gqpab818j23qf7qsldxssflzlj0mh7igvgwh";
+      name = "kapman-23.08.0.tar.xz";
     };
   };
   kapptemplate = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kapptemplate-23.04.3.tar.xz";
-      sha256 = "1kdi948w5x328nalxcf17rnmxsp7mx3p7a58f7c65cf2y4ap9vwm";
-      name = "kapptemplate-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kapptemplate-23.08.0.tar.xz";
+      sha256 = "1r2kbh9r1b0nhzsipsnp2ppa817g324p39pwpnrsc0zyi52mdack";
+      name = "kapptemplate-23.08.0.tar.xz";
     };
   };
   kasts = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kasts-23.04.3.tar.xz";
-      sha256 = "0qpc04c841ry2f12pb1bc22qk9ncxmb0b2ji3m60il4ivgwarq9b";
-      name = "kasts-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kasts-23.08.0.tar.xz";
+      sha256 = "0sayr85lwj2xwmcx8r1kdmf7isjdn5a5shn58n930sishpcplhjn";
+      name = "kasts-23.08.0.tar.xz";
     };
   };
   kate = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kate-23.04.3.tar.xz";
-      sha256 = "0yyhh21pvzsaz7swmghdchzsfk089axhqkjwjv1m8j4q3q3rhv86";
-      name = "kate-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kate-23.08.0.tar.xz";
+      sha256 = "1cb8il661x9s7cn5dzc8az073s30s119mlnwglisglawzqn0v4ry";
+      name = "kate-23.08.0.tar.xz";
     };
   };
   katomic = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/katomic-23.04.3.tar.xz";
-      sha256 = "0a571058r9s2y6pyyapxfvlbpr6grabpl7x1lqlg3hfzyc7gl2h1";
-      name = "katomic-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/katomic-23.08.0.tar.xz";
+      sha256 = "0arryssaaw5m5mhq6hym8zjzxx0zr45jyh07ya1cmcx5r2505xl8";
+      name = "katomic-23.08.0.tar.xz";
     };
   };
   kbackup = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kbackup-23.04.3.tar.xz";
-      sha256 = "121w54ivmq8qnxc97g47i8vq4nkivypp84pqs9rs5bid4cpfvh9p";
-      name = "kbackup-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kbackup-23.08.0.tar.xz";
+      sha256 = "0i91rr2sh8qs4gxwv1bmfarjppyvbba1pv7i0wcvj6lmaz6h3yna";
+      name = "kbackup-23.08.0.tar.xz";
     };
   };
   kblackbox = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kblackbox-23.04.3.tar.xz";
-      sha256 = "0h7byd7g52yvmz3gxrzp2frs4iifm0r6lq8fjz2nxbl1rkw9ljbp";
-      name = "kblackbox-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kblackbox-23.08.0.tar.xz";
+      sha256 = "1axyzchy4cv5gci01w2kj7vg0sddafcx4zvwy07m2nb46niahcvy";
+      name = "kblackbox-23.08.0.tar.xz";
     };
   };
   kblocks = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kblocks-23.04.3.tar.xz";
-      sha256 = "1z5f2zpnmfh05vlmjw85jj2d0sfxl5w1kg30ky6gmgmmfzj2sjzx";
-      name = "kblocks-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kblocks-23.08.0.tar.xz";
+      sha256 = "1fr54i2jw058pxsrba8vy48yyzqcipb3aw40zw3093bglmiig1ql";
+      name = "kblocks-23.08.0.tar.xz";
     };
   };
   kbounce = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kbounce-23.04.3.tar.xz";
-      sha256 = "06b0q4f4yn8m8gy7wgax54ldwnkgykr8yfr2h0ih8mfg3w8xsx7s";
-      name = "kbounce-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kbounce-23.08.0.tar.xz";
+      sha256 = "13lwykx2dvjqa8qviwpr5w3dvprb6p5mf1ygqvw7476mdp8709jx";
+      name = "kbounce-23.08.0.tar.xz";
     };
   };
   kbreakout = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kbreakout-23.04.3.tar.xz";
-      sha256 = "08fq0s1c71ag6jzyxz6spc5ylmzpbqpyqi9lqjk0x7y7brkfk9fq";
-      name = "kbreakout-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kbreakout-23.08.0.tar.xz";
+      sha256 = "1mwdajfaxfawswk0c9r5b78q1rhh6q1v3wbfbllg4k2lnmp40b4x";
+      name = "kbreakout-23.08.0.tar.xz";
     };
   };
   kbruch = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kbruch-23.04.3.tar.xz";
-      sha256 = "0gr5d5xlrca71lrjqxnllsw4wji21y8wnzpq685f1nkkkhamxk37";
-      name = "kbruch-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kbruch-23.08.0.tar.xz";
+      sha256 = "0ipmbzy9iqb5mng80vv8hcj8ay7v9yj762xzsscf444dhdy78vad";
+      name = "kbruch-23.08.0.tar.xz";
     };
   };
   kcachegrind = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kcachegrind-23.04.3.tar.xz";
-      sha256 = "175bag1mfidp7bdsjb3zinib76jy8h881rqxgmkn90gmv4fqy62b";
-      name = "kcachegrind-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kcachegrind-23.08.0.tar.xz";
+      sha256 = "1087a4mwq3a2fqii0kcxl4i94wcni491n3x53i3c25bi5qypsmvw";
+      name = "kcachegrind-23.08.0.tar.xz";
     };
   };
   kcalc = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kcalc-23.04.3.tar.xz";
-      sha256 = "04mqicwqn6h99jgh1zl0wsgk1rdkswzxaq8b8yz5hq654dsyq6y1";
-      name = "kcalc-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kcalc-23.08.0.tar.xz";
+      sha256 = "1q7c7v2m84c7kbgfjgsm0qy8jyz19l0plk6rff1qmfqx3y20glny";
+      name = "kcalc-23.08.0.tar.xz";
     };
   };
   kcalutils = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kcalutils-23.04.3.tar.xz";
-      sha256 = "1j7f5ai25zcxggw3dvky624asxim5bkd6a35rcdzkjhj1qwk3vll";
-      name = "kcalutils-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kcalutils-23.08.0.tar.xz";
+      sha256 = "1wqp0d40pqn1vaqhv7x5qzp9nx43a96l9yk9vyh3yg9q8jfgajgy";
+      name = "kcalutils-23.08.0.tar.xz";
     };
   };
   kcharselect = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kcharselect-23.04.3.tar.xz";
-      sha256 = "05z80j8bwrj1zfpy376gsx30bv7bxsa3lyvrqsz197w1g8vp5gix";
-      name = "kcharselect-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kcharselect-23.08.0.tar.xz";
+      sha256 = "0b4ay70rc0wzz05ld3rm8yf2wq2gkmxgysnak34nj62iadz52rf5";
+      name = "kcharselect-23.08.0.tar.xz";
     };
   };
   kclock = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kclock-23.04.3.tar.xz";
-      sha256 = "1rn1v7y7kjmly703qlk0jhsqk5kiixrf7z339h38l7b32r8vdm9r";
-      name = "kclock-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kclock-23.08.0.tar.xz";
+      sha256 = "08v180yl7da7i8q5ll0i3dqlh6pqnirsrcq5lfbb2mvczxsr1frw";
+      name = "kclock-23.08.0.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kcolorchooser-23.04.3.tar.xz";
-      sha256 = "1ripvn2li74rwngicay9c78j0slia1rpsi1f43rbb36p9af02lwq";
-      name = "kcolorchooser-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kcolorchooser-23.08.0.tar.xz";
+      sha256 = "15vxyd8xwg8m1jbmag5897094hs8a7ipsa04ss3yd4zd9g4bx0fp";
+      name = "kcolorchooser-23.08.0.tar.xz";
     };
   };
   kcron = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kcron-23.04.3.tar.xz";
-      sha256 = "107rx45d4gzkxiab8i87jk0qvyagwlrynq0k7098w5zfxg603vgg";
-      name = "kcron-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kcron-23.08.0.tar.xz";
+      sha256 = "1y9zga7mniadnzkqpyqy61hiznzib5p0ycfv8bbx1q5bx7cnkslh";
+      name = "kcron-23.08.0.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kde-dev-scripts-23.04.3.tar.xz";
-      sha256 = "079wvyr7qjbxgywdzd9mydn7l4wq9jx20dv2j3iwq5cq9scwfgvm";
-      name = "kde-dev-scripts-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kde-dev-scripts-23.08.0.tar.xz";
+      sha256 = "0mdi1jpx6lxg7g8jfz8z5sdyv7kf6yfk8mhr3xv3mmmnb3qpkkx0";
+      name = "kde-dev-scripts-23.08.0.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kde-dev-utils-23.04.3.tar.xz";
-      sha256 = "0gadxs9qxqkla6rwirpyckfh718m8lslvwi4lc0xsn3nkjprj7kl";
-      name = "kde-dev-utils-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kde-dev-utils-23.08.0.tar.xz";
+      sha256 = "0x03czwbr134kp9b6bgm91jqyja6wh5mkfs95afirb0h4v7xmr0i";
+      name = "kde-dev-utils-23.08.0.tar.xz";
     };
   };
   kde-inotify-survey = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kde-inotify-survey-23.04.3.tar.xz";
-      sha256 = "1l9lvjwqrc05fz75d7whkkxk5hy1ra6n5mf8dj0p8k0xxnxhs178";
-      name = "kde-inotify-survey-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kde-inotify-survey-23.08.0.tar.xz";
+      sha256 = "1hc8rlbrb7k5m3j3cwbxi5a51c15ax1lv593il5bbbz6yr36dhiq";
+      name = "kde-inotify-survey-23.08.0.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kdebugsettings-23.04.3.tar.xz";
-      sha256 = "02igg8ry1cxa83pdj6pgwzw7hpjwfrfk57d9ybgfvy2x08d5kvqz";
-      name = "kdebugsettings-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kdebugsettings-23.08.0.tar.xz";
+      sha256 = "1a8h8fn55jsyf56l5s6y3cag1v4wm1cwk2hdfrjl3zi5j0vqln4d";
+      name = "kdebugsettings-23.08.0.tar.xz";
     };
   };
   kdeconnect-kde = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kdeconnect-kde-23.04.3.tar.xz";
-      sha256 = "1gcmqqj752h3lmcpvc7cm6k6bpb158ha7i5ysp0kqvf8cmpi5ydz";
-      name = "kdeconnect-kde-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kdeconnect-kde-23.08.0.tar.xz";
+      sha256 = "1sfm04k81992skb5s1n968nj8zd07yyk0p5qqnhyyacrz5scchcb";
+      name = "kdeconnect-kde-23.08.0.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kdeedu-data-23.04.3.tar.xz";
-      sha256 = "0qki2anbhwrmfcyin0n2hx2xmax3ybks59g4lcxbganyk3k64yfc";
-      name = "kdeedu-data-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kdeedu-data-23.08.0.tar.xz";
+      sha256 = "1322hc5iavnv181i5kydvfvfdap3j6a5m9q2id7g6il5iwvpq04d";
+      name = "kdeedu-data-23.08.0.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kdegraphics-mobipocket-23.04.3.tar.xz";
-      sha256 = "13hn6dh5d4vsblvg6wyyvbmcyl0yyqr8srilik86wilp58qbsrdv";
-      name = "kdegraphics-mobipocket-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kdegraphics-mobipocket-23.08.0.tar.xz";
+      sha256 = "1yvrg6z9gjicqnr64la5k3acb8p1x0d9mc1xrhy8gsxpj67wdb8m";
+      name = "kdegraphics-mobipocket-23.08.0.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kdegraphics-thumbnailers-23.04.3.tar.xz";
-      sha256 = "16z6sf8v9874ng5b6b6wzvnlqncp7xz2fqpc93vs7sby8rwsdpy0";
-      name = "kdegraphics-thumbnailers-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kdegraphics-thumbnailers-23.08.0.tar.xz";
+      sha256 = "0csl6kh2j6sdsq812an10vlrg6cirm5v195dxgc3na1y6ncjk250";
+      name = "kdegraphics-thumbnailers-23.08.0.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kdenetwork-filesharing-23.04.3.tar.xz";
-      sha256 = "19izy4bjz5xzibabhf0dvijag7ig7vf3pz1c2dphspsbqkgpjanb";
-      name = "kdenetwork-filesharing-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kdenetwork-filesharing-23.08.0.tar.xz";
+      sha256 = "0airv4vgb6ivl74hhhsm26f6isjkrr7222l01kqcxv4dwf0jkmyf";
+      name = "kdenetwork-filesharing-23.08.0.tar.xz";
     };
   };
   kdenlive = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kdenlive-23.04.3.tar.xz";
-      sha256 = "0jy95mbsifcv5kg80dw6nn86qcs5vy1652w4ig2wd2f7q864wfri";
-      name = "kdenlive-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kdenlive-23.08.0.tar.xz";
+      sha256 = "01yjwikvjs75khr12s86sw2ly9c51vrb7zgh9q0phxbz3p6gcqsz";
+      name = "kdenlive-23.08.0.tar.xz";
     };
   };
   kdepim-addons = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kdepim-addons-23.04.3.tar.xz";
-      sha256 = "1nai47wccf1shrgvywslqdkxk066zdkpb1grf3qzh8q77za2kmqz";
-      name = "kdepim-addons-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kdepim-addons-23.08.0.tar.xz";
+      sha256 = "189fmzgvshnld3j7y98g70z9qyrkizk0nfl5im5wamrcn77vwpv1";
+      name = "kdepim-addons-23.08.0.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kdepim-runtime-23.04.3.tar.xz";
-      sha256 = "1wvwibq6zzjlhh8yqrlqras0m8i01ynlwj9z6l3f0g0hyyz5nkw4";
-      name = "kdepim-runtime-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kdepim-runtime-23.08.0.tar.xz";
+      sha256 = "16i2sbqzvmsjb20xjlbp92jaig66bg9ws52dk7d45r2j8ppb9qli";
+      name = "kdepim-runtime-23.08.0.tar.xz";
     };
   };
   kdesdk-kio = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kdesdk-kio-23.04.3.tar.xz";
-      sha256 = "0sxdjpwxwbbinmpz0pq2icm2h9cv9k0yzha0szf1ighfc7kyqwbs";
-      name = "kdesdk-kio-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kdesdk-kio-23.08.0.tar.xz";
+      sha256 = "17wmzkbmq6p60dabnb3bkx7f6z04wkj271fpyhlijj5ma3w6dl88";
+      name = "kdesdk-kio-23.08.0.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kdesdk-thumbnailers-23.04.3.tar.xz";
-      sha256 = "04fw6lrilccvi71y70zz0nag41gdpfp49556c6vx3nv3ndm28wfa";
-      name = "kdesdk-thumbnailers-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kdesdk-thumbnailers-23.08.0.tar.xz";
+      sha256 = "1add5r1vaqp1r5m37636pzvik15imz7k3qnskyrw60jzyk9fyq9m";
+      name = "kdesdk-thumbnailers-23.08.0.tar.xz";
     };
   };
   kdev-php = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kdev-php-23.04.3.tar.xz";
-      sha256 = "1nrdf5iyhcfy77fynaq65y06z3n3z7v2qzd9zp74ngb4j3x3ks1p";
-      name = "kdev-php-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kdev-php-23.08.0.tar.xz";
+      sha256 = "0dwxczpbxn3in08cmyf393k7xh83qmj95kbm0fbxigpadxy76ykg";
+      name = "kdev-php-23.08.0.tar.xz";
     };
   };
   kdev-python = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kdev-python-23.04.3.tar.xz";
-      sha256 = "1i1rba7405gfzywh7in915s27b6gn2f8m76kc6ra63dvh75qpyyi";
-      name = "kdev-python-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kdev-python-23.08.0.tar.xz";
+      sha256 = "1s0zw2b8kb16nii2da8sx2vx1x4s130nlc9fwvc63jin8f01ynmx";
+      name = "kdev-python-23.08.0.tar.xz";
     };
   };
   kdevelop = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kdevelop-23.04.3.tar.xz";
-      sha256 = "0m1q5nhx7wd4b8850ikw7dk6zka57gapf78wawjv2h1hijxcyf4v";
-      name = "kdevelop-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kdevelop-23.08.0.tar.xz";
+      sha256 = "0spfg8a4carrdl9fmf60qr85dzxah2g6vy3zxhqaadd4kcsrjz1h";
+      name = "kdevelop-23.08.0.tar.xz";
     };
   };
   kdf = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kdf-23.04.3.tar.xz";
-      sha256 = "11ndcbfkq5fhb1lfij0mmm43fw49sh0z3nw644sll0smcwic76aa";
-      name = "kdf-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kdf-23.08.0.tar.xz";
+      sha256 = "1x5gfa7bs8fyq2pqvnriswwlak78pq61np2whsmh07njq8s6frdq";
+      name = "kdf-23.08.0.tar.xz";
     };
   };
   kdialog = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kdialog-23.04.3.tar.xz";
-      sha256 = "042az7d9ngar6xp7gv3xcmlns9hpbvs39dkymanqgc0riwa1mvsx";
-      name = "kdialog-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kdialog-23.08.0.tar.xz";
+      sha256 = "1h4mid01v732iw8gd86r88l8n9yq55dwlixk9lz239i17hzr8l0n";
+      name = "kdialog-23.08.0.tar.xz";
     };
   };
   kdiamond = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kdiamond-23.04.3.tar.xz";
-      sha256 = "038lpp387m45zcy49rgmisiz5ajrvxwxnf424wllrjkihxy1siyn";
-      name = "kdiamond-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kdiamond-23.08.0.tar.xz";
+      sha256 = "0ps4wf3gz7zrkplsqa9b5a0523f55a5m2b41vnfmkcg3fkdpn4n0";
+      name = "kdiamond-23.08.0.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/keditbookmarks-23.04.3.tar.xz";
-      sha256 = "08cgyfbnszr5l3xg8a15rml3n8ldszdzm9xqnmjpifrzj5qbw9va";
-      name = "keditbookmarks-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/keditbookmarks-23.08.0.tar.xz";
+      sha256 = "1fvi81qpf3nvgp0lqyqgbk1mhwf6s4m6k6ivd1d4zhlcq93wwjf6";
+      name = "keditbookmarks-23.08.0.tar.xz";
     };
   };
   keysmith = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/keysmith-23.04.3.tar.xz";
-      sha256 = "1rfp516adliyc57nx4ha1rp8v2z340ygsvblh5sqmsdsg2ivjklj";
-      name = "keysmith-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/keysmith-23.08.0.tar.xz";
+      sha256 = "1xa0r9c28m87chk90kaxs1xs73s6y6m6a9na1j6p15zad1lxjn81";
+      name = "keysmith-23.08.0.tar.xz";
     };
   };
   kfind = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kfind-23.04.3.tar.xz";
-      sha256 = "03g9cn0wp3f2n9zwzbc5sbcria4hcp2ls77fbxyj3wkady3m50if";
-      name = "kfind-23.04.3.tar.xz";
-    };
-  };
-  kfloppy = {
-    version = "23.04.3";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kfloppy-23.04.3.tar.xz";
-      sha256 = "1q33bjvp376amgryjwday3qqkx41q5p7vyqkbwpgb2x97gk7q94x";
-      name = "kfloppy-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kfind-23.08.0.tar.xz";
+      sha256 = "0wsym0gi32fr35dr0c2ib6h7pgm5h9cbibgm5knrs18fsncqkj5i";
+      name = "kfind-23.08.0.tar.xz";
     };
   };
   kfourinline = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kfourinline-23.04.3.tar.xz";
-      sha256 = "0chfjp0k4ps5f6vy8nxqc2xlj4xql08llxnzsz6c2x611n69aszm";
-      name = "kfourinline-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kfourinline-23.08.0.tar.xz";
+      sha256 = "17xx3yraiarkll24yxw0n7vg1ygsix8kjiwk3w2dc8xlgg36smhh";
+      name = "kfourinline-23.08.0.tar.xz";
     };
   };
   kgeography = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kgeography-23.04.3.tar.xz";
-      sha256 = "16vvfz7rw2d5zslifrk4s6vvm5502rcjjg60z67nplfckx1vi4a5";
-      name = "kgeography-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kgeography-23.08.0.tar.xz";
+      sha256 = "1rz973mlc5jiyn0xgxpwvvk015g68mmk71xwgdhd785al1hi0nwi";
+      name = "kgeography-23.08.0.tar.xz";
     };
   };
   kget = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kget-23.04.3.tar.xz";
-      sha256 = "1n9wnm1si4g4rv8zaqpr8m3c2aav0mj8i7z96m78dk1apippx77r";
-      name = "kget-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kget-23.08.0.tar.xz";
+      sha256 = "1w5y5cphzjz2j9vfc9qnzxn6wcbp2gw9i30jxchnvrp0lzzfi30n";
+      name = "kget-23.08.0.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kgoldrunner-23.04.3.tar.xz";
-      sha256 = "0acavby9lwbqbx577a3az9lcahchngcs15571va2ndnq1r16paxf";
-      name = "kgoldrunner-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kgoldrunner-23.08.0.tar.xz";
+      sha256 = "1sn5h0ng1ixislq010x6yv6npby19i9abg4swk3dadij52fgm4yd";
+      name = "kgoldrunner-23.08.0.tar.xz";
     };
   };
   kgpg = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kgpg-23.04.3.tar.xz";
-      sha256 = "1ihxw1s4sq7cp5pm6rddcmvqk0v5gfg4v38b6yg8hyjg655x63jz";
-      name = "kgpg-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kgpg-23.08.0.tar.xz";
+      sha256 = "14qqv67vp16v3i9bhyhjvbgpr4c7xsfmn4pzcdwpjrqscy54713a";
+      name = "kgpg-23.08.0.tar.xz";
     };
   };
   khangman = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/khangman-23.04.3.tar.xz";
-      sha256 = "1rzl6kfb7457w4s0wgkk07s0vr8nngivhpfr6q0m4261qf7b17zw";
-      name = "khangman-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/khangman-23.08.0.tar.xz";
+      sha256 = "1xjsmf161z0xlaxpxm9p7n1477qcka8fzvcdj7gsrk55p519idsl";
+      name = "khangman-23.08.0.tar.xz";
     };
   };
   khelpcenter = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/khelpcenter-23.04.3.tar.xz";
-      sha256 = "10rivj5c14v5hwk87z41gwk830sy35fz0jg1jpay43jzw0ss995y";
-      name = "khelpcenter-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/khelpcenter-23.08.0.tar.xz";
+      sha256 = "1g1y4hcxcd2aw7f5wymsdma1zjpmkhqvsnwn8yj1yj9gzh35wwcn";
+      name = "khelpcenter-23.08.0.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kidentitymanagement-23.04.3.tar.xz";
-      sha256 = "03bfz0x35wiynla39iysxa5g3rckmy9nj2z1f439v9sblcqbvz3p";
-      name = "kidentitymanagement-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kidentitymanagement-23.08.0.tar.xz";
+      sha256 = "10hnbnc2iwa73m2nk4b2vj1r1g6y29cqijkx0ldqxim3q6f2pqi6";
+      name = "kidentitymanagement-23.08.0.tar.xz";
     };
   };
   kig = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kig-23.04.3.tar.xz";
-      sha256 = "18ml5ca8mmqb1a0j18pf9ajpj20rs5i0knvz4rssjfzibf9v6cbs";
-      name = "kig-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kig-23.08.0.tar.xz";
+      sha256 = "1gf5ffxaxz26pbawc0j2ymkasg7r55dinp9n267x31ljfk96vl16";
+      name = "kig-23.08.0.tar.xz";
     };
   };
   kigo = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kigo-23.04.3.tar.xz";
-      sha256 = "0qx9plrs588210rdgvb2bkm5yjw4pna9q7v38cb166nfgkh6gv63";
-      name = "kigo-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kigo-23.08.0.tar.xz";
+      sha256 = "1klhc1lyl32av1bzrd0j6y3n2vjf3ng1jkx6pr95w0mys3nz3z0w";
+      name = "kigo-23.08.0.tar.xz";
     };
   };
   killbots = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/killbots-23.04.3.tar.xz";
-      sha256 = "0ygg2cmp7wqzw9nsn768vzgjs8i44k3skwcn2abg1jj5k64wp9cb";
-      name = "killbots-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/killbots-23.08.0.tar.xz";
+      sha256 = "0ihrrb1zngr1b9xwl65b631cb5d7w3na9f7k0dhih32j2rd1mc6z";
+      name = "killbots-23.08.0.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kimagemapeditor-23.04.3.tar.xz";
-      sha256 = "05c30x7gihljw9vxpq2ag68bfyikh5gj17xbckkkg6l01qk6lqdc";
-      name = "kimagemapeditor-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kimagemapeditor-23.08.0.tar.xz";
+      sha256 = "1lj7pbccghniakbxcb4dyffb2q5s62r880cls08pw1hmnih558cq";
+      name = "kimagemapeditor-23.08.0.tar.xz";
     };
   };
   kimap = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kimap-23.04.3.tar.xz";
-      sha256 = "08s2891f2cnf5f7q034lmqv3vnh3v61l7bsyssdx711jfbswg9ik";
-      name = "kimap-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kimap-23.08.0.tar.xz";
+      sha256 = "0rn2xg6nrnr33d6lljfqdvc65dn2rmglv6j03cqml5cqck1cm0l7";
+      name = "kimap-23.08.0.tar.xz";
     };
   };
   kio-admin = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kio-admin-23.04.3.tar.xz";
-      sha256 = "1vpl0bmgf23zvigbmxvmmpl01p99n81g4640qdjfx2f9854qqzz0";
-      name = "kio-admin-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kio-admin-23.08.0.tar.xz";
+      sha256 = "157l499087gcw70wmdiaapqf5yipknsbqvpv2jjbb8p2vgp8q1pc";
+      name = "kio-admin-23.08.0.tar.xz";
     };
   };
   kio-extras = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kio-extras-23.04.3.tar.xz";
-      sha256 = "1ygxfq62idpgf1dlic1245y5gf0fnkrpbqxd230xmxi7a35za8qd";
-      name = "kio-extras-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kio-extras-23.08.0.tar.xz";
+      sha256 = "02a84v4d9d2rns65j4yq1dspmifbh5h0mr1v14i9znffz3pfn72s";
+      name = "kio-extras-23.08.0.tar.xz";
     };
   };
   kio-gdrive = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kio-gdrive-23.04.3.tar.xz";
-      sha256 = "0s7kz25z46gh1rv85i2ndbgv8nhbjlwc7ypd8fsd4lqgf025h0ns";
-      name = "kio-gdrive-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kio-gdrive-23.08.0.tar.xz";
+      sha256 = "1cngw7hyyryr0d1yj8r7l5ijdx9xxjw43c426m8rxm8w6x640mcz";
+      name = "kio-gdrive-23.08.0.tar.xz";
     };
   };
   kio-zeroconf = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kio-zeroconf-23.04.3.tar.xz";
-      sha256 = "0b7p5ivfcggs63y5hmyy5fwjxs63ghhkrs603h7hmj24apfwk15a";
-      name = "kio-zeroconf-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kio-zeroconf-23.08.0.tar.xz";
+      sha256 = "1920kl6r8jm8zp0q9c5civ7gx0a3kj13i9hlingjp042lwbww9z2";
+      name = "kio-zeroconf-23.08.0.tar.xz";
     };
   };
   kipi-plugins = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kipi-plugins-23.04.3.tar.xz";
-      sha256 = "12785nyni2jj6phyr7xwnspr179pkaq17pzs985azxjm4wsjn5bz";
-      name = "kipi-plugins-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kipi-plugins-23.08.0.tar.xz";
+      sha256 = "0v9sm5c4d8g5ih9wbsmbfvxgjk7divjklfbwkv3pyhzvbqspai0p";
+      name = "kipi-plugins-23.08.0.tar.xz";
     };
   };
   kirigami-gallery = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kirigami-gallery-23.04.3.tar.xz";
-      sha256 = "0j719ggd1kd9qwqsc5wd256l8yiqivq1ifkfsisc14llawb7m0h2";
-      name = "kirigami-gallery-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kirigami-gallery-23.08.0.tar.xz";
+      sha256 = "06l6izavxlsgdkmi798ynk9b1sfw74cwhhdga4q92qvy3ick311x";
+      name = "kirigami-gallery-23.08.0.tar.xz";
     };
   };
   kiriki = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kiriki-23.04.3.tar.xz";
-      sha256 = "13lzpbhkp48r9m0bcrzfqacz9xvc89xavf3yn3ql50g3jjlkq41v";
-      name = "kiriki-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kiriki-23.08.0.tar.xz";
+      sha256 = "030nw63s8xmvmgngb6w04yv6h0yj6cqvl7qybwhrrahxr3906jzs";
+      name = "kiriki-23.08.0.tar.xz";
     };
   };
   kiten = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kiten-23.04.3.tar.xz";
-      sha256 = "0l3cgcamkrfyjdqy4x38lc18p1acn97xyhm01q91pbr644gyiy25";
-      name = "kiten-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kiten-23.08.0.tar.xz";
+      sha256 = "1fhx9hbciw622wpqj5lhdb9vws4p2l6zrbmzmxkx7djxdym41hra";
+      name = "kiten-23.08.0.tar.xz";
     };
   };
   kitinerary = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kitinerary-23.04.3.tar.xz";
-      sha256 = "0fcqix7hgmv7qcfxzmqy61kg7dqi5zas5vqfs7pfycgcxma0g869";
-      name = "kitinerary-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kitinerary-23.08.0.tar.xz";
+      sha256 = "1m7yhm4yrvhbpggigfrm2xd41rg91zwvs0rbnfsrpnhr2wm8qb1r";
+      name = "kitinerary-23.08.0.tar.xz";
     };
   };
   kjournald = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kjournald-23.04.3.tar.xz";
-      sha256 = "0mnfn3b8792hajfwfxm701n67knvvz46kvr6pm1jwwz5l6hbwncq";
-      name = "kjournald-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kjournald-23.08.0.tar.xz";
+      sha256 = "19mcj53gxlipd6ny6dzyqxq0i6v1838wxl79dj9gwgvmqrr1vd4i";
+      name = "kjournald-23.08.0.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kjumpingcube-23.04.3.tar.xz";
-      sha256 = "09bh57vzjnn56dnhpp4szx72wyskc5g714vlyp6c27vr27xry8fi";
-      name = "kjumpingcube-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kjumpingcube-23.08.0.tar.xz";
+      sha256 = "0grzrw3mi94fc00flq8alrf1z2pksk0r0xafazi1i9ibv789d899";
+      name = "kjumpingcube-23.08.0.tar.xz";
     };
   };
   kldap = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kldap-23.04.3.tar.xz";
-      sha256 = "0hp5j02kwh91xf0n6zqzgam7g50r54hzbkli5i7c0rxdb1g28ihm";
-      name = "kldap-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kldap-23.08.0.tar.xz";
+      sha256 = "14457ld8rdvs2s2nrbpnvf7vcqrpbxxnzbqbxg8z7swpn695w235";
+      name = "kldap-23.08.0.tar.xz";
     };
   };
   kleopatra = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kleopatra-23.04.3.tar.xz";
-      sha256 = "0lcl20yihsa8dq0s24akp5z0290vh9nxjjjdwqk88nz8vmsr29i0";
-      name = "kleopatra-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kleopatra-23.08.0.tar.xz";
+      sha256 = "0pr56q1cb26453zxxya8lxhchp2v05631ic4v9fqbwfmgchj13xq";
+      name = "kleopatra-23.08.0.tar.xz";
     };
   };
   klettres = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/klettres-23.04.3.tar.xz";
-      sha256 = "09vklxcj7hhbb1m9b5gpd73qcxnkvh94v49cn84d9hdnm7gbsb23";
-      name = "klettres-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/klettres-23.08.0.tar.xz";
+      sha256 = "1wqnmpl9ilv4bl8cp55kqbcnbqm9k2g93z0ilv313k8wlx79djld";
+      name = "klettres-23.08.0.tar.xz";
     };
   };
   klickety = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/klickety-23.04.3.tar.xz";
-      sha256 = "0ngbjn3dlw4257p2gzlhm8rlljqgzjmb160wiw6j4yz1mxd75fr2";
-      name = "klickety-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/klickety-23.08.0.tar.xz";
+      sha256 = "118pf0zj4a0q1hca0ym70q85ac5fsjkki2g04x1hjrzkcv51q8zz";
+      name = "klickety-23.08.0.tar.xz";
     };
   };
   klines = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/klines-23.04.3.tar.xz";
-      sha256 = "1dny7wsj90c3vbgbrpxvxfy44j9ip3vdylc7889ckzbliivipxk4";
-      name = "klines-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/klines-23.08.0.tar.xz";
+      sha256 = "0al1ri7g20r8w7ijk1pdgpvn32z9nfrr19rj2hrm2wg2349kvqdq";
+      name = "klines-23.08.0.tar.xz";
     };
   };
   kmag = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kmag-23.04.3.tar.xz";
-      sha256 = "13ar37yv3gk5451cdqrgbm91jm50qw4559sx25fv95g2i9wa7z74";
-      name = "kmag-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kmag-23.08.0.tar.xz";
+      sha256 = "0swj9zaamrv8jp38hmd8fisnaljjr1i1vplrbvipxr2sg2f3zlip";
+      name = "kmag-23.08.0.tar.xz";
     };
   };
   kmahjongg = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kmahjongg-23.04.3.tar.xz";
-      sha256 = "1q2aq8y3c4a84rjvqk4gz6mlyflfnzw6im68p96wmcn98s5gsc22";
-      name = "kmahjongg-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kmahjongg-23.08.0.tar.xz";
+      sha256 = "1i20mxciwvgb5d0zg7via8rk4yzx7n35c8gphd0lyf27s8rc0kpr";
+      name = "kmahjongg-23.08.0.tar.xz";
     };
   };
   kmail = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kmail-23.04.3.tar.xz";
-      sha256 = "16gz0i7na1pkyly9jnvavyffkawxf5irr92rd50w68p01b82dhc6";
-      name = "kmail-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kmail-23.08.0.tar.xz";
+      sha256 = "052pz9rhb2s0cf86ms1br8sl3f7iwb6k864d64b3wd5xvhbcsf55";
+      name = "kmail-23.08.0.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kmail-account-wizard-23.04.3.tar.xz";
-      sha256 = "1840zjgrqwk2zgqbb33gl9nvigsrmk5grzvzg5cw116h7lb7z7xx";
-      name = "kmail-account-wizard-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kmail-account-wizard-23.08.0.tar.xz";
+      sha256 = "14y0q8xm0m59pqh783y9iji5ngf7ckhyfrh9kmj2i972m3dzh2db";
+      name = "kmail-account-wizard-23.08.0.tar.xz";
     };
   };
   kmailtransport = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kmailtransport-23.04.3.tar.xz";
-      sha256 = "14vmm9vla8i477jq40z73lc4klx6mm03y2xnljvx1v4inm3cpw2c";
-      name = "kmailtransport-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kmailtransport-23.08.0.tar.xz";
+      sha256 = "0ifaqbjpfmislngl92qssnssjd9maz44lzlihp8cnnn2kd1xw3pg";
+      name = "kmailtransport-23.08.0.tar.xz";
     };
   };
   kmbox = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kmbox-23.04.3.tar.xz";
-      sha256 = "05hdfjwp6ay2j16rxp55k3fywwf7kxiig4dv9fh51iysglmzzn76";
-      name = "kmbox-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kmbox-23.08.0.tar.xz";
+      sha256 = "1v5s0vs2n316qk0kr737i9kcmx15b7z1yhgbdwhmllyb2cybn6s4";
+      name = "kmbox-23.08.0.tar.xz";
     };
   };
   kmime = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kmime-23.04.3.tar.xz";
-      sha256 = "1i38g0s98d24882kxyjay965nz3d3fjhb3mv1p4sllm2lnffrq2d";
-      name = "kmime-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kmime-23.08.0.tar.xz";
+      sha256 = "0z7zk9q0j0i4ddcnlgqb8p82vnwwxqw5l9hpmlyd8bsdxghd8wp4";
+      name = "kmime-23.08.0.tar.xz";
     };
   };
   kmines = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kmines-23.04.3.tar.xz";
-      sha256 = "0x301dsppn0sav31ds5hpbfkbbisjg640ri13103s1jn0y2b90b9";
-      name = "kmines-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kmines-23.08.0.tar.xz";
+      sha256 = "10wrx0xlnx3d27hyb3j33cdrqis8lvmd8h0x6vm7xrw9pbfnhfzk";
+      name = "kmines-23.08.0.tar.xz";
     };
   };
   kmix = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kmix-23.04.3.tar.xz";
-      sha256 = "09pfsa6y1phm6z24da60s47gc18w4cvv7r8sxh5qfww7b0dnhixj";
-      name = "kmix-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kmix-23.08.0.tar.xz";
+      sha256 = "013jwxd0l3vdfqjqd3g52p5jpql67f50qhnfnr2vygmz5xb65p8k";
+      name = "kmix-23.08.0.tar.xz";
     };
   };
   kmousetool = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kmousetool-23.04.3.tar.xz";
-      sha256 = "1prh9xdzwx0mx93g9cbjy55hxwcci90hvrv2ckj4dqdnv5fv4h21";
-      name = "kmousetool-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kmousetool-23.08.0.tar.xz";
+      sha256 = "1nijq9d2chvil677npx9pj155v6xl5iklyi2696jndfw9v30hsy1";
+      name = "kmousetool-23.08.0.tar.xz";
     };
   };
   kmouth = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kmouth-23.04.3.tar.xz";
-      sha256 = "0qyzq4cvcsacb7hr6n79i3rzyjr0m3c8lrf8fwbzdivswpk8wss3";
-      name = "kmouth-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kmouth-23.08.0.tar.xz";
+      sha256 = "031kj9n1p9x927z373b1yhfnhi2r8spp5lb4gxfngfxnh41cadrx";
+      name = "kmouth-23.08.0.tar.xz";
     };
   };
   kmplot = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kmplot-23.04.3.tar.xz";
-      sha256 = "1wln4agx0mkbs82nynb5m63z798s3rlyymf9llcvrhqqpvi9416b";
-      name = "kmplot-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kmplot-23.08.0.tar.xz";
+      sha256 = "0if00w89a4zjsbjxagz49jkqbir9l4fqn7rzrxx3ji6pgk5817yf";
+      name = "kmplot-23.08.0.tar.xz";
     };
   };
   knavalbattle = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/knavalbattle-23.04.3.tar.xz";
-      sha256 = "1brj2dvymgpf74vbsrs2m81lxxfxsly9pafd13g8rkzdx3hn1n0q";
-      name = "knavalbattle-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/knavalbattle-23.08.0.tar.xz";
+      sha256 = "0vfzp4bcmxgz1llza7vigffa2zcgs2k2qmxahqbb076fy6qmqgqr";
+      name = "knavalbattle-23.08.0.tar.xz";
     };
   };
   knetwalk = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/knetwalk-23.04.3.tar.xz";
-      sha256 = "1xqqwsbm3f8bmid7afbnacxlg1hih644f0nw0i87pr746m1sskgz";
-      name = "knetwalk-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/knetwalk-23.08.0.tar.xz";
+      sha256 = "0wh746q4hnyf4zq2rh1i8y22b3a8a5qwrp3rwl1b8aq6fwhfwypl";
+      name = "knetwalk-23.08.0.tar.xz";
     };
   };
   knights = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/knights-23.04.3.tar.xz";
-      sha256 = "09vc765fb01vqcxyg1qqik8z76r9mmb02axy9a5wmjdf1k4y9cia";
-      name = "knights-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/knights-23.08.0.tar.xz";
+      sha256 = "1qjlssvdiri6y4grl4w1dzg65gnkwdpvlamhz7q8fbrbifr10im6";
+      name = "knights-23.08.0.tar.xz";
     };
   };
   knotes = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/knotes-23.04.3.tar.xz";
-      sha256 = "0f2a9xy2w909y792hwwnmsqvxx91azn6f0j0xl2mlmav00a4w6za";
-      name = "knotes-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/knotes-23.08.0.tar.xz";
+      sha256 = "03mvz47c8arjzmjlmr91gw9gnad6f6smspbzr0niwhsgns7brcqq";
+      name = "knotes-23.08.0.tar.xz";
     };
   };
   koko = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/koko-23.04.3.tar.xz";
-      sha256 = "1n76fpj955rqg98z46plhv2lwlvwskvgwqws0fslmn9vxfnzv989";
-      name = "koko-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/koko-23.08.0.tar.xz";
+      sha256 = "18i7kw8x6wg1ak1l0qn83kdfkq5p7fc0zkf71jyzbs30jgx3lird";
+      name = "koko-23.08.0.tar.xz";
     };
   };
   kolf = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kolf-23.04.3.tar.xz";
-      sha256 = "0wbdpclc6nimjzs2pqbzaxnqn516hci1yk1dgig0jgdy1jv2nyhv";
-      name = "kolf-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kolf-23.08.0.tar.xz";
+      sha256 = "1k6zv6lgld5cvv73bkr1sb50hihvrjhwf8irw11wing808fcg1w9";
+      name = "kolf-23.08.0.tar.xz";
     };
   };
   kollision = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kollision-23.04.3.tar.xz";
-      sha256 = "0g9nz3df8nibcwlrjlyw306dnrx58nlga2lljn7a9acpmvbp6qgi";
-      name = "kollision-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kollision-23.08.0.tar.xz";
+      sha256 = "0j8fyh0k48wh3rhbv0vid4lh9a439cyiqg7d0kpz5v93271vj99b";
+      name = "kollision-23.08.0.tar.xz";
     };
   };
   kolourpaint = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kolourpaint-23.04.3.tar.xz";
-      sha256 = "1ab9v6ksb185f6jfhhk578qazhmy8hx6s8vjr9xyh7k3jilayj9v";
-      name = "kolourpaint-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kolourpaint-23.08.0.tar.xz";
+      sha256 = "1d53m63nmphd81vv5a75kaqx75z8sdfgasbi8yrppgp423157j8v";
+      name = "kolourpaint-23.08.0.tar.xz";
     };
   };
   kompare = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kompare-23.04.3.tar.xz";
-      sha256 = "058rr0n5r9czxqs6ixacx0bm8hglwjmhfpf5xf1zr0fjgcirlrwy";
-      name = "kompare-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kompare-23.08.0.tar.xz";
+      sha256 = "1fkhb3ap3xmyjy8ixybdgbllq4948zsjxqypxczjxjalc3mpijz1";
+      name = "kompare-23.08.0.tar.xz";
     };
   };
   kongress = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kongress-23.04.3.tar.xz";
-      sha256 = "1yns427iivbn7s3lw11jpf9qgsv6wdbc827apdsg5lp35n8dvr0p";
-      name = "kongress-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kongress-23.08.0.tar.xz";
+      sha256 = "1773qavz9g4jxwxb5qvj64pcfr0j4yd3r9wqb3a291p3fspi5flk";
+      name = "kongress-23.08.0.tar.xz";
     };
   };
   konqueror = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/konqueror-23.04.3.tar.xz";
-      sha256 = "0qynyslgjqa0yqcfsq7957i7a2rbqc0fbr5vcycmib9593wi9ip0";
-      name = "konqueror-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/konqueror-23.08.0.tar.xz";
+      sha256 = "1xgrmag0x9hhhxwih1zzcf89jm2f60cbih5sc291daayfjb907x3";
+      name = "konqueror-23.08.0.tar.xz";
     };
   };
   konquest = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/konquest-23.04.3.tar.xz";
-      sha256 = "0svzaibs8v1xd36ysj3wk7sxma26fl5pz6yp774jg0g9zi9rlkff";
-      name = "konquest-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/konquest-23.08.0.tar.xz";
+      sha256 = "090ksydgn56f1hym1s3sv58n5l3n990idl9149xpf7q33zfvwnlp";
+      name = "konquest-23.08.0.tar.xz";
     };
   };
   konsole = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/konsole-23.04.3.tar.xz";
-      sha256 = "1k68y1i3g3bsz1dz81jhkx1q2fb13rbm5ywh632bcyln0c6l0vz0";
-      name = "konsole-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/konsole-23.08.0.tar.xz";
+      sha256 = "177sfgs5jpaih6zpk4wfax6ic9qh3zlq6bi2h7mr7jsd8pcnplii";
+      name = "konsole-23.08.0.tar.xz";
     };
   };
   kontact = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kontact-23.04.3.tar.xz";
-      sha256 = "05kfdz0pfyfq28cvxjc05v2j89n4yj2hik1qx1qp99ydb0hbk69y";
-      name = "kontact-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kontact-23.08.0.tar.xz";
+      sha256 = "116dmf6pkcix00dwj7rajxbb3jjfp7xiwd6w2g08w6ir9n2fgncr";
+      name = "kontact-23.08.0.tar.xz";
     };
   };
   kontactinterface = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kontactinterface-23.04.3.tar.xz";
-      sha256 = "16fg24hz9vx912cffc94x5zx4jv3k72mbxgp5ck50lydypx6rfns";
-      name = "kontactinterface-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kontactinterface-23.08.0.tar.xz";
+      sha256 = "1q4yc240hzmdqg2y384cg8gfqbq0hf93fn2y8ihq02chn1iqyxp3";
+      name = "kontactinterface-23.08.0.tar.xz";
     };
   };
   kontrast = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kontrast-23.04.3.tar.xz";
-      sha256 = "08qwvc2b5bj3012lvwxainbw7d34mkbwwznj3661ydsnfjyxxs92";
-      name = "kontrast-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kontrast-23.08.0.tar.xz";
+      sha256 = "018p2k8b332pgc0lc0jrhpajy6wdz3va77g59x6yjq16qkm3njxa";
+      name = "kontrast-23.08.0.tar.xz";
     };
   };
   konversation = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/konversation-23.04.3.tar.xz";
-      sha256 = "1ip0jlz71fad5l0ppbc6w914hqk7h626s12ssbb9p1c2yvlr1j1v";
-      name = "konversation-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/konversation-23.08.0.tar.xz";
+      sha256 = "1zjl9fppl8k53i5f5fpgnnxqg7dmfh8kv0a19x9dm5wrxv4rf60x";
+      name = "konversation-23.08.0.tar.xz";
     };
   };
   kopeninghours = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kopeninghours-23.04.3.tar.xz";
-      sha256 = "14m4wl79b4qad42l1capz59pslfcrm25jshyhmcqzhqb0wzwkav9";
-      name = "kopeninghours-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kopeninghours-23.08.0.tar.xz";
+      sha256 = "15vx9qq93vbq9lpynmvysbqa5cdr83547mrs6zhjzz9s0xm05qy9";
+      name = "kopeninghours-23.08.0.tar.xz";
     };
   };
   kopete = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kopete-23.04.3.tar.xz";
-      sha256 = "1ps6g440p1dy2zwbj23f0mzw1d78r02aj88fy3i5sws9p9ra92gi";
-      name = "kopete-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kopete-23.08.0.tar.xz";
+      sha256 = "13sygr3bq7ynwijcw7mjv8b9vsvhk0fsz5jzl9zlpg7z8mv9wf89";
+      name = "kopete-23.08.0.tar.xz";
     };
   };
   korganizer = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/korganizer-23.04.3.tar.xz";
-      sha256 = "1vp1jsmna059vvfj7xaj9fhhhq0lz9k0pphczkfbwm3gy6nzcavz";
-      name = "korganizer-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/korganizer-23.08.0.tar.xz";
+      sha256 = "18213j807nbmyjr2583pcmvp7mql35fgwg2ngn4la30q2b1av4l8";
+      name = "korganizer-23.08.0.tar.xz";
     };
   };
   kosmindoormap = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kosmindoormap-23.04.3.tar.xz";
-      sha256 = "1winrgc3698wjpil0hblw7bgbgaxgjh6h3dsl1kwc77w14f6vql3";
-      name = "kosmindoormap-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kosmindoormap-23.08.0.tar.xz";
+      sha256 = "1w9h7rbsb4dwxbbp0jx5cp1fvnzaj0bl2bqpvcyc6n2203v6dkad";
+      name = "kosmindoormap-23.08.0.tar.xz";
     };
   };
   kpat = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kpat-23.04.3.tar.xz";
-      sha256 = "15c34vv0vdlsgrjy4i0v6ghk95c0x0h6jl0qn2bin9lgvvba3bkl";
-      name = "kpat-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kpat-23.08.0.tar.xz";
+      sha256 = "1q7lygdzklh6gqlm0hjd4qyw6bfglaq0d04r9yqw2ihy5dyn7wcp";
+      name = "kpat-23.08.0.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kpimtextedit-23.04.3.tar.xz";
-      sha256 = "1rrs19bwl8qvasridysbbgsgdy9hyjlpi26hw77hli5ixkflj85b";
-      name = "kpimtextedit-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kpimtextedit-23.08.0.tar.xz";
+      sha256 = "15xq92d0ximnln1yk0s4fa4byhkbbgm3m0c6f4dsjdim2x57ldk3";
+      name = "kpimtextedit-23.08.0.tar.xz";
     };
   };
   kpkpass = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kpkpass-23.04.3.tar.xz";
-      sha256 = "1l3k33yzfjzarc2rpf576ib86ifzrfmsvpcdmv060dy0k8lbm1k9";
-      name = "kpkpass-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kpkpass-23.08.0.tar.xz";
+      sha256 = "02s6gzq4qny9n5k5jcrvlpsjf6ac0wla9q24cgn52cvf85z704wp";
+      name = "kpkpass-23.08.0.tar.xz";
     };
   };
   kpmcore = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kpmcore-23.04.3.tar.xz";
-      sha256 = "0cz0pz84sxa7lvkq8v25775z7x7g6pz9sq7c90pfv8h9qsz8q1l9";
-      name = "kpmcore-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kpmcore-23.08.0.tar.xz";
+      sha256 = "11wkcwf8971v37pz678lcx04darh5x6pzr8qdxdgf00sfv27lcld";
+      name = "kpmcore-23.08.0.tar.xz";
     };
   };
   kpublictransport = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kpublictransport-23.04.3.tar.xz";
-      sha256 = "04fa9ismgkhskpmjf6b8gvra2z0jpsigz79b93m1snxm4046xihb";
-      name = "kpublictransport-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kpublictransport-23.08.0.tar.xz";
+      sha256 = "0lzjczj9lpxq00ady02xmdnclqg6sdhw08smhxa59pzj50m5qffg";
+      name = "kpublictransport-23.08.0.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kqtquickcharts-23.04.3.tar.xz";
-      sha256 = "12812djkanz0y4sxnpm3xmkjpjf4spvjsykaxby4cnsag3jpjr1v";
-      name = "kqtquickcharts-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kqtquickcharts-23.08.0.tar.xz";
+      sha256 = "0x9j2xggc7rw1nqyy66qx61fksqcrmzgns90an7yrcckmgivllfl";
+      name = "kqtquickcharts-23.08.0.tar.xz";
     };
   };
   krdc = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/krdc-23.04.3.tar.xz";
-      sha256 = "0jva74n11fpm4ix4sbi0y1xnbly97lnap7dfj0bliw5s2d0sdjr0";
-      name = "krdc-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/krdc-23.08.0.tar.xz";
+      sha256 = "1ii828489kijdfnc4ac5i9mj89mcq2zw8qmf965yalagxphjp3sx";
+      name = "krdc-23.08.0.tar.xz";
     };
   };
   krecorder = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/krecorder-23.04.3.tar.xz";
-      sha256 = "1dxz896jkammfigwg3nyz5mzm4npxxzgdnpqimi06swd76bjyd3k";
-      name = "krecorder-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/krecorder-23.08.0.tar.xz";
+      sha256 = "078nq5y0vrvzpqpbh10yg6p3w8g82z69xqlysc6vy8nvkcs3ghm6";
+      name = "krecorder-23.08.0.tar.xz";
     };
   };
   kreversi = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kreversi-23.04.3.tar.xz";
-      sha256 = "1mb1xrywk5p7ipjml1g2mjqfs7rlpa41if3yc7p9zcrkcasnbffv";
-      name = "kreversi-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kreversi-23.08.0.tar.xz";
+      sha256 = "1b4i74i7fvkscxp2i8jjdm5f0rnggilcl8l75xvrjz3h06h0576s";
+      name = "kreversi-23.08.0.tar.xz";
     };
   };
   krfb = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/krfb-23.04.3.tar.xz";
-      sha256 = "0qbrvf2wa3af1z1dpq3pqkngfbrfdgqfz8xs1qpdpyb7jxnphry7";
-      name = "krfb-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/krfb-23.08.0.tar.xz";
+      sha256 = "0j5qz5yb0xvlzyy6sm3v1xk4m9h1aqb4xx0k2mxpcy4m23lhyi60";
+      name = "krfb-23.08.0.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kross-interpreters-23.04.3.tar.xz";
-      sha256 = "1cr78xz318dnqjrkfr4xbvbra6d5fssgj57vl8zybz15dyh6fbic";
-      name = "kross-interpreters-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kross-interpreters-23.08.0.tar.xz";
+      sha256 = "09dl86ll5v8k19sfg4jhvzl4g9f2ypnq6v9wiads41051bgx987h";
+      name = "kross-interpreters-23.08.0.tar.xz";
     };
   };
   kruler = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kruler-23.04.3.tar.xz";
-      sha256 = "079kmi66xms6a9x6p3csrvqia57ip9d8r9cjdgdqx6bnn0gfc0w3";
-      name = "kruler-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kruler-23.08.0.tar.xz";
+      sha256 = "010yifsv5mcg9idsvfjziy2qdfqhzna2nwpzc22kfpxc3fgcfnha";
+      name = "kruler-23.08.0.tar.xz";
     };
   };
   ksanecore = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/ksanecore-23.04.3.tar.xz";
-      sha256 = "19dd54y9mkb8lmxwz8wvmnvgq9gky3md2la9fpanxwzq2bh4237i";
-      name = "ksanecore-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/ksanecore-23.08.0.tar.xz";
+      sha256 = "1nmx6490yr49lm39jwh941b25y5i3p7f4j66v0zbg7mq3752ggsn";
+      name = "ksanecore-23.08.0.tar.xz";
     };
   };
   kshisen = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kshisen-23.04.3.tar.xz";
-      sha256 = "0bfk6nbwl35sfqxhf7cdv3n61ybi5962i2lvg7m1vlpp21q0diz8";
-      name = "kshisen-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kshisen-23.08.0.tar.xz";
+      sha256 = "1p4c4k3qzs6mpf53fr7crnif0l1gs4f5licd715fbv2ral874w5n";
+      name = "kshisen-23.08.0.tar.xz";
     };
   };
   ksirk = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/ksirk-23.04.3.tar.xz";
-      sha256 = "1sp5mhnf8r3fvifz0kw74436j5kwsmiw66myygb4rsggb8amh5x4";
-      name = "ksirk-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/ksirk-23.08.0.tar.xz";
+      sha256 = "0xrbjbbscab83vvxldbfwr3aspwfyima27a5ry65clf86r40g8fi";
+      name = "ksirk-23.08.0.tar.xz";
     };
   };
   ksmtp = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/ksmtp-23.04.3.tar.xz";
-      sha256 = "0pz17vmn38n2xl35d9di1b9138dh54wgyal9hx412nh123w13h12";
-      name = "ksmtp-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/ksmtp-23.08.0.tar.xz";
+      sha256 = "0kfl1zrbh9114bmvby387cgqd616i21hrhbbih6diklr2xk0ramr";
+      name = "ksmtp-23.08.0.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/ksnakeduel-23.04.3.tar.xz";
-      sha256 = "182z9664p0shyx4rbr1cn32mzlfzl80x96nwakvv1ss7sf7dp1x3";
-      name = "ksnakeduel-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/ksnakeduel-23.08.0.tar.xz";
+      sha256 = "1qhplpq4ybk4zlmh92b7v5rxki4i0j7azngc2pn8awabblylhc8j";
+      name = "ksnakeduel-23.08.0.tar.xz";
     };
   };
   kspaceduel = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kspaceduel-23.04.3.tar.xz";
-      sha256 = "1mpry73vvi332wxyw2wymh3lsrj2amblg50dym9ni1lj2af657ia";
-      name = "kspaceduel-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kspaceduel-23.08.0.tar.xz";
+      sha256 = "01fis8xzbslvwgk7f4mdf4rijjcdkiq2zza99d4qgn3zldjznxyw";
+      name = "kspaceduel-23.08.0.tar.xz";
     };
   };
   ksquares = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/ksquares-23.04.3.tar.xz";
-      sha256 = "0b3r99hfhm5r4jxkwiji0lww703r7dj60x2m55ginvdy7ixm46rm";
-      name = "ksquares-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/ksquares-23.08.0.tar.xz";
+      sha256 = "1yng38zvgs91qb2w4nnmyhv8adnwq4zipqpbm4nr7ipysq7acm10";
+      name = "ksquares-23.08.0.tar.xz";
     };
   };
   ksudoku = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/ksudoku-23.04.3.tar.xz";
-      sha256 = "03hrwyvwzhxdbq7pp03c7lkz0dhv9yi6lcwvz3s63mn01wyq6iv3";
-      name = "ksudoku-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/ksudoku-23.08.0.tar.xz";
+      sha256 = "0cz2rjwvyg062cjx9fik75ic782i0xqcs4cvcska6m1slhv93w9m";
+      name = "ksudoku-23.08.0.tar.xz";
     };
   };
   ksystemlog = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/ksystemlog-23.04.3.tar.xz";
-      sha256 = "15c1h1dlcgbx2adhjzry2zwia0alym7vc251zymyzhl2xjacvqlm";
-      name = "ksystemlog-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/ksystemlog-23.08.0.tar.xz";
+      sha256 = "0k8cncpp27l7n6s7aq3iwacf41jjskxs03204y2i877nv9xg6j3x";
+      name = "ksystemlog-23.08.0.tar.xz";
     };
   };
   kteatime = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kteatime-23.04.3.tar.xz";
-      sha256 = "02c3j21f0adilvwyy20pmkbrq4h33vdmrp00cqjbncsk6il5xym7";
-      name = "kteatime-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kteatime-23.08.0.tar.xz";
+      sha256 = "0nw9ly0jvkl9m3fr7cgmycg28379vl2n547n9k2sh8p5va545dj1";
+      name = "kteatime-23.08.0.tar.xz";
     };
   };
   ktimer = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/ktimer-23.04.3.tar.xz";
-      sha256 = "1n5az5cgb0q28lz5f7afqjlfga32q232g836nkl1sfq8n5whj5z5";
-      name = "ktimer-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/ktimer-23.08.0.tar.xz";
+      sha256 = "06dlhfxr3amrvbdrdq3k85i477i7qan913dqp577nlbf3wlblvsc";
+      name = "ktimer-23.08.0.tar.xz";
     };
   };
   ktnef = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/ktnef-23.04.3.tar.xz";
-      sha256 = "00dkcmywjxzq5v2kp4klw50c3w74lmh16kbcwn8qd97kky3pd5ik";
-      name = "ktnef-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/ktnef-23.08.0.tar.xz";
+      sha256 = "00ybqdbz5g6392yzc725pgspx8mf4123iv7pd4x7qnfzf5by91l1";
+      name = "ktnef-23.08.0.tar.xz";
     };
   };
   ktorrent = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/ktorrent-23.04.3.tar.xz";
-      sha256 = "17q6ivnbh4zxqnbm1bdzz3hri1434sq2rs9y57lvn4bb2xdwn1z5";
-      name = "ktorrent-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/ktorrent-23.08.0.tar.xz";
+      sha256 = "048p6lir9kk1pllpgwc5nr0laywlgd5namp70h22lmiwgaymh20r";
+      name = "ktorrent-23.08.0.tar.xz";
     };
   };
   ktouch = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/ktouch-23.04.3.tar.xz";
-      sha256 = "1kpljbg5vjclydiymzn474wzb05bvn7587dr3pns2x09h6iv3c98";
-      name = "ktouch-23.04.3.tar.xz";
-    };
-  };
-  ktp-accounts-kcm = {
-    version = "23.04.3";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/ktp-accounts-kcm-23.04.3.tar.xz";
-      sha256 = "06p3fl229ks9kf820g91jb5f7qynysnybaay2pcq1yyqvv98ayrl";
-      name = "ktp-accounts-kcm-23.04.3.tar.xz";
-    };
-  };
-  ktp-approver = {
-    version = "23.04.3";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/ktp-approver-23.04.3.tar.xz";
-      sha256 = "0hin782xn9xdya2cv3vy79qhywjd72r2mx9sl1c69qkklqsf9xpr";
-      name = "ktp-approver-23.04.3.tar.xz";
-    };
-  };
-  ktp-auth-handler = {
-    version = "23.04.3";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/ktp-auth-handler-23.04.3.tar.xz";
-      sha256 = "1hn3a9rc4yzc18rxn2j6by6hjnrpnqqgzyzg7nxyrsfwcc7wgvq9";
-      name = "ktp-auth-handler-23.04.3.tar.xz";
-    };
-  };
-  ktp-call-ui = {
-    version = "23.04.3";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/ktp-call-ui-23.04.3.tar.xz";
-      sha256 = "1gz5a5hjsz2f9k8dyfb5k9x8n2wqps30fpf6kgv8m0mazszgy87y";
-      name = "ktp-call-ui-23.04.3.tar.xz";
-    };
-  };
-  ktp-common-internals = {
-    version = "23.04.3";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/ktp-common-internals-23.04.3.tar.xz";
-      sha256 = "0hhba4nwc88yhn1qai3lc0mvczw4kvqjg6h3lq4mr2zfac0g2wbs";
-      name = "ktp-common-internals-23.04.3.tar.xz";
-    };
-  };
-  ktp-contact-list = {
-    version = "23.04.3";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/ktp-contact-list-23.04.3.tar.xz";
-      sha256 = "1di1rbfdq28y4p0v6hdj3cyvzini6zkzzam72gffjdayp4ba5mrn";
-      name = "ktp-contact-list-23.04.3.tar.xz";
-    };
-  };
-  ktp-contact-runner = {
-    version = "23.04.3";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/ktp-contact-runner-23.04.3.tar.xz";
-      sha256 = "0hyj92wiaj4vzp030pfn7yr9zjx921d4x2rxgfkmhymkvj0v7pqb";
-      name = "ktp-contact-runner-23.04.3.tar.xz";
-    };
-  };
-  ktp-desktop-applets = {
-    version = "23.04.3";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/ktp-desktop-applets-23.04.3.tar.xz";
-      sha256 = "1sricvnmsdmh0458v04i7wkywc57vnc0w727zys9xcbbv1zc1n2r";
-      name = "ktp-desktop-applets-23.04.3.tar.xz";
-    };
-  };
-  ktp-filetransfer-handler = {
-    version = "23.04.3";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/ktp-filetransfer-handler-23.04.3.tar.xz";
-      sha256 = "1wnqd8xji5pykxczlgyyjf8hcxw9v131n5ssflx4wyrvkccgii95";
-      name = "ktp-filetransfer-handler-23.04.3.tar.xz";
-    };
-  };
-  ktp-kded-module = {
-    version = "23.04.3";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/ktp-kded-module-23.04.3.tar.xz";
-      sha256 = "1chgrjmd23kzzcrya5dch8al5x8d1ll48bb597ik2hhr8w63s3cb";
-      name = "ktp-kded-module-23.04.3.tar.xz";
-    };
-  };
-  ktp-send-file = {
-    version = "23.04.3";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/ktp-send-file-23.04.3.tar.xz";
-      sha256 = "1hkk88i88vwysqxbfi0ahhz6aw3snyjgz1jkcf5j5iik73xspcmb";
-      name = "ktp-send-file-23.04.3.tar.xz";
-    };
-  };
-  ktp-text-ui = {
-    version = "23.04.3";
-    src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/ktp-text-ui-23.04.3.tar.xz";
-      sha256 = "01rikl02cdnb77l8irz6jcbz2viq947l0wbvrqpjlvxv7x7hyvfx";
-      name = "ktp-text-ui-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/ktouch-23.08.0.tar.xz";
+      sha256 = "0y550h945fk1jfqfyc5fyd6hfi9g7awr7ag596jjrbw552xy8ynq";
+      name = "ktouch-23.08.0.tar.xz";
     };
   };
   ktrip = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/ktrip-23.04.3.tar.xz";
-      sha256 = "1y2gbz5jv08jjjhdy2vyvwalmj436h332dmbw8qwc06ify2r469l";
-      name = "ktrip-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/ktrip-23.08.0.tar.xz";
+      sha256 = "1y3xkkjh8ip4mcx5y6396axbylpql1iyfz9y115r7s7n8hb1qrfp";
+      name = "ktrip-23.08.0.tar.xz";
     };
   };
   ktuberling = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/ktuberling-23.04.3.tar.xz";
-      sha256 = "0zk7wijp425657s2j7xq7mhybgyddpam88ih8i0sbpcs0sliyz7k";
-      name = "ktuberling-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/ktuberling-23.08.0.tar.xz";
+      sha256 = "1wc74cpvalp0xpnhsqkbqyk3gjnzmi95hqdsj4wpqj60mh78zzy7";
+      name = "ktuberling-23.08.0.tar.xz";
     };
   };
   kturtle = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kturtle-23.04.3.tar.xz";
-      sha256 = "0hknmg65kafm1f6885yiz86g9jpqyycjg6208iyi6i15lyqjr4a9";
-      name = "kturtle-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kturtle-23.08.0.tar.xz";
+      sha256 = "064kf6apwxnv7zmpv1mal3y4i7y46rd939dfa9dk4x41d3la2mlv";
+      name = "kturtle-23.08.0.tar.xz";
     };
   };
   kubrick = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kubrick-23.04.3.tar.xz";
-      sha256 = "0nank1ga4c4xfsw0m1cqhjhyz2wpbsxplyyb9x3l2vpg92gj5dbs";
-      name = "kubrick-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kubrick-23.08.0.tar.xz";
+      sha256 = "0y0h7l3mpijm08r13hlfy1dmx34kafndx0cr7vll0wb3b9xhlpqv";
+      name = "kubrick-23.08.0.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kwalletmanager-23.04.3.tar.xz";
-      sha256 = "1g3yw32kv7yij2ymk52fpp0srncr2ijfckfvz5hc0nsn7xhyqdby";
-      name = "kwalletmanager-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kwalletmanager-23.08.0.tar.xz";
+      sha256 = "0hf3288bhyr8864k0fm6kw77rx13fbkhxlspisl4l7algc9z5qfq";
+      name = "kwalletmanager-23.08.0.tar.xz";
     };
   };
   kwave = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kwave-23.04.3.tar.xz";
-      sha256 = "0s9w8jgwblljwfji2a19bqs3nx6sr2qzz35kwbi0ahwncy69k4jx";
-      name = "kwave-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kwave-23.08.0.tar.xz";
+      sha256 = "0a278cq9ya3cvvzllminkiw1ac8g0g5qs5ay59xh6h4mn6lxn0y4";
+      name = "kwave-23.08.0.tar.xz";
     };
   };
   kweather = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kweather-23.04.3.tar.xz";
-      sha256 = "1147lagd99m5qgpy9dk5vkc500p2jw4nb50kjhr1b9yhdz8dcbwn";
-      name = "kweather-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kweather-23.08.0.tar.xz";
+      sha256 = "00ympmljkp8xvl8gg86dbmyd5mxasg6wfx17jgyrvwh0fdq150q5";
+      name = "kweather-23.08.0.tar.xz";
     };
   };
   kwordquiz = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/kwordquiz-23.04.3.tar.xz";
-      sha256 = "15abyxccp02b1bmcb79g0k7sd6j6dmhw2k8l2h9as2ja4r5xhir1";
-      name = "kwordquiz-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/kwordquiz-23.08.0.tar.xz";
+      sha256 = "1n7lh8xyp5w0r3d4dijsl8lnv2az6vvkbnlywbhjcs28lc1s392g";
+      name = "kwordquiz-23.08.0.tar.xz";
     };
   };
   libgravatar = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/libgravatar-23.04.3.tar.xz";
-      sha256 = "03zhnpb114y6a6vhiv9c1fiqsinjmk52j1k9w2r04ibxp35m3xj7";
-      name = "libgravatar-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/libgravatar-23.08.0.tar.xz";
+      sha256 = "1v8lljgawzdrfv2dcbrxkih6as67q3p2id093nxks6x3j81li223";
+      name = "libgravatar-23.08.0.tar.xz";
     };
   };
   libkcddb = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/libkcddb-23.04.3.tar.xz";
-      sha256 = "1s10g6m6c3h14gzxvp2s0v51jxzsrh23xfn7gl51a0r50srbbz52";
-      name = "libkcddb-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/libkcddb-23.08.0.tar.xz";
+      sha256 = "0pkiy5qfmy58s6zvss1zx837jg6nv696m2z99vyj5nshz7926gv4";
+      name = "libkcddb-23.08.0.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/libkcompactdisc-23.04.3.tar.xz";
-      sha256 = "0gl21mhfz3vj89x0r8y79yiijcag1xfdnyfrjqzkx9i8yd2k45b1";
-      name = "libkcompactdisc-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/libkcompactdisc-23.08.0.tar.xz";
+      sha256 = "0m677c12hxd7n7vf887x8pp29i3y42kvvj9ah3rgza7qr7w5bnpf";
+      name = "libkcompactdisc-23.08.0.tar.xz";
     };
   };
   libkdcraw = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/libkdcraw-23.04.3.tar.xz";
-      sha256 = "0vwr44j77c1vffsppkzdasd0l8apzx7jn6llwhzb4bjp93arx18w";
-      name = "libkdcraw-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/libkdcraw-23.08.0.tar.xz";
+      sha256 = "0iyq01ql0v0vvcca2qa7vi02kby76446qja7vg6h70524pgvdjx3";
+      name = "libkdcraw-23.08.0.tar.xz";
     };
   };
   libkdegames = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/libkdegames-23.04.3.tar.xz";
-      sha256 = "1sicpfsrkxn5d0fdy71h7033rpkb94r5hjvv5ab7qbmzb1qa4awq";
-      name = "libkdegames-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/libkdegames-23.08.0.tar.xz";
+      sha256 = "12nb3gj8capcajb9s5qga3i58b57vv3fqn000wsqg3bb4l2wg6c7";
+      name = "libkdegames-23.08.0.tar.xz";
     };
   };
   libkdepim = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/libkdepim-23.04.3.tar.xz";
-      sha256 = "1i5c4qqd4ghlfjvxniy8sbfqh0fsrz4sadvh0n2d207s9rsl274v";
-      name = "libkdepim-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/libkdepim-23.08.0.tar.xz";
+      sha256 = "1vhcd0r8lqwm09i95c8x913ld4f6mqm6r83d3s67m0s0gm3zhf10";
+      name = "libkdepim-23.08.0.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/libkeduvocdocument-23.04.3.tar.xz";
-      sha256 = "04qnahyy3400ys56nvqlq5lgyp5w64bxj13jpljggja5r72ay9n0";
-      name = "libkeduvocdocument-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/libkeduvocdocument-23.08.0.tar.xz";
+      sha256 = "0ibjacd0nqgkjfn9dhr2pibh10fzmd601lp7ycr0nafn11k8fdyn";
+      name = "libkeduvocdocument-23.08.0.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/libkexiv2-23.04.3.tar.xz";
-      sha256 = "16cb7cab4pyarwwn2byyvanwlakcgq5h203hkysp44flszq515cl";
-      name = "libkexiv2-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/libkexiv2-23.08.0.tar.xz";
+      sha256 = "0rkb7zfzn0m67fjcy5qmzz1hvwjrhf1ylk0rjddyvpyn7ndnnisy";
+      name = "libkexiv2-23.08.0.tar.xz";
     };
   };
   libkgapi = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/libkgapi-23.04.3.tar.xz";
-      sha256 = "18jcrp7qi35zxzb4b7mn6519bjw47s7kwfahd6a50p40j17k09bs";
-      name = "libkgapi-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/libkgapi-23.08.0.tar.xz";
+      sha256 = "0rnzf2g66kf7krv1ab7ipz2cgzbcd87c7rkmd67q73ia3nw8r6lp";
+      name = "libkgapi-23.08.0.tar.xz";
     };
   };
   libkipi = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/libkipi-23.04.3.tar.xz";
-      sha256 = "1g6p7nvdd1k7p5nixq7p18zd0dmr5ym6irvz7s9j879a71w444j8";
-      name = "libkipi-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/libkipi-23.08.0.tar.xz";
+      sha256 = "0bz0fhwish0ry2hxljkzj5vqv2rbapprvyv6hsvwnc9j6bzf72lj";
+      name = "libkipi-23.08.0.tar.xz";
     };
   };
   libkleo = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/libkleo-23.04.3.tar.xz";
-      sha256 = "0l77n4dlbv9hclzvh69kdzji907if7yayxiasxnnjkzsvcm1af25";
-      name = "libkleo-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/libkleo-23.08.0.tar.xz";
+      sha256 = "0087mhn5h8zg696dwkpinvfjyn0scss7ggh2avm00qf1m5z8pbyc";
+      name = "libkleo-23.08.0.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/libkmahjongg-23.04.3.tar.xz";
-      sha256 = "1a0c0q34h5yxwx76y6934ibn6hm1ip1hc2xvl11q1kaazq0alca3";
-      name = "libkmahjongg-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/libkmahjongg-23.08.0.tar.xz";
+      sha256 = "1r5qwgx5qdmb0lzbw1jbid8lyms3flr51swljbv8vd0ivyj8vh88";
+      name = "libkmahjongg-23.08.0.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/libkomparediff2-23.04.3.tar.xz";
-      sha256 = "1zkiyyrbfbr1i7zyhhayf53daaarzc8a2xz0iqjy9za7rawnmgbv";
-      name = "libkomparediff2-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/libkomparediff2-23.08.0.tar.xz";
+      sha256 = "1qg5hjga7za1j2an2qgbfg1gnngz7bbimhasaabxp1dah81z7j2l";
+      name = "libkomparediff2-23.08.0.tar.xz";
     };
   };
   libksane = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/libksane-23.04.3.tar.xz";
-      sha256 = "0hmsrkrcqiyhdcshln5jg9xzqn7xvyjj1g6vrx82pfs1lwsczhr6";
-      name = "libksane-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/libksane-23.08.0.tar.xz";
+      sha256 = "1q3acb4iyqqwwkhi12xiajc4094ckkrf62s463hk8xqn1z7chm9i";
+      name = "libksane-23.08.0.tar.xz";
     };
   };
   libksieve = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/libksieve-23.04.3.tar.xz";
-      sha256 = "066z33v30h568bmdcsl4v478p3xhiwsmq7pr7kziilrhy3a2m7p6";
-      name = "libksieve-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/libksieve-23.08.0.tar.xz";
+      sha256 = "0yz2539lcnhsyxq997rs25dn6djwbbmc2syhkysny3ar088drwj9";
+      name = "libksieve-23.08.0.tar.xz";
     };
   };
   libktorrent = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/libktorrent-23.04.3.tar.xz";
-      sha256 = "1m6gyk1bids7qr9wfh6gcfq73ac9j5b2bljvfvfsw9f1ky1cmwab";
-      name = "libktorrent-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/libktorrent-23.08.0.tar.xz";
+      sha256 = "1xi66zrdigxw61psg8j1y1jm2qz9acynbjdiz497gq125n6cmh0g";
+      name = "libktorrent-23.08.0.tar.xz";
     };
   };
   lokalize = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/lokalize-23.04.3.tar.xz";
-      sha256 = "0czkb5dk44yb5zwknq3s2m5im99fs06dmbsp60gx2m6p355m4w8z";
-      name = "lokalize-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/lokalize-23.08.0.tar.xz";
+      sha256 = "12xhla3kcwd6qg1f2ihwzdssv922vnzmiyldbzxxbyyd51dkqwsa";
+      name = "lokalize-23.08.0.tar.xz";
     };
   };
   lskat = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/lskat-23.04.3.tar.xz";
-      sha256 = "1qphzc1r26qwc8sl5rjkw16ia3lsj7c2lg9fxnhk08k8mxncymxg";
-      name = "lskat-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/lskat-23.08.0.tar.xz";
+      sha256 = "11sxz0lzcc9vw1xcs5gw4as0wn9y90ibcagadq3h078awp8n2vl5";
+      name = "lskat-23.08.0.tar.xz";
     };
   };
   mailcommon = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/mailcommon-23.04.3.tar.xz";
-      sha256 = "165a0qf6i2862dpsw4wvgnxi4wv7hnc9s63fsf9jp6kbwwfw9nqv";
-      name = "mailcommon-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/mailcommon-23.08.0.tar.xz";
+      sha256 = "0xm9qlxcjf07p086w7ajqj7ksih2v61ycajxp1qxjhjmbl5wsbd4";
+      name = "mailcommon-23.08.0.tar.xz";
     };
   };
   mailimporter = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/mailimporter-23.04.3.tar.xz";
-      sha256 = "18shpxz7rg64g2mxdhdjhxhn893m0930v76cdnij339ycbcq5ypc";
-      name = "mailimporter-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/mailimporter-23.08.0.tar.xz";
+      sha256 = "00m3ibqyghxfh6bdq4h60b10snzgaijfss5dbyfqzd5a2c08070m";
+      name = "mailimporter-23.08.0.tar.xz";
     };
   };
   marble = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/marble-23.04.3.tar.xz";
-      sha256 = "14ys9yfnwh3i64wm198gsf7z1iyxsi5wv93ygv0wy7rv9czb1zl8";
-      name = "marble-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/marble-23.08.0.tar.xz";
+      sha256 = "1djvylddhpvqyr6h7kq9y215a4m5fxgdz5y9yzrsr1yf16fzj6x1";
+      name = "marble-23.08.0.tar.xz";
     };
   };
   markdownpart = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/markdownpart-23.04.3.tar.xz";
-      sha256 = "0w3aflbsrmbgsiin3xl7svrw3rwbj3dk9kh3ibycvvmrp03p9yp4";
-      name = "markdownpart-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/markdownpart-23.08.0.tar.xz";
+      sha256 = "0ddjgvnljhng71xdv6zpi0csi6q0xigwc28fv1by70x035f0z5yn";
+      name = "markdownpart-23.08.0.tar.xz";
     };
   };
   mbox-importer = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/mbox-importer-23.04.3.tar.xz";
-      sha256 = "0qaz4r69gmqag6jwmxk54rih78sh88jsw2qvyjhdhdywc4r8bx32";
-      name = "mbox-importer-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/mbox-importer-23.08.0.tar.xz";
+      sha256 = "1qq945m0rmrf37rnwp8a7dqchzwwhqnrsliiqz40y6qsblzigvlj";
+      name = "mbox-importer-23.08.0.tar.xz";
+    };
+  };
+  merkuro = {
+    version = "23.08.0";
+    src = fetchurl {
+      url = "${mirror}/stable/release-service/23.08.0/src/merkuro-23.08.0.tar.xz";
+      sha256 = "0xrrjx592vw0qxgsna08rhsj8yhq5kmg9gl138aqhaib9x05dsia";
+      name = "merkuro-23.08.0.tar.xz";
     };
   };
   messagelib = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/messagelib-23.04.3.tar.xz";
-      sha256 = "0aqac0p46cwnr3qxjk0ivalfwjcgwy52s088wnk6ckp77m7r65is";
-      name = "messagelib-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/messagelib-23.08.0.tar.xz";
+      sha256 = "1dqzsm6i0nm565xi4nhvslkmyxcsycg36x4m3jr1njwlphpg86jy";
+      name = "messagelib-23.08.0.tar.xz";
     };
   };
   minuet = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/minuet-23.04.3.tar.xz";
-      sha256 = "1lsnm52jcr37bk8lf9j1h6nvx2avc4z12g418bhg3424bwv4pmlf";
-      name = "minuet-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/minuet-23.08.0.tar.xz";
+      sha256 = "0g4a7r6av4bczd4ra18axlhdl25xpi7liq76bg863x4vkvcxwq86";
+      name = "minuet-23.08.0.tar.xz";
     };
   };
   neochat = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/neochat-23.04.3.tar.xz";
-      sha256 = "015g42qbnj0g5n6swjj85nsxvlcih829ff11l14h1a7f4ip00yif";
-      name = "neochat-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/neochat-23.08.0.tar.xz";
+      sha256 = "1ywbfmiv37bxq046l85xchryv04mqmsl0x4s49rk3r88lfgimbaf";
+      name = "neochat-23.08.0.tar.xz";
     };
   };
   okular = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/okular-23.04.3.tar.xz";
-      sha256 = "1vgcqkq6mzd270hzabmdqqv105iv6kr6ah2h18b15al2n9rmg0bi";
-      name = "okular-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/okular-23.08.0.tar.xz";
+      sha256 = "0f38k4jvbhlg0fyns6k128x91307sd9day3rxsc5423mz52cailv";
+      name = "okular-23.08.0.tar.xz";
     };
   };
   palapeli = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/palapeli-23.04.3.tar.xz";
-      sha256 = "19xh03rhb48m4bbdmpga4aqij6agqg047ghl92p98z1phg5lxzrv";
-      name = "palapeli-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/palapeli-23.08.0.tar.xz";
+      sha256 = "19cxxcj2vzy7bd27lgvx1jlhchmn5dr9i3x13zhyqhq7fgash31l";
+      name = "palapeli-23.08.0.tar.xz";
     };
   };
   parley = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/parley-23.04.3.tar.xz";
-      sha256 = "136ygvdv0p9pfpbyddc1y3jj8jaak2r5b4szrfaq051m3y54i9mb";
-      name = "parley-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/parley-23.08.0.tar.xz";
+      sha256 = "19w4mmi0pn167mwg49k9ldd7827vs2crg3p00lvcxbiywxc3n88w";
+      name = "parley-23.08.0.tar.xz";
     };
   };
   partitionmanager = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/partitionmanager-23.04.3.tar.xz";
-      sha256 = "03xx3nh2grkgkjn8dixy529lb4gnrdhlzhzsry82g64f8c6sfqqm";
-      name = "partitionmanager-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/partitionmanager-23.08.0.tar.xz";
+      sha256 = "01pjka3mc0lh5s3mc8w73mjrn89yxfrzq5fyyam13dglyxcy0z3w";
+      name = "partitionmanager-23.08.0.tar.xz";
     };
   };
   picmi = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/picmi-23.04.3.tar.xz";
-      sha256 = "1x1iv6a840jwldfpx44wvh1vki1jz1hixzvzhdfx2mhw05v91fjx";
-      name = "picmi-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/picmi-23.08.0.tar.xz";
+      sha256 = "1z6rv7zi5ywsiz9l7snrw3f79m0w7pfhf5qnp7qlz5pj6k9f3b9y";
+      name = "picmi-23.08.0.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/pim-data-exporter-23.04.3.tar.xz";
-      sha256 = "1bwh5srkdlqmxindci9416zmrp0gjvci59zyilvnr09kwg7lmwn0";
-      name = "pim-data-exporter-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/pim-data-exporter-23.08.0.tar.xz";
+      sha256 = "03rnrinkadvxgh4h75vs8aq4r7jf9vyhk14l4ixfzqbsxc6jllmf";
+      name = "pim-data-exporter-23.08.0.tar.xz";
     };
   };
   pim-sieve-editor = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/pim-sieve-editor-23.04.3.tar.xz";
-      sha256 = "1yik788sniv7jh1w9wwc4rf06x1kd3bwkb3vflckinn37y2rpl4a";
-      name = "pim-sieve-editor-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/pim-sieve-editor-23.08.0.tar.xz";
+      sha256 = "1i750958l16jp8gikv0rxy4hzrl2dpfda069mr68ih4l1dndj6am";
+      name = "pim-sieve-editor-23.08.0.tar.xz";
     };
   };
   pimcommon = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/pimcommon-23.04.3.tar.xz";
-      sha256 = "1v2nv83h9p1ajbcwfdk8b7lrr84r8c855lysknzvzkpm5z012z3l";
-      name = "pimcommon-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/pimcommon-23.08.0.tar.xz";
+      sha256 = "1q14yjaa51mkc5x1dccln82cw2kdkr1g5601s0pkxfy13dnqb0dv";
+      name = "pimcommon-23.08.0.tar.xz";
     };
   };
   plasmatube = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/plasmatube-23.04.3.tar.xz";
-      sha256 = "0wmzzh8db3ybzhn9hh4j9c126pzcdshz4a0fzakgx93z1ph59pcg";
-      name = "plasmatube-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/plasmatube-23.08.0.tar.xz";
+      sha256 = "1k8xzmsg34b8xjb16mlcrq9y87b3f8pwk971dvjng1b1ml425m5c";
+      name = "plasmatube-23.08.0.tar.xz";
     };
   };
   poxml = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/poxml-23.04.3.tar.xz";
-      sha256 = "11rqd7hhsy6f8qi0529cmy381bhskji6wf4fij7yjksmrsdvfw6d";
-      name = "poxml-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/poxml-23.08.0.tar.xz";
+      sha256 = "10qn0bz0k5sdrxd0mp75ri1dafh6djdpmypkg4y6lc27q2ghfi8p";
+      name = "poxml-23.08.0.tar.xz";
     };
   };
   print-manager = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/print-manager-23.04.3.tar.xz";
-      sha256 = "1fnbkx2xk3pr3cwcji1xbswcf5b7h8r4kag8i3lv28cnjw3ahs52";
-      name = "print-manager-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/print-manager-23.08.0.tar.xz";
+      sha256 = "09p4bwgqg1wzns37wig4wc5304pnab1n77zs3nv55k7kqk2b58cv";
+      name = "print-manager-23.08.0.tar.xz";
     };
   };
   qmlkonsole = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/qmlkonsole-23.04.3.tar.xz";
-      sha256 = "146c7rzgr3m2gw8ndac9i2kzkhpinn86h17f3vky6kph6nrmlx9j";
-      name = "qmlkonsole-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/qmlkonsole-23.08.0.tar.xz";
+      sha256 = "0xyzdhb0r3wilc44h7mw6bg5axw7n5pbmlq4wf1k1pjd1m910ilg";
+      name = "qmlkonsole-23.08.0.tar.xz";
     };
   };
   rocs = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/rocs-23.04.3.tar.xz";
-      sha256 = "13bzxsicsylfq7kdpfik4afgkbv2g7avg3imbkiw969jbgl8qbmb";
-      name = "rocs-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/rocs-23.08.0.tar.xz";
+      sha256 = "15havvabqzwbqapz5lkw9wq0yl9bskya87yb0sgg3ing658i1kxq";
+      name = "rocs-23.08.0.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/signon-kwallet-extension-23.04.3.tar.xz";
-      sha256 = "067lldmvsrr1p2vp15xi2zwaq61x55yh7wqq3nhmmblpjiimywvl";
-      name = "signon-kwallet-extension-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/signon-kwallet-extension-23.08.0.tar.xz";
+      sha256 = "0hyp9mn52qh88dn9cf223nw917xxrzdfilxpjyxzpffsbdv7kf51";
+      name = "signon-kwallet-extension-23.08.0.tar.xz";
     };
   };
   skanlite = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/skanlite-23.04.3.tar.xz";
-      sha256 = "0g6p3m16vx8cmshyj1c5qkvlhghi1az6rv6jqkzwjjk5mzchmcgj";
-      name = "skanlite-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/skanlite-23.08.0.tar.xz";
+      sha256 = "126l8va5kyxsa78gsj1y7d85449rwm6ccrnrpd4p9cmaxz4vld26";
+      name = "skanlite-23.08.0.tar.xz";
     };
   };
   skanpage = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/skanpage-23.04.3.tar.xz";
-      sha256 = "1j5jaq67mrnrb0vgspb5rlhcvpskc3f4bfnksr84njrv0jd3gzi2";
-      name = "skanpage-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/skanpage-23.08.0.tar.xz";
+      sha256 = "1wgjp10yp7siklqbssxq9fm0c7bqw6fihhn0q1khn5c42dr2xbh1";
+      name = "skanpage-23.08.0.tar.xz";
     };
   };
   spectacle = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/spectacle-23.04.3.tar.xz";
-      sha256 = "1fyklcvz0zndxabflkka75rham6768rp01as7m5dv0ic4lipkf9m";
-      name = "spectacle-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/spectacle-23.08.0.tar.xz";
+      sha256 = "1vn1w9ywkf5f4d1i02hf3qha6647cx3nwaj5cv70rxyp71x1wfrq";
+      name = "spectacle-23.08.0.tar.xz";
     };
   };
   step = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/step-23.04.3.tar.xz";
-      sha256 = "0ayg41vw4ssaq1zk3a8vs8gbvvbkkq042msasas5avq1pdixl470";
-      name = "step-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/step-23.08.0.tar.xz";
+      sha256 = "138b5l79zzhi0yms4h4nimyfhkr4pnpn0p7xhhl0jhyqmgjpyyqv";
+      name = "step-23.08.0.tar.xz";
     };
   };
   svgpart = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/svgpart-23.04.3.tar.xz";
-      sha256 = "0cc4b4iq19ylmmawapcnk5d6h0qj30x9gm81x3w4k29pp754mmli";
-      name = "svgpart-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/svgpart-23.08.0.tar.xz";
+      sha256 = "0ljys7hi2drz6bmk4h62d07j4jrgv6pla8aqvsxs6fckb88knsjm";
+      name = "svgpart-23.08.0.tar.xz";
     };
   };
   sweeper = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/sweeper-23.04.3.tar.xz";
-      sha256 = "19b382cgdcd4qh4ppdmbhsacvcc9nlbs7spcg8ii02bdpx6qw9b7";
-      name = "sweeper-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/sweeper-23.08.0.tar.xz";
+      sha256 = "1g3k249zf077d6w2264szih2gvhvd2p5pbx6xvxb685p7bg0kiva";
+      name = "sweeper-23.08.0.tar.xz";
     };
   };
   telly-skout = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/telly-skout-23.04.3.tar.xz";
-      sha256 = "0rnidnzv8qifb5ci3qk0sfvadycqg5wfdmiv47pgmp61jsgrqgrb";
-      name = "telly-skout-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/telly-skout-23.08.0.tar.xz";
+      sha256 = "1d102ldb9ycprz2x2iv7f835w4az9bi9cgsdmx2pglizi0sk7azm";
+      name = "telly-skout-23.08.0.tar.xz";
     };
   };
   tokodon = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/tokodon-23.04.3.tar.xz";
-      sha256 = "021pd3r4hxa7g9jswb9c57j8c9gxyjclrk6r5fm2nnai5z7cz1ky";
-      name = "tokodon-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/tokodon-23.08.0.tar.xz";
+      sha256 = "1dwbx6v95pmid0pl77l798kmazjh5bmwscp15wql3nvz9p1wdj2h";
+      name = "tokodon-23.08.0.tar.xz";
     };
   };
   umbrello = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/umbrello-23.04.3.tar.xz";
-      sha256 = "1mk779xl4vqk7qz7vlxyc2ddx1345pg8mz46igkragrx1kq4vbzw";
-      name = "umbrello-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/umbrello-23.08.0.tar.xz";
+      sha256 = "0bjaz0lig3n5vjyarydjlgc934jg35g74br5cdmn8xlmm5y73ffb";
+      name = "umbrello-23.08.0.tar.xz";
     };
   };
   yakuake = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/yakuake-23.04.3.tar.xz";
-      sha256 = "17ylm5z5lzjq5g4d48s0clpl3hg4rym9sc1p5hr0wfs9jx7197jy";
-      name = "yakuake-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/yakuake-23.08.0.tar.xz";
+      sha256 = "1q72rcwjrrjdwx9sy4w020ydgnqg4myi6icv0vr2fkfcsxr6r0q5";
+      name = "yakuake-23.08.0.tar.xz";
     };
   };
   zanshin = {
-    version = "23.04.3";
+    version = "23.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.3/src/zanshin-23.04.3.tar.xz";
-      sha256 = "0f6d2wf9vly7qqbzv9nfahjvyi8db77anb9w0qfc95i69hggy2yj";
-      name = "zanshin-23.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/23.08.0/src/zanshin-23.08.0.tar.xz";
+      sha256 = "01w4m27pw6nrf5m8xfxwhfmvgr24jlbys9h3byfl1ddr9l6f3l6x";
+      name = "zanshin-23.08.0.tar.xz";
     };
   };
 }
diff --git a/pkgs/applications/kde/tokodon.nix b/pkgs/applications/kde/tokodon.nix
index bf40a5a00155..43da82e89018 100644
--- a/pkgs/applications/kde/tokodon.nix
+++ b/pkgs/applications/kde/tokodon.nix
@@ -20,6 +20,7 @@
 , qtwebsockets
 , kitemmodels
 , pimcommon
+, mpv
 }:
 
 mkDerivation {
@@ -47,6 +48,7 @@ mkDerivation {
     qtwebsockets
     kitemmodels
     pimcommon
+    mpv
   ];
 
   meta = with lib; {
diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix
index 2ec1097338e4..6e9d2e6cc1bb 100644
--- a/pkgs/applications/misc/tellico/default.nix
+++ b/pkgs/applications/misc/tellico/default.nix
@@ -34,11 +34,6 @@ mkDerivation rec {
     hash = "sha256-opg4FbfOM48eqWQUJnMHH7KSo6x4S2DHd7ucPw6iTzg=";
   };
 
-  postPatch = ''
-    substituteInPlace src/gui/imagewidget.h \
-      --replace ksane_version.h KF5/ksane_version.h
-  '';
-
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
diff --git a/pkgs/development/libraries/futuresql/default.nix b/pkgs/development/libraries/futuresql/default.nix
new file mode 100644
index 000000000000..2adc148701a7
--- /dev/null
+++ b/pkgs/development/libraries/futuresql/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, cmake, extra-cmake-modules, qtbase }:
+stdenv.mkDerivation rec {
+  pname = "futuresql";
+  version = "0.1.1";
+
+  src = fetchurl {
+    url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz";
+    hash = "sha256-5E7Y1alhizynuimD7ZxfdXLm4KWxmflIaINLccy+vUM=";
+  };
+
+  nativeBuildInputs = [ cmake extra-cmake-modules ];
+  buildInputs = [ qtbase ];
+
+  # a library, nothing to wrap
+  dontWrapQtApps = true;
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4038c003f20b..a440ec395e51 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2020,20 +2020,20 @@ mapAliases ({
   https://github.com/NixOS/nixpkgs/pull/101369 */
 
   inherit (plasma5Packages)
-    akonadi akregator ark bluedevil bomber bovo breeze-grub breeze-gtk
+    akonadi akregator arianna ark bluedevil bomber bovo breeze-grub breeze-gtk
     breeze-icons breeze-plymouth breeze-qt5 colord-kde discover dolphin dragon elisa falkon
     ffmpegthumbs filelight granatier gwenview k3b kactivitymanagerd kaddressbook
-    kalendar kalzium kapman kapptemplate kate katomic kblackbox kblocks kbounce
+    kalzium kapman kapptemplate kate katomic kblackbox kblocks kbounce
     kcachegrind kcalc kcharselect kcolorchooser kde-cli-tools kde-gtk-config
     kdenlive kdeplasma-addons kdevelop-pg-qt kdevelop-unwrapped kdev-php
-    kdev-python kdevelop kdf kdialog kdiamond keditbookmarks kfind kfloppy
+    kdev-python kdevelop kdf kdialog kdiamond keditbookmarks kfind
     kgamma5 kget kgpg khelpcenter kig kigo killbots kinfocenter kitinerary
     kleopatra klettres klines kmag kmail kmenuedit kmines kmix kmplot
     knavalbattle knetwalk knights kollision kolourpaint kompare konsole kontact
     konversation korganizer kpkpass krdc kreversi krfb kscreen kscreenlocker
     kshisen ksquares ksshaskpass ksystemlog kteatime ktimer ktorrent ktouch
     kturtle kwallet-pam kwalletmanager kwave kwayland-integration kwin kwrited
-    marble milou minuet okular oxygen oxygen-icons5 picmi
+    marble merkuro milou minuet okular oxygen oxygen-icons5 picmi
     plasma-browser-integration plasma-desktop plasma-integration plasma-nano
     plasma-nm plasma-pa plasma-mobile plasma-systemmonitor plasma-thunderbolt
     plasma-vault plasma-workspace plasma-workspace-wallpapers polkit-kde-agent
@@ -2041,6 +2041,9 @@ mapAliases ({
     systemsettings xdg-desktop-portal-kde yakuake zanshin
   ;
 
+  kalendar = merkuro;  # Renamed in 23.08
+  kfloppy = throw "kfloppy has been removed upstream in KDE Gear 23.08";
+
   inherit (plasma5Packages.thirdParty)
     krohnkite
     krunner-ssh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d7d15560be11..590570bcd35e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19287,6 +19287,8 @@ with pkgs;
 
   funzzy = callPackage ../development/tools/misc/funzzy { };
 
+  futuresql = libsForQt5.callPackage ../development/libraries/futuresql { };
+
   fzf-make = callPackage ../development/tools/misc/fzf-make { };
 
   gede = libsForQt5.callPackage ../development/tools/misc/gede { };
@@ -30475,8 +30477,6 @@ with pkgs;
 
   argo-rollouts = callPackage ../applications/networking/cluster/argo-rollouts { };
 
-  arianna = libsForQt5.callPackage ../applications/misc/arianna { };
-
   ario = callPackage ../applications/audio/ario { };
 
   arion = callPackage ../applications/virtualization/arion { };

From 54a6844d592afa637b9d88cad312020c28d84468 Mon Sep 17 00:00:00 2001
From: alyaeanyx <alyaeanyx@mailbox.org>
Date: Thu, 24 Aug 2023 22:03:29 +0200
Subject: [PATCH 12/54] xournalpp: 1.2.0 -> 1.2.1

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

diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix
index cd3b73b6b482..fbc99ad20852 100644
--- a/pkgs/applications/graphics/xournalpp/default.nix
+++ b/pkgs/applications/graphics/xournalpp/default.nix
@@ -25,13 +25,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xournalpp";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "xournalpp";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-0xsNfnKdGl34qeN0KZbII9w6PzC1HvvO7mtlNlRvUqQ=";
+    sha256 = "sha256-dnFNGWPpK/eoW4Ib1E5w/kPy5okPxAja1v4rf0KpVKM=";
   };
 
   nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook ];

From 3d99e9b98029f4657ce0ff72a2f0643e1e48c004 Mon Sep 17 00:00:00 2001
From: alyaeanyx <alyaeanyx@mailbox.org>
Date: Thu, 24 Aug 2023 22:15:44 +0200
Subject: [PATCH 13/54] {libqalculate, qalculate-gtk, qalculate-qt}: 4.7.0 ->
 4.8.0

---
 pkgs/applications/science/math/qalculate-gtk/default.nix | 8 ++++----
 pkgs/applications/science/math/qalculate-qt/default.nix  | 4 ++--
 pkgs/development/libraries/libqalculate/default.nix      | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix
index 970f5517c21f..405561510be0 100644
--- a/pkgs/applications/science/math/qalculate-gtk/default.nix
+++ b/pkgs/applications/science/math/qalculate-gtk/default.nix
@@ -1,20 +1,20 @@
-{ lib, stdenv, fetchFromGitHub, intltool, autoreconfHook, pkg-config, libqalculate, gtk3, wrapGAppsHook }:
+{ lib, stdenv, fetchFromGitHub, intltool, autoreconfHook, pkg-config, libqalculate, gtk3, curl, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "qalculate-gtk";
-  version = "4.7.0";
+  version = "4.8.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "qalculate-gtk";
     rev = "v${version}";
-    sha256 = "sha256-Fbi+vZEyXhUZQjWUX01IXd6G1cthfiuztdbisNQ/VZU=";
+    sha256 = "sha256-GYy3Ot2vjXpCp89Rib3Ua0XeVGOOTejKcaqNZvPmxm0=";
   };
 
   hardeningDisable = [ "format" ];
 
   nativeBuildInputs = [ intltool pkg-config autoreconfHook wrapGAppsHook ];
-  buildInputs = [ libqalculate gtk3 ];
+  buildInputs = [ libqalculate gtk3 curl ];
   enableParallelBuilding = true;
 
   meta = with lib; {
diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix
index abe65e413690..be9dd27695f7 100644
--- a/pkgs/applications/science/math/qalculate-qt/default.nix
+++ b/pkgs/applications/science/math/qalculate-qt/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qalculate-qt";
-  version = "4.7.0";
+  version = "4.8.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "qalculate-qt";
     rev = "v${version}";
-    hash = "sha256-fMchJgxuOO2e7cOHLako26c9gsWvQY2MTRVD3JWGSAU=";
+    hash = "sha256-7VlaoiY+HgHCMZCegUdy2wpgfx3fKaViMtkdNRleHaA=";
   };
 
   nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ];
diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix
index b84562850efe..a8826e4381eb 100644
--- a/pkgs/development/libraries/libqalculate/default.nix
+++ b/pkgs/development/libraries/libqalculate/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libqalculate";
-  version = "4.7.0";
+  version = "4.8.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "libqalculate";
     rev = "v${version}";
-    sha256 = "sha256-Wgy1vsr0FXRJz9BCfw2PyFkesIJ/eg2dYDY/I2TESnU=";
+    sha256 = "sha256-wONqqd8Ds10SvkUrj7Ps6BfqUNPE6hCnQrKDTEglVEQ=";
   };
 
   outputs = [ "out" "dev" "doc" ];

From 273b57549448095229690bc009a4fe05b289012a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Aug 2023 20:19:22 +0000
Subject: [PATCH 14/54] mainsail: 2.6.2 -> 2.7.1

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

diff --git a/pkgs/applications/misc/mainsail/default.nix b/pkgs/applications/misc/mainsail/default.nix
index dd7aae237a11..48fbce686ffc 100644
--- a/pkgs/applications/misc/mainsail/default.nix
+++ b/pkgs/applications/misc/mainsail/default.nix
@@ -5,11 +5,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "mainsail";
-  version = "2.6.2";
+  version = "2.7.1";
 
   src = fetchzip {
     url = "https://github.com/mainsail-crew/mainsail/releases/download/v${version}/mainsail.zip";
-    hash = "sha256-/ej26rLze/QaxGDtU4XhaejlkbkzZfzB+ib2I+3W8Ho=";
+    hash = "sha256-j2ri7PyQGzRlhpgE9qKneX00HwlDmIi2JUremz446wk=";
     stripRoot = false;
   };
 

From 2aa870904857a4356512e98a69987c554b8bd0e3 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Thu, 24 Aug 2023 17:20:58 -0400
Subject: [PATCH 15/54] felix-fm: 2.7.0 -> 2.8.0

Diff: https://github.com/kyoheiu/felix/compare/v2.7.0...v2.8.0

Changelog: https://github.com/kyoheiu/felix/blob/v2.8.0/CHANGELOG.md
---
 pkgs/applications/file-managers/felix-fm/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/applications/file-managers/felix-fm/default.nix
index a3572e782b0d..10d5193893cb 100644
--- a/pkgs/applications/file-managers/felix-fm/default.nix
+++ b/pkgs/applications/file-managers/felix-fm/default.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "felix";
-  version = "2.7.0";
+  version = "2.8.0";
 
   src = fetchFromGitHub {
     owner = "kyoheiu";
-    repo = pname;
+    repo = "felix";
     rev = "v${version}";
-    sha256 = "sha256-3oXF9BG3BjGOeXqJHo3+fpcqcTOKrLED7Y3VQ06tnNA=";
+    hash = "sha256-d01AbHAIelwjVnVX5hn4QY0sp9n9Ez4ImYqNO/RBmEU=";
   };
 
-  cargoHash = "sha256-2XMVappHbf1ZPtQO8zy8Z0n9wshDM4d30qkmG8OBoUY=";
+  cargoHash = "sha256-n8cVdGvh3/lQ6pF0ukxsog+XpIdpjuxGcgkDkM/3IFk=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 0dd23d04664f8dd7b9989ff3f77b7644858969cf Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 25 Aug 2023 00:22:17 +0200
Subject: [PATCH 16/54] python311Packages.spdx-tools: 0.8.0 -> 0.8.1

Diff: https://github.com/spdx/tools-python/compare/refs/tags/v0.8.0...v0.8.1

Changelog: https://github.com/spdx/tools-python/blob/v0.8.1/CHANGELOG.md
---
 pkgs/development/python-modules/spdx-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/spdx-tools/default.nix b/pkgs/development/python-modules/spdx-tools/default.nix
index 956eaa30b847..913a458ae0f3 100644
--- a/pkgs/development/python-modules/spdx-tools/default.nix
+++ b/pkgs/development/python-modules/spdx-tools/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "spdx-tools";
-  version = "0.8.0";
+  version = "0.8.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "spdx";
     repo = "tools-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-TMiaxapJuiLqm+x9K49MIzeWOE/CRAI+M1+9OeU0YvM=";
+    hash = "sha256-/iBy6i4J/IiJzfNdW6pN3VTE9PVED4ckoe4OBlw8wnI=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 745d134992c0d53053d0ca307ae72c0fdf669752 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Aug 2023 01:11:00 +0000
Subject: [PATCH 17/54] python310Packages.pex: 2.1.143 -> 2.1.144

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

diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix
index 56d36ebdda56..2491ebb6b851 100644
--- a/pkgs/development/python-modules/pex/default.nix
+++ b/pkgs/development/python-modules/pex/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "pex";
-  version = "2.1.143";
+  version = "2.1.144";
   format = "flit";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-xyYD9oGrlK1kswQ7uiO3/gAJUnelvWv7ZHyzn/g5iCg=";
+    hash = "sha256-wugHG/ZfyfNgd2znDS7FXu34LsUVMcwDswFkh4lRIXo=";
   };
 
   nativeBuildInputs = [

From 5cfb5416c86e1b4d1aad19fe135c3894a1b8b679 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Aug 2023 01:33:46 +0000
Subject: [PATCH 18/54] python310Packages.sqlite-utils: 3.34 -> 3.35

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

diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix
index c3ad45ec13a6..4edb02182b11 100644
--- a/pkgs/development/python-modules/sqlite-utils/default.nix
+++ b/pkgs/development/python-modules/sqlite-utils/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "sqlite-utils";
-  version = "3.34";
+  version = "3.35";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-RgdoPLsyz9TzxjkpBF6qAgqwIhxQNvm7QbeyW8dVzSM=";
+    hash = "sha256-j2/n+NEncs1c9FlHA6mNzQw3wP1oIN0gVBunS5/KNjo=";
   };
 
   postPatch = ''

From 1673011828ea82dff369c18096689e2801246258 Mon Sep 17 00:00:00 2001
From: Alex Martens <alex@thinglab.org>
Date: Thu, 24 Aug 2023 18:44:50 -0700
Subject: [PATCH 19/54] idasen: 0.9.6 -> 0.10.0

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

diff --git a/pkgs/development/python-modules/idasen/default.nix b/pkgs/development/python-modules/idasen/default.nix
index e4792be41690..8ce6928b9057 100644
--- a/pkgs/development/python-modules/idasen/default.nix
+++ b/pkgs/development/python-modules/idasen/default.nix
@@ -2,7 +2,6 @@
 , buildPythonPackage
 , pythonOlder
 , fetchFromGitHub
-, fetchpatch
 , bleak
 , pyyaml
 , voluptuous
@@ -13,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "idasen";
-  version = "0.9.6";
+  version = "0.10.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -22,17 +21,9 @@ buildPythonPackage rec {
     owner = "newAM";
     repo = "idasen";
     rev = "refs/tags/v${version}";
-    hash = "sha256-t8w4USDzyS0k5yk0XtQF8fVffzdf+udKSkdveMlseHk=";
+    hash = "sha256-aCVKnKWJlrlKD+74KL9JKlNpMGOzg/iWmB+1IMn0V/E=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "replace-poetry-with-poetry-core.patch";
-      url = "https://github.com/newAM/idasen/commit/b9351d5c9def0687e4ae4cb65f38d14ed9ff2df5.patch";
-      hash = "sha256-Qi3psPZExJ5tBJ4IIvDC3JnWf4Gym6Z7akGCV8GZUNY=";
-    })
-  ];
-
   nativeBuildInputs = [
     poetry-core
   ];

From c18a848adb63b6135abd3c8c67b77b7a9d301123 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Aug 2023 14:50:39 +0000
Subject: [PATCH 20/54] vial: 0.6 -> 0.7

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

diff --git a/pkgs/tools/misc/vial/default.nix b/pkgs/tools/misc/vial/default.nix
index 6834a53bb6ec..827a27cb5fea 100644
--- a/pkgs/tools/misc/vial/default.nix
+++ b/pkgs/tools/misc/vial/default.nix
@@ -1,12 +1,12 @@
 { lib, fetchurl, appimageTools }:
 let
   name = "vial-${version}";
-  version = "0.6";
+  version = "0.7";
   pname = "Vial";
 
   src = fetchurl {
     url = "https://github.com/vial-kb/vial-gui/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage";
-    sha256 = "sha256-2EapikmY79KQdoHnz1A7gErVXBN8D80r1GJMKQ5gIM0=";
+    sha256 = "sha256-IvOjwboxc3KRKUMXW3dWoHMy8Oh7NGsu0GIJcLZ6WR8=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit name src; };

From 5a43ed114f59dcbe2067321b68e1f38526b78602 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 25 Aug 2023 00:03:32 -0300
Subject: [PATCH 21/54] vial: cosmetic modifications

- use hash instead of sha256
- set meta.mainProgram and meta.sourceProvenance
---
 pkgs/tools/misc/vial/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/vial/default.nix b/pkgs/tools/misc/vial/default.nix
index 827a27cb5fea..40d3a7c3322d 100644
--- a/pkgs/tools/misc/vial/default.nix
+++ b/pkgs/tools/misc/vial/default.nix
@@ -6,7 +6,7 @@ let
 
   src = fetchurl {
     url = "https://github.com/vial-kb/vial-gui/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage";
-    sha256 = "sha256-IvOjwboxc3KRKUMXW3dWoHMy8Oh7NGsu0GIJcLZ6WR8=";
+    hash = "sha256-IvOjwboxc3KRKUMXW3dWoHMy8Oh7NGsu0GIJcLZ6WR8=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit name src; };
@@ -23,11 +23,13 @@ appimageTools.wrapType2 {
     echo 'KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0666", TAG+="uaccess", TAG+="udev-acl"' > $out/etc/udev/rules.d/92-viia.rules
   '';
 
-  meta = with lib; {
-    description = "An Open-source QMK GUI fork for configuring your keyboard in real time";
+  meta = {
+    description = "An Open-source GUI and QMK fork for configuring your keyboard in real time";
     homepage = "https://get.vial.today";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ kranzes ];
+    license = lib.licenses.gpl2Plus;
+    mainProgram = "vial";
+    maintainers = with lib.maintainers; [ kranzes ];
     platforms = [ "x86_64-linux" ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
 }

From 45adc10ae080be54f5e84b64069fda12dae6ed8d Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 25 Aug 2023 03:50:54 +0000
Subject: [PATCH 22/54] xfce.xfce4-appfinder: 4.18.0 -> 4.18.1

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

diff --git a/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix b/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix
index b479a574d97b..e716fab959a0 100644
--- a/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-appfinder/default.nix
@@ -3,9 +3,9 @@
 mkXfceDerivation {
   category = "xfce";
   pname = "xfce4-appfinder";
-  version = "4.18.0";
+  version = "4.18.1";
 
-  sha256 = "sha256-/VYZpWk08OQPZ/DQ5SqSL4F4KDdh+IieQBDOZUxZvtw=";
+  sha256 = "sha256-CZEX1PzFsVt72Fkb4+5PiZjAcDisvYnbzFGFXjFL4sc=";
 
   nativeBuildInputs = [ exo ];
   buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ];

From 008ce73e1d7430d2113313f820a4f0993520b58e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Aug 2023 04:08:16 +0000
Subject: [PATCH 23/54] swtpm: 0.8.0 -> 0.8.1

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

diff --git a/pkgs/tools/security/swtpm/default.nix b/pkgs/tools/security/swtpm/default.nix
index e71b88c8c3b9..d132e27a8059 100644
--- a/pkgs/tools/security/swtpm/default.nix
+++ b/pkgs/tools/security/swtpm/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "swtpm";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "stefanberger";
     repo = "swtpm";
     rev = "v${version}";
-    sha256 = "sha256-O+sHkmQ47FbqsgWpaqAc/j2AJ5xzsvpBj/p0Zea1nSI=";
+    sha256 = "sha256-QKR5S7FlMFDw4+VpyRdqixMWyzLpQkf3QCUceQvsliU=";
   };
 
   nativeBuildInputs = [

From 19154f8b9effbad10db55b44cb773073352a7251 Mon Sep 17 00:00:00 2001
From: kashw2 <supra4keanu@hotmail.com>
Date: Wed, 23 Aug 2023 07:55:26 +1000
Subject: [PATCH 24/54] azure-storage-azcopy: 10.20.0 -> 10.20.1

azure-storage-azcopy: removed unused dependencies
---
 pkgs/development/tools/azcopy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix
index 3ab48462dbbc..0d94e4e2f6c3 100644
--- a/pkgs/development/tools/azcopy/default.nix
+++ b/pkgs/development/tools/azcopy/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "azure-storage-azcopy";
-  version = "10.20.0";
+  version = "10.20.1";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "azure-storage-azcopy";
     rev = "v${version}";
-    sha256 = "sha256-0NUOOJu3iuKBlIi4z1Jv8e00BTsgk0dpLOgfpIKSc2A=";
+    sha256 = "sha256-pfbSNFKZubgebx90zL5sVva36wXS+0NQvvMxPI8kV3Y=";
   };
 
   subPackages = [ "." ];
@@ -23,7 +23,7 @@ buildGoModule rec {
 
   meta = with lib; {
     broken = stdenv.isDarwin;
-    maintainers = with maintainers; [ colemickens ];
+    maintainers = with maintainers; [ colemickens kashw2 ];
     license = licenses.mit;
     description = "The new Azure Storage data transfer utility - AzCopy v10";
   };

From dff06000622c1f9d96f7dfb40757317b72fb9e03 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Aug 2023 04:32:26 +0000
Subject: [PATCH 25/54] python310Packages.oci: 2.110.1 -> 2.110.2

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

diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix
index 9cae940ccc38..2cf9223978bd 100644
--- a/pkgs/development/python-modules/oci/default.nix
+++ b/pkgs/development/python-modules/oci/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "oci";
-  version = "2.110.1";
+  version = "2.110.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "oracle";
     repo = "oci-python-sdk";
     rev = "refs/tags/v${version}";
-    hash = "sha256-v2h/K1gat+nHGjn6a9r1BDMDAoJ/OtNctxHzV41gRkg=";
+    hash = "sha256-4+qP/eCd3xy0Q3Nrwbj2VpyNWqiKL82nrX7Od0yHToo=";
   };
 
   pythonRelaxDeps = [

From afec397bef443421ec993f3ca7e93b02935febef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Aug 2023 04:41:25 +0000
Subject: [PATCH 26/54] discord-ptb: 0.0.44 -> 0.0.45

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

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 6288154f43a1..45ce7c3d1df1 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -2,7 +2,7 @@
 let
   versions = if stdenv.isLinux then {
     stable = "0.0.28";
-    ptb = "0.0.44";
+    ptb = "0.0.45";
     canary = "0.0.166";
     development = "0.0.217";
   } else {
@@ -20,7 +20,7 @@ let
       };
       ptb = fetchurl {
         url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
-        sha256 = "lehrB2jTvMKIDt7QWK/UAkrzYnW5pAP4LRHfIvGpnzA=";
+        sha256 = "cN70ZYl9hxWU5FSCpDbpOuR2Wsz6XtPSDoXOTvcCe7g=";
       };
       canary = fetchurl {
         url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";

From cd050a883c40ff70e3880e5b4b0667854e862343 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Aug 2023 04:53:45 +0000
Subject: [PATCH 27/54] python310Packages.pyomo: 6.6.1 -> 6.6.2

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

diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix
index c0900b664439..9e0de7f3915d 100644
--- a/pkgs/development/python-modules/pyomo/default.nix
+++ b/pkgs/development/python-modules/pyomo/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pyomo";
-  version = "6.6.1";
+  version = "6.6.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     repo = "pyomo";
     owner = "pyomo";
     rev = "refs/tags/${version}";
-    hash = "sha256-1FSu5ejFjjNTuvaFU/UqAI/817HkrOA1Hczq8gcPQGA=";
+    hash = "sha256-hh2sfWOUp3ac75NEuTrw3YkvS7hXpzJp39v6cfrhNiQ=";
   };
 
   propagatedBuildInputs = [

From 2a365c82ed4fb8a73e415fca46bd7fac99df20cf Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Fri, 25 Aug 2023 13:48:42 +0800
Subject: [PATCH 28/54] gopacked: use sri hash

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

diff --git a/pkgs/applications/misc/gopacked/default.nix b/pkgs/applications/misc/gopacked/default.nix
index 42b886e4c72b..1af03a1528a2 100644
--- a/pkgs/applications/misc/gopacked/default.nix
+++ b/pkgs/applications/misc/gopacked/default.nix
@@ -8,10 +8,10 @@ buildGoModule rec {
     owner = "tulir";
     repo = "gopacked";
     rev = "v${version}";
-    sha256 = "03qr8rlnipziy16nbcpf631jh42gsyv2frdnh8yzsh8lm0p8p4ry";
+    hash = "sha256-PpOLLqgUQf09grZlJ7bXTxAowzDusmVN8PHfaGlGGQ8=";
   };
 
-  vendorSha256 = "0fklr3lxh8g7gda65wf2wdkqv15869h7m1bwbzbiv8pasrf5b352";
+  vendorHash = "sha256-ooxVXNbqoh3XX3yFemAyqISNZ+PC8WJUe+ch2OnIdDo=";
 
   doCheck = false;
 

From 3d7fcb0ae2494a8b8e8f2896a7d1aae1bd2d6106 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Aug 2023 05:54:18 +0000
Subject: [PATCH 29/54] python310Packages.troposphere: 4.3.2 -> 4.4.1

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

diff --git a/pkgs/development/python-modules/troposphere/default.nix b/pkgs/development/python-modules/troposphere/default.nix
index 567c2dec60e2..fe719cf416cf 100644
--- a/pkgs/development/python-modules/troposphere/default.nix
+++ b/pkgs/development/python-modules/troposphere/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "troposphere";
-  version = "4.3.2";
+  version = "4.4.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "cloudtools";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-8vIpwZBUdU9gD1Ya0+L1phMDMcAABtuyRx4quDfQWGA=";
+    hash = "sha256-ecRpp8XsP/iv4G8m85qcGJXHXH4CPdgBO8c0IZU56wU=";
   };
 
   propagatedBuildInputs = [

From e2a2f3cc9e4a51ac96ba671693139cf29f310dc7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Aug 2023 06:08:33 +0000
Subject: [PATCH 30/54] katriawm: 23.04 -> 23.06

---
 pkgs/applications/window-managers/katriawm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/katriawm/default.nix b/pkgs/applications/window-managers/katriawm/default.nix
index fece3d808b4f..74bd269285c2 100644
--- a/pkgs/applications/window-managers/katriawm/default.nix
+++ b/pkgs/applications/window-managers/katriawm/default.nix
@@ -9,12 +9,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "katriawm";
-  version = "23.04";
+  version = "23.06";
 
   src = fetchzip {
     name = finalAttrs.pname + "-" + finalAttrs.version;
     url = "https://www.uninformativ.de/git/katriawm/archives/katriawm-v${finalAttrs.version}.tar.gz";
-    hash = "sha256-Wi9Fv/Ms6t7tr8nxznXrn/6V04lnO1HMz4XFbuCr9+Y=";
+    hash = "sha256-4vdBX5biakoxiOyz7DPNgkLxlzi27kZ9rC20g+pn3N4=";
   };
 
   nativeBuildInputs = [

From 1db5ef68695e0b9b85176ea8ce6ca862291c8e6b Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 24 Aug 2023 22:33:55 +0200
Subject: [PATCH 31/54] xml2: add install check

---
 pkgs/tools/text/xml/xml2/default.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/tools/text/xml/xml2/default.nix b/pkgs/tools/text/xml/xml2/default.nix
index 265ab10e5ac8..d469078c91dc 100644
--- a/pkgs/tools/text/xml/xml2/default.nix
+++ b/pkgs/tools/text/xml/xml2/default.nix
@@ -12,6 +12,25 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libxml2 ];
 
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    echo -n 'checking csv2 and 2csv...'
+    $out/bin/csv2 -f <<< $'a,b\n1,2' \
+      | $out/bin/2csv record a b \
+      | grep -qF '1,2'
+    echo ' ok'
+
+    echo -n 'checking xml2 and 2xml...'
+    $out/bin/xml2 <<< $'<a>abc</a>' \
+      | $out/bin/2xml \
+      | grep -qF '<a>abc</a>'
+    echo ' ok'
+
+    runHook postInstallCheck
+  '';
+
   meta = with lib; {
     homepage = "https://web.archive.org/web/20160515005047/http://dan.egnor.name:80/xml2";
     description = "Tools for command line processing of XML, HTML, and CSV";

From 8bcfd8b5229407915cb944aa625ef09a6c629278 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 25 Aug 2023 08:36:46 +0200
Subject: [PATCH 32/54] cargo-public-api: 0.31.3 -> 0.32.0

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 pkgs/development/tools/rust/cargo-public-api/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix
index 913755b64812..af5937e328d0 100644
--- a/pkgs/development/tools/rust/cargo-public-api/default.nix
+++ b/pkgs/development/tools/rust/cargo-public-api/default.nix
@@ -10,14 +10,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-public-api";
-  version = "0.31.3";
+  version = "0.32.0";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-oSjfNbId5jEHeLiJ3FMoNqwLZg6iyr3ZqpcfKvEnpac=";
+    hash = "sha256-etEwMmfwyOTHRb/UfkcHvmnLVVqeSagWJ5HjuJ6gZVo=";
   };
 
-  cargoHash = "sha256-VHHEQafQfRqmdscuWpN+NdcfEc1sTt+lKLg26aM9QQE=";
+  cargoHash = "sha256-7GyPjEit3FEjnegLnZt9TMLBI3BtzcDssrJPj60gpTo=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 06c2814ae891ce84956d75ebce73b9eea16552ca Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 25 Aug 2023 08:50:46 +0200
Subject: [PATCH 33/54] python311Packages.keyrings-cryptfile: 1.3.4 -> 1.3.9

Changelog: https://github.com/frispete/keyrings.cryptfile/blob/v1.3.9/CHANGES.md
---
 .../keyrings-cryptfile/default.nix            | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/python-modules/keyrings-cryptfile/default.nix b/pkgs/development/python-modules/keyrings-cryptfile/default.nix
index a31a5a3c957d..4a640d7b1b7c 100644
--- a/pkgs/development/python-modules/keyrings-cryptfile/default.nix
+++ b/pkgs/development/python-modules/keyrings-cryptfile/default.nix
@@ -1,8 +1,7 @@
 { lib
+, argon2-cffi
 , buildPythonPackage
 , fetchPypi
-, fetchpatch
-, argon2-cffi
 , keyring
 , pycryptodome
 , pytestCheckHook
@@ -10,26 +9,22 @@
 }:
 
 buildPythonPackage rec {
-  pname = "keyrings.cryptfile";
-  # NOTE: newer releases are bugged/incompatible
-  # https://github.com/frispete/keyrings.cryptfile/issues/15
-  version = "1.3.4";
+  pname = "keyrings-cryptfile";
+  version = "1.3.9";
+  format = "setuptools";
+
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-jW+cKMm+xef8C+fl0CGe+6SEkYBHDjFX2/kLCZ62j6c=";
+    pname = "keyrings.cryptfile";
+    inherit version;
+    hash = "sha256-fCpFPKuZhUJrjCH3rVSlfkn/joGboY4INAvYgBrPAJE=";
   };
 
-  patches = [
-    # upstream setup.cfg has an option that is not supported
-    ./fix-testsuite.patch
-    # change of API in keyrings.testing
-    (fetchpatch {
-      url = "https://github.com/frispete/keyrings.cryptfile/commit/6fb9e45f559b8b69f7a0a519c0bece6324471d79.patch";
-      hash = "sha256-1878pMO9Ed1zs1pl+7gMjwx77HbDHdE1CryN8TPfPdU=";
-    })
-  ];
+  postPatch = ''
+    substituteInPlace setup.cfg \
+      --replace "-s --cov=keyrings/cryptfile" ""
+  '';
 
   propagatedBuildInputs = [
     argon2-cffi
@@ -46,13 +41,14 @@ buildPythonPackage rec {
   ];
 
   disabledTests = [
-    "test_set_properties"
-    "UncryptedFileKeyringTestCase"
+    # FileNotFoundError: [Errno 2] No such file or directory: '/build/...
+    "test_versions"
   ];
 
   meta = with lib; {
     description = "Encrypted file keyring backend";
     homepage = "https://github.com/frispete/keyrings.cryptfile";
+    changelog = "https://github.com/frispete/keyrings.cryptfile/blob/v${version}/CHANGES.md";
     license = licenses.mit;
     maintainers = teams.chia.members;
   };

From 183d3269e8575f84c3cc7c6e928c5bc0c17df49c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 25 Aug 2023 09:08:42 +0200
Subject: [PATCH 34/54] python311Packages.events: 0.4 -> 0.5

Diff: https://github.com/pyeve/events/compare/refs/tags/v0.4...v0.5

Changelog: https://github.com/pyeve/events/blob/v0.5/CHANGES
---
 .../python-modules/events/default.nix         | 38 +++++++++++++++----
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/events/default.nix b/pkgs/development/python-modules/events/default.nix
index 6fe355d9c4d8..f4e9dcd250f0 100644
--- a/pkgs/development/python-modules/events/default.nix
+++ b/pkgs/development/python-modules/events/default.nix
@@ -1,17 +1,41 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+}:
 
 buildPythonPackage rec {
-  pname = "Events";
-  version = "0.4";
+  pname = "events";
+  version = "0.5";
+  format = "setuptools";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "01d9dd2a061f908d74a89fa5c8f07baa694f02a2a5974983663faaf7a97180f5";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "pyeve";
+    repo = "events";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-GGhIKHbJ31IN0Uoe689X9V/MZvtseE47qx2CmM4MYUs=";
   };
 
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "events"
+  ];
+
+  pytestFlagsArray = [
+    "events/tests/tests.py"
+  ];
+
   meta = with lib; {
-    homepage = "https://events.readthedocs.org";
     description = "Bringing the elegance of C# EventHanlder to Python";
+    homepage = "https://events.readthedocs.org";
+    changelog = "https://github.com/pyeve/events/blob/v0.5/CHANGES";
     license = licenses.bsd3;
+    maintainers = with maintainers; [ ];
   };
 }

From 629c8da168da3f13ed01787ad5475b7eaaecfd4d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 25 Aug 2023 09:17:41 +0200
Subject: [PATCH 35/54] python311Packages.strawberry-graphql: 0.185.1 ->
 0.205.0

Changelog: https://github.com/strawberry-graphql/strawberry/blob/0.205.0/CHANGELOG.md
---
 .../python-modules/strawberry-graphql/default.nix        | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix
index 98bd27072d16..761a14fbfd03 100644
--- a/pkgs/development/python-modules/strawberry-graphql/default.nix
+++ b/pkgs/development/python-modules/strawberry-graphql/default.nix
@@ -42,20 +42,21 @@
 
 buildPythonPackage rec {
   pname = "strawberry-graphql";
-  version = "0.185.1";
+  version = "0.205.0";
   format = "pyproject";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "strawberry-graphql";
     repo = "strawberry";
     rev = "refs/tags/${version}";
-    hash = "sha256-PwhTD1k2GOVf6ACNDY1atLLP1jjAF6eTDCE3eLUIpJA=";
+    hash = "sha256-58pBsTQM3t5rj4AywhMqmCUzUQB4BH9FAF7J3p6Qkok=";
   };
 
   patches = [
     (fetchpatch {
+      # https://github.com/strawberry-graphql/strawberry/pull/2199
       name = "switch-to-poetry-core.patch";
       url = "https://github.com/strawberry-graphql/strawberry/commit/710bb96f47c244e78fc54c921802bcdb48f5f421.patch";
       hash = "sha256-ekUZ2hDPCqwXp9n0YjBikwSkhCmVKUzQk7LrPECcD7Y=";
@@ -64,7 +65,7 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace " --emoji --mypy-ini-file=mypy.ini --benchmark-disable" "" \
+      --replace "--emoji --mypy-ini-file=mypy.ini" "" \
   '';
 
   nativeBuildInputs = [

From de5fe4bdb635d9616a3bdbc2fd924735443a6420 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 25 Aug 2023 09:20:15 +0200
Subject: [PATCH 36/54] python311Packages.pysnooz: add changelog to meta

---
 pkgs/development/python-modules/pysnooz/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pysnooz/default.nix b/pkgs/development/python-modules/pysnooz/default.nix
index 24868e7a6b62..b3b358adb00f 100644
--- a/pkgs/development/python-modules/pysnooz/default.nix
+++ b/pkgs/development/python-modules/pysnooz/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "AustinBrunkhorst";
     repo = pname;
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
     hash = "sha256-X7RjI4KytJI9raHAJHLygV3J4zHKuHk8Kq+3JfktPeg=";
   };
 
@@ -62,6 +62,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Library to control SNOOZ white noise machines";
     homepage = "https://github.com/AustinBrunkhorst/pysnooz";
+    changelog = "https://github.com/AustinBrunkhorst/pysnooz/blob/v${version}/CHANGELOG.md";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };

From f47db52fd26b3d8921bd5b0f4a61c845dce56351 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 25 Aug 2023 09:22:21 +0200
Subject: [PATCH 37/54] python311Packages.pysnooz: relax events constraint

---
 pkgs/development/python-modules/pysnooz/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pysnooz/default.nix b/pkgs/development/python-modules/pysnooz/default.nix
index b3b358adb00f..8d4adbb86d13 100644
--- a/pkgs/development/python-modules/pysnooz/default.nix
+++ b/pkgs/development/python-modules/pysnooz/default.nix
@@ -31,7 +31,8 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace 'transitions = "^0.8.11"' 'transitions = ">0.8.11"' \
+      --replace 'transitions = "^0.8.11"' 'transitions = ">=0.8.11"' \
+      --replace 'Events = "^0.4"' 'Events = ">=0.4"' \
       --replace " --cov=pysnooz --cov-report=term-missing:skip-covered" ""
   '';
 

From de9fdcfaa8862c9962ca98412896cbafaec4c44f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Aug 2023 07:29:57 +0000
Subject: [PATCH 38/54] monkeysAudio: 10.17 -> 10.19

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

diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix
index 4a70f96994a0..ac9d4f2e26a1 100644
--- a/pkgs/applications/audio/monkeys-audio/default.nix
+++ b/pkgs/applications/audio/monkeys-audio/default.nix
@@ -5,13 +5,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "10.17";
+  version = "10.19";
   pname = "monkeys-audio";
 
   src = fetchzip {
     url = "https://monkeysaudio.com/files/MAC_${
       builtins.concatStringsSep "" (lib.strings.splitString "." version)}_SDK.zip";
-    sha256 = "sha256-yWoYeOGELXub/3kLC51SNPMC91u1aWAtdRsU6fRuX98=";
+    sha256 = "sha256-kuK6Uok5PAK66OtY+Uu1R7g8T7geA9edn2Sv6LN2pXc=";
     stripRoot = false;
   };
   nativeBuildInputs = [

From 0fba4aa9c36761c01ab1e6a72b42e9114b6bfdf0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 25 Aug 2023 09:35:05 +0200
Subject: [PATCH 39/54] python311Packages.troposphere: migrate to
 unittestCheckHook

---
 .../python-modules/troposphere/default.nix    | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/troposphere/default.nix b/pkgs/development/python-modules/troposphere/default.nix
index fe719cf416cf..39c71da17761 100644
--- a/pkgs/development/python-modules/troposphere/default.nix
+++ b/pkgs/development/python-modules/troposphere/default.nix
@@ -1,13 +1,11 @@
 { lib
+, awacs
 , buildPythonPackage
+, cfn-flip
 , fetchFromGitHub
 , pythonOlder
-, python
-
-  # python dependencies
-, awacs
-, cfn-flip
 , typing-extensions
+, unittestCheckHook
 }:
 
 buildPythonPackage rec {
@@ -26,29 +24,30 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     cfn-flip
-  ] ++ lib.lists.optionals (pythonOlder "3.8") [
+  ] ++ lib.optionals (pythonOlder "3.8") [
     typing-extensions
   ];
 
   nativeCheckInputs = [
     awacs
+    unittestCheckHook
   ];
 
   passthru.optional-dependencies = {
-    policy = [ awacs ];
+    policy = [
+      awacs
+    ];
   };
 
-  checkPhase = ''
-    ${python.interpreter} -m unittest discover
-  '';
-
-  pythonImportsCheck = [ "troposphere" ];
+  pythonImportsCheck = [
+    "troposphere"
+  ];
 
   meta = with lib; {
     description = "Library to create AWS CloudFormation descriptions";
-    maintainers = with maintainers; [ jlesquembre ];
-    license = licenses.bsd2;
     homepage = "https://github.com/cloudtools/troposphere";
     changelog = "https://github.com/cloudtools/troposphere/blob/${version}/CHANGELOG.rst";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ jlesquembre ];
   };
 }

From c88e2d8315ad25d5f65cce49f4af28421b42bd62 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 25 Aug 2023 10:01:58 +0200
Subject: [PATCH 40/54] python311Packages.hahomematic: 2023.8.9 -> 2023.8.10

Diff: https://github.com/danielperna84/hahomematic/compare/refs/tags/2023.8.9...2023.8.10

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

diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix
index d1bd71fa1c57..1e0410d3153e 100644
--- a/pkgs/development/python-modules/hahomematic/default.nix
+++ b/pkgs/development/python-modules/hahomematic/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "hahomematic";
-  version = "2023.8.9";
+  version = "2023.8.10";
   format = "pyproject";
 
   disabled = pythonOlder "3.11";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "danielperna84";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-PQ9KxKyTa9xiLa6suqHRem6Rs732djbjzFKKLZDUM/g=";
+    hash = "sha256-Piy/yUIK+IuEVbkkB18Z1iGNcE67eowff3IimI43E+s=";
   };
 
   nativeBuildInputs = [

From a377820115cb84589e1dd2d9b73fc77f3a752690 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 25 Aug 2023 10:04:25 +0200
Subject: [PATCH 41/54] python311Packages.ical: 5.0.0 -> 5.0.1

Diff: https://github.com/allenporter/ical/compare/refs/tags/5.0.0...5.0.1

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

diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix
index 2f539c87524d..da27462cc50b 100644
--- a/pkgs/development/python-modules/ical/default.nix
+++ b/pkgs/development/python-modules/ical/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "ical";
-  version = "5.0.0";
+  version = "5.0.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.10";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "allenporter";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-6xDbr/y9ZNT9thWMLHPi9/EXVXrUdMCVJdQAcd3G2vo=";
+    hash = "sha256-6gMmY6XlFdqF0DxkrCJhZPzUYZuEpDnIHG++nBRE3hg=";
   };
 
   nativeBuildInputs = [

From 88694cdb0edbd255d2ad17c7fb1b16089e149ab2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 25 Aug 2023 10:07:37 +0200
Subject: [PATCH 42/54] python311Packages.coinmetrics-api-client: 2023.8.10.19
 -> 2023.8.24.13

---
 .../python-modules/coinmetrics-api-client/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
index ca1dd48a9df5..b426de499aa0 100644
--- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix
+++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "coinmetrics-api-client";
-  version = "2023.8.10.19";
+  version = "2023.8.24.13";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "coinmetrics_api_client";
-    hash = "sha256-sXWcnl6E2Aw78Y4JPpTQlRmhRP6egl6eo81N2PIhi34=";
+    hash = "sha256-Ju8QczI/vyX4//WMy92H66DafTGJefsOqIjifCfQXGU=";
   };
 
   pythonRelaxDeps = [

From dcf94dee78fa79159e33bdb536c60f98a1ba32b6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 25 Aug 2023 10:48:28 +0200
Subject: [PATCH 43/54] python311Packages.asyncsleepiq: 1.3.5 -> 1.3.6

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

diff --git a/pkgs/development/python-modules/asyncsleepiq/default.nix b/pkgs/development/python-modules/asyncsleepiq/default.nix
index fcfa15fcb1de..ee3efac57914 100644
--- a/pkgs/development/python-modules/asyncsleepiq/default.nix
+++ b/pkgs/development/python-modules/asyncsleepiq/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "asyncsleepiq";
-  version = "1.3.5";
+  version = "1.3.6";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-CLBKFDvhErnWNEs7xWLha2QgUvKRDmj0y1CYYKri3ag=";
+    hash = "sha256-h+Q9g0kznGMLLi8i/iKodGXB+f/m3PXoF6h6hhIX9ys=";
   };
 
   propagatedBuildInputs = [

From 91498b491ac6116af516864eec63f20d34807fc7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 25 Aug 2023 10:51:19 +0200
Subject: [PATCH 44/54] python311Packages.exchangelib: 5.0.3 -> 5.1.0

Diff: https://github.com/ecederstrand/exchangelib/compare/refs/tags/v5.0.3...v5.1.0

Changelog: https://github.com/ecederstrand/exchangelib/blob/v5.1.0/CHANGELOG.md
---
 pkgs/development/python-modules/exchangelib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix
index 470d17deeba1..b7d4cda7df7c 100644
--- a/pkgs/development/python-modules/exchangelib/default.nix
+++ b/pkgs/development/python-modules/exchangelib/default.nix
@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "exchangelib";
-  version = "5.0.3";
+  version = "5.1.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "ecederstrand";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-oQ09/CvHIA4PAVqK6DeY3slHvQ1aPRqCC6ZuhubTN94=";
+    hash = "sha256-WKQgfmEbil55WO3tWVq4n9wiJNw0Op/jbI7xt5vtKpA=";
   };
 
   patches = [

From 0d3ba90f52a4af5109392269dd1aa5d1c8b5ecf2 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Fri, 25 Aug 2023 11:03:05 +0800
Subject: [PATCH 45/54] nixos/emacs: replace emacs with Emacs in the doc

---
 nixos/modules/services/editors/emacs.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/editors/emacs.md b/nixos/modules/services/editors/emacs.md
index 72364b295144..2fe25f5e3f43 100644
--- a/nixos/modules/services/editors/emacs.md
+++ b/nixos/modules/services/editors/emacs.md
@@ -286,11 +286,11 @@ The server should now be ready to serve Emacs clients.
 
 ### Starting the client {#module-services-emacs-starting-client}
 
-Ensure that the emacs server is enabled, either by customizing the
+Ensure that the Emacs server is enabled, either by customizing the
 {var}`server-mode` variable, or by adding
 `(server-start)` to {file}`~/.emacs`.
 
-To connect to the emacs daemon, run one of the following:
+To connect to the Emacs daemon, run one of the following:
 ```
 emacsclient FILENAME
 emacsclient --create-frame  # opens a new frame (window)
@@ -356,7 +356,7 @@ startup:
 ```
 :::
 
-After the declarative emacs package configuration has been tested,
+After the declarative Emacs package configuration has been tested,
 previously downloaded packages can be cleaned up by removing
 {file}`~/.emacs.d/elpa` (do make a backup first, in case you
 forgot a package).

From 71a875313402e808cf7c32e82854276c5919d67e Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Fri, 25 Aug 2023 11:03:51 +0800
Subject: [PATCH 46/54] emacs: update doc about emacs.pkgs.withPackages

---
 doc/builders/packages/emacs.section.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/builders/packages/emacs.section.md b/doc/builders/packages/emacs.section.md
index d46f890858f4..d1b0dab33db9 100644
--- a/doc/builders/packages/emacs.section.md
+++ b/doc/builders/packages/emacs.section.md
@@ -103,7 +103,7 @@ You can install it like any other packages via `nix-env -iA myEmacs`. However, t
 
 This provides a fairly full Emacs start file. It will load in addition to the user's personal config. You can always disable it by passing `-q` to the Emacs command.
 
-Sometimes `emacs.pkgs.withPackages` is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in `pkgs/top-level/emacs-packages.nix`). But you can't control these priorities when some package is installed as a dependency. You can override it on a per-package-basis, providing all the required dependencies manually, but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package, you can use `overrideScope`.
+Sometimes `emacs.pkgs.withPackages` is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to GNU-devel ELPA, and the highest for packages manually defined in `pkgs/applications/editors/emacs/elisp-packages/manual-packages`). But you can't control these priorities when some package is installed as a dependency. You can override it on a per-package-basis, providing all the required dependencies manually, but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package, you can use `overrideScope`.
 
 ```nix
 overrides = self: super: rec {

From 665651c7366ba4a6efe6f549170ffddfc80ef688 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Fri, 25 Aug 2023 11:13:47 +0800
Subject: [PATCH 47/54] emacs: remove outdated doc about package initialization

Since Emacs 27[1], there is no need to call package-initialize in the
init file.

[1]: https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS.27?id=cae528457cb862dc886a34240c9d4c73035b6659#n227
---
 doc/builders/packages/emacs.section.md  |  4 ----
 nixos/modules/services/editors/emacs.md | 18 ++----------------
 pkgs/top-level/emacs-packages.nix       |  7 -------
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/doc/builders/packages/emacs.section.md b/doc/builders/packages/emacs.section.md
index d1b0dab33db9..c50c7815537d 100644
--- a/doc/builders/packages/emacs.section.md
+++ b/doc/builders/packages/emacs.section.md
@@ -26,10 +26,6 @@ You can install it like any other packages via `nix-env -iA myEmacs`. However, t
 {
   packageOverrides = pkgs: with pkgs; rec {
     myEmacsConfig = writeText "default.el" ''
-      ;; initialize package
-
-      (require 'package)
-      (package-initialize 'noactivate)
       (eval-when-compile
         (require 'use-package))
 
diff --git a/nixos/modules/services/editors/emacs.md b/nixos/modules/services/editors/emacs.md
index 2fe25f5e3f43..9db1bd594175 100644
--- a/nixos/modules/services/editors/emacs.md
+++ b/nixos/modules/services/editors/emacs.md
@@ -339,22 +339,8 @@ This will add the symlink
 
 ## Configuring Emacs {#module-services-emacs-configuring}
 
-The Emacs init file should be changed to load the extension packages at
-startup:
-
-::: {.example #module-services-emacs-package-initialisation}
-### Package initialization in `.emacs`
-
-```
-(require 'package)
-
-;; optional. makes unpure packages archives unavailable
-(setq package-archives nil)
-
-(setq package-enable-at-startup nil)
-(package-initialize)
-```
-:::
+If you want to only use extension packages from Nixpkgs, you can add
+`(setq package-archives nil)` to your init file.
 
 After the declarative Emacs package configuration has been tested,
 previously downloaded packages can be cleaned up by removing
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 3f61bc2229d0..609d27a8d8d6 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -7,18 +7,11 @@
 # Alternative: use `emacs`, install everything to a system or user profile
 # and then add this at the start your `init.el`:
 /*
-  (require 'package)
-
-  ;; optional. makes unpure packages archives unavailable
-  (setq package-archives nil)
-
   ;; optional. use this if you install emacs packages to the system profile
   (add-to-list 'package-directory-list "/run/current-system/sw/share/emacs/site-lisp/elpa")
 
   ;; optional. use this if you install emacs packages to user profiles (with nix-env)
   (add-to-list 'package-directory-list "~/.nix-profile/share/emacs/site-lisp/elpa")
-
-  (package-initialize)
 */
 
 { pkgs'

From 26e8da26b4089966dce23f36741dd2be35fbeedc Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Fri, 25 Aug 2023 11:19:25 +0800
Subject: [PATCH 48/54] emacsPackages: update comment about
 package-directory-list

Since Emacs 27[1], package initialization is done before init.el.
So package-directory-list needs to be modified in early-init.el.

[1]: https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS.27?id=cae528457cb862dc886a34240c9d4c73035b6659#n227
---
 pkgs/top-level/emacs-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 609d27a8d8d6..2b06fd2e2425 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -5,7 +5,7 @@
 # Recommended: simply use `emacsWithPackages` with the packages you want.
 #
 # Alternative: use `emacs`, install everything to a system or user profile
-# and then add this at the start your `init.el`:
+# and then add this at the start your `early-init.el`:
 /*
   ;; optional. use this if you install emacs packages to the system profile
   (add-to-list 'package-directory-list "/run/current-system/sw/share/emacs/site-lisp/elpa")

From 11c5895493dbbd2dbb275ea7db4b0ccc654bf497 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 24 Aug 2023 04:20:00 +0000
Subject: [PATCH 49/54] nushell: 0.83.1 -> 0.84.0

Diff: https://github.com/nushell/nushell/compare/0.83.1...0.84.0
---
 pkgs/shells/nushell/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index b76b63167e2b..d87d842be08c 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -22,7 +22,7 @@
 }:
 
 let
-  version = "0.83.1";
+  version = "0.84.0";
 in
 
 rustPlatform.buildRustPackage {
@@ -33,10 +33,10 @@ rustPlatform.buildRustPackage {
     owner = "nushell";
     repo = "nushell";
     rev = version;
-    hash = "sha256-WMMGsJFgUkascCja7v0VA3spaOb5QmMFXQ2JOT9beO4=";
+    hash = "sha256-vXtQUWKRPS53IBUgO9Dw8dVzfD5W2kHSPOZHs293O5Q=";
   };
 
-  cargoHash = "sha256-/0+k3qOM9/rY6XmeVjqQWkjv19yZTkmfMK51z4+ppJU=";
+  cargoHash = "sha256-NtTCuTWbGTrGKF7ulm3Bfal/WuBtPEX7QvHoOyKY1V8=";
 
   nativeBuildInputs = [ pkg-config ]
     ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ]

From b4e06a160cea4adfca324094fb153c9acf34af45 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 24 Aug 2023 04:20:00 +0000
Subject: [PATCH 50/54] nu_scripts: unstable-2023-07-29 -> unstable-2023-08-24

---
 pkgs/shells/nushell/nu_scripts/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/nushell/nu_scripts/default.nix b/pkgs/shells/nushell/nu_scripts/default.nix
index 0a49f709a6b7..9170e8452460 100644
--- a/pkgs/shells/nushell/nu_scripts/default.nix
+++ b/pkgs/shells/nushell/nu_scripts/default.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "nu_scripts";
-  version = "unstable-2023-07-29";
+  version = "unstable-2023-08-24";
 
   src = fetchFromGitHub {
     owner = "nushell";
     repo = pname;
-    rev = "3ee56c6ec31fcc8dbffee85e1c73eb6fe0bbba8d";
-    hash = "sha256-luGIvcKOfhDorPfGfL449+eD+58MGo5jMCsNwIRJWt4=";
+    rev = "45c051dad0e243a63608c8274b7fddd5f0b74941";
+    hash = "sha256-kpE+vgobYsQuh8sS3gK/yg68nQykquwteeuecjLtIrE=";
   };
 
   installPhase = ''

From b5a22a41c5045389e35b29757b33b58ddf8c1800 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 24 Aug 2023 04:20:00 +0000
Subject: [PATCH 51/54] nushellPlugins.gstat: 0.83.1 -> 0.84.0

Diff: https://github.com/nushell/nushell/compare/0.84.0...0.84.0
---
 pkgs/shells/nushell/plugins/gstat.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix
index bbba12bddb35..4cab90c7e05a 100644
--- a/pkgs/shells/nushell/plugins/gstat.nix
+++ b/pkgs/shells/nushell/plugins/gstat.nix
@@ -11,9 +11,9 @@ let
 in
 rustPlatform.buildRustPackage {
   inherit pname;
-  version = "0.83.1";
+  version = "0.84.0";
   src = nushell.src;
-  cargoHash = "sha256-qRKONc8rDRALEin8WGxi7Jma4uD+U+9Gu6zpmYWmGOc=";
+  cargoHash = "sha256-RcwCYfIEV0+NbZ99uWaCOLqLap3wZ4qXIsc02fqkBSQ=";
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];
   cargoBuildFlags = [ "--package nu_plugin_gstat" ];

From 8dcdc0029eb01a9fc01be27715dc631d361fb0c8 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 24 Aug 2023 04:20:00 +0000
Subject: [PATCH 52/54] nushellPlugins.query: 0.83.1 -> 0.84.0

Diff: https://github.com/nushell/nushell/compare/0.84.0...0.84.0
---
 pkgs/shells/nushell/plugins/query.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix
index 00b70f279c67..0988d4f80bb7 100644
--- a/pkgs/shells/nushell/plugins/query.nix
+++ b/pkgs/shells/nushell/plugins/query.nix
@@ -9,11 +9,11 @@
 
 rustPlatform.buildRustPackage {
   pname = "nushell_plugin_query";
-  version = "0.83.1";
+  version = "0.84.0";
 
   src = nushell.src;
 
-  cargoHash = "sha256-0Bcu2h1ooc4z4ezKSjl7ca5cNQwnF3je7XzdhuqP4iQ=";
+  cargoHash = "sha256-8uAoiurQpI++duheNqwEDw/0CIPE1dHcgL48hKWqNUg=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ];
 

From c5773735aca77ab4a8071434839f6c00d14a34bb Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 25 Aug 2023 07:42:58 +0000
Subject: [PATCH 53/54] crosvm: 115.2 -> 116.1

---
 .../virtualization/crosvm/default.nix         | 20 +++++--------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix
index f9c15b35e43b..6a3da1f03a66 100644
--- a/pkgs/applications/virtualization/crosvm/default.nix
+++ b/pkgs/applications/virtualization/crosvm/default.nix
@@ -1,31 +1,21 @@
-{ lib, rustPlatform, fetchgit, fetchpatch
-, pkg-config, protobuf, python3, wayland-scanner
+{ lib, rustPlatform, fetchgit, pkg-config, protobuf, python3, wayland-scanner
 , libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "crosvm";
-  version = "115.2";
+  version = "116.1";
 
   src = fetchgit {
     url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
-    rev = "d14053a211eb6753c53ced71fad2d3b402b997e6";
-    sha256 = "8p6M9Q9E07zqtHYdIIi6io9LLatd+9fH4Inod2Xjy5M=";
+    rev = "97ac6ce38d8e5789c91fcc5bae6078d21a2afdb3";
+    sha256 = "NssjHXorPGZBYqERPeLW3cqEzbXqyL9N4OnLLQMLALk=";
     fetchSubmodules = true;
   };
 
-  patches = [
-    # Backport option to not vendor virglrenderer.
-    (fetchpatch {
-      url = "https://chromium.googlesource.com/crosvm/crosvm/+/dde9aa0e6d89a090f5d5f000822f7911eba98445%5E%21/?format=TEXT";
-      decode = "base64 -d";
-      hash = "sha256-W/s1i2reBXsbr0AOEtL9go3TNNYMwDVEu6pz3Q9wBSU=";
-    })
-  ];
-
   separateDebugInfo = true;
 
-  cargoSha256 = "ZXyMeu2forItGcsGrNBWhV1V9HzVQK6LM4TxBrxAZnU=";
+  cargoHash = "sha256-mlXAlq62nAW6ZVxRav+k/iU1YDecfPDTCPp7FdJBO54=";
 
   nativeBuildInputs = [
     pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner

From a27fe291a4bb128d66abb37d0534a8f4fdfc88da Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 25 Aug 2023 14:41:10 +0300
Subject: [PATCH 54/54] qt6.qtwebengine: use vendored re2

Ours is too new and doesn't compile. The other removed inputs were unused already.
---
 pkgs/development/libraries/qt-6/modules/qtwebengine.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix
index 58b672d2b7b9..5d9aa71e8537 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix
@@ -14,8 +14,6 @@
 , python3
 , which
 , nodejs
-, qtbase
-, perl
 , xorg
 , libXcursor
 , libXScrnSaver
@@ -51,8 +49,6 @@
 , systemd
 , pipewire
 , gn
-, runCommand
-, writeScriptBin
 , ffmpeg_4
 , lib
 , stdenv
@@ -60,10 +56,8 @@
 , libxml2
 , libxslt
 , lcms2
-, re2
 , libkrb5
 , mesa
-, xkeyboard_config
 , enableProprietaryCodecs ? true
   # darwin
 , llvmPackages_14
@@ -229,7 +223,6 @@ qtModule {
     libxml2
     libxslt
     lcms2
-    re2
 
     libevent
     ffmpeg_4