From e1c7d5776f090ac68451be7a271c19371dc85a2b Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 31 May 2023 18:36:02 +0900
Subject: [PATCH 001/107] python3Packages.cacheyou: init at 23.3

---
 .../python-modules/cacheyou/default.nix       | 62 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 64 insertions(+)
 create mode 100644 pkgs/development/python-modules/cacheyou/default.nix

diff --git a/pkgs/development/python-modules/cacheyou/default.nix b/pkgs/development/python-modules/cacheyou/default.nix
new file mode 100644
index 00000000000..375beadd4f6
--- /dev/null
+++ b/pkgs/development/python-modules/cacheyou/default.nix
@@ -0,0 +1,62 @@
+{ lib
+, buildPythonPackage
+, cherrypy
+, fetchPypi
+, filelock
+, msgpack
+, pdm-backend
+, pytestCheckHook
+, pythonOlder
+, redis
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "cacheyou";
+  version = "23.3";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.7";
+
+  __darwinAllowLocalNetworking = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-fkCPFfSXj+oiR3NLMIYh919/4Wm0YWeVGccuioXWHV0=";
+  };
+
+  nativeBuildInputs = [
+    pdm-backend
+  ];
+
+  propagatedBuildInputs = [
+    msgpack
+    requests
+  ];
+
+  passthru.optional-dependencies = {
+    filecache = [
+      filelock
+    ];
+    redis = [
+      redis
+    ];
+  };
+
+  nativeCheckInputs = [
+    cherrypy
+    pytestCheckHook
+  ] ++ passthru.optional-dependencies.filecache;
+
+  pythonImportsCheck = [
+    "cacheyou"
+  ];
+
+  meta = {
+    description = "The httplib2 caching algorithms packaged up for use with requests";
+    homepage = "https://github.com/frostming/cacheyou";
+    changelog = "https://github.com/frostming/cacheyou/releases/tag/${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ natsukium ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7fef6b0d244..f8f33ad8dd2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1579,6 +1579,8 @@ self: super: with self; {
 
   cachey = callPackage ../development/python-modules/cachey { };
 
+  cacheyou = callPackage ../development/python-modules/cacheyou { };
+
   cachy = callPackage ../development/python-modules/cachy { };
 
   cadquery = callPackage ../development/python-modules/cadquery {

From f0f0ab209e68fa1e9739d7676ca0bb728f2a6a1c Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 31 May 2023 18:11:23 +0900
Subject: [PATCH 002/107] pdm: 2.6.1 -> 2.7.0

Changelog: https://github.com/pdm-project/pdm/releases/tag/2.7.0
---
 pkgs/tools/package-management/pdm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix
index e3ea6d4afa5..01eda1ea050 100644
--- a/pkgs/tools/package-management/pdm/default.nix
+++ b/pkgs/tools/package-management/pdm/default.nix
@@ -24,13 +24,13 @@ in
 with python.pkgs;
 buildPythonApplication rec {
   pname = "pdm";
-  version = "2.6.1";
+  version = "2.7.0";
   format = "pyproject";
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-EFlYhJovjZqp7yGDosUOrp60rEf8gScs1QT92ckO3qI=";
+    hash = "sha256-4dyu/neMFX/U1RuI0ZEBzdbONIHvdWyvpy1Gu5iMAcg=";
   };
 
   nativeBuildInputs = [
@@ -39,7 +39,7 @@ buildPythonApplication rec {
 
   propagatedBuildInputs = [
     blinker
-    cachecontrol
+    cacheyou
     certifi
     findpython
     installer

From 0fa17e3f9a1a7bc6317ccf43688e15bf6e04e1ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?=
 <ereslibre@ereslibre.es>
Date: Thu, 1 Jun 2023 00:20:20 +0200
Subject: [PATCH 003/107] unison: M4h -> M4i

---
 pkgs/development/compilers/unison/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix
index b5031fa5897..0fd99ac0c37 100644
--- a/pkgs/development/compilers/unison/default.nix
+++ b/pkgs/development/compilers/unison/default.nix
@@ -6,18 +6,18 @@
 
 stdenv.mkDerivation rec {
   pname = "unison-code-manager";
-  milestone_id = "M4h";
+  milestone_id = "M4i";
   version = "1.0.${milestone_id}-alpha";
 
   src = if (stdenv.isDarwin) then
     fetchurl {
       url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-macos.tar.gz";
-      hash = "sha256-7yphap7qZBkbTKiwhyCTLgbBO/aA0eUWtva+XjpaZDI=";
+      hash = "sha256-1Qp1SB5rCsVimZzRo1NOX8HBoMEGlIycJPm3zGTUuOw=";
     }
   else
     fetchurl {
       url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/ucm-linux.tar.gz";
-      hash = "sha256-vrZpYFoQw1hxgZ7lAoejIqnjIOFFMahAI9SjFN/Cnms=";
+      hash = "sha256-Qx8vO/Vaz0VdCGXwIwRQIuMlp44hxCroQ7m7Y+m7aXk=";
     };
 
   # The tarball is just the prebuilt binary, in the archive root.

From 5b90f7a6a942ec630ea24cc202bb2a57b3f726a4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 26 May 2023 12:57:31 +0200
Subject: [PATCH 004/107] coding-conventions: include the preceding upstream
 version when packaging a commit without a version attached

---
 doc/contributing/coding-conventions.chapter.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md
index 7a538de18d1..03cd3dd458c 100644
--- a/doc/contributing/coding-conventions.chapter.md
+++ b/doc/contributing/coding-conventions.chapter.md
@@ -220,7 +220,9 @@ There are a few naming guidelines:
 
 - The `version` attribute _must_ start with a digit e.g`"0.3.1rc2".
 
-- If a package is not a release but a commit from a repository, then the `version` attribute _must_ be the date of that (fetched) commit. The date _must_ be in `"unstable-YYYY-MM-DD"` format.
+- If a package is a commit from a repository without a version assigned, then the `version` attribute _should_ be the latest upstream version preceding that commit, followed by `-unstable-` and the date of the (fetched) commit. The date _must_ be in `"YYYY-MM-DD"` format.
+
+Example: Given a project had its latest releases `2.2` in November 2021, and `3.0` in January 2022, a commit authored on March 15, 2022 for an upcoming bugfix release `2.2.1` would have `version = "2.2-unstable-2022-03-15"`.
 
 - Dashes in the package `pname` _should_ be preserved in new variable names, rather than converted to underscores or camel cased — e.g., `http-parser` instead of `http_parser` or `httpParser`. The hyphenated style is preferred in all three package names.
 

From 916f9bcaee1e9e101617d0bfe70b9fe1e5249017 Mon Sep 17 00:00:00 2001
From: Victor Buttner <victor@0x23.dk>
Date: Mon, 22 May 2023 21:58:10 +0200
Subject: [PATCH 005/107] jpexs: 15.0.0 -> 18.4.1

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

diff --git a/pkgs/development/tools/jpexs/default.nix b/pkgs/development/tools/jpexs/default.nix
index 910ad795523..c61246016a8 100644
--- a/pkgs/development/tools/jpexs/default.nix
+++ b/pkgs/development/tools/jpexs/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "jpexs";
-  version = "15.0.0";
+  version = "18.4.1";
 
   src = fetchzip {
-    url = "${meta.homepage}/releases/download/version${version}/ffdec_${version}.zip";
-    sha256 = "1w8sh0dzln6mxcbibyw6r9f9c8g0cbwxq4qbm5kawq00yydvwfza";
+    url = "https://github.com/jindrapetrik/jpexs-decompiler/releases/download/version${version}/ffdec_${version}.zip";
+    sha256 = "sha256-aaEL3xJZkFw78zo3IyauWJM9kOo0rJTUSKmWsv9xQZ8=";
     stripRoot = false;
   };
 

From 39f6dbc3792b88ce6572a95b1a26108393ff2e29 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 3 Jun 2023 17:30:24 -0500
Subject: [PATCH 006/107] gvisor: 20221102.1 -> 20230529.0

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../virtualization/gvisor/default.nix         | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix
index a07c98be49f..f97be741af7 100644
--- a/pkgs/applications/virtualization/gvisor/default.nix
+++ b/pkgs/applications/virtualization/gvisor/default.nix
@@ -9,20 +9,31 @@
 
 buildGoModule rec {
   pname = "gvisor";
-  version = "20221102.1";
+  version = "20230529.0";
 
   # gvisor provides a synthetic go branch (https://github.com/google/gvisor/tree/go)
   # that can be used to build gvisor without bazel.
+  #
   # For updates, you should stick to the commits labeled "Merge release-** (automated)"
+  # Make sure to check that the tagged commit for a release aligns with the version in
+  # the message for good measure; e.g. the commit
+  #
+  #     142d38d770a07291877dc0d50b88b719dbef76dc is "Merge release-20230522.0-11-g919cfd12b (automated)"
+  #
+  # on the 'go' branch. But the mentioned commit, 919cfd12b..., is actually tagged as release-20230529.0
+  #
+  #    https://github.com/google/gvisor/releases/tag/release-202329.0
+  #
+  # Presumably this is a result of the release process. Handle with care.
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "gvisor";
-    rev = "bf8eeee3a9eb966bc72c773da060a3c8bb73b8ff";
-    sha256 = "sha256-rADQsJ+AnBVlfQURGJl1xR6Ad5NyRWSrBSpOFMRld+o=";
+    rev = "142d38d770a07291877dc0d50b88b719dbef76dc";
+    hash = "sha256-Ukcjlz/6iUmDAUpQpIVfZHKbwK90Mt6fukcFaw64hQI=";
   };
 
-  vendorSha256 = "sha256-iGLWxx/Kn1QaJTNOZcc+mwoF3ecEDOkaqmA0DH4pdgU=";
+  vendorHash = "sha256-COr47mZ4tsbzMjkv63l+fexo0RL5lrBXeewak9CuZVk=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From 0d394b14280f49eb5d39a297715ac7cd1511bc60 Mon Sep 17 00:00:00 2001
From: Terje Larsen <terlar@gmail.com>
Date: Sat, 3 Jun 2023 22:53:12 +0000
Subject: [PATCH 007/107] pacproxy: init at 2.0.5

---
 pkgs/tools/networking/pacproxy/default.nix | 26 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/tools/networking/pacproxy/default.nix

diff --git a/pkgs/tools/networking/pacproxy/default.nix b/pkgs/tools/networking/pacproxy/default.nix
new file mode 100644
index 00000000000..f1fb107dd62
--- /dev/null
+++ b/pkgs/tools/networking/pacproxy/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+  pname = "pacproxy";
+  version = "2.0.5";
+
+  src = fetchFromGitHub {
+    owner = "williambailey";
+    repo = "pacproxy";
+    rev = "v${version}";
+    hash = "sha256-oDSptPihrDIiTCgcP4t2J3vJBNGMViyPAAmBv4ynLNU=";
+  };
+
+  vendorHash = "sha256-0Go+xwzaT1qt+cJfcPkC8ft3eB/OZCvOi2Pnn/A/rtQ=";
+
+  meta = with lib; {
+    description = "A no-frills local HTTP proxy server powered by a proxy auto-config (PAC) file";
+    homepage = "https://github.com/williambailey/pacproxy";
+    changelog = "https://github.com/williambailey/pacproxy/releases/tag/v${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ terlar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad848496a9c..81f2ef5a4bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -889,6 +889,8 @@ with pkgs;
 
   packr = callPackage ../development/libraries/packr { };
 
+  pacproxy = callPackage ../tools/networking/pacproxy { };
+
   perseus-cli = callPackage ../development/tools/perseus-cli {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };

From cdced93fd4fd5b5b7b1b350588b5dfa6237a7417 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Sun, 4 Jun 2023 16:38:24 +1000
Subject: [PATCH 008/107] ent-go: 0.11.0 -> 0.12.3

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

diff --git a/pkgs/development/tools/ent/default.nix b/pkgs/development/tools/ent/default.nix
index 31c6007fb0a..6e45ad539e7 100644
--- a/pkgs/development/tools/ent/default.nix
+++ b/pkgs/development/tools/ent/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "ent-go";
-  version = "0.11.0";
+  version = "0.12.3";
 
   src = fetchFromGitHub {
     owner = "ent";
     repo = "ent";
     rev = "v${version}";
-    sha256 = "sha256-EPUaBOvEAOjA24EYD0pyuNRdyX9qPxERXrBzHXC6cLI=";
+    sha256 = "sha256-ryOpaRQi30NPDNe9rUmW+fEqWSKWEsvHl/Bd1+i88y4=";
   };
 
-  vendorSha256 = "sha256-Q5vnfhUcbTmk3+t0D0z4dwU6pXKT7/hTfVHOUPXEzrg=";
+  vendorSha256 = "sha256-67+4r4ByVS0LgfL7eUOdEoQ+CMRzqNjPgkq3dNfNwBY=";
 
   subPackages = [ "cmd/ent" ];
 

From 431e42eb13573b4064e150d3fa7180504f58fd8b Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Sun, 4 Jun 2023 16:39:15 +1000
Subject: [PATCH 009/107] ent-go: unpin go

---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad848496a9c..5cd5de9197c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18420,9 +18420,7 @@ with pkgs;
 
   emma = callPackage ../development/tools/analysis/emma { };
 
-  ent-go = callPackage ../development/tools/ent {
-    buildGoModule = buildGo119Module; # go 1.20 build failure
-  };
+  ent-go = callPackage ../development/tools/ent { };
 
   epm = callPackage ../development/tools/misc/epm { };
 

From 984d7a10d19c89bae91a2fc32cff2f0b4f656bed Mon Sep 17 00:00:00 2001
From: zendo <linzway@qq.com>
Date: Sun, 4 Jun 2023 11:31:52 +0800
Subject: [PATCH 010/107] thiefmd: 0.2.5 -> 0.2.7

---
 pkgs/applications/editors/thiefmd/default.nix | 69 ++++++++++++-------
 1 file changed, 46 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/editors/thiefmd/default.nix b/pkgs/applications/editors/thiefmd/default.nix
index 7f265aefcd0..1b7b4a668b2 100644
--- a/pkgs/applications/editors/thiefmd/default.nix
+++ b/pkgs/applications/editors/thiefmd/default.nix
@@ -1,46 +1,69 @@
-{ lib, stdenv, fetchFromGitHub, wrapGAppsHook, cmake, desktop-file-utils, glib
-, meson, ninja, pkg-config, vala, clutter, discount, gtk3, gtksourceview4, gtkspell3
-, libarchive, libgee, libhandy, libsecret, link-grammar, webkitgtk }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, vala
+, pkg-config
+, wrapGAppsHook
+, desktop-file-utils
+, discount
+, glib
+, gtk3
+, gtksourceview4
+, gtkspell3
+, json-glib
+, libarchive
+, libgee
+, libhandy
+, libsecret
+, libxml2
+, link-grammar
+, webkitgtk_4_1
+}:
 
 stdenv.mkDerivation rec {
   pname = "thiefmd";
-  version = "0.2.5-stability";
+  version = "0.2.7";
 
   src = fetchFromGitHub {
     owner = "kmwallio";
     repo = "ThiefMD";
     rev = "v${version}";
-    sha256 = "sha256-cUZ7NVGe4e9ZISo9gjWFuDNCyF3rsQtrDX+ureyqtwM=";
+    hash = "sha256-noNfGFMeIyKhAgiovJDn91TLELAOQ4nD/5QlQfsKTII=";
     fetchSubmodules = true;
   };
 
   nativeBuildInputs = [
-    cmake desktop-file-utils glib meson wrapGAppsHook
-    ninja pkg-config vala
+    meson
+    ninja
+    vala
+    pkg-config
+    wrapGAppsHook
+    desktop-file-utils
   ];
 
   buildInputs = [
-    clutter discount gtk3 gtksourceview4 gtkspell3
-    libarchive libgee libhandy libsecret link-grammar
-    webkitgtk
+    discount # libmarkdown
+    glib
+    gtk3
+    gtksourceview4
+    gtkspell3
+    json-glib
+    libarchive
+    libgee
+    libhandy
+    libsecret
+    libxml2
+    link-grammar
+    webkitgtk_4_1
   ];
 
-  dontUseCmakeConfigure = true;
-
-  postInstall = ''
-    mv $out/share/applications/com.github.kmwallio.thiefmd.desktop \
-      $out/share/applications/thiefmd.desktop
-    substituteInPlace $out/share/applications/thiefmd.desktop \
-      --replace 'Exec=com.github.kmwallio.' Exec=$out/bin/
-
-    makeWrapper $out/bin/com.github.kmwallio.thiefmd \
-      $out/bin/thiefmd \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/"
-  '';
-
   meta = with lib; {
     description = "Markdown & Fountain editor that helps with organization and management";
     homepage = "https://thiefmd.com";
+    downloadPage = "https://github.com/kmwallio/ThiefMD";
+    mainProgram = "com.github.kmwallio.thiefmd";
     license = licenses.gpl3Only;
     platforms = platforms.linux;
     maintainers = with maintainers; [ wolfangaukang ];

From 04b8795d8ee09dbca2a1c7e9ec14911ddc23c35e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 4 Jun 2023 09:52:34 +0200
Subject: [PATCH 011/107] hdf5_1_10: mark vulnerable

Closes: #128374
---
 pkgs/tools/misc/hdf5/1.10.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/tools/misc/hdf5/1.10.nix b/pkgs/tools/misc/hdf5/1.10.nix
index fbfac18414c..1ff4b392d76 100644
--- a/pkgs/tools/misc/hdf5/1.10.nix
+++ b/pkgs/tools/misc/hdf5/1.10.nix
@@ -51,5 +51,11 @@ stdenv.mkDerivation rec {
     license = lib.licenses.bsd3; # Lawrence Berkeley National Labs BSD 3-Clause variant
     homepage = "https://www.hdfgroup.org/HDF5/";
     platforms = lib.platforms.unix;
+    knownVulnerabilities = [
+      "CVE-2020-10809"
+      "CVE-2020-10810"
+      "CVE-2020-10811"
+      "CVE-2020-10812"
+    ];
   };
 }

From 5dfcee77945aca69685472c1b16acdac6fb209a7 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Sun, 4 Jun 2023 10:35:26 +0300
Subject: [PATCH 012/107] waycorner: init at 0.2.1

---
 pkgs/applications/misc/waycorner/default.nix | 40 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/applications/misc/waycorner/default.nix

diff --git a/pkgs/applications/misc/waycorner/default.nix b/pkgs/applications/misc/waycorner/default.nix
new file mode 100644
index 00000000000..66e5660042a
--- /dev/null
+++ b/pkgs/applications/misc/waycorner/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, makeWrapper
+, rustPlatform
+, pkg-config
+, fetchFromGitHub
+, wayland
+,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "waycorner";
+  version = "0.2.1";
+  src = fetchFromGitHub {
+    owner = "AndreasBackx";
+    repo = "waycorner";
+    rev = version;
+    hash = "sha256-xvmvtn6dMqt8kUwvn5d5Nl1V84kz1eWa9BSIN/ONkSQ=";
+  };
+  cargoHash = "sha256-Dl+GhJywWhaC4QMS70klazPsFipGVRW+6jrXH2XsEAI=";
+  buildInputs = [
+    wayland
+  ];
+  nativeBuildInputs = [
+    pkg-config
+    makeWrapper
+  ];
+  postFixup = ''
+    # the program looks for libwayland-client.so at runtime
+    wrapProgram $out/bin/waycorner \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ wayland ]}
+  '';
+
+  meta = with lib; {
+    description = "Hot corners for Wayland";
+    changelog = "https://github.com/AndreasBackx/waycorner/blob/main/CHANGELOG.md";
+    homepage = "https://github.com/AndreasBackx/waycorner";
+    platforms = platforms.linux;
+    license = licenses.mit;
+    maintainers = with maintainers; [ NotAShelf ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad848496a9c..9a967e6ed41 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31563,6 +31563,8 @@ with pkgs;
 
   waybar = callPackage ../applications/misc/waybar { };
 
+  waycorner = callPackage ../applications/misc/waycorner { };
+
   waylock = callPackage ../applications/misc/waylock {
     zig = buildPackages.zig_0_10;
   };

From 83ff7cdc656b2953ef02f22cf3d8df3c44d243a4 Mon Sep 17 00:00:00 2001
From: Martino Fontana <tinozzo123@tutanota.com>
Date: Mon, 30 May 2022 14:35:29 +0200
Subject: [PATCH 013/107] rapidyaml: init at 0.5.0

---
 .../libraries/rapidyaml/default.nix           | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/libraries/rapidyaml/default.nix

diff --git a/pkgs/development/libraries/rapidyaml/default.nix b/pkgs/development/libraries/rapidyaml/default.nix
new file mode 100644
index 00000000000..68449479278
--- /dev/null
+++ b/pkgs/development/libraries/rapidyaml/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, stdenv
+, cmake
+, fetchFromGitHub
+, git
+}:
+
+stdenv.mkDerivation rec {
+  pname = "rapidyaml";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "biojppm";
+    repo = pname;
+    fetchSubmodules = true;
+    rev = "v${version}";
+    sha256 = "sha256-1/P6Szgng94UU8cPFAtOKMS+EmiwfW/IJl2UTolDU5s=";
+  };
+
+  nativeBuildInputs = [ cmake git ];
+
+  meta = with lib; {
+    description = "A library to parse and emit YAML, and do it fast.";
+    homepage = "https://github.com/biojppm/rapidyaml";
+    license = licenses.mit;
+    maintainers = with maintainers; [ martfont ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3e56c9678e..8935f14f8b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23811,6 +23811,8 @@ with pkgs;
 
   rapidxml = callPackage ../development/libraries/rapidxml { };
 
+  rapidyaml = callPackage ../development/libraries/rapidyaml {};
+
   raul = callPackage ../development/libraries/audio/raul { };
 
   raylib = callPackage ../development/libraries/raylib { };

From f9a0f4a620090300271a243b2aec06fa6218bc62 Mon Sep 17 00:00:00 2001
From: Martino Fontana <tinozzo123@tutanota.com>
Date: Mon, 30 May 2022 14:36:31 +0200
Subject: [PATCH 014/107] pcsx2: 1.7.3331 -> 1.7.4554

---
 pkgs/applications/emulators/pcsx2/default.nix | 108 ++++++++++--------
 pkgs/top-level/all-packages.nix               |   4 +-
 2 files changed, 63 insertions(+), 49 deletions(-)

diff --git a/pkgs/applications/emulators/pcsx2/default.nix b/pkgs/applications/emulators/pcsx2/default.nix
index 34eba5ed781..953fd3a3daa 100644
--- a/pkgs/applications/emulators/pcsx2/default.nix
+++ b/pkgs/applications/emulators/pcsx2/default.nix
@@ -1,90 +1,110 @@
-{ alsa-lib
-, cmake
+{ cmake
 , fetchFromGitHub
+, lib
+, stdenv
+, curl
+, ffmpeg
 , fmt
 , gettext
-, glib
-, gtk3
 , harfbuzz
-, lib
 , libaio
+, libbacktrace
 , libpcap
-, libpng
 , libpulseaudio
 , libsamplerate
-, libXdmcp
-, openssl
-, pcre
-, perl
+, libXrandr
+, libzip
 , pkg-config
-, portaudio
+, qtbase
+, qtsvg
+, qttools
+, qttranslations
+, qtwayland
+, rapidyaml
 , SDL2
 , soundtouch
-, stdenv
-, udev
 , vulkan-headers
 , vulkan-loader
-, wrapGAppsHook
-, wxGTK
-, zlib
 , wayland
+, wrapQtAppsHook
+, xz
+, zip
 }:
 
+let
+  # The pre-zipped files in releases don't have a versioned link, we need to zip them ourselves
+  pcsx2_patches = fetchFromGitHub {
+    owner = "PCSX2";
+    repo = "pcsx2_patches";
+    rev = "8db5ae467a35cc00dc50a65061aa78dc5115e6d1";
+    sha256 = "sha256-68kD7IAhBMASFmkGwvyQ7ppO/3B1csAKik+rU792JI4=";
+  };
+in
 stdenv.mkDerivation rec {
   pname = "pcsx2";
-  version = "1.7.3331";
-  # nixpkgs-update: no auto update
+  version = "1.7.4554";
 
   src = fetchFromGitHub {
     owner = "PCSX2";
     repo = "pcsx2";
     fetchSubmodules = true;
     rev = "v${version}";
-    hash = "sha256-0RcmBMxKj/gnkNEjn2AUSSO1DzyNSf1lOZWPSUq6764=";
+    sha256 = "sha256-9MRbpm7JdVmZwv8zD4lErzVTm7A4tYM0FgXE9KpX+/8=";
   };
 
   cmakeFlags = [
     "-DDISABLE_ADVANCE_SIMD=TRUE"
-    "-DDISABLE_PCSX2_WRAPPER=TRUE"
-    "-DPACKAGE_MODE=TRUE"
-    "-DWAYLAND_API=TRUE"
-    "-DXDG_STD=TRUE"
-    "-DUSE_VULKAN=TRUE"
+    "-DUSE_SYSTEM_LIBS=ON"
+    "-DDISABLE_BUILD_DATE=TRUE"
   ];
 
-  nativeBuildInputs = [ cmake perl pkg-config vulkan-headers wrapGAppsHook ];
+  nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook zip ];
 
   buildInputs = [
-    alsa-lib
+    curl
+    ffmpeg
     fmt
     gettext
-    glib
-    gtk3
     harfbuzz
     libaio
+    libbacktrace
     libpcap
-    libpng
     libpulseaudio
     libsamplerate
-    libXdmcp
-    openssl
-    pcre
-    portaudio
+    libXrandr
+    libzip
+    qtbase
+    qtsvg
+    qttools
+    qttranslations
+    qtwayland
+    rapidyaml
     SDL2
     soundtouch
-    udev
+    vulkan-headers
     vulkan-loader
     wayland
-    wxGTK
-    zlib
+    xz
   ];
 
-  preFixup = ''
-    gappsWrapperArgs+=(
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}
-    )
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -a bin/pcsx2-qt bin/resources $out/bin/
+
+    install -Dm644 $src/pcsx2/Resources/AppIcon64.png $out/share/pixmaps/PCSX2.png
+    install -Dm644 $src/.github/workflows/scripts/linux/pcsx2-qt.desktop $out/share/applications/PCSX2.desktop
+
+    zip -jq $out/bin/resources/patches.zip ${pcsx2_patches}/patches/*
   '';
 
+  qtWrapperArgs = [
+    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
+      ffmpeg # It's loaded with dlopen. They plan to change it https://github.com/PCSX2/pcsx2/issues/8624
+      libpulseaudio
+      vulkan-loader
+    ]}"
+  ];
+
   meta = with lib; {
     description = "Playstation 2 emulator";
     longDescription = ''
@@ -95,13 +115,9 @@ stdenv.mkDerivation rec {
       PC, with many additional features and benefits.
     '';
     homepage = "https://pcsx2.net";
+    license = with licenses; [ gpl3 lgpl3 ];
     maintainers = with maintainers; [ hrdinka govanify ];
-
-    # PCSX2's source code is released under LGPLv3+. It However ships
-    # additional data files and code that are licensed differently.
-    # This might be solved in future, for now we should stick with
-    # license.free
-    license = licenses.free;
+    mainProgram = "pcsx2-qt";
     platforms = platforms.x86_64;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8935f14f8b8..911f5df257b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2399,9 +2399,7 @@ with pkgs;
 
   pcem = callPackage ../applications/emulators/pcem { };
 
-  pcsx2 = callPackage ../applications/emulators/pcsx2 {
-    wxGTK = wxGTK32;
-  };
+  pcsx2 = qt6Packages.callPackage ../applications/emulators/pcsx2 { };
 
   pcsxr = callPackage ../applications/emulators/pcsxr { };
 

From fdcd339e76c06ff732b62420f4d836717ddcad69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Mon, 5 Jun 2023 10:24:59 -0300
Subject: [PATCH 015/107] qogir-icon-theme: 2023-02-23 -> 2023-06-05

---
 pkgs/data/icons/qogir-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix
index 9b41b66c8de..bfa4e33fc8c 100644
--- a/pkgs/data/icons/qogir-icon-theme/default.nix
+++ b/pkgs/data/icons/qogir-icon-theme/default.nix
@@ -18,13 +18,13 @@ lib.checkListOfEnum "${pname}: theme variants" [ "default" "manjaro" "ubuntu" "a
 
 stdenvNoCC.mkDerivation rec {
   inherit pname;
-  version = "2023-02-23";
+  version = "2023-06-05";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = version;
-    sha256 = "sha256-yXpHm/iXtBdEo6m8W7Itp3N9vrWRTb7S3aKi0X2RObo=";
+    sha256 = "sha256-qiHmA/K4hdXVSFzergGhgssKR+kXp3X0cqtX1X5ayM4=";
   };
 
   nativeBuildInputs = [ gtk3 jdupes ];

From 07961f5341722ac039f0cb7168cd78941301643a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 5 Jun 2023 19:53:21 +0000
Subject: [PATCH 016/107] python310Packages.jupyterlab-lsp: 4.0.1 -> 4.2.0

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

diff --git a/pkgs/development/python-modules/jupyterlab-lsp/default.nix b/pkgs/development/python-modules/jupyterlab-lsp/default.nix
index d7f62e9e203..5ebdb8ae5f5 100644
--- a/pkgs/development/python-modules/jupyterlab-lsp/default.nix
+++ b/pkgs/development/python-modules/jupyterlab-lsp/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "jupyterlab-lsp";
-  version = "4.0.1";
+  version = "4.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-1VPRfs+F24h2xJeoJglZQpuCcPDk6Ptf8cWrAW3G5to=";
+    hash = "sha256-OqsByMrAQKjTqev6QIUiOwVLf71iGdPHtWD2qXZsovM=";
   };
 
   propagatedBuildInputs = [

From 276e54000ed52125ea62946563c137e7422fd845 Mon Sep 17 00:00:00 2001
From: Alex Wied <centromere@users.noreply.github.com>
Date: Thu, 4 May 2023 05:43:34 -0400
Subject: [PATCH 017/107] python3Packages.py-partiql-parser: init at 0.3.3

https://github.com/getmoto/py-partiql-parser
---
 .../py-partiql-parser/default.nix             | 46 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/python-modules/py-partiql-parser/default.nix

diff --git a/pkgs/development/python-modules/py-partiql-parser/default.nix b/pkgs/development/python-modules/py-partiql-parser/default.nix
new file mode 100644
index 00000000000..e85e4116ba5
--- /dev/null
+++ b/pkgs/development/python-modules/py-partiql-parser/default.nix
@@ -0,0 +1,46 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, nix-update-script
+, pytestCheckHook
+, setuptools
+, sure
+}:
+
+buildPythonPackage rec {
+  pname = "py-partiql-parser";
+  version = "0.3.3";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "getmoto";
+    repo = "py-partiql-parser";
+    rev = "refs/tags/${version}";
+    hash = "sha256-7FYIRlr75L0y1d9jgbPpq/G7VC4YMD7IUQVNhfHdCh8=";
+  };
+
+  nativeBuildInputs = [
+    setuptools
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    sure
+  ];
+
+  pythonImportsCheck = [
+    "py_partiql_parser"
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = with lib; {
+    description = "A tokenizer/parser/executor for the PartiQL-language, in Python";
+    homepage = "https://github.com/getmoto/py-partiql-parser";
+    changelog = "https://github.com/getmoto/py-partiql-parser/blob/${version}/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ centromere ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f4d0bda3cb7..0cb538d42b8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8178,6 +8178,8 @@ self: super: with self; {
 
   py-nightscout = callPackage ../development/python-modules/py-nightscout { };
 
+  py-partiql-parser = callPackage ../development/python-modules/py-partiql-parser { };
+
   py-pdf-parser = callPackage ../development/python-modules/py-pdf-parser { };
 
   py-serializable = callPackage ../development/python-modules/py-serializable { };

From 3b0e48a74ca267a92e2f6bf73bea742681ec05ec Mon Sep 17 00:00:00 2001
From: Mrinal Purohit <github@mrinalpurohit.in>
Date: Tue, 6 Jun 2023 15:00:16 +0200
Subject: [PATCH 018/107] google-cloud-sdk: 426.0.0 -> 433.0.1

---
 .../admin/google-cloud-sdk/components.json    | 1044 ++++++++---------
 pkgs/tools/admin/google-cloud-sdk/data.nix    |   22 +-
 2 files changed, 533 insertions(+), 533 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/components.json b/pkgs/tools/admin/google-cloud-sdk/components.json
index 709fdf117b3..c953c355d90 100644
--- a/pkgs/tools/admin/google-cloud-sdk/components.json
+++ b/pkgs/tools/admin/google-cloud-sdk/components.json
@@ -5,7 +5,7 @@
         "checksum": "5a65179c291bc480696ca323d2f8c4874985458303eff8f233e16cdca4e88e6f",
         "contents_checksum": "038c999c7a7d70d5133eab7dc5868c4c3d0358431dad250f9833306af63016c8",
         "size": 800,
-        "source": "components/google-cloud-sdk-alpha-20230410222307.tar.gz",
+        "source": "components/google-cloud-sdk-alpha-20230601190557.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -22,8 +22,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20230410222307,
-        "version_string": "2023.04.10"
+        "build_number": 20230601190557,
+        "version_string": "2023.06.01"
       }
     },
     {
@@ -258,15 +258,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "0.2.35"
+        "version_string": "0.2.36"
       }
     },
     {
       "data": {
-        "checksum": "cd73f7e6ace652d30f659a3c6ac8fff68a46ecd29063866fe3a671f1c38b0a4f",
-        "contents_checksum": "fec54314ed5717b286bdacb8b775bbe0d1c85e104441877b15cb71630b065f6e",
-        "size": 69503906,
-        "source": "components/google-cloud-sdk-anthoscli-darwin-arm-20230213205029.tar.gz",
+        "checksum": "622aa4a1a3cfd76bfbf928f50a062f6f678e6b1dec9298aac9cc17a6061b1fac",
+        "contents_checksum": "49e7d6fe11fe648f67789e906e16e4095deb1a8fb47baa7b43444ca3431f6e1c",
+        "size": 69697123,
+        "source": "components/google-cloud-sdk-anthoscli-darwin-arm-20230417163046.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -290,8 +290,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230213205029,
-        "version_string": "0.2.35"
+        "build_number": 20230417163046,
+        "version_string": "0.2.36"
       }
     },
     {
@@ -329,10 +329,10 @@
     },
     {
       "data": {
-        "checksum": "af4420a00e5df7152c52d9ec8eecd3b9b81ad27bfcf051a05da81cfc0859d728",
-        "contents_checksum": "8453e52c280a0164cfa3101ef82e429f50890cb8a399df669b8b05af10e32725",
-        "size": 72623902,
-        "source": "components/google-cloud-sdk-anthoscli-darwin-x86_64-20230213205029.tar.gz",
+        "checksum": "c979d977c431bc1c1bcb246e33c4037bd415b9a9a72b29eaadea8d27f64ce34f",
+        "contents_checksum": "8f1b2882132f4cda0d19193285a71f3189e587b58e9bbefc912cf14057938656",
+        "size": 72538860,
+        "source": "components/google-cloud-sdk-anthoscli-darwin-x86_64-20230417163046.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -356,16 +356,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230213205029,
-        "version_string": "0.2.35"
+        "build_number": 20230417163046,
+        "version_string": "0.2.36"
       }
     },
     {
       "data": {
-        "checksum": "f58347287688be7b0211691e55efa9ba51174c33b706e778d63fb555df740216",
-        "contents_checksum": "a3e5f9678e5e9aacf43a8895762b874c895d2a02dbef3a3761a16af014477271",
-        "size": 66574923,
-        "source": "components/google-cloud-sdk-anthoscli-linux-arm-20230213205029.tar.gz",
+        "checksum": "8ac44f062930b70ba19b5447cf646b5005afb81281f23b21790db5e8560184c3",
+        "contents_checksum": "648e248ac1a1841aed1631054a37237b1881d7203ab1e05133d4db22551fd449",
+        "size": 66361425,
+        "source": "components/google-cloud-sdk-anthoscli-linux-arm-20230417163046.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -389,16 +389,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230213205029,
-        "version_string": "0.2.35"
+        "build_number": 20230417163046,
+        "version_string": "0.2.36"
       }
     },
     {
       "data": {
-        "checksum": "0ff7482c86a97f05b601569083c1413509857b4d356067007f4f860fb9dd6155",
-        "contents_checksum": "572ebf1447edfdd7aa08cbd0cbee4b3710ccfab6189ef2c6e2b6c2dad117d8e5",
-        "size": 67367245,
-        "source": "components/google-cloud-sdk-anthoscli-linux-x86-20230213205029.tar.gz",
+        "checksum": "9e5a595066afd0703675fddbe16baa99eadcfe54bc8ed61842118c95bcf41362",
+        "contents_checksum": "3308d2d3f0ce3c4e08b04c2086c1587897109fd4d00358f71ede62a10f235b8b",
+        "size": 67573673,
+        "source": "components/google-cloud-sdk-anthoscli-linux-x86-20230417163046.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -422,16 +422,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230213205029,
-        "version_string": "0.2.35"
+        "build_number": 20230417163046,
+        "version_string": "0.2.36"
       }
     },
     {
       "data": {
-        "checksum": "216c2fb3c1dbf150ff9262750f27abfed1059227fe88c29e0add7ee6f7a43f28",
-        "contents_checksum": "fff2393c122315fdc1987176634b1a13f1f1d88aae4c015b1329f66835f6da0a",
-        "size": 71957154,
-        "source": "components/google-cloud-sdk-anthoscli-linux-x86_64-20230213205029.tar.gz",
+        "checksum": "a2812edb4b032104a4411ae5a682e6079628505aa5492f0c47927719329e988e",
+        "contents_checksum": "8cfc497719a3125f56468847a483f4a8fa1042dee5fe16e62a67bd0712289ab9",
+        "size": 71766688,
+        "source": "components/google-cloud-sdk-anthoscli-linux-x86_64-20230417163046.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -455,16 +455,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230213205029,
-        "version_string": "0.2.35"
+        "build_number": 20230417163046,
+        "version_string": "0.2.36"
       }
     },
     {
       "data": {
-        "checksum": "ef1db6a1b54163977812e552abf21083479a163098e786d4a16deda66bed3ee6",
-        "contents_checksum": "6fc3664b6bb933c3fa356bc20d60047c776a1299f2c7962ce998e45e7d208e8e",
-        "size": 69205254,
-        "source": "components/google-cloud-sdk-anthoscli-windows-x86-20230213205029.tar.gz",
+        "checksum": "206e446b0f4233ffb7ed3e9ec7e65956e632484d53b1b2cd850a15ed382dad29",
+        "contents_checksum": "fa8d318d1b9bd2dbec735d7938adcd40155673bca07d2c463e73a475cec4083b",
+        "size": 69419510,
+        "source": "components/google-cloud-sdk-anthoscli-windows-x86-20230417163046.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -488,16 +488,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230213205029,
-        "version_string": "0.2.35"
+        "build_number": 20230417163046,
+        "version_string": "0.2.36"
       }
     },
     {
       "data": {
-        "checksum": "d79d6455f5bad1165ea4d3af4621b7c6d9115d982c590c73791f9a8c9a33ced8",
-        "contents_checksum": "a41704bd9be2c0131a24957b8358490601ed5ff123ce373442a5bf0a6a10c93e",
-        "size": 72060854,
-        "source": "components/google-cloud-sdk-anthoscli-windows-x86_64-20230213205029.tar.gz",
+        "checksum": "65824f466c280e4732db1eae23e2bcd80ad91d9712f456d0737536a83dc29bd2",
+        "contents_checksum": "1adb2ffa94b2160fca1c2405986e151c03e403ded4d6ca397b221522b17bb2c1",
+        "size": 71888445,
+        "source": "components/google-cloud-sdk-anthoscli-windows-x86_64-20230417163046.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -521,8 +521,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230213205029,
-        "version_string": "0.2.35"
+        "build_number": 20230417163046,
+        "version_string": "0.2.36"
       }
     },
     {
@@ -560,15 +560,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "1.9.74"
+        "version_string": "1.9.75"
       }
     },
     {
       "data": {
-        "checksum": "9ccbf2d3f1b16c6e135c0f212ffc23a57014bfe630760e053c5fd598c3d7c81e",
-        "contents_checksum": "6ed06edd2ff2d1a53c731cf5fefa978b8821111df2fd4c5c053539bf5e8e68d1",
-        "size": 4463608,
-        "source": "components/google-cloud-sdk-app-engine-go-darwin-arm-20230410222307.tar.gz",
+        "checksum": "88f025a6822f74ffa4c34d23b656158f6191891abf9fbe244a4664077a45f57c",
+        "contents_checksum": "7a27fc4862491e5690c8158b915dd6c2c27c4fd1668f273057e059af4977a6e8",
+        "size": 4469651,
+        "source": "components/google-cloud-sdk-app-engine-go-darwin-arm-20230417163046.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -594,16 +594,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230410222307,
-        "version_string": "1.9.74"
+        "build_number": 20230417163046,
+        "version_string": "1.9.75"
       }
     },
     {
       "data": {
-        "checksum": "541aadb1f47c1746f88bbb544c075dfe69d721d5f1c0febc1791d896001e1bf7",
-        "contents_checksum": "76b0489355b7682fc72f0433f7f5b2d5f486f6cc9f7afe414771fb874509bf49",
-        "size": 4658275,
-        "source": "components/google-cloud-sdk-app-engine-go-darwin-x86_64-20230410222307.tar.gz",
+        "checksum": "4a093245d248d58197ea5ec35a65b4b329fc7aed383df80dd9a9206700ca830e",
+        "contents_checksum": "f17f61e98b4f3221eae38212f727d736326ac5c803526067d2c0da965ade6000",
+        "size": 4658659,
+        "source": "components/google-cloud-sdk-app-engine-go-darwin-x86_64-20230417163046.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -629,16 +629,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230410222307,
-        "version_string": "1.9.74"
+        "build_number": 20230417163046,
+        "version_string": "1.9.75"
       }
     },
     {
       "data": {
-        "checksum": "0285d1f1181f05dff4fd971095760c2cc31c93db77393a73584a8b96f2ee28e9",
-        "contents_checksum": "b51ee28c36a553f2d9c3e2bbdd38969861d49da7501fa8377faa53b91f3f9aee",
-        "size": 4418740,
-        "source": "components/google-cloud-sdk-app-engine-go-linux-arm-20230410222307.tar.gz",
+        "checksum": "18e5f83a7ae30202e2794d5a46641319dba24d01ac43d1e427b906109ce9069a",
+        "contents_checksum": "22b5e43c2665f646b3b4c043ea8ce5d657576ba54392ffab81c64776ccb0e10e",
+        "size": 4426107,
+        "source": "components/google-cloud-sdk-app-engine-go-linux-arm-20230417163046.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -664,16 +664,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230410222307,
-        "version_string": "1.9.74"
+        "build_number": 20230417163046,
+        "version_string": "1.9.75"
       }
     },
     {
       "data": {
-        "checksum": "9ace85dd79d0cbe1239829215fe7bbbec1402cd76b1d6a04672909f818d78ba5",
-        "contents_checksum": "1262e24409d76def1483927ef95203635637f28c56fa5fd3fd643a47ba4ad38d",
-        "size": 4813823,
-        "source": "components/google-cloud-sdk-app-engine-go-linux-x86-20230410222307.tar.gz",
+        "checksum": "e6271bd8ecf5309c573cae3cf2386a51099517dbe8ec3a8563e96586d6b5beb2",
+        "contents_checksum": "dab30a813f4c0da5028b46ca3ca4675b708358cb4d983b1bc52e03d385f49cfb",
+        "size": 4798186,
+        "source": "components/google-cloud-sdk-app-engine-go-linux-x86-20230417163046.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -699,16 +699,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230410222307,
-        "version_string": "1.9.74"
+        "build_number": 20230417163046,
+        "version_string": "1.9.75"
       }
     },
     {
       "data": {
-        "checksum": "d27520cde52bece0702e1b5883a62bf1ed86c4dd07ff2325babe5eb428dfb1f9",
-        "contents_checksum": "09fcb20e1a31f23528b7177343e5c462a542d3a279b29eb796e8435a50bc20e2",
-        "size": 4727758,
-        "source": "components/google-cloud-sdk-app-engine-go-linux-x86_64-20230410222307.tar.gz",
+        "checksum": "1d5396984ff515be84c3bb526a802cfa9da49e677b46a23d192e09b063cad7d9",
+        "contents_checksum": "d4dce85cce2a173cdfac1e039f409c364b3db99624010cc0c38bcfbc96996cc3",
+        "size": 4731246,
+        "source": "components/google-cloud-sdk-app-engine-go-linux-x86_64-20230417163046.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -734,16 +734,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230410222307,
-        "version_string": "1.9.74"
+        "build_number": 20230417163046,
+        "version_string": "1.9.75"
       }
     },
     {
       "data": {
-        "checksum": "99a6f51c86bc35826bbb6238f5c019a1db67a3a6a725cb5af0a3a8b08665b27f",
-        "contents_checksum": "311aebedf540d23402665c67a125ba7342bc01524cf3b86f361c991052db0485",
-        "size": 4916010,
-        "source": "components/google-cloud-sdk-app-engine-go-windows-x86-20230410222307.tar.gz",
+        "checksum": "d1bbf796ff06580baeccc60c792c348cb1e466a3e6cc587ef6972ad0f67cd522",
+        "contents_checksum": "847ee7c88906720d640fbdb926b61105fd95e93d816fa5d1a83f1acf04ef8d74",
+        "size": 4900275,
+        "source": "components/google-cloud-sdk-app-engine-go-windows-x86-20230417163046.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -769,16 +769,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230410222307,
-        "version_string": "1.9.74"
+        "build_number": 20230417163046,
+        "version_string": "1.9.75"
       }
     },
     {
       "data": {
-        "checksum": "e34f285a94e28318a0d7cfccf53388a47250c2ee164f33634d9ef9dfe62409e5",
-        "contents_checksum": "535438cf6e6ac0a8317cb784a875f932a68c32b2cb0cdcd4387b50573b7c8a6b",
-        "size": 4786620,
-        "source": "components/google-cloud-sdk-app-engine-go-windows-x86_64-20230410222307.tar.gz",
+        "checksum": "4f2b7379f39b50a092cf158174b5966f9e14f7cd3ca1ac5732f1164ae60ba94e",
+        "contents_checksum": "9bd2d84c68d600bb3da84855996341596df3b8716d732fc9b7502db972dc5da3",
+        "size": 4784860,
+        "source": "components/google-cloud-sdk-app-engine-go-windows-x86_64-20230417163046.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -804,8 +804,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230410222307,
-        "version_string": "1.9.74"
+        "build_number": 20230417163046,
+        "version_string": "1.9.75"
       }
     },
     {
@@ -1020,10 +1020,10 @@
     },
     {
       "data": {
-        "checksum": "b53004d4d4439fa8e404409acfbb10893cb3546a0e369b914bac3e81e7e0f644",
-        "contents_checksum": "bb23237e8ce620be4b8102c87b1f1f8473a0fe1e5b1409be50678051e7e67951",
-        "size": 67693771,
-        "source": "components/google-cloud-sdk-app-engine-java-20230317195124.tar.gz",
+        "checksum": "3dd4a776118a1d70ba55fd3d36952332d3a8750c5bbec8ccce89c1a14c8eae51",
+        "contents_checksum": "08f55467011313e31e5696fe9dd40a519921a63d216fb4adaffca05704fff51d",
+        "size": 67724388,
+        "source": "components/google-cloud-sdk-app-engine-java-20230509142714.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1041,8 +1041,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20230317195124,
-        "version_string": "2.0.12"
+        "build_number": 20230509142714,
+        "version_string": "2.0.14"
       }
     },
     {
@@ -1142,10 +1142,10 @@
     },
     {
       "data": {
-        "checksum": "323a335ae7cc5bfc5d26bf192a1fab11d23f912b369fe8b16c3240bb0ef0f2f7",
-        "contents_checksum": "0223717c76b651d517cdedd4db71d66f66abeeffa486b6944ce976c97bce4bcc",
-        "size": 8827754,
-        "source": "components/google-cloud-sdk-app-engine-python-20230310163703.tar.gz",
+        "checksum": "9f4f0d000298def2c2fd0deec7b4020f6ecd18b492b45ce47b49382effd49337",
+        "contents_checksum": "0674f1b0d1bff60ff096b20ee545a416b4bf246866deb51cf5789faf27ddebdd",
+        "size": 8901812,
+        "source": "components/google-cloud-sdk-app-engine-python-20230509142714.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1164,16 +1164,16 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20230310163703,
-        "version_string": "1.9.103"
+        "build_number": 20230509142714,
+        "version_string": "1.9.104"
       }
     },
     {
       "data": {
-        "checksum": "83b1c2df408816a9d51d9a0301eb97e30d61d729c987ba585806a444a6785ffc",
-        "contents_checksum": "5d88b8454d9e5d39fb3f4d7a4bb16e296eb6883c325c17622050bf7b73ef8ff0",
-        "size": 27709995,
-        "source": "components/google-cloud-sdk-app-engine-python-extras-20211015142804.tar.gz",
+        "checksum": "1e3f40b2a1365fd9c6f638112d5f3b1f71d65ac6bd702b0a7359269105b0053f",
+        "contents_checksum": "d2c4f64d71d4d39a4f3a158f618584aa256e4264e08f38c079af890e6b1d49f5",
+        "size": 28667616,
+        "source": "components/google-cloud-sdk-app-engine-python-extras-20230509142714.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1191,8 +1191,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20211015142804,
-        "version_string": "1.9.96"
+        "build_number": 20230509142714,
+        "version_string": "1.9.100"
       }
     },
     {
@@ -1432,7 +1432,7 @@
         "checksum": "707d412854a14450b4fddee199d258e75946fe51b44eb2980c8cd7e274c15760",
         "contents_checksum": "0b4e9d8e6394dc841aece07ca4da91920a460cbd7ec22495be4a2b4f46635b4d",
         "size": 797,
-        "source": "components/google-cloud-sdk-beta-20230410222307.tar.gz",
+        "source": "components/google-cloud-sdk-beta-20230601190557.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1449,8 +1449,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20230410222307,
-        "version_string": "2023.04.10"
+        "build_number": 20230601190557,
+        "version_string": "2023.06.01"
       }
     },
     {
@@ -1493,10 +1493,10 @@
     },
     {
       "data": {
-        "checksum": "4e02fbb855adc3ad7925822d9d7c86f344e816fdd31e30586cd8a015049b9477",
-        "contents_checksum": "155d3754ce6cdbba7b4f52695b1e573f2ee6168ec551d12afa2dddffa8cbeaa4",
-        "size": 6650817,
-        "source": "components/google-cloud-sdk-bigtable-darwin-arm-20221014224505.tar.gz",
+        "checksum": "e51c0fb53e882e982c753b91072e9130a226132573af05ca0b567d858831dfbf",
+        "contents_checksum": "681c071d6faa4a7863a201e2463797aa7e70f35be9b34bd07ace7eed850022ef",
+        "size": 6972757,
+        "source": "components/google-cloud-sdk-bigtable-darwin-arm-20230509142714.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1521,7 +1521,7 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20221014224505,
+        "build_number": 20230509142714,
         "version_string": ""
       }
     },
@@ -1561,10 +1561,10 @@
     },
     {
       "data": {
-        "checksum": "3261baa866ec11323748ae3c6f3fd90712fbc2a1c8c8d1d3117e9711ed345f26",
-        "contents_checksum": "7372c8c895335e6be5073d8d9ef9b28d4637501decf5989452bcdd6a71afea15",
-        "size": 6842480,
-        "source": "components/google-cloud-sdk-bigtable-darwin-x86_64-20221014224505.tar.gz",
+        "checksum": "85b81a659b7ce4c7c9e68188d5bda2f8c87b981d79eb5bc94d98d23f5735ddad",
+        "contents_checksum": "60c057c831569a9ad9c011c4e7b44ff70dbb027213938c3ff08bde7e2202424e",
+        "size": 7202711,
+        "source": "components/google-cloud-sdk-bigtable-darwin-x86_64-20230509142714.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1589,16 +1589,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20221014224505,
+        "build_number": 20230509142714,
         "version_string": ""
       }
     },
     {
       "data": {
-        "checksum": "3abbc9a922d18a30e18044c1be49b95d9d52875e34ace0b35640de6975c7ad68",
-        "contents_checksum": "75cf2dedaee8e376823ae5323efc56255ecf6aac81eac39049a50c991a96d1ee",
-        "size": 6588911,
-        "source": "components/google-cloud-sdk-bigtable-linux-arm-20221014224505.tar.gz",
+        "checksum": "cc53d02d7f792ad638c99fef6ec6de38374bafbc68f1acbe272878ca2a340d94",
+        "contents_checksum": "92492fb5fc33a8b558dae73435719b6fb9b871626a058874d7e0f4d6340fbbec",
+        "size": 6833489,
+        "source": "components/google-cloud-sdk-bigtable-linux-arm-20230509142714.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1623,16 +1623,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20221014224505,
+        "build_number": 20230509142714,
         "version_string": ""
       }
     },
     {
       "data": {
-        "checksum": "feb1547637b7cd4c8e06f7390b78d32478d2276840a30a0b921c26516cd16c27",
-        "contents_checksum": "77e58559b06ed7e98e5c5442afc0c887ee46b9bf3137df991474578455b9f95d",
-        "size": 6965993,
-        "source": "components/google-cloud-sdk-bigtable-linux-x86-20221014224505.tar.gz",
+        "checksum": "7d0964348f97573d60894dd1aa79a819c9dbb66fa4b4aa9060fbeaad16cd3d1b",
+        "contents_checksum": "0278a1e0ca46bf7ad12f878ecb012ff6c9afc1ad659efff5caae6fb207e40be7",
+        "size": 7239068,
+        "source": "components/google-cloud-sdk-bigtable-linux-x86-20230509142714.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1657,16 +1657,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20221014224505,
+        "build_number": 20230509142714,
         "version_string": ""
       }
     },
     {
       "data": {
-        "checksum": "a45c8db9cfe1849e433fa5a8bf4a7ba331fd36cb9cd218140f07cb92a8f074eb",
-        "contents_checksum": "1e9a4d7f561687568a89879dab51d0b60cc913dd8d64e35eb18add8883bd7017",
-        "size": 7009373,
-        "source": "components/google-cloud-sdk-bigtable-linux-x86_64-20221014224505.tar.gz",
+        "checksum": "6eba5408e045bc81a391a088d5e758f9911c4d47f67fbdb6bf858c006fdc210d",
+        "contents_checksum": "1c5188c66452535df9e520a2911b586c8eeaeb013191eddd49201ca4cfc1e03d",
+        "size": 7319603,
+        "source": "components/google-cloud-sdk-bigtable-linux-x86_64-20230509142714.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1691,16 +1691,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20221014224505,
+        "build_number": 20230509142714,
         "version_string": ""
       }
     },
     {
       "data": {
-        "checksum": "0af006926c7b931efc252aed2750f04fd9bb6d4d46402243c385cb0da9fbadab",
-        "contents_checksum": "d4bf1d2ba05f3ac3e0a18829b3aae6b0fa3c79fcdd61a13e866e2b3418d04274",
-        "size": 6992588,
-        "source": "components/google-cloud-sdk-bigtable-windows-x86-20221014224505.tar.gz",
+        "checksum": "92d5947d1a92fcdf7c3dffdc5afa4288e7feb4f17a1de4314afe72621f75fad0",
+        "contents_checksum": "dba6b4c586cdb1b87a37b3e9a1ab15794e45080a63a9c827004d1ba7e7b4d204",
+        "size": 7264529,
+        "source": "components/google-cloud-sdk-bigtable-windows-x86-20230509142714.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1725,16 +1725,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20221014224505,
+        "build_number": 20230509142714,
         "version_string": ""
       }
     },
     {
       "data": {
-        "checksum": "8f68d5772472e1b5fb7b31c59609ca210d3dd84ae03f5aefc44b890c93ea4425",
-        "contents_checksum": "7ace77be7717a8a3185774ef5f6e43261f88016f0460c0ed450514bb4892883f",
-        "size": 6967066,
-        "source": "components/google-cloud-sdk-bigtable-windows-x86_64-20221014224505.tar.gz",
+        "checksum": "27383e7176acd029de91fd9d3a8278d37cac50302d6a83b817f656a417b67a75",
+        "contents_checksum": "75d71f882a506c2658919d83795164bd89d4198db3f24198edb5f83f42ed8032",
+        "size": 7288040,
+        "source": "components/google-cloud-sdk-bigtable-windows-x86_64-20230509142714.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1759,16 +1759,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20221014224505,
+        "build_number": 20230509142714,
         "version_string": ""
       }
     },
     {
       "data": {
-        "checksum": "4a06cd26e6c56d79e5af12c8333f003e92f09af3a0018e58f315a62ca016dc8b",
-        "contents_checksum": "1ed865efe8040709ef0236d2506997639c06f83ef7dc32fef5dfe1c125b9e6fb",
-        "size": 1661255,
-        "source": "components/google-cloud-sdk-bq-20230410222307.tar.gz",
+        "checksum": "15b7679bb150599a732864144389e8fb6dedce0ab36e0fb43c443690e0f991f4",
+        "contents_checksum": "26e505f5640d2ef739a79efbab5719bbe820a9cf1d31656d4a1809131c3251cc",
+        "size": 1681057,
+        "source": "components/google-cloud-sdk-bq-20230519173220.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -1787,8 +1787,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20230410222307,
-        "version_string": "2.0.90"
+        "build_number": 20230519173220,
+        "version_string": "2.0.93"
       }
     },
     {
@@ -2014,10 +2014,10 @@
     },
     {
       "data": {
-        "checksum": "0d85b7ba8c3b49c50d5e9296f6468afec497b4103f411e09f73798ca148b339d",
-        "contents_checksum": "a9d92675ac83d7b79d43de2e06e9efe0ffac2afee080872f684706ecddba8e31",
-        "size": 66467643,
-        "source": "components/google-cloud-sdk-bundled-python3-unix-linux-x86_64-20230303155151.tar.gz",
+        "checksum": "0db534f49d742f4214541dd80d86b50687f859a91ac141eecc9212826a2a6c4a",
+        "contents_checksum": "06fb4f1178dd64c413ccc042a3a14b47f5386898c9d01def8c786db5db0caf1b",
+        "size": 66615539,
+        "source": "components/google-cloud-sdk-bundled-python3-unix-linux-x86_64-20230428152336.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2042,16 +2042,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230303155151,
+        "build_number": 20230428152336,
         "version_string": "3.9.16"
       }
     },
     {
       "data": {
-        "checksum": "33fbead315d17079a81e571d00477f289a62ab21b92e43808ce5cba0db73b1a6",
-        "contents_checksum": "3e21c855a128106326db955f67c88b46f341fe732674c17e981a08d2b2ba5379",
-        "size": 20656105,
-        "source": "components/google-cloud-sdk-bundled-python3-windows-x86-20230130152419.tar.gz",
+        "checksum": "c44075ba9a5786b711aceb90305e53007aafb852777816315e0ad4a2150f50eb",
+        "contents_checksum": "6ad5d6f90482d680deebc471dd9c4f1c7cec098564e08fbf143b3a943a76f8f7",
+        "size": 20834587,
+        "source": "components/google-cloud-sdk-bundled-python3-windows-x86-20230509142714.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2076,16 +2076,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230130152419,
+        "build_number": 20230509142714,
         "version_string": "3.9.12"
       }
     },
     {
       "data": {
-        "checksum": "de9d580c1b2e61656a41f70d84ceed4f3aeaf852de914bd2c7f4774bdc0e1912",
-        "contents_checksum": "1b86b99bf3081de1aabd7f09364de608dce3d9221142e5bc0adbb8a31f3652f5",
-        "size": 22352936,
-        "source": "components/google-cloud-sdk-bundled-python3-windows-x86_64-20230130152419.tar.gz",
+        "checksum": "14ccdf30d73c288d8d07737723a8bf7ff505cb4d9705c456ea020c165f6f29a7",
+        "contents_checksum": "f5be123487d261a3f40769db2773659a1f2eb4ed52ecd47f61ae88df6b74c7a2",
+        "size": 22620820,
+        "source": "components/google-cloud-sdk-bundled-python3-windows-x86_64-20230509142714.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2110,7 +2110,7 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230130152419,
+        "build_number": 20230509142714,
         "version_string": "3.9.12"
       }
     },
@@ -2148,15 +2148,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "0.13.0"
+        "version_string": "0.15.0"
       }
     },
     {
       "data": {
-        "checksum": "1e122e1f8ce63f99616e8c36345e4f4a232a289628445ec9793e0497f947dd05",
-        "contents_checksum": "e4ee910acd3ee7ffecebdb1c2c291beaa446b2af0ad3af562360d05c53b46fa4",
-        "size": 10302644,
-        "source": "components/google-cloud-sdk-cbt-darwin-arm-20221205224721.tar.gz",
+        "checksum": "630fd981dcae05d02296540bbc6922a56d771d6926901065b79de24ba4f984c4",
+        "contents_checksum": "050863150ff33b3bbedd7b7af10b974514506f6a7f90a94faedd9533ddd1bf7b",
+        "size": 11344871,
+        "source": "components/google-cloud-sdk-cbt-darwin-arm-20230509142714.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2180,8 +2180,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20221205224721,
-        "version_string": "0.13.0"
+        "build_number": 20230509142714,
+        "version_string": "0.15.0"
       }
     },
     {
@@ -2219,10 +2219,10 @@
     },
     {
       "data": {
-        "checksum": "10b41dce042e6afd4519484387dbd490b15ce5ee9c2bc25461dc9aaa079a37f1",
-        "contents_checksum": "da3c1a6bc4b3896527cca0e614af13e0c16633d63efef2c76a36d71efde21278",
-        "size": 10655029,
-        "source": "components/google-cloud-sdk-cbt-darwin-x86_64-20221205224721.tar.gz",
+        "checksum": "114f77c7157b201f950af877015630de822277e896e87989cf4183c517b2ae25",
+        "contents_checksum": "6bd3c8e23a984ef4ae57144837065d753d3fcaf9f4da6cb3fc61557f5b4228f8",
+        "size": 11739619,
+        "source": "components/google-cloud-sdk-cbt-darwin-x86_64-20230509142714.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2246,16 +2246,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20221205224721,
-        "version_string": "0.13.0"
+        "build_number": 20230509142714,
+        "version_string": "0.15.0"
       }
     },
     {
       "data": {
-        "checksum": "1f5798e8d0debb9a70ce5c2c2b55351ba3f463e77ee6e2bff36bd3711d4fe3f3",
-        "contents_checksum": "36e2269c38a54a343e82ccf8322a86f59d63ef68abad8293083576a3469f789b",
-        "size": 10171654,
-        "source": "components/google-cloud-sdk-cbt-linux-arm-20221205224721.tar.gz",
+        "checksum": "377c8fbcaf0d643ff398bdaf547ae646fe20da26a9f1af06e98693304f47d618",
+        "contents_checksum": "c49dcee01759e0e4a87abd44ae057a3b0ad14909a3ad8d8bb66f93240c1e20df",
+        "size": 11113034,
+        "source": "components/google-cloud-sdk-cbt-linux-arm-20230509142714.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2279,16 +2279,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20221205224721,
-        "version_string": "0.13.0"
+        "build_number": 20230509142714,
+        "version_string": "0.15.0"
       }
     },
     {
       "data": {
-        "checksum": "000120b6f789408e13750784352b6d933729680c38b6695f15843e72cb92db17",
-        "contents_checksum": "9eece280f36b3b5a05f0013258c7cda7ab0b15dd238b1afcbdee0dcf846d26a8",
-        "size": 10736065,
-        "source": "components/google-cloud-sdk-cbt-linux-x86-20221205224721.tar.gz",
+        "checksum": "1166a160963a80017bdf41d53951849004a03843eab2fab056a961ed33c412f0",
+        "contents_checksum": "44f67b98726f64851dfef809d2bf820d5600ff5e19ad5731e821c79d50d917aa",
+        "size": 11635197,
+        "source": "components/google-cloud-sdk-cbt-linux-x86-20230509142714.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2312,16 +2312,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20221205224721,
-        "version_string": "0.13.0"
+        "build_number": 20230509142714,
+        "version_string": "0.15.0"
       }
     },
     {
       "data": {
-        "checksum": "7dee5e08893083f3a87e7df67c4eb708152de50f2d0423d4d839f9bccb859d28",
-        "contents_checksum": "40bc7f273eb7d6181ea550499f9343a06130e404abbf18ba9e71fa58b858b6ff",
-        "size": 10891694,
-        "source": "components/google-cloud-sdk-cbt-linux-x86_64-20221205224721.tar.gz",
+        "checksum": "07ce5e2b2b5b94d23e7e86f35995ae1975fc366b2c03f4266f702f54b597da78",
+        "contents_checksum": "7aae3bbe111ec9217e6bad3ec499b23e6f790ebc5c819cd8565ebe3147cb6d55",
+        "size": 11928343,
+        "source": "components/google-cloud-sdk-cbt-linux-x86_64-20230509142714.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2345,16 +2345,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20221205224721,
-        "version_string": "0.13.0"
+        "build_number": 20230509142714,
+        "version_string": "0.15.0"
       }
     },
     {
       "data": {
-        "checksum": "5a577a161e08fad125c262f7529b9b6954522f7eff89297ee4e5537450cb9b7f",
-        "contents_checksum": "7819039981a2f0813e685d7cebac090a274b613497060e5886a8f4b8b17ac514",
-        "size": 10825693,
-        "source": "components/google-cloud-sdk-cbt-windows-x86-20221205224721.tar.gz",
+        "checksum": "4ce8d2ff11c007d33599e07d4b68a090b331017d0a34cbd26e3da65800a8ecb5",
+        "contents_checksum": "26cd10c92f8bee2b36a1e46830494feabb77db5437487d7e955cae0cfe584d1c",
+        "size": 11740480,
+        "source": "components/google-cloud-sdk-cbt-windows-x86-20230509142714.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2378,16 +2378,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20221205224721,
-        "version_string": "0.13.0"
+        "build_number": 20230509142714,
+        "version_string": "0.15.0"
       }
     },
     {
       "data": {
-        "checksum": "aea7bad39416a751cff8a421e4519ea07092ddaf1705777f09f172bd51036c93",
-        "contents_checksum": "230697b231d07b6fe5ddc7824640769acc6536278e849b8c681ea543392d4e31",
-        "size": 10856641,
-        "source": "components/google-cloud-sdk-cbt-windows-x86_64-20221205224721.tar.gz",
+        "checksum": "e8f8f9fefc8087aa277f271a6d2c68b12db21fc890dba673c55ae7659d87506d",
+        "contents_checksum": "23050509e189b1943e2ea193312f247f6092ccbf4ced2b1117bf5cdea21732c6",
+        "size": 11895276,
+        "source": "components/google-cloud-sdk-cbt-windows-x86_64-20230509142714.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2411,8 +2411,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20221205224721,
-        "version_string": "0.13.0"
+        "build_number": 20230509142714,
+        "version_string": "0.15.0"
       }
     },
     {
@@ -2572,10 +2572,10 @@
     },
     {
       "data": {
-        "checksum": "a52eb1dda3325d75d78cbb79c6e8af98b5c01253cb7308b263710d63e8ab3b72",
-        "contents_checksum": "4460720582fb6618d23a181fbbe5644d7eabcf18b74275338923e3bac7181545",
-        "size": 43642102,
-        "source": "components/google-cloud-sdk-cloud-firestore-emulator-20230317195124.tar.gz",
+        "checksum": "7ac74c714682f74b614e35a5c10ce779151ae6890418e1da13d1f96992441e8f",
+        "contents_checksum": "ed4c85187a3ee18f1082395e6457057a39f2046465d20a306e96c4290ff22857",
+        "size": 44447671,
+        "source": "components/google-cloud-sdk-cloud-firestore-emulator-20230428152336.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2592,8 +2592,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20230317195124,
-        "version_string": "1.16.1"
+        "build_number": 20230428152336,
+        "version_string": "1.17.4"
       }
     },
     {
@@ -2626,15 +2626,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "0.3.0"
+        "version_string": "0.4.0"
       }
     },
     {
       "data": {
-        "checksum": "8b6f1e898426170cc9d828d56c65077a2030a2ef4cc1c3acd2faa041ddc11eab",
-        "contents_checksum": "254e6455954c6fbe7edc20e36df09b1a5430e47d3ef6ba855fa64f23558be77e",
-        "size": 7735939,
-        "source": "components/google-cloud-sdk-cloud-run-proxy-darwin-arm-20220310160002.tar.gz",
+        "checksum": "d41b5b96ea7690595813a23194af46ebcea7e66a65c09636d05df5b709b9ba19",
+        "contents_checksum": "d7c74ad1c5e11488a3d817d70a8b05f7bf9926dfe9aabedc8e1d1f4ff7d2998a",
+        "size": 11997608,
+        "source": "components/google-cloud-sdk-cloud-run-proxy-darwin-arm-20230526134617.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2658,16 +2658,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20220310160002,
-        "version_string": "0.3.0"
+        "build_number": 20230526134617,
+        "version_string": "0.4.0"
       }
     },
     {
       "data": {
-        "checksum": "20ae1978957d1686c6e47eeec2eb3374304b87000a4ac9d38aaa48ed0d6a9a78",
-        "contents_checksum": "b84b90138765c10084ad1822c198d2b4e4264effdb6301c8e3cddec2f64ebfda",
-        "size": 8024792,
-        "source": "components/google-cloud-sdk-cloud-run-proxy-darwin-x86_64-20220310160002.tar.gz",
+        "checksum": "4611d4c7c977729ed6a6e1d0ec913e49dc10413276df20a20262036e0dc779e4",
+        "contents_checksum": "4194b5f06c95f2ff081b17781456edf92408970e8d053a1c4853c1fa5f9a0750",
+        "size": 12354577,
+        "source": "components/google-cloud-sdk-cloud-run-proxy-darwin-x86_64-20230526134617.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2691,16 +2691,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20220310160002,
-        "version_string": "0.3.0"
+        "build_number": 20230526134617,
+        "version_string": "0.4.0"
       }
     },
     {
       "data": {
-        "checksum": "4605882aaef70f337c2b92ebc993396d4565edaf0f85dff31c0dc0d553c6cf85",
-        "contents_checksum": "1c8d5c6c77d0cc304ecb562aa887ccc72d8f7cf00dd3c6495fa5e5c1041a22f6",
-        "size": 7670643,
-        "source": "components/google-cloud-sdk-cloud-run-proxy-linux-arm-20220310160002.tar.gz",
+        "checksum": "f66232a39ff89c2e3a61214588392dc5834da54320d3d0d284a85291aeb451b2",
+        "contents_checksum": "e9fb09a47f31dfc8023fe6f92b7574851104822808cdf77315662abef24024c0",
+        "size": 11871678,
+        "source": "components/google-cloud-sdk-cloud-run-proxy-linux-arm-20230526134617.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2724,16 +2724,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20220310160002,
-        "version_string": "0.3.0"
+        "build_number": 20230526134617,
+        "version_string": "0.4.0"
       }
     },
     {
       "data": {
-        "checksum": "8d5d6af2bc3b912e7b5b0575ef9b5255f33be284065035728b1318c39fdbe4b2",
-        "contents_checksum": "f3fb71ce6c6082cfc4d985a39df76b3a4ba01b326ada09d9c2b68a87b92041e9",
-        "size": 9387984,
-        "source": "components/google-cloud-sdk-cloud-run-proxy-linux-x86_64-20220310160002.tar.gz",
+        "checksum": "ed57d6387c29c0fdb0d66346a50715625e8a44d6dd7ccebbfe649d108e0eafe9",
+        "contents_checksum": "d3c6097c6d4db5505daebeb2b77290468670305be01300d3f7161a8728235d94",
+        "size": 14022178,
+        "source": "components/google-cloud-sdk-cloud-run-proxy-linux-x86_64-20230526134617.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2757,16 +2757,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20220310160002,
-        "version_string": "0.3.0"
+        "build_number": 20230526134617,
+        "version_string": "0.4.0"
       }
     },
     {
       "data": {
-        "checksum": "25fb7bb66dc08fcebc2471e9a040c4a6eab8e5e13c917674f3d108762b399562",
-        "contents_checksum": "b710b3a69fe57881ff1940a28466950d245885a064d7c0c6060fdb313f1e6cda",
-        "size": 7998283,
-        "source": "components/google-cloud-sdk-cloud-run-proxy-windows-x86_64-20220310160002.tar.gz",
+        "checksum": "b929e9ee1748ed6cdc03158c1fe50376e7b965b36c0b954ff3950f7f169a4868",
+        "contents_checksum": "db29c260ff7bc1db902eb8821451a20f2df2efdf52b5476c14d415faad19c481",
+        "size": 12550598,
+        "source": "components/google-cloud-sdk-cloud-run-proxy-windows-x86_64-20230526134617.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2790,8 +2790,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20220310160002,
-        "version_string": "0.3.0"
+        "build_number": 20230526134617,
+        "version_string": "0.4.0"
       }
     },
     {
@@ -2818,15 +2818,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "1.5.2"
+        "version_string": "1.5.4"
       }
     },
     {
       "data": {
-        "checksum": "7f2760004610137539f4acd364803170377bdd46610009fa87516d78d8ea6f00",
-        "contents_checksum": "5c69f77ead6547b8731e318fc4d7a292c5d4f36976505cf4bd67c8900d946685",
-        "size": 30132273,
-        "source": "components/google-cloud-sdk-cloud-spanner-emulator-linux-x86_64-20230331214548.tar.gz",
+        "checksum": "352e4868884191d5246f1a48e154215b80b23696b383312e78b3ea0a6f6c50b1",
+        "contents_checksum": "816915f437f973b80c0ef65df1282f4e5e8cd78340fd45bf38a8fc60068e2944",
+        "size": 31115956,
+        "source": "components/google-cloud-sdk-cloud-spanner-emulator-linux-x86_64-20230425182028.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -2851,8 +2851,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230331214548,
-        "version_string": "1.5.2"
+        "build_number": 20230425182028,
+        "version_string": "1.5.4"
       }
     },
     {
@@ -3322,10 +3322,10 @@
     },
     {
       "data": {
-        "checksum": "53a5066680e61999e1418ec7ebbb9efe5d087b4bf52b298f75071acbeadd666a",
-        "contents_checksum": "0b0ffc99b9c7f62dc21f83ee9ba3a0df6500a189506a1cb7d69998840abbb931",
-        "size": 21202857,
-        "source": "components/google-cloud-sdk-core-20230410222307.tar.gz",
+        "checksum": "e452b989977ca590707673106947e3f2db095d59c922d82c2b61a3a124707932",
+        "contents_checksum": "857b044173e3aa5a680071f51b96520f5772d97a06211794b132e0a4ad6079fe",
+        "size": 21722840,
+        "source": "components/google-cloud-sdk-core-20230601190557.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -3346,8 +3346,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20230410222307,
-        "version_string": "2023.04.10"
+        "build_number": 20230601190557,
+        "version_string": "2023.06.01"
       }
     },
     {
@@ -3819,10 +3819,10 @@
     },
     {
       "data": {
-        "checksum": "913e96308ecbb2ec3b57d0b1fe1e78b300667b6972e462d95c06bfd78d0abd6a",
-        "contents_checksum": "c297205a2740033a3ba718d8d00af9dc027f73025f51ce777be157daeec2e6e2",
-        "size": 7325184,
-        "source": "components/google-cloud-sdk-enterprise-certificate-proxy-windows-x86_64-20230224152814.tar.gz",
+        "checksum": "211f5ac63a9397b6f7ac95d22fd34e18c98b348acfdb2cbf3bcd1384ee1deeb0",
+        "contents_checksum": "16743f19efef5cd51b3f1038e27a60ef68f626317a700acd6a25e2f72e381992",
+        "size": 6778179,
+        "source": "components/google-cloud-sdk-enterprise-certificate-proxy-windows-x86_64-20230519173220.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -3846,7 +3846,7 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230224152814,
+        "build_number": 20230519173220,
         "version_string": "0.2.1"
       }
     },
@@ -3907,10 +3907,10 @@
     },
     {
       "data": {
-        "checksum": "2046c1b645a14c7119a348d0de21b5fc82db1920c19258376abbef9b5ffe9bf1",
-        "contents_checksum": "8b167288e9a026643714db5a72aabdc70a0195f58218c55c0ce0adeab2113cec",
-        "size": 1229607,
-        "source": "components/google-cloud-sdk-gcloud-crc32c-darwin-arm-20230324213959.tar.gz",
+        "checksum": "5c6fe252ee030aa5455e88d5db7ed3b80bdb3f2447e76c0a4e2416592615dd65",
+        "contents_checksum": "5a9493ed313cdd4a0a44b65e4d3bed080cc9acd5c00ea82ea6579d9b77295570",
+        "size": 1237607,
+        "source": "components/google-cloud-sdk-gcloud-crc32c-darwin-arm-20230526134617.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -3934,16 +3934,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230324213959,
+        "build_number": 20230526134617,
         "version_string": "1.0.0"
       }
     },
     {
       "data": {
-        "checksum": "a51d2f997a8a616c1b79ab2525ae7fc38e42ffcf26c308243084838f01d60212",
-        "contents_checksum": "d3f0aeeabb4e9a4f48edb299ac050b3415391347ca5da5351b7e69072f2c8168",
-        "size": 1274220,
-        "source": "components/google-cloud-sdk-gcloud-crc32c-darwin-x86_64-20230324213959.tar.gz",
+        "checksum": "b64b064d5cea25c05f23cc68b4229bfc26821a7ac7b3539daa7e2003c7c31b9c",
+        "contents_checksum": "9e1af69ab404336bb18ccd68123f89d2df4f1d38b1fdab192cfb441ca446b01f",
+        "size": 1275432,
+        "source": "components/google-cloud-sdk-gcloud-crc32c-darwin-x86_64-20230526134617.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -3967,16 +3967,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230324213959,
+        "build_number": 20230526134617,
         "version_string": "1.0.0"
       }
     },
     {
       "data": {
-        "checksum": "31ed7b97a1018c46fd3603ed0e108242c12c3ee78987e885fe0a10dd9c3d1f59",
-        "contents_checksum": "366803ae8348808c4f1927d2b3a6d7b15fe11652d8919aa1750a8abb936723c1",
-        "size": 1192526,
-        "source": "components/google-cloud-sdk-gcloud-crc32c-linux-arm-20230324213959.tar.gz",
+        "checksum": "60f716e4eedf520df2bec9fb7e5fc3f34fc03d432be3990352029a6b8508059c",
+        "contents_checksum": "0fc0846fcf356145bf62b4ae51fd9b98ad22845599de1c33dda0c02c35785029",
+        "size": 1193815,
+        "source": "components/google-cloud-sdk-gcloud-crc32c-linux-arm-20230526134617.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4000,16 +4000,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230324213959,
+        "build_number": 20230526134617,
         "version_string": "1.0.0"
       }
     },
     {
       "data": {
-        "checksum": "460d86265d67d125f6962459e75f5b27dbac2a74532c498887ab1afcf9198b3e",
-        "contents_checksum": "d46e11858e2098c927346eb2e60149115abd6c51c992d18896ab7743f594221b",
-        "size": 1254904,
-        "source": "components/google-cloud-sdk-gcloud-crc32c-linux-x86-20230324213959.tar.gz",
+        "checksum": "3662e50c56c66c1834fac6281026177e48c73ef0f826f6a07419cef68702de47",
+        "contents_checksum": "14bd98f46bd8f2c1a2c7f24db4284cb385f3fa3ea570ab1898d84fcde402ef31",
+        "size": 1255942,
+        "source": "components/google-cloud-sdk-gcloud-crc32c-linux-x86-20230526134617.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4033,16 +4033,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230324213959,
+        "build_number": 20230526134617,
         "version_string": "1.0.0"
       }
     },
     {
       "data": {
-        "checksum": "2d145b03895967ce63d5158b8b9416c53aa1fba619db8f506fcc09669ac9a3c5",
-        "contents_checksum": "6d35e8d85ad7a1799b4135adb66b8929153902030c75182485aa429392785d3e",
-        "size": 1269358,
-        "source": "components/google-cloud-sdk-gcloud-crc32c-linux-x86_64-20230324213959.tar.gz",
+        "checksum": "c355743d334b2e57a4712ecf37a48b69499c7235625d0bb0f9ecaae4d9e071f1",
+        "contents_checksum": "724475753b7100dc07a4435dfe3fdd6c2d82cabe3beea6d85ce476f79f665415",
+        "size": 1270213,
+        "source": "components/google-cloud-sdk-gcloud-crc32c-linux-x86_64-20230526134617.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4066,16 +4066,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230324213959,
+        "build_number": 20230526134617,
         "version_string": "1.0.0"
       }
     },
     {
       "data": {
-        "checksum": "907a83b69836b1f1c83cfa6dc9f0553e56960dbf3ce3f418a2affd75736665bb",
-        "contents_checksum": "2c09a270c05cb385d0122f177205e9bcd68be2178e2ba8a05ce0445d9afda11b",
-        "size": 1312973,
-        "source": "components/google-cloud-sdk-gcloud-crc32c-windows-x86-20230324213959.tar.gz",
+        "checksum": "06b066ff147206bb0d32da28f9b02da5b0dd413d9b3c8a7749c0242f30311024",
+        "contents_checksum": "a41784c597ae73dea4d3d719c496f8cb9123e22040d5c63510bd293a6df21d68",
+        "size": 1313036,
+        "source": "components/google-cloud-sdk-gcloud-crc32c-windows-x86-20230526134617.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4099,16 +4099,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230324213959,
+        "build_number": 20230526134617,
         "version_string": "1.0.0"
       }
     },
     {
       "data": {
-        "checksum": "c92c9210563a88cb5d6ff8d80a39f9f2b67b2175471b608709c9cebcf0911d50",
-        "contents_checksum": "43ef9154777bf3976daf7279b8f9ead5a87530cb5f088b34aa7c471f6f6feeb4",
-        "size": 1324157,
-        "source": "components/google-cloud-sdk-gcloud-crc32c-windows-x86_64-20230324213959.tar.gz",
+        "checksum": "1176e5250dc61d230f807387b8577e7d7f2d570fbd9d0bcfe64f7ad361d8e701",
+        "contents_checksum": "cd0affa729a50df2bbad59e1d004ac02e29c996afb44543c8fecd217e7d4bbd7",
+        "size": 1324097,
+        "source": "components/google-cloud-sdk-gcloud-crc32c-windows-x86_64-20230526134617.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4132,16 +4132,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230324213959,
+        "build_number": 20230526134617,
         "version_string": "1.0.0"
       }
     },
     {
       "data": {
-        "checksum": "af7ff3a8ec7d8a733a0b88910d569c9d3f7171e3fdbce88e45872fe05991da03",
-        "contents_checksum": "e222736b661e5d516690cdc360cedb56a7440209caef906afcc3b23f754a086a",
-        "size": 11797805,
-        "source": "components/google-cloud-sdk-gcloud-deps-20230410222307.tar.gz",
+        "checksum": "a6cde1f336f8ed1ccacd1b147cda3c3fa1814995b7248de78125ba1d39cbe1eb",
+        "contents_checksum": "3e55f07cb018a3a464905ab8b4c00cd2d54d2b7ad0bb10e4953ada759bc1aa34",
+        "size": 11562814,
+        "source": "components/google-cloud-sdk-gcloud-deps-20230519173220.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4164,8 +4164,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20230410222307,
-        "version_string": "2023.04.10"
+        "build_number": 20230519173220,
+        "version_string": "2023.05.19"
       }
     },
     {
@@ -4401,10 +4401,10 @@
     },
     {
       "data": {
-        "checksum": "026737be09469f6f33f0a93f2aa77db18f4b8e95c3a1fbb99e6e4149338e0abd",
-        "contents_checksum": "61b69e3108f54924f32b786e45010f4e32f9daf0398d89076b3cc7487bc0dcb6",
-        "size": 5846262,
-        "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20230410222307.tar.gz",
+        "checksum": "691f88da7ff78a5458d197eab8ecc507a191a5a09b449acec964a962847c786a",
+        "contents_checksum": "dc5b745f11b1497f32db0a83fb8632a653e7c57b4502004b62f01a82744965a2",
+        "size": 5986784,
+        "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20230526134617.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4429,7 +4429,7 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230410222307,
+        "build_number": 20230526134617,
         "version_string": ""
       }
     },
@@ -4466,15 +4466,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "0.5.2"
+        "version_string": "0.5.3"
       }
     },
     {
       "data": {
-        "checksum": "73e525287b867731cfb7aba65181ec70f7575ee2198ac56ac64a30b1106ac159",
-        "contents_checksum": "02729057ccb36e84b8cf0c416b0510dfa7d2986fe2d78f528da2fc47d5976ece",
-        "size": 7515183,
-        "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-darwin-arm-20230317195124.tar.gz",
+        "checksum": "64e22f2b60ccad717c39c8458c33da1e1155552634fa578ccf45637cb2649568",
+        "contents_checksum": "245c428e8641a61c70329210d401a527faab6a9d4c219c4f19971045ab2b44bb",
+        "size": 7517636,
+        "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-darwin-arm-20230509142714.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4498,16 +4498,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230317195124,
-        "version_string": "0.5.2"
+        "build_number": 20230509142714,
+        "version_string": "0.5.3"
       }
     },
     {
       "data": {
-        "checksum": "955c487b369ddbd25a9164fd10d4b158f414549f0737671635778f726ecd6988",
-        "contents_checksum": "917024235e489f33d3a91ab267d438cdbb70e3269f0f094ef5f7f93c1ea308c0",
-        "size": 7861085,
-        "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-darwin-x86_64-20230317195124.tar.gz",
+        "checksum": "e7b926a874a696cf74ad96670a46ea94df0ee3ae233ef927c54d1ec21c845dfd",
+        "contents_checksum": "3199f0b6c7c3efe7c7ccac9fe99db373d9e4abdbd03e0b38ca6c6165e1b93b27",
+        "size": 7863269,
+        "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-darwin-x86_64-20230509142714.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4531,16 +4531,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230317195124,
-        "version_string": "0.5.2"
+        "build_number": 20230509142714,
+        "version_string": "0.5.3"
       }
     },
     {
       "data": {
-        "checksum": "24c076c59432a3e52d104c3ee43eba1ae20b0d7d29f61b43b797b5a891cda1a3",
-        "contents_checksum": "a463379d8d33575d8d08f19e64431cbdcb9b55f7795b3857de85162e0ec26df5",
-        "size": 7456415,
-        "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-arm-20230317195124.tar.gz",
+        "checksum": "5ca7e7d8c58b4beb9e351bd486ef7aad031daf750907389d497f0c476db8858e",
+        "contents_checksum": "b3b76dc2bfbf7071986b51610a463419d3d5b2b43bd8f1ac99021b9fd68ac23c",
+        "size": 7462002,
+        "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-arm-20230509142714.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4564,16 +4564,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230317195124,
-        "version_string": "0.5.2"
+        "build_number": 20230509142714,
+        "version_string": "0.5.3"
       }
     },
     {
       "data": {
-        "checksum": "be053073314c8503269bbc9e416cd3359103a03744824cbf800303a5a587e368",
-        "contents_checksum": "67aab53b31b6b8c68e1be3ccc53e4f9af76fa51581e3cb7bf21a2fc6224ed43f",
-        "size": 8001498,
-        "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-x86-20230317195124.tar.gz",
+        "checksum": "e0da094a8c965101b9355e30b046ec0cbd4a324d834d442f7431d8a1fa57aa69",
+        "contents_checksum": "1228ca8b05d58045a4667fa75a9621cdb36185c331b82a7c86d9cd8149fed39d",
+        "size": 8002953,
+        "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-x86-20230509142714.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4597,16 +4597,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230317195124,
-        "version_string": "0.5.2"
+        "build_number": 20230509142714,
+        "version_string": "0.5.3"
       }
     },
     {
       "data": {
-        "checksum": "7f0d5b657debc681bb3be6a3a99a36d07e688a7139d61d580375f32add6875c5",
-        "contents_checksum": "55f831813980c0cde2292f4d96fa93b1835605839f422625cacdb997c240244a",
-        "size": 8032285,
-        "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-x86_64-20230317195124.tar.gz",
+        "checksum": "abaf580bc837f34281d783756bcbbf2bccfbbcc00b31e1839857de90f6bcf222",
+        "contents_checksum": "89beb7282d46e2d0188d29396cfb4aa1ce86089b8af63b24476338a66e179471",
+        "size": 8033861,
+        "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-x86_64-20230509142714.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4630,16 +4630,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230317195124,
-        "version_string": "0.5.2"
+        "build_number": 20230509142714,
+        "version_string": "0.5.3"
       }
     },
     {
       "data": {
-        "checksum": "4bb2185fc71f97d1a386ba87f295b1fef27c4dc53d4177270fc88b25ab25fcbb",
-        "contents_checksum": "0c8db13d99863127911b9dc78ef3d8ab01f1af058b44862145dbfb857caabcbf",
-        "size": 8110397,
-        "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-windows-x86-20230317195124.tar.gz",
+        "checksum": "88a5c2c9782fb5f9bb88ff91693dc31f725216e656017810dc81cd50460154d7",
+        "contents_checksum": "7eaa9d44141451ccf4c555a5e67c13dc89e00ba962f4df5af7caa23a8c8ff6ed",
+        "size": 8112496,
+        "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-windows-x86-20230509142714.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4663,16 +4663,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230317195124,
-        "version_string": "0.5.2"
+        "build_number": 20230509142714,
+        "version_string": "0.5.3"
       }
     },
     {
       "data": {
-        "checksum": "8443e1bec288df7c7efe34f8b9022282e0ba7c6f52ce3e86eb063f5f7cc3f36a",
-        "contents_checksum": "4006f87a94eddc0fb4e07577bbadc6433583d938c62f0e5d34e673bfbda4bbdb",
-        "size": 8173782,
-        "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-windows-x86_64-20230317195124.tar.gz",
+        "checksum": "420a7a88f4349c3fbeb76fac9ece39eafaaa5863b8ba38d1a785dd9cafd5df3e",
+        "contents_checksum": "66cb4f148a9784b226c902e1659e2265fd5df4ecf95ee3c57b7a34477d09d0ed",
+        "size": 8177407,
+        "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-windows-x86_64-20230509142714.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4696,16 +4696,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230317195124,
-        "version_string": "0.5.2"
+        "build_number": 20230509142714,
+        "version_string": "0.5.3"
       }
     },
     {
       "data": {
-        "checksum": "dfdac5b6c580cee8fd9b2877d4919585261c9f142ec841bf69709befe2f1ffb4",
-        "contents_checksum": "313cdac7b2de17dfe6b39bdb2f544812974219085a165ced0ba5eb0790dc94ad",
-        "size": 16304023,
-        "source": "components/google-cloud-sdk-gsutil-20230310163703.tar.gz",
+        "checksum": "43f4957c66e1971a75d3cbcd9b1567d712d1e491ce242bddd86747c6a1c21592",
+        "contents_checksum": "c5b1dfbcf78db58a02916a16cab71d9dc662d79174eb870cdc0d86c28cffd52c",
+        "size": 11815391,
+        "source": "components/google-cloud-sdk-gsutil-20230526134617.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4724,8 +4724,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20230310163703,
-        "version_string": "5.21"
+        "build_number": 20230526134617,
+        "version_string": "5.24"
       }
     },
     {
@@ -4816,15 +4816,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "2.0.3"
+        "version_string": "2.1.0"
       }
     },
     {
       "data": {
-        "checksum": "bba42d44c83d7ab0a2437ae561ee718d215dd55b6525aa8635d7726ab4638a80",
-        "contents_checksum": "da61f9f44c74667079644f3cce92f9054195920ef9adfecea7b7761e75795f2a",
-        "size": 23362209,
-        "source": "components/google-cloud-sdk-harbourbridge-linux-x86_64-20230331214548.tar.gz",
+        "checksum": "72d96d78b4b7bdb2ee919c597bed76b99af28256f3c0761fbd957cf824e5b866",
+        "contents_checksum": "8b5b032a025e3c3d17df10855a026437d36c87d563b3fe97dde93c992c747bc8",
+        "size": 22225690,
+        "source": "components/google-cloud-sdk-harbourbridge-linux-x86_64-20230509142714.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4848,8 +4848,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230331214548,
-        "version_string": "2.0.3"
+        "build_number": 20230509142714,
+        "version_string": "2.1.0"
       }
     },
     {
@@ -4880,15 +4880,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "1.0.0-beta.29"
+        "version_string": "1.0.0-beta.34"
       }
     },
     {
       "data": {
-        "checksum": "81de4b83ed33b5b20ad4168a26d30924c73036501786a5116418d3d7a32825e0",
-        "contents_checksum": "fc6c6f7570b294eb7a2f0da866b0e8356dc322dcfe0a874a703fc57f7ddb1857",
-        "size": 21742097,
-        "source": "components/google-cloud-sdk-kpt-darwin-arm-20230324213959.tar.gz",
+        "checksum": "5fde5d4a600634e71d329e8b0be170cb44d5d38082336f97be8530d5e9a030c3",
+        "contents_checksum": "825a0c680034f5d75e499cbdf5196427e0cd7ee07da484336669b092f3584a4b",
+        "size": 14632210,
+        "source": "components/google-cloud-sdk-kpt-darwin-arm-20230526134617.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4912,16 +4912,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230324213959,
-        "version_string": "1.0.0-beta.29"
+        "build_number": 20230526134617,
+        "version_string": "1.0.0-beta.34"
       }
     },
     {
       "data": {
-        "checksum": "8b95c7400cc24fa8b02f1902d9db22e48fd1d148054d89001c5dc2fd179419e5",
-        "contents_checksum": "0bdbba13d63fac31c391ed903b052ee5fa186fcb7b1472a4d862610b71e9d55c",
-        "size": 23344122,
-        "source": "components/google-cloud-sdk-kpt-darwin-x86_64-20230324213959.tar.gz",
+        "checksum": "be854fa996056ecc375fb2c79c9539eb23533ee711e9ead14118bc29197deed7",
+        "contents_checksum": "a89843c2e2680cf9595f4580f86bc969830d172c2eb451983be42026df743348",
+        "size": 15355735,
+        "source": "components/google-cloud-sdk-kpt-darwin-x86_64-20230526134617.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4945,16 +4945,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230324213959,
-        "version_string": "1.0.0-beta.29"
+        "build_number": 20230526134617,
+        "version_string": "1.0.0-beta.34"
       }
     },
     {
       "data": {
-        "checksum": "1597bafb8ce74b5138a776a7b71b7915e4125284a40cf6086a5c7359ace13239",
-        "contents_checksum": "f9346eecc880d8a588b4e249fece1b5905aeaf2421a3875a72f6d2efd56f6258",
-        "size": 18313521,
-        "source": "components/google-cloud-sdk-kpt-linux-arm-20230324213959.tar.gz",
+        "checksum": "e1841d3903987a0b5c087c5060cc976102691aaf7c4654c5b426afe64524eca8",
+        "contents_checksum": "11e0027194419d5478df60568075d800ce6fe7279455fb82bf539f0ea441f0a5",
+        "size": 13098548,
+        "source": "components/google-cloud-sdk-kpt-linux-arm-20230526134617.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -4978,16 +4978,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230324213959,
-        "version_string": "1.0.0-beta.29"
+        "build_number": 20230526134617,
+        "version_string": "1.0.0-beta.34"
       }
     },
     {
       "data": {
-        "checksum": "17f8036e4dcf1c9d385f19b91a211b4b05ec7bbf0d491c89d5bdf1f1983400c3",
-        "contents_checksum": "50e6b41708884530b4ab480e037e8b7a5eddd7657de90477458395caed8bd763",
-        "size": 20378814,
-        "source": "components/google-cloud-sdk-kpt-linux-x86_64-20230324213959.tar.gz",
+        "checksum": "a71473897411d5464809cfa95693fc48b8f3b18b4605611148f731af131126a6",
+        "contents_checksum": "fe5344ccf137a3f3b3aa51eecd75adbf229b5996d3d638155647e4b25f1f6e50",
+        "size": 14634474,
+        "source": "components/google-cloud-sdk-kpt-linux-x86_64-20230526134617.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5011,16 +5011,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230324213959,
-        "version_string": "1.0.0-beta.29"
+        "build_number": 20230526134617,
+        "version_string": "1.0.0-beta.34"
       }
     },
     {
       "data": {
-        "checksum": "1ef6835ec996cab924206a652e8f80a0fab4dea2e7f01f60311c3276ac380b61",
-        "contents_checksum": "bd7b922fd563e96052235916aea0fa37207d0526c034ea7d7861c539755e8d17",
-        "size": 35450,
-        "source": "components/google-cloud-sdk-kubectl-20230324213959.tar.gz",
+        "checksum": "4d0494337cf4dea3a5f6c236a7d97f12f36ec68ab4d2d4347e17abd7ede3db2b",
+        "contents_checksum": "a29c1f1c57176daa2fb7cdbeff15e911e55d12284be40a484c8adde7838c2374",
+        "size": 35616,
+        "source": "components/google-cloud-sdk-kubectl-20230519173220.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5044,16 +5044,16 @@
       "platform": {},
       "platform_required": true,
       "version": {
-        "build_number": 20230324213959,
-        "version_string": "1.24.12"
+        "build_number": 20230519173220,
+        "version_string": "1.25.9"
       }
     },
     {
       "data": {
-        "checksum": "6615777d5da7c0e97767147e9bba143fb5d6d7506406b5a3f2195e17740f161a",
-        "contents_checksum": "ea86574e2f7f8a9f46d7b226ea5a5aa7a7a51c03e7bff6d97f79b0d06631eef2",
-        "size": 97310652,
-        "source": "components/google-cloud-sdk-kubectl-darwin-arm-20230324213959.tar.gz",
+        "checksum": "c3028f97328f56e757070a77abf5130b25609ea98147de8c7e88e7155270dcbe",
+        "contents_checksum": "a1ec4b1cb047b1a0bb29e92a221b0e1bf832af115ff6b03052c72ea9ba31e7ce",
+        "size": 112680034,
+        "source": "components/google-cloud-sdk-kubectl-darwin-arm-20230519173220.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5078,16 +5078,16 @@
       },
       "platform_required": true,
       "version": {
-        "build_number": 20230324213959,
-        "version_string": "1.24.12"
+        "build_number": 20230519173220,
+        "version_string": "1.25.9"
       }
     },
     {
       "data": {
-        "checksum": "c53c1affee814dcfb82a26e4875ba9a88413bd2a28f7f9db416e4b5469bef5ea",
-        "contents_checksum": "f8e8335772735554cb6b15cc39e1ea6064db03e3d8da56a906e4d727e50e8dc8",
-        "size": 101838395,
-        "source": "components/google-cloud-sdk-kubectl-darwin-x86_64-20230324213959.tar.gz",
+        "checksum": "e783001a005d9dbc7da8c38001aad2cf98de3104f765fd67ccf9ae287cba5991",
+        "contents_checksum": "a4696b48005c6d917176500eead6b41b27ade7ccd2e2d3a78bc859bfc5ae5fb2",
+        "size": 117920812,
+        "source": "components/google-cloud-sdk-kubectl-darwin-x86_64-20230519173220.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5112,16 +5112,16 @@
       },
       "platform_required": true,
       "version": {
-        "build_number": 20230324213959,
-        "version_string": "1.24.12"
+        "build_number": 20230519173220,
+        "version_string": "1.25.9"
       }
     },
     {
       "data": {
-        "checksum": "cbd836abf6a889a8fff71136de04e0a9e3a9c10cb1bb3f6a42d44e57601db04b",
-        "contents_checksum": "6f199a1549d7e90df24de3ebe60cde6ae4ec80921114a1aca91a705be123d85e",
-        "size": 90572129,
-        "source": "components/google-cloud-sdk-kubectl-linux-arm-20230324213959.tar.gz",
+        "checksum": "a78a40f3e7958178149de1b7e4832bbb12600fee97c711e199ab6eeb4045cc62",
+        "contents_checksum": "d745e88f27355e89fe742d58323b7cf1895e8d4440fecf6fb2f2263746a60467",
+        "size": 104338071,
+        "source": "components/google-cloud-sdk-kubectl-linux-arm-20230519173220.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5146,16 +5146,16 @@
       },
       "platform_required": true,
       "version": {
-        "build_number": 20230324213959,
-        "version_string": "1.24.12"
+        "build_number": 20230519173220,
+        "version_string": "1.25.9"
       }
     },
     {
       "data": {
-        "checksum": "9403baea67e9c4baec41b1fa3c90e803978b5d18a2e212931b3d9f940d1ec81c",
-        "contents_checksum": "0f3cb1e140157eb3570863f05bcdf846a927b8bd74cd37f1794f0a4916a300b0",
-        "size": 91230399,
-        "source": "components/google-cloud-sdk-kubectl-linux-x86-20230324213959.tar.gz",
+        "checksum": "75b6195a254ded3c7eb5a94f045e729b3b8ea5fd93d4b7528f4b9f7344a16452",
+        "contents_checksum": "ec354ad99889f9ea628b74acfef690c47e644cd430d1c3efe10d214ceb071cea",
+        "size": 105690006,
+        "source": "components/google-cloud-sdk-kubectl-linux-x86-20230519173220.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5180,16 +5180,16 @@
       },
       "platform_required": true,
       "version": {
-        "build_number": 20230324213959,
-        "version_string": "1.24.12"
+        "build_number": 20230519173220,
+        "version_string": "1.25.9"
       }
     },
     {
       "data": {
-        "checksum": "f646b481b855b508bf6eba6f8c765bf55706aeb24e1cf3995d0176b0eb4c9a03",
-        "contents_checksum": "080f7d74f600c04ea2210f69092fd365a5c0cd9302870e789dd7c3977ee22493",
-        "size": 97072962,
-        "source": "components/google-cloud-sdk-kubectl-linux-x86_64-20230324213959.tar.gz",
+        "checksum": "b1bcbdac01707db7f120c72a955a53828a8d1e171e925a952f0771f59a50bb00",
+        "contents_checksum": "6e3dab4ce8097df507b0b41a992b2cf88462e44b06df4f260fcdde9490407db0",
+        "size": 112403350,
+        "source": "components/google-cloud-sdk-kubectl-linux-x86_64-20230519173220.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5214,8 +5214,8 @@
       },
       "platform_required": true,
       "version": {
-        "build_number": 20230324213959,
-        "version_string": "1.24.12"
+        "build_number": 20230519173220,
+        "version_string": "1.25.9"
       }
     },
     {
@@ -5418,10 +5418,10 @@
     },
     {
       "data": {
-        "checksum": "7e8e6cd99e980ce55d77f89659888646743eddb673b974b8fc9761fc65bbdf2e",
-        "contents_checksum": "4f31395a7e38d0298f40193d237c0a805c19f9abc92e9c5835affbe76e558951",
-        "size": 95844144,
-        "source": "components/google-cloud-sdk-kubectl-windows-x86-20230324213959.tar.gz",
+        "checksum": "2d0cee9772a5de522eabaa2c9525c1da0a1cb4bbb457f555fd2353fee69c1178",
+        "contents_checksum": "eeafb48e912c29671459357dedec11240cd323c6a477507936d43c8d24fb20a9",
+        "size": 110980063,
+        "source": "components/google-cloud-sdk-kubectl-windows-x86-20230519173220.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5448,16 +5448,16 @@
       },
       "platform_required": true,
       "version": {
-        "build_number": 20230324213959,
-        "version_string": "1.24.12"
+        "build_number": 20230519173220,
+        "version_string": "1.25.9"
       }
     },
     {
       "data": {
-        "checksum": "28ede713dcdb6c6f19609f93bad44a558b7bd7937889ba7c7c3204c15073c738",
-        "contents_checksum": "3067f236fa529433fb01b0f37aba20c0861ef4aa0bbb5493d5e0ef677dd43401",
-        "size": 98379081,
-        "source": "components/google-cloud-sdk-kubectl-windows-x86_64-20230324213959.tar.gz",
+        "checksum": "e447a8a8ae3e55495f134235d755cdc01658bcc0f3d135759df0220855d144e8",
+        "contents_checksum": "367c0f43c0ff1c7243cfaa3ce021d50f4c8164171780a08d6e43515a99b89273",
+        "size": 113882356,
+        "source": "components/google-cloud-sdk-kubectl-windows-x86_64-20230519173220.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5484,8 +5484,8 @@
       },
       "platform_required": true,
       "version": {
-        "build_number": 20230324213959,
-        "version_string": "1.24.12"
+        "build_number": 20230519173220,
+        "version_string": "1.25.9"
       }
     },
     {
@@ -5679,15 +5679,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "1.5.7"
+        "version_string": "1.5.8"
       }
     },
     {
       "data": {
-        "checksum": "feb55ccc59e22cf790514b673977165f1d8549d9b6bd0e8ad9fcd3c5933ada5e",
-        "contents_checksum": "6793b48653e62dc39b34e61761e06a4b67d896105a0e72e3ce6f466bde0ebf27",
-        "size": 12437107,
-        "source": "components/google-cloud-sdk-local-extract-darwin-arm-20230120151534.tar.gz",
+        "checksum": "2ea1fe7ae51fb773eb353c58446d83e6a82cdb629c6da85b48903dbd02de5494",
+        "contents_checksum": "55130d953d8226d9591f5643ceefd69bf7c4f23abb9b6f1080aaf07f08f44980",
+        "size": 14314114,
+        "source": "components/google-cloud-sdk-local-extract-darwin-arm-20230417163046.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5711,16 +5711,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230120151534,
-        "version_string": "1.5.7"
+        "build_number": 20230417163046,
+        "version_string": "1.5.8"
       }
     },
     {
       "data": {
-        "checksum": "595652bb6c0e9a6289e69ccd7e0a6495fa7da4d6cf1fb8f51a663d4a161360b5",
-        "contents_checksum": "63f96cc55f8f0ac56f3f093d3ab5420b49521a00216f07d1701c1e245627c7b2",
-        "size": 12908644,
-        "source": "components/google-cloud-sdk-local-extract-darwin-x86_64-20230120151534.tar.gz",
+        "checksum": "30d177e3950988d05e46998313b8963a39826d73033adb053af50355c9d5e436",
+        "contents_checksum": "74d786672096ebc339400315795fa570c87458b9fe78aa5336eb00d84b1d37c1",
+        "size": 14726693,
+        "source": "components/google-cloud-sdk-local-extract-darwin-x86_64-20230417163046.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5744,16 +5744,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230120151534,
-        "version_string": "1.5.7"
+        "build_number": 20230417163046,
+        "version_string": "1.5.8"
       }
     },
     {
       "data": {
-        "checksum": "3ee8015504e83a35d3653eac04706123f9953a5ac852fd56a480e54670590c67",
-        "contents_checksum": "8b8d6fa979547efd7c7cc3e7a2e59070982ddc37cdfd66dc8c8a3571be2ae334",
-        "size": 12264536,
-        "source": "components/google-cloud-sdk-local-extract-linux-arm-20230120151534.tar.gz",
+        "checksum": "4f7e390f204f84465ba52cba147b988fe0cdb627b414830bee37f007d16075a1",
+        "contents_checksum": "4df95e3115a59b7cff68bbeffe056539e3b97bafdc545b038dc9391dbc6fe3d0",
+        "size": 14106551,
+        "source": "components/google-cloud-sdk-local-extract-linux-arm-20230417163046.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5777,16 +5777,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230120151534,
-        "version_string": "1.5.7"
+        "build_number": 20230417163046,
+        "version_string": "1.5.8"
       }
     },
     {
       "data": {
-        "checksum": "dd98a2e8e6eebfc80fa46a3b4e301db75705cb6824ef4fecd8a1742e8f6bf6a3",
-        "contents_checksum": "0f5b2c42e4d2be977dcb8ee0382f487473b6f293de12f669511c0182429a2c7e",
-        "size": 14599545,
-        "source": "components/google-cloud-sdk-local-extract-linux-x86_64-20230120151534.tar.gz",
+        "checksum": "cec30c55a9198883ff2fdc981f46b7a70489bb90d0d41868e7e1b1aa1518d076",
+        "contents_checksum": "8f224a4f1e133be9936aa22d2680548eba835632b3e0d2d933733f8ee9aeeed8",
+        "size": 14974806,
+        "source": "components/google-cloud-sdk-local-extract-linux-x86_64-20230417163046.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -5810,8 +5810,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230120151534,
-        "version_string": "1.5.7"
+        "build_number": 20230417163046,
+        "version_string": "1.5.8"
       }
     },
     {
@@ -6235,15 +6235,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "1.14.3-rc.3"
+        "version_string": "1.15.1-rc.3"
       }
     },
     {
       "data": {
-        "checksum": "9ed3de22e3a5849eaf819ab8c80065798546f544024b6d7612bf570cb5c62848",
-        "contents_checksum": "cdaed43f8af47e99efe92056d25b39991a8cc70f249c0421920cac25623f46e9",
-        "size": 25815404,
-        "source": "components/google-cloud-sdk-nomos-darwin-x86_64-20230324213959.tar.gz",
+        "checksum": "538df21fcfaef38a30dfbf62ef4fbe777776f210b6fef2a0d7051c670872e9a4",
+        "contents_checksum": "04d026f29d496906299d5fce9a1c4d8eb6fd349d9382e9f61bf746cba940576d",
+        "size": 27037687,
+        "source": "components/google-cloud-sdk-nomos-darwin-x86_64-20230526134617.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6267,16 +6267,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230324213959,
-        "version_string": "1.14.3-rc.3"
+        "build_number": 20230526134617,
+        "version_string": "1.15.1-rc.3"
       }
     },
     {
       "data": {
-        "checksum": "a9eb55c70921c2139c0219c740580c42ae297b6af0a713e49b63545feacc794c",
-        "contents_checksum": "791ba29ec03a2245ac861ff1c11d7f813b0cd6566256d55a79d8266f07b41719",
-        "size": 26468945,
-        "source": "components/google-cloud-sdk-nomos-linux-x86_64-20230324213959.tar.gz",
+        "checksum": "13fe71397f675d761817312d37babf772ff4c895742d16fe284faaf6fda49b58",
+        "contents_checksum": "2d991316c735ea70007cd44d4193dd7b9e49d4ca6bf3f308216762d9ef2ae256",
+        "size": 27726553,
+        "source": "components/google-cloud-sdk-nomos-linux-x86_64-20230526134617.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6300,8 +6300,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230324213959,
-        "version_string": "1.14.3-rc.3"
+        "build_number": 20230526134617,
+        "version_string": "1.15.1-rc.3"
       }
     },
     {
@@ -6512,10 +6512,10 @@
     },
     {
       "data": {
-        "checksum": "3f12deb9f7fb03cba0f3bab7f1894d98b70003900b5e2d0457a82e213f919c1d",
-        "contents_checksum": "6092247b6a05e29e853c83ba123ceed9190f0435f8bcf9b1dea240515f18c3f9",
-        "size": 69647459,
-        "source": "components/google-cloud-sdk-pubsub-emulator-20230317195124.tar.gz",
+        "checksum": "cd9a287303ba402176f8d36e754d9f60865a53e6b52bf70585cb14ae1975580c",
+        "contents_checksum": "7a58dab45adf050736ebfb7ae79a9448c6b9ed4b57d0c1c93caf4963da451070",
+        "size": 65673515,
+        "source": "components/google-cloud-sdk-pubsub-emulator-20230512143556.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6532,8 +6532,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20230317195124,
-        "version_string": "0.8.1"
+        "build_number": 20230512143556,
+        "version_string": "0.8.2"
       }
     },
     {
@@ -6567,15 +6567,15 @@
       "platform_required": false,
       "version": {
         "build_number": 0,
-        "version_string": "2.3.0"
+        "version_string": "2.4.1"
       }
     },
     {
       "data": {
-        "checksum": "37a66708e57ae8b4eb7609896cc56c15c128b66af9f7fee44d9b9d92aaa54088",
-        "contents_checksum": "5df531a5b9e6fac2bec4fd7541836cbb4ff49b5937b55e5d6ca4d8e05f1770d0",
-        "size": 22835187,
-        "source": "components/google-cloud-sdk-skaffold-darwin-arm-20230410222307.tar.gz",
+        "checksum": "56ed1b2372dc05ef2cbaa658d575c52c8d3f76da7aece4ca81a65f278b0bca7f",
+        "contents_checksum": "eb2b38982c3c46144c616c1510dc873eaa57ba3ea2eb4a2619bedfa413469db7",
+        "size": 23186363,
+        "source": "components/google-cloud-sdk-skaffold-darwin-arm-20230519173220.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6600,16 +6600,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230410222307,
-        "version_string": "2.3.0"
+        "build_number": 20230519173220,
+        "version_string": "2.4.1"
       }
     },
     {
       "data": {
-        "checksum": "37d557756347bccd89d74d44e8f6474d43d856f03e105d82ba40653dc84c41ad",
-        "contents_checksum": "75a9ec0576d9ed37961ed276eaf6037c8b59747f18beb2a4b6b6c022e4e79d7e",
-        "size": 24930459,
-        "source": "components/google-cloud-sdk-skaffold-darwin-x86_64-20230410222307.tar.gz",
+        "checksum": "72666771e3a813b233c3f64a84819eaa6ab10c7d38a8a1d986375b5e1fcf83c3",
+        "contents_checksum": "e51319b9e56da691d5a923a58c9e3bdec414c300687d3c006dcfd83393f356dc",
+        "size": 25308594,
+        "source": "components/google-cloud-sdk-skaffold-darwin-x86_64-20230519173220.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6634,16 +6634,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230410222307,
-        "version_string": "2.3.0"
+        "build_number": 20230519173220,
+        "version_string": "2.4.1"
       }
     },
     {
       "data": {
-        "checksum": "73b00f22c3a09f37722360e61c5e74467bce8a9a7d8317b8bde215090c164a47",
-        "contents_checksum": "ca80ad12d1ae70fefb70c8e6200523e7627c5746a9333841d865c8ebabafaf3c",
-        "size": 20964851,
-        "source": "components/google-cloud-sdk-skaffold-linux-arm-20230410222307.tar.gz",
+        "checksum": "9719f63fe99ec530e48ec15baed84e5fa600253cc203364f87bd517695a4776f",
+        "contents_checksum": "9d45dfaa5de2cab1d8c1769c35f5f76b3dc2c68b755f683643b3c9114c3a9186",
+        "size": 21287084,
+        "source": "components/google-cloud-sdk-skaffold-linux-arm-20230519173220.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6668,16 +6668,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230410222307,
-        "version_string": "2.3.0"
+        "build_number": 20230519173220,
+        "version_string": "2.4.1"
       }
     },
     {
       "data": {
-        "checksum": "5cb36aa3040f04d48048eda22f9833fbfb0659623f7c255afb3e23865f875d63",
-        "contents_checksum": "8157e8582ca8e284605cb2ca0f33c53ebd0514332e8b8b427990b2190e21e9b6",
-        "size": 23084056,
-        "source": "components/google-cloud-sdk-skaffold-linux-x86_64-20230410222307.tar.gz",
+        "checksum": "5d9287941647031b597b65ec1b6efbf001007cfd9967273e074dc9f3800d4c41",
+        "contents_checksum": "97bbd4849597e675a8eb13e849d1b494600e4709acf10edeb14548e9c362fd1a",
+        "size": 23445461,
+        "source": "components/google-cloud-sdk-skaffold-linux-x86_64-20230519173220.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6702,16 +6702,16 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230410222307,
-        "version_string": "2.3.0"
+        "build_number": 20230519173220,
+        "version_string": "2.4.1"
       }
     },
     {
       "data": {
-        "checksum": "64ca050875949ae4d11aec1d976d847497c94f48d44e4893b28645fa4d2d8552",
-        "contents_checksum": "8fcd773de270da033fee3be73138eeb1b4e956178536ad2c1e85141d3438b1a2",
-        "size": 23197474,
-        "source": "components/google-cloud-sdk-skaffold-windows-x86_64-20230410222307.tar.gz",
+        "checksum": "6abe5069590386a3b825fdae712c4e0bc4187b2b6679875d793b59093ced02fc",
+        "contents_checksum": "33511a129240ffaa2d6f9089204cb668cd57a4189cfac4cafc8869b79aa1758e",
+        "size": 23560789,
+        "source": "components/google-cloud-sdk-skaffold-windows-x86_64-20230519173220.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -6736,8 +6736,8 @@
       },
       "platform_required": false,
       "version": {
-        "build_number": 20230410222307,
-        "version_string": "2.3.0"
+        "build_number": 20230519173220,
+        "version_string": "2.4.1"
       }
     },
     {
@@ -6993,10 +6993,10 @@
     },
     {
       "data": {
-        "checksum": "c33a7e819bac731e0ed03586bb44f7860593685f21fc078eb24d5892415cb335",
-        "contents_checksum": "3c525f6eb474de59010c4abb3b932449712a6aaedda8e7b0384e3056f28a97d4",
-        "size": 37555440,
-        "source": "components/google-cloud-sdk-tests-20230410222307.tar.gz",
+        "checksum": "6b461dc181d8e6398028957cdf94eb68d5cea45867e15b85f42d46467832e385",
+        "contents_checksum": "6d97fbe370631bdc7fbf54b674e6285babd1258bc7b1d0339e03981521363b8c",
+        "size": 37909277,
+        "source": "components/google-cloud-sdk-tests-20230601190557.tar.gz",
         "type": "tar"
       },
       "dependencies": [
@@ -7013,8 +7013,8 @@
       "platform": {},
       "platform_required": false,
       "version": {
-        "build_number": 20230410222307,
-        "version_string": "2023.04.10"
+        "build_number": 20230601190557,
+        "version_string": "2023.06.01"
       }
     }
   ],
@@ -7033,11 +7033,11 @@
   ],
   "post_processing_command": "components post-process",
   "release_notes_url": "RELEASE_NOTES",
-  "revision": 20230410222307,
+  "revision": 20230601190557,
   "schema_version": {
     "no_update": false,
     "url": "https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz",
     "version": 3
   },
-  "version": "426.0.0"
+  "version": "433.0.1"
 }
diff --git a/pkgs/tools/admin/google-cloud-sdk/data.nix b/pkgs/tools/admin/google-cloud-sdk/data.nix
index 9d5eab65ddf..0db557c4135 100644
--- a/pkgs/tools/admin/google-cloud-sdk/data.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/data.nix
@@ -1,32 +1,32 @@
 # DO NOT EDIT! This file is generated automatically by update.sh
 { }:
 {
-  version = "426.0.0";
+  version = "433.0.1";
   googleCloudSdkPkgs = {
     x86_64-linux =
       {
-        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-426.0.0-linux-x86_64.tar.gz";
-        sha256 = "04rfabif4d6760dfsbhs3qfzinzspb5hvnp17h7f0jvl5vciz5jg";
+        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-433.0.1-linux-x86_64.tar.gz";
+        sha256 = "06bv2sa91irinayg1g6jjnhji680balcbva8cxl76wscbcx9dpz7";
       };
     x86_64-darwin =
       {
-        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-426.0.0-darwin-x86_64.tar.gz";
-        sha256 = "02w6mls2k8kw4qyn79zzbkwp1x4lpwdaxnhv3pgb5c8cdfhmi7hw";
+        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-433.0.1-darwin-x86_64.tar.gz";
+        sha256 = "1h00f40hrvfzf2zgnlywsc46hjs650qm9r192h5l23bghz1ari5s";
       };
     aarch64-linux =
       {
-        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-426.0.0-linux-arm.tar.gz";
-        sha256 = "1mak6vd0asdyl7qjr59qc6m82i0bacbmvi187xgm8fmzm49nqnn2";
+        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-433.0.1-linux-arm.tar.gz";
+        sha256 = "053s74gnfd2cav720h6rls0m2ax4clb5pw9kgwyb9phnv9pjiwxg";
       };
     aarch64-darwin =
       {
-        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-426.0.0-darwin-arm.tar.gz";
-        sha256 = "16rizpxd9i8wmh120pnd7jks2c2ff4anhgpdglmfklfdd5n7bjig";
+        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-433.0.1-darwin-arm.tar.gz";
+        sha256 = "1x1jnrydhwkp7vqgbyz0hbizrs6dd0s3dcggkgzyzhmkppc3skry";
       };
     i686-linux =
       {
-        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-426.0.0-linux-x86.tar.gz";
-        sha256 = "19n8xc2bap473q4qp1m01irpmksgdbhx6f9jiwmsxfa0077sj2qy";
+        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-433.0.1-linux-x86.tar.gz";
+        sha256 = "04gjirlgn9qcdwagi250005na6nrjgbi5rvf7jj7narqa501846c";
       };
   };
 }

From 6b1239502606eef0262e0143f233370512fcdb62 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Tue, 6 Jun 2023 10:16:09 -0400
Subject: [PATCH 019/107] vimPlugins.edgy-nvim: init at 2023-06-06

---
 pkgs/applications/editors/vim/plugins/vim-plugin-names | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 008196645f8..ce6d9c8346a 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -247,6 +247,7 @@ https://github.com/stevearc/dressing.nvim/,,
 https://github.com/Shougo/echodoc.vim/,,
 https://github.com/sainnhe/edge/,,
 https://github.com/edgedb/edgedb-vim/,,
+https://github.com/folke/edgy.nvim/,HEAD,
 https://github.com/editorconfig/editorconfig-vim/,,
 https://github.com/gpanders/editorconfig.nvim/,,
 https://github.com/elixir-tools/elixir-tools.nvim/,HEAD,

From 39bb4b7769ddf43cae23c3e313b34c77e6a274f8 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Tue, 6 Jun 2023 10:17:47 -0400
Subject: [PATCH 020/107] vimPlugins: update

---
 .../editors/vim/plugins/generated.nix         | 114 ++++++++++--------
 1 file changed, 63 insertions(+), 51 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 1f73221b5a1..1f4f6d68efe 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -173,12 +173,12 @@ final: prev:
 
   LazyVim = buildVimPluginFrom2Nix {
     pname = "LazyVim";
-    version = "2023-06-05";
+    version = "2023-06-06";
     src = fetchFromGitHub {
       owner = "LazyVim";
       repo = "LazyVim";
-      rev = "56f092f1a8f37036253a5c1f1253d0eebac6dd61";
-      sha256 = "1bf2dsy1xgxzi9fb49jgqk6pqx68079lakaa4x0slaij0k0hlvi5";
+      rev = "0731f08ee43138b61eaf02ac00110babf61be99d";
+      sha256 = "1rkb321a8za0dp12vln131kc420al620v2c36n00kj2xk19qlk75";
     };
     meta.homepage = "https://github.com/LazyVim/LazyVim/";
   };
@@ -2431,12 +2431,12 @@ final: prev:
 
   dart-vim-plugin = buildVimPluginFrom2Nix {
     pname = "dart-vim-plugin";
-    version = "2022-05-23";
+    version = "2023-06-05";
     src = fetchFromGitHub {
       owner = "dart-lang";
       repo = "dart-vim-plugin";
-      rev = "81e50e80329e5eac2c115f45585b1838a614d07a";
-      sha256 = "0xi8iv3ycam3ypcxl0zn418qi2m1g0zcbfj6zvdbnfbi0nbqwj9n";
+      rev = "0ba32c911178e6701d3f76d754c8138a7c7c2e6f";
+      sha256 = "0qz1d0immg9wc9ccqkn2i558jpv0v96g8zn7kd26dc3j1j64lpd4";
     };
     meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/";
   };
@@ -2959,6 +2959,18 @@ final: prev:
     meta.homepage = "https://github.com/edgedb/edgedb-vim/";
   };
 
+  edgy-nvim = buildVimPluginFrom2Nix {
+    pname = "edgy.nvim";
+    version = "2023-06-06";
+    src = fetchFromGitHub {
+      owner = "folke";
+      repo = "edgy.nvim";
+      rev = "cb82974725e7730c847a5764f51da4b84361b502";
+      sha256 = "1ha7sqcbjf9jmiscqgd513fwp6x3pigrcb2l75jnx1nhh6nc1zxm";
+    };
+    meta.homepage = "https://github.com/folke/edgy.nvim/";
+  };
+
   editorconfig-vim = buildVimPluginFrom2Nix {
     pname = "editorconfig-vim";
     version = "2023-03-22";
@@ -3839,12 +3851,12 @@ final: prev:
 
   haskell-tools-nvim = buildNeovimPluginFrom2Nix {
     pname = "haskell-tools.nvim";
-    version = "2023-06-04";
+    version = "2023-06-05";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "haskell-tools.nvim";
-      rev = "33bac7b297df2b16df82f1465decfa13069b1ce1";
-      sha256 = "1r82ykba0nzyja8kgrk770895ihbggn6c839c3sbgn0vc8drc0np";
+      rev = "c8084560f5d449053b8d13d0a21ef0c7619fd886";
+      sha256 = "05w403gc8p3c4c7n1485dn9zqzz12jx3c00g07pc0j5623a3idip";
     };
     meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
   };
@@ -4439,12 +4451,12 @@ final: prev:
 
   lazy-nvim = buildVimPluginFrom2Nix {
     pname = "lazy.nvim";
-    version = "2023-06-03";
+    version = "2023-06-06";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "lazy.nvim";
-      rev = "f145e6f42a56306c5536e9efbfe41f7efbec285d";
-      sha256 = "0dllxvrnyfxij710lkwq99m4vfwsabnh47dx4nrl5x0gbplaw6m9";
+      rev = "ae25448d39fb2bdc38a139339233270edec44484";
+      sha256 = "03vdi199hxngfmkaizqgdwh7vxg86pw0ngmmv87vx8hnl9il8gps";
     };
     meta.homepage = "https://github.com/folke/lazy.nvim/";
   };
@@ -5555,12 +5567,12 @@ final: prev:
 
   neodev-nvim = buildVimPluginFrom2Nix {
     pname = "neodev.nvim";
-    version = "2023-06-04";
+    version = "2023-06-06";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neodev.nvim";
-      rev = "91bebf70e2c50c1d298752b74a34ca9da3c04f85";
-      sha256 = "1mz33za6a1vrvbx7bxw497bzpmhnwgiandmgg3xhr6zjym22kzvk";
+      rev = "1dffaffd6eadd39daba4a102d1ead42dd198e2c2";
+      sha256 = "1146pjml56rgis3waxha40dlg0r3a3d5n65mim9jac9l91pbl76y";
     };
     meta.homepage = "https://github.com/folke/neodev.nvim/";
   };
@@ -5651,12 +5663,12 @@ final: prev:
 
   neorg = buildVimPluginFrom2Nix {
     pname = "neorg";
-    version = "2023-06-05";
+    version = "2023-06-06";
     src = fetchFromGitHub {
       owner = "nvim-neorg";
       repo = "neorg";
-      rev = "45efa0e606cd403fead47dd7b199f6b5c9a0a68b";
-      sha256 = "09754m3r6yz563sl1g100cxpzf8pz6cpikhqznn5xalv1d7c10si";
+      rev = "474af829b0f3e25e09e68d2842ffcb6ca24d359b";
+      sha256 = "054901bdaw6a0aqwdxbm66cii0h03inyrww7k0dw6ahbni7rswgp";
     };
     meta.homepage = "https://github.com/nvim-neorg/neorg/";
   };
@@ -6083,12 +6095,12 @@ final: prev:
 
   nlsp-settings-nvim = buildVimPluginFrom2Nix {
     pname = "nlsp-settings.nvim";
-    version = "2023-06-04";
+    version = "2023-06-06";
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "nlsp-settings.nvim";
-      rev = "f6e8784d53908060b507a777c57449b472fbae97";
-      sha256 = "0p8l1gwphc8d6z5yyb95i3p800sbdh9p3ha2kinfxmk978jf0a2y";
+      rev = "8f136a9e341b8ef9d306d8ed378f023f179c9501";
+      sha256 = "0ca15pxv66k7hvfwd8cg9wf44075n3m353mqm7q86dr041f5zhc8";
     };
     meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
   };
@@ -6131,12 +6143,12 @@ final: prev:
 
   noice-nvim = buildVimPluginFrom2Nix {
     pname = "noice.nvim";
-    version = "2023-06-04";
+    version = "2023-06-06";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "noice.nvim";
-      rev = "7b14678f83ad1a875b1bcea34de4377ebfb50973";
-      sha256 = "05y8lz4r4rmjbnma7zv3fz0lknlgby6385sai92zkh5a959bj51x";
+      rev = "acf47e2b863eb20f177aa1bd5398041513e731e1";
+      sha256 = "1w4vzkashi7yqkzgb9cdq7nv27ibkw94ih041jf36k9axmlffqbr";
     };
     meta.homepage = "https://github.com/folke/noice.nvim/";
   };
@@ -6191,12 +6203,12 @@ final: prev:
 
   null-ls-nvim = buildVimPluginFrom2Nix {
     pname = "null-ls.nvim";
-    version = "2023-05-30";
+    version = "2023-06-06";
     src = fetchFromGitHub {
       owner = "jose-elias-alvarez";
       repo = "null-ls.nvim";
-      rev = "c89333e034a8daba654ebfcf9a4ec9f87765f01e";
-      sha256 = "1kpyh1y5p0cazbvcm9cazkc93giqbbngm9zk1pf5qxrl18217cqh";
+      rev = "a138b14099e9623832027ea12b4631ddd2a49256";
+      sha256 = "1jgsh1jkyxfj6cjz9sh4b80k83nlqi83kbd1c7jnqz5x98lybi1p";
     };
     meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
   };
@@ -6359,12 +6371,12 @@ final: prev:
 
   nvim-cokeline = buildVimPluginFrom2Nix {
     pname = "nvim-cokeline";
-    version = "2023-06-03";
+    version = "2023-06-06";
     src = fetchFromGitHub {
       owner = "willothy";
       repo = "nvim-cokeline";
-      rev = "dce9f06d939b85abb5222939874343e3100a4c0d";
-      sha256 = "1vbv63klkzcl2szz146f8251xc60px0yfsh3i79cbaknrskmmj8d";
+      rev = "7fb6753c8fb90eebb6b56f86fc6e65468a23c81c";
+      sha256 = "18japvpc1rrvsb6ycjzixqgrcabwyd8aq94a35k271liyk3i5i7g";
     };
     meta.homepage = "https://github.com/willothy/nvim-cokeline/";
   };
@@ -6695,12 +6707,12 @@ final: prev:
 
   nvim-lspconfig = buildVimPluginFrom2Nix {
     pname = "nvim-lspconfig";
-    version = "2023-06-05";
+    version = "2023-06-06";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "664de12a7816dfa348bb475607edfa4fe0122025";
-      sha256 = "0f2068l6kcrxxvk9wk8gxswqj0f3f6w6dm1nzmbcvqv4j5mvwnps";
+      rev = "00d7063cdca8d39eb4e3308277cc21eae7bb44f7";
+      sha256 = "0s4lwpafikfjl4kbp7dpll0akz1ir11bw5zgcy2zll2z2zdsb447";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
   };
@@ -6899,12 +6911,12 @@ final: prev:
 
   nvim-scrollview = buildVimPluginFrom2Nix {
     pname = "nvim-scrollview";
-    version = "2023-06-05";
+    version = "2023-06-06";
     src = fetchFromGitHub {
       owner = "dstein64";
       repo = "nvim-scrollview";
-      rev = "b0aee8d8a8ec4bb4b1d8152b8748ae6da37cd39c";
-      sha256 = "1fphw6g9h2b3dk8xxjvmyxhcmw7b27y0jq0g3ybx9wnqac3w06m0";
+      rev = "b4a7bb3f54e180e6203071ffa80f375bef9239fd";
+      sha256 = "014bis349y6j2ll17xbanikcaw0v54yiz69pi8k1pmkif7n08c6d";
     };
     meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
   };
@@ -8982,12 +8994,12 @@ final: prev:
 
   telescope-manix = buildNeovimPluginFrom2Nix {
     pname = "telescope-manix";
-    version = "2023-05-29";
+    version = "2023-06-05";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "telescope-manix";
-      rev = "86f40f1d562e344851e2d9df853c8f058db33c38";
-      sha256 = "0br5naafzrzrmr4qzdhl6j8557c4m4d6agqzphn9fcd8q6faphk8";
+      rev = "3930d658899dff2c796d8a5b488f7cc77a08d966";
+      sha256 = "030v85lihjhvma9m22j1xc37wm06g4jkmhlmxpv1hsafff8cmxhq";
     };
     meta.homepage = "https://github.com/MrcJkb/telescope-manix/";
   };
@@ -9524,12 +9536,12 @@ final: prev:
 
   typescript-nvim = buildVimPluginFrom2Nix {
     pname = "typescript.nvim";
-    version = "2023-01-03";
+    version = "2023-06-06";
     src = fetchFromGitHub {
       owner = "jose-elias-alvarez";
       repo = "typescript.nvim";
-      rev = "f66d4472606cb24615dfb7dbc6557e779d177624";
-      sha256 = "1hm87jpscv250x8hv3vacw0sdhkwa81x21cxyvc6nf2vsbj5hx9w";
+      rev = "5b3680e5c386e8778c081173ea0c978c14a40ccb";
+      sha256 = "0ixxgbcz8y42xlbin2dv3ycrlrgjd53shi9i8iyy0kxpr57cjldz";
     };
     meta.homepage = "https://github.com/jose-elias-alvarez/typescript.nvim/";
   };
@@ -11420,12 +11432,12 @@ final: prev:
 
   vim-gruvbox8 = buildVimPluginFrom2Nix {
     pname = "vim-gruvbox8";
-    version = "2023-06-05";
+    version = "2023-06-06";
     src = fetchFromGitHub {
       owner = "lifepillar";
       repo = "vim-gruvbox8";
-      rev = "6bf129b4d65fad40ce4317f0ac34f9708afc7f0e";
-      sha256 = "00i8xfbzjs8d0fpmsvrysc1p6hnk6z95d61q7nc1hkx14hlc5w0l";
+      rev = "75614aff9669abd7f8b0aae58fdfbaddfebee1e0";
+      sha256 = "0bszxd8f0qyydx0w9dff46spc36s35jdpgshr616wlfwpgi4l1z4";
     };
     meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/";
   };
@@ -13595,12 +13607,12 @@ final: prev:
 
   vim-solarized8 = buildVimPluginFrom2Nix {
     pname = "vim-solarized8";
-    version = "2023-06-02";
+    version = "2023-06-06";
     src = fetchFromGitHub {
       owner = "lifepillar";
       repo = "vim-solarized8";
-      rev = "2b5bad7944c6990a8dd31ff519268b174b587a70";
-      sha256 = "1z45y9cvkavffb8hjj9gq2r2hlha9v0g7cijcirpa7rlpz486qm3";
+      rev = "77a6bd78a6f1f8b6f841fc7e1ea427b2348ac1b7";
+      sha256 = "072y01039s2gimnsvibwfb499r0wqbwqk7n8ykqilf6y298r1m2g";
     };
     meta.homepage = "https://github.com/lifepillar/vim-solarized8/";
   };
@@ -15098,12 +15110,12 @@ final: prev:
 
   lspsaga-nvim-original = buildVimPluginFrom2Nix {
     pname = "lspsaga-nvim-original";
-    version = "2023-06-01";
+    version = "2023-06-06";
     src = fetchFromGitHub {
       owner = "nvimdev";
       repo = "lspsaga.nvim";
-      rev = "c475ace5b8882631b351ef7c3e8078ca9ebbb751";
-      sha256 = "1dg96sg0262nm2rzq6h80f51grc4www7ljcx6c7j3l8p0c003gha";
+      rev = "4f075452c466df263e69ae142f6659dcf9324bf6";
+      sha256 = "0p7lqf8562z7wnjiijniqs9pn36n16gywpm940lbz724g5lykm4q";
     };
     meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
   };

From 13182e662ab753c4f360dbb41693a257f66af48e Mon Sep 17 00:00:00 2001
From: Icy-Thought <icy-thought@pm.me>
Date: Tue, 6 Jun 2023 22:07:13 +0200
Subject: [PATCH 021/107] fluent-icon-theme: 2023-02-01 -> 2023-06-07

---
 pkgs/data/icons/fluent-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/fluent-icon-theme/default.nix b/pkgs/data/icons/fluent-icon-theme/default.nix
index 50c11d7b3a8..6933a0ecb92 100644
--- a/pkgs/data/icons/fluent-icon-theme/default.nix
+++ b/pkgs/data/icons/fluent-icon-theme/default.nix
@@ -16,13 +16,13 @@ lib.checkListOfEnum "${pname}: available color variants" [ "standard" "green" "g
 
 stdenvNoCC.mkDerivation rec {
   inherit pname;
-  version = "2023-02-01";
+  version = "2023-06-07";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = version;
-    hash = "sha256-Plm05+5r6p9MabLmmh8kWitALGFalruBbhAgBhPCjRo=";
+    hash = "sha256-drEAjIY/lacqncSeVeNmeRX6v4PnLvGo66Na1fuFXRg=";
   };
 
   nativeBuildInputs = [ gtk3 jdupes ];

From df7487ff174ede2ab4544694f5fbc5309b9e7e77 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Thu, 18 May 2023 08:16:24 -0400
Subject: [PATCH 022/107] cctools-llvm: init at 11.1.0-973.0.1

cctools-llvm is a replacement for cctools that replaces as much of cctools with equivalents from LLVM that it can reasonably do. This was motivated by wanting to reduce dependencies on cctools, which are updated infrequently by upstream.

To provide a motivating example, the version of `strip` included in cctools cannot properly strip the archives in compiler-rt in LLVM 15. Paths are left to bootstrap tools, resulting in failed requisites checks in the final stdenv build. Since `strip` needs replaced, the opportunity was taken to replace other provided they are functional replacements.

Note: This has to be done in cctools (or some equivalent) because some derivations (noteably LLVM) use the bintools of the stdenv directly instead of going through the wrapper.

The following tools from LLVM are not used in this derivation:

* LLD - not fully compatible with ld64 yet and potentially too big of a change;
* libtool - not a drop-in replacement yet because it does not support linker passthrough, which is needed by xcbuild;
* lipo - crashes when running the LLVM test suite;
* install_name_tool - fails when trying to build swift-corefoundation; and.
* randlib - not completely a drop-in replacement, so leaving it out for now.

If other incompatabilities are found, the tools can be reverted or made conditional. For example, cctools `strip` is preferred on older versions of LLVM (which lack the compiler-rt issue) or when cctools itself is a new enough version because `llvm-strip` on LLVM 11 produces files that older verions of `codesign_allocate` cannot process correctly.

One final caveat/note: Some tools are not duplicated or linked from cctools-port. The names of the tools and which ones were linked was determined based on what is provided upstream in Xcode and is installed on macOS system.
---
 pkgs/os-specific/darwin/cctools/llvm.nix | 104 +++++++++++++++++++++++
 pkgs/stdenv/darwin/default.nix           |   2 +-
 pkgs/top-level/darwin-packages.nix       |  10 ++-
 3 files changed, 113 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/os-specific/darwin/cctools/llvm.nix

diff --git a/pkgs/os-specific/darwin/cctools/llvm.nix b/pkgs/os-specific/darwin/cctools/llvm.nix
new file mode 100644
index 00000000000..11ec2b4d04f
--- /dev/null
+++ b/pkgs/os-specific/darwin/cctools/llvm.nix
@@ -0,0 +1,104 @@
+# Create a cctools-compatible bintools that uses equivalent tools from LLVM in place of the ones
+# from cctools when possible.
+
+{ lib, stdenv, makeWrapper, cctools-port, llvmPackages, enableManpages ? true }:
+
+let
+  cctoolsVersion = lib.getVersion cctools-port;
+  llvmVersion = llvmPackages.release_version;
+
+  # `bitcode_strip` is not available until LLVM 12.
+  useLLVMBitcodeStrip = lib.versionAtLeast llvmVersion "12";
+
+  # A compatible implementation of `otool` was not added until LLVM 13.
+  useLLVMOtool = lib.versionAtLeast llvmVersion "13";
+
+  # Older versions of `strip` cause problems for the version of `codesign_allocate` available in
+  # the version of cctools in nixpkgs. The version of `codesign_allocate` in cctools-1005.2 does
+  # not appear to have issues, but the source is not available yet (as of June 2023).
+  useLLVMStrip = lib.versionAtLeast llvmVersion "15" || lib.versionAtLeast cctoolsVersion "1005.2";
+
+  llvm_bins = [
+    "dwarfdump"
+    "nm"
+    "objdump"
+    "size"
+    "strings"
+  ]
+  ++ lib.optional useLLVMBitcodeStrip "bitcode-strip"
+  ++ lib.optional useLLVMOtool "otool"
+  ++ lib.optional useLLVMStrip "strip";
+
+  # Only include the tools that LLVM doesn’t provide and that are present normally on Darwin.
+  # The only exceptions are the following tools, which should be reevaluated when LLVM is bumped.
+  # - install_name_tool (llvm-objcopy): unrecognized linker commands when building open source CF;
+  # - libtool (llvm-libtool-darwin): not fully compatible when used with xcbuild; and
+  # - lipo (llvm-lipo): crashes when running the LLVM test suite.
+  cctools_bins = [
+    "cmpdylib"
+    "codesign_allocate"
+    "ctf_insert"
+    "install_name_tool"
+    "ld"
+    "libtool"
+    "lipo"
+    "nmedit"
+    "pagestuff"
+    "ranlib"
+    "segedit"
+    "vtool"
+  ]
+  ++ lib.optional (!useLLVMBitcodeStrip) "bitcode_strip"
+  ++ lib.optional (!useLLVMOtool) "otool"
+  ++ lib.optional (!useLLVMStrip) "strip";
+
+  inherit (stdenv.cc) targetPrefix;
+
+  linkManPages = pkg: source: target: lib.optionalString enableManpages ''
+    sourcePath=${pkg}/share/man/man1/${source}.1.gz
+    targetPath=$man/share/man/man1/${target}.1.gz
+
+    if [ -f "$sourcePath" ]; then
+      mkdir -p "$(dirname "$targetPath")"
+      ln -s "$sourcePath" "$targetPath"
+    fi
+  '';
+in
+stdenv.mkDerivation {
+  pname = "cctools-llvm";
+  version = "${llvmVersion}-${cctoolsVersion}";
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  # The `man` output has to be included unconditionally because darwin.binutils expects it.
+  outputs = [ "out" "dev" "man" ];
+
+  buildCommand = ''
+    mkdir -p "$out/bin" "$man"
+    ln -s ${lib.getDev cctools-port} "$dev"
+
+    # Use the clang-integrated assembler instead of using `as` from cctools.
+    makeWrapper "${lib.getBin llvmPackages.clang-unwrapped}/bin/clang" "$out/bin/${targetPrefix}as" \
+      --add-flags "-x assembler -integrated-as -c"
+
+    ln -s "${lib.getBin llvmPackages.bintools-unwrapped}/bin/llvm-ar" "$out/bin/${targetPrefix}ar"
+    ${linkManPages llvmPackages.llvm-manpages "llvm-ar" "ar"}
+
+    for tool in ${toString llvm_bins}; do
+      cctoolsTool=''${tool/-/_}
+      ln -s "${lib.getBin llvmPackages.llvm}/bin/llvm-$tool" "$out/bin/${targetPrefix}$cctoolsTool"
+      ${linkManPages llvmPackages.llvm-manpages "llvm-$tool" "$cctoolsTool"}
+    done
+
+    for tool in ${toString cctools_bins}; do
+      ln -s "${lib.getBin cctools-port}/bin/${targetPrefix}$tool" "$out/bin/${targetPrefix}$tool"
+      ${linkManPages (lib.getMan cctools-port) "$tool" "$tool"}
+    done
+
+    ${linkManPages (lib.getMan cctools-port) "ld64" "ld64"}
+    ${lib.optionalString (!useLLVMOtool)  # The actual man page for otool in cctools is llvm-otool
+      linkManPages (lib.getMan cctools-port) "llvm-otool" "llvm-otool"}
+  '';
+
+  passthru = { inherit targetPrefix; };
+}
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 780717db56b..a83f727cfe1 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -651,7 +651,7 @@ rec {
         darwin = super.darwin.overrideScope (_: _: {
           inherit (darwin) dyld ICU Libsystem Csu libiconv rewrite-tbd;
         } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) {
-          inherit (darwin) binutils binutils-unwrapped cctools;
+          inherit (darwin) binutils binutils-unwrapped cctools-port;
         });
       } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) {
         inherit llvm;
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index b6e70772d04..fa03c385e4f 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -100,11 +100,17 @@ impure-cmds // appleSourcePackages // chooseLibs // {
     bintools = self.binutils-unwrapped;
   };
 
-  cctools = callPackage ../os-specific/darwin/cctools/port.nix {
+  cctools = self.cctools-port;
+
+  cctools-apple = callPackage ../os-specific/darwin/cctools/apple.nix {
     stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv;
   };
 
-  cctools-apple = callPackage ../os-specific/darwin/cctools/apple.nix {
+  cctools-llvm = callPackage ../os-specific/darwin/cctools/llvm.nix {
+    stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv;
+  };
+
+  cctools-port = callPackage ../os-specific/darwin/cctools/port.nix {
     stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv;
   };
 

From 26dd98dcf85fd3f47138284401e5eae9fd9be996 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Tue, 6 Jun 2023 19:27:25 -0400
Subject: [PATCH 023/107] argc: 1.3.0 -> 1.4.0

Diff: https://github.com/sigoden/argc/compare/v1.3.0...v1.4.0

Changelog: https://github.com/sigoden/argc/releases/tag/v1.4.0
---
 pkgs/development/tools/argc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/argc/default.nix b/pkgs/development/tools/argc/default.nix
index 94ab17e4eed..35e1c98cce4 100644
--- a/pkgs/development/tools/argc/default.nix
+++ b/pkgs/development/tools/argc/default.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "argc";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "sigoden";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-mcJAtcGVqOQNafGu59QNcABvNNkImQ2qydZylf3a2Qs=";
+    hash = "sha256-TMBXcLicrqdykGZJjtEyobHvqK6CR6CaJoiBntj1i4o=";
   };
 
-  cargoHash = "sha256-Q7jL+9EwHD0HcRpS6SQ2M625z2h/eA7cUF60zDpekZY=";
+  cargoHash = "sha256-K18oD6TT0pmF0ctEO4yJlA0koeRtiMFjz/8FLb7gwo0=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 96fbaff5726f334236c27370f6f1786ad5cc040e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 7 Jun 2023 03:59:16 +0000
Subject: [PATCH 024/107] wiki-js: 2.5.298 -> 2.5.299

---
 pkgs/servers/web-apps/wiki-js/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/servers/web-apps/wiki-js/default.nix
index 604599c3ca1..374c270689c 100644
--- a/pkgs/servers/web-apps/wiki-js/default.nix
+++ b/pkgs/servers/web-apps/wiki-js/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "wiki-js";
-  version = "2.5.298";
+  version = "2.5.299";
 
   src = fetchurl {
     url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz";
-    sha256 = "sha256-O7KQ134zh9ullYyQZimmxfdRwXeHkD8aAhy/pRzIjxo=";
+    sha256 = "sha256-GYe05dbR8RwCzPedeCMUQTWZ51roM/V2jUPPv7o7UEU=";
   };
 
   # Implements nodejs 18 support as it's not planned to fix this before

From 70e53e395e9ba00ec942e1ed44f12ae5dc9c47eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 7 Jun 2023 11:34:06 -0700
Subject: [PATCH 025/107] libdeltachat: 1.115.0 -> 1.116.0

Diff: https://github.com/deltachat/deltachat-core-rust/compare/v1.115.0...v1.116.0

Changelog: https://github.com/deltachat/deltachat-core-rust/blob/v1.116.0/CHANGELOG.md
---
 .../libraries/libdeltachat/Cargo.lock         | 347 ++++++++++--------
 .../libraries/libdeltachat/default.nix        |   4 +-
 2 files changed, 199 insertions(+), 152 deletions(-)

diff --git a/pkgs/development/libraries/libdeltachat/Cargo.lock b/pkgs/development/libraries/libdeltachat/Cargo.lock
index 7545582b6c7..15900472ae9 100644
--- a/pkgs/development/libraries/libdeltachat/Cargo.lock
+++ b/pkgs/development/libraries/libdeltachat/Cargo.lock
@@ -88,6 +88,12 @@ dependencies = [
  "alloc-no-stdlib",
 ]
 
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -112,6 +118,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "anstyle"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
+
 [[package]]
 name = "anyhow"
 version = "1.0.71"
@@ -209,7 +221,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d11e163a705d0c809dfc886eee95df5117c758539c940c0fe9aa3aa4da5388ce"
 dependencies = [
  "async-channel",
- "base64 0.21.0",
+ "base64 0.21.2",
  "byte-pool",
  "chrono",
  "futures",
@@ -270,7 +282,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.18",
 ]
 
 [[package]]
@@ -287,17 +299,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -312,7 +313,7 @@ checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39"
 dependencies = [
  "async-trait",
  "axum-core",
- "base64 0.21.0",
+ "base64 0.21.2",
  "bitflags 1.3.2",
  "bytes",
  "futures-util",
@@ -403,9 +404,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.21.0"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
+checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
 
 [[package]]
 name = "base64ct"
@@ -655,13 +656,13 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.24"
+version = "0.4.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
 dependencies = [
+ "android-tzdata",
  "iana-time-zone",
  "js-sys",
- "num-integer",
  "num-traits",
  "time 0.1.45",
  "wasm-bindgen",
@@ -707,24 +708,29 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "3.2.23"
+version = "4.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5"
+checksum = "b4ed2379f8603fa2b7509891660e802b88c70a79a6427a70abb5968054de2c28"
 dependencies = [
+ "clap_builder",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72394f3339a76daf211e57d4bcb374410f3965dcc606dd0e03738c7888766980"
+dependencies = [
+ "anstyle",
  "bitflags 1.3.2",
  "clap_lex",
- "indexmap",
- "textwrap",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.2.4"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
-dependencies = [
- "os_str_bytes",
-]
+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
 
 [[package]]
 name = "clipboard-win"
@@ -854,20 +860,20 @@ dependencies = [
 
 [[package]]
 name = "criterion"
-version = "0.4.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb"
+checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
 dependencies = [
  "anes",
- "atty",
  "cast",
  "ciborium",
  "clap",
  "criterion-plot",
  "futures",
+ "is-terminal",
  "itertools",
- "lazy_static",
  "num-traits",
+ "once_cell",
  "oorandom",
  "plotters",
  "rayon",
@@ -977,6 +983,16 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "ctor"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
+dependencies = [
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "curve25519-dalek"
 version = "3.2.0"
@@ -1144,7 +1160,7 @@ dependencies = [
 
 [[package]]
 name = "deltachat"
-version = "1.115.0"
+version = "1.116.0"
 dependencies = [
  "ansi_term",
  "anyhow",
@@ -1154,7 +1170,7 @@ dependencies = [
  "async-smtp",
  "async_zip",
  "backtrace",
- "base64 0.21.0",
+ "base64 0.21.2",
  "brotli",
  "chrono",
  "criterion",
@@ -1183,6 +1199,7 @@ dependencies = [
  "parking_lot",
  "percent-encoding",
  "pgp",
+ "pretty_assertions",
  "pretty_env_logger",
  "proptest",
  "qrcodegen",
@@ -1219,18 +1236,19 @@ dependencies = [
 
 [[package]]
 name = "deltachat-jsonrpc"
-version = "1.115.0"
+version = "1.116.0"
 dependencies = [
  "anyhow",
  "async-channel",
  "axum",
- "base64 0.21.0",
+ "base64 0.21.2",
  "deltachat",
- "env_logger 0.10.0",
+ "env_logger",
  "futures",
  "log",
  "num-traits",
  "sanitize-filename",
+ "schemars",
  "serde",
  "serde_json",
  "tempfile",
@@ -1242,7 +1260,7 @@ dependencies = [
 
 [[package]]
 name = "deltachat-repl"
-version = "1.115.0"
+version = "1.116.0"
 dependencies = [
  "ansi_term",
  "anyhow",
@@ -1257,12 +1275,12 @@ dependencies = [
 
 [[package]]
 name = "deltachat-rpc-server"
-version = "1.115.0"
+version = "1.116.0"
 dependencies = [
  "anyhow",
  "deltachat",
  "deltachat-jsonrpc",
- "env_logger 0.10.0",
+ "env_logger",
  "futures-lite",
  "log",
  "serde",
@@ -1277,12 +1295,12 @@ name = "deltachat_derive"
 version = "2.0.0"
 dependencies = [
  "quote",
- "syn 2.0.15",
+ "syn 2.0.18",
 ]
 
 [[package]]
 name = "deltachat_ffi"
-version = "1.115.0"
+version = "1.116.0"
 dependencies = [
  "anyhow",
  "deltachat",
@@ -1295,6 +1313,7 @@ dependencies = [
  "serde_json",
  "thiserror",
  "tokio",
+ "yerpc",
 ]
 
 [[package]]
@@ -1399,6 +1418,12 @@ dependencies = [
  "cipher",
 ]
 
+[[package]]
+name = "diff"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
+
 [[package]]
 name = "digest"
 version = "0.9.0"
@@ -1496,6 +1521,12 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "dyn-clone"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30"
+
 [[package]]
 name = "ecdsa"
 version = "0.14.8"
@@ -1766,26 +1797,13 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "env_logger"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
-dependencies = [
- "atty",
- "humantime 1.3.0",
- "log",
- "regex",
- "termcolor",
-]
-
 [[package]]
 name = "env_logger"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
 dependencies = [
- "humantime 2.1.0",
+ "humantime",
  "is-terminal",
  "log",
  "regex",
@@ -2058,7 +2076,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.18",
 ]
 
 [[package]]
@@ -2166,9 +2184,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21"
+checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782"
 dependencies = [
  "bytes",
  "fnv",
@@ -2213,15 +2231,6 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "hermit-abi"
 version = "0.2.6"
@@ -2329,15 +2338,6 @@ dependencies = [
  "libm 0.2.6",
 ]
 
-[[package]]
-name = "humantime"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
-dependencies = [
- "quick-error 1.2.3",
-]
-
 [[package]]
 name = "humantime"
 version = "2.1.0"
@@ -2530,7 +2530,7 @@ checksum = "e4fb9858c8cd3dd924a5da5bc511363845a9bcfdfac066bb2ef8454eb6111546"
 dependencies = [
  "abao",
  "anyhow",
- "base64 0.21.0",
+ "base64 0.21.2",
  "blake3",
  "bytes",
  "default-net",
@@ -2661,9 +2661,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.142"
+version = "0.2.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
+checksum = "fc86cde3ff845662b8f4ef6cb50ea0e20c524eb3d29ae048287e06a1b3fa6a81"
 
 [[package]]
 name = "libm"
@@ -2722,12 +2722,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.17"
+version = "0.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
-]
+checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"
 
 [[package]]
 name = "lru-cache"
@@ -3083,9 +3080,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.17.1"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
 [[package]]
 name = "oorandom"
@@ -3171,12 +3168,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "os_str_bytes"
-version = "6.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
-
 [[package]]
 name = "ouroboros"
 version = "0.15.6"
@@ -3200,6 +3191,15 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "output_vt100"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "overload"
 version = "0.1.1"
@@ -3326,9 +3326,9 @@ dependencies = [
 
 [[package]]
 name = "percent-encoding"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
 
 [[package]]
 name = "pgp"
@@ -3337,7 +3337,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37a79d6411154d1a9908e7a2c4bac60a5742f6125823c2c30780c7039aef02f0"
 dependencies = [
  "aes",
- "base64 0.21.0",
+ "base64 0.21.2",
  "bitfield",
  "block-padding",
  "blowfish",
@@ -3545,12 +3545,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
-name = "pretty_env_logger"
-version = "0.4.0"
+name = "pretty_assertions"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d"
+checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755"
 dependencies = [
- "env_logger 0.7.1",
+ "ctor",
+ "diff",
+ "output_vt100",
+ "yansi",
+]
+
+[[package]]
+name = "pretty_env_logger"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c"
+dependencies = [
+ "env_logger",
  "log",
 ]
 
@@ -3589,24 +3601,23 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.55"
+version = "1.0.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d0dd4be24fcdcfeaa12a432d588dc59bbad6cad3510c67e74a2b6b2fc950564"
+checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "proptest"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29f1b898011ce9595050a68e60f90bad083ff2987a695a42357134c8381fba70"
+checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65"
 dependencies = [
  "bitflags 1.3.2",
  "byteorder",
  "lazy_static",
  "num-traits",
- "quick-error 2.0.1",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rand_xorshift",
@@ -3644,12 +3655,6 @@ version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
-[[package]]
-name = "quick-error"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
-
 [[package]]
 name = "quick-xml"
 version = "0.28.2"
@@ -3709,9 +3714,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.26"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
 dependencies = [
  "proc-macro2",
 ]
@@ -3881,13 +3886,13 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.8.1"
+version = "1.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370"
+checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.7.1",
+ "regex-syntax 0.7.2",
 ]
 
 [[package]]
@@ -3907,17 +3912,17 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c"
+checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
 
 [[package]]
 name = "reqwest"
-version = "0.11.17"
+version = "0.11.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91"
+checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55"
 dependencies = [
- "base64 0.21.0",
+ "base64 0.21.2",
  "bytes",
  "encoding_rs",
  "futures-core",
@@ -3955,7 +3960,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00"
 dependencies = [
  "hostname",
- "quick-error 1.2.3",
+ "quick-error",
 ]
 
 [[package]]
@@ -4137,7 +4142,7 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b"
 dependencies = [
- "base64 0.21.0",
+ "base64 0.21.2",
 ]
 
 [[package]]
@@ -4209,6 +4214,30 @@ dependencies = [
  "windows-sys 0.42.0",
 ]
 
+[[package]]
+name = "schemars"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f"
+dependencies = [
+ "dyn-clone",
+ "schemars_derive",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "schemars_derive"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde_derive_internals",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "scopeguard"
 version = "1.1.0"
@@ -4293,9 +4322,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.160"
+version = "1.0.163"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
+checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
 dependencies = [
  "serde_derive",
 ]
@@ -4320,13 +4349,24 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.160"
+version = "1.0.163"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
+checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.18",
+]
+
+[[package]]
+name = "serde_derive_internals"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -4351,9 +4391,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
+checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d"
 dependencies = [
  "serde",
 ]
@@ -4633,9 +4673,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.15"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
+checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4765,7 +4805,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.18",
 ]
 
 [[package]]
@@ -4843,9 +4883,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.28.0"
+version = "1.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f"
+checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
 dependencies = [
  "autocfg",
  "bytes",
@@ -4878,7 +4918,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.15",
+ "syn 2.0.18",
 ]
 
 [[package]]
@@ -4960,9 +5000,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21"
+checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -4972,18 +5012,18 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
+checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.19.8"
+version = "0.19.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
+checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739"
 dependencies = [
  "indexmap",
  "serde",
@@ -5288,9 +5328,9 @@ checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372"
 
 [[package]]
 name = "uuid"
-version = "1.3.2"
+version = "1.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dad5567ad0cf5b760e5665964bec1b47dfd077ba8a2544b513f3556d3d239a2"
+checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2"
 dependencies = [
  "getrandom 0.2.8",
  "serde",
@@ -5689,9 +5729,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
 
 [[package]]
 name = "winnow"
-version = "0.4.1"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"
+checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699"
 dependencies = [
  "memchr",
 ]
@@ -5743,6 +5783,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "yansi"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
+
 [[package]]
 name = "yasna"
 version = "0.5.1"
@@ -5754,9 +5800,9 @@ dependencies = [
 
 [[package]]
 name = "yerpc"
-version = "0.4.3"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6a0257f42e6bdc187f37074723b6094da3502cee21ae517b3c54d2c37d506e7"
+checksum = "30fc983d32883ecb563227a2dcdcbe8567decd9c533b5ecca7e3099e2f7d4c96"
 dependencies = [
  "anyhow",
  "async-channel",
@@ -5766,6 +5812,7 @@ dependencies = [
  "futures",
  "futures-util",
  "log",
+ "schemars",
  "serde",
  "serde_json",
  "tokio",
@@ -5776,9 +5823,9 @@ dependencies = [
 
 [[package]]
 name = "yerpc_derive"
-version = "0.4.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bd53ff9053698697b92c2535bf7ecb983fd5d546d690b7c725e5070d6d9a620"
+checksum = "6d6b8ce490e8719fe84d7d80ad4d58572b2ea9d7a83d156f6afd6ab3ad5cfb94"
 dependencies = [
  "convert_case 0.5.0",
  "darling 0.14.3",
diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix
index 73921037f97..097624ddcde 100644
--- a/pkgs/development/libraries/libdeltachat/default.nix
+++ b/pkgs/development/libraries/libdeltachat/default.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libdeltachat";
-  version = "1.115.0";
+  version = "1.116.0";
 
   src = fetchFromGitHub {
     owner = "deltachat";
     repo = "deltachat-core-rust";
     rev = "v${version}";
-    hash = "sha256-GAU/v2/MwvgqtZnvp2wwrKpPXhzr5g7QxVngR+pt35c=";
+    hash = "sha256-fSTte2rqy0w4zk9Vh4y3/UWplR0hvwdBqSoSYjoUhPg=";
   };
 
   patches = [

From ae01b8ed8d1351c99e76dad737167d8ded8304d8 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Wed, 31 May 2023 20:01:21 -0300
Subject: [PATCH 026/107] gitRepo: 2.32 -> 2.34.1

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 pkgs/applications/version-management/git-repo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index 2e3eeeb3d6f..d0de2e5cad0 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "git-repo";
-  version = "2.32";
+  version = "2.34.1";
 
   src = fetchFromGitHub {
     owner = "android";
     repo = "tools_repo";
     rev = "v${version}";
-    sha256 = "sha256-WY77F4culQ1y8UDIhI117AHBL5mEk40s8HpP3+5muZI=";
+    hash = "sha256-jSHUtgghYI9Wgdf7RGYjVlq7iSJT612Lv5M2mq7L4EA=";
   };
 
   # Fix 'NameError: name 'ssl' is not defined'

From 61ff23358ec9c8413e1a7060f6a5933c901da5db Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Jun 2023 21:00:40 +0200
Subject: [PATCH 027/107] python310Packages.accuweather: 0.5.2 -> 1.0.0

https://github.com/bieniu/accuweather/releases/tag/1.0.0
---
 pkgs/development/python-modules/accuweather/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/accuweather/default.nix b/pkgs/development/python-modules/accuweather/default.nix
index ec4adec7638..cff7fd06c8e 100644
--- a/pkgs/development/python-modules/accuweather/default.nix
+++ b/pkgs/development/python-modules/accuweather/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "accuweather";
-  version = "0.5.2";
+  version = "1.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "bieniu";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-rXA5A80PWn08VPeimJeMNWMGvzaE/gWrRuJseHiDkRg=";
+    hash = "sha256-CWPhdu0lttYhAS6hzyKPL3vtNRVqbDexxY6nvMya3jA=";
   };
 
   propagatedBuildInputs = [

From b5f4812bfec6a5261b5253753bef76bea4c799a1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Wed, 7 Jun 2023 21:05:52 +0200
Subject: [PATCH 028/107] python311Packages.aioairzone: 0.5.5 -> 0.6.3
 (#232482)

Diff: https://github.com/Noltari/aioairzone/compare/refs/tags/0.5.0...0.6.3

Changelog: https://github.com/Noltari/aioairzone/releases/tag/0.6.0
Changelog: https://github.com/Noltari/aioairzone/releases/tag/0.5.6
Changelog: https://github.com/Noltari/aioairzone/releases/tag/0.6.3
---
 pkgs/development/python-modules/aioairzone/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix
index 3d49fddec7d..4c6ef2d4980 100644
--- a/pkgs/development/python-modules/aioairzone/default.nix
+++ b/pkgs/development/python-modules/aioairzone/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "aioairzone";
-  version = "0.5.5";
+  version = "0.6.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "Noltari";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-6PBNwCfh5ryR3Jub3GDykY6lRQt9wdkV8yWkvivuQpM=";
+    hash = "sha256-grUfhUc8U7d7GgUa8TfvSPYOYr4IW1mZM0tl6I5gUdg=";
   };
 
   nativeBuildInputs = [

From ea56bb2263f2bfd8127968bae0c677e172470956 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Jun 2023 21:10:55 +0200
Subject: [PATCH 029/107] python310Packages.devolo-plc-api: 1.3.0 -> 1.3.1

https://github.com/2Fake/devolo_plc_api/releases/tag/v1.3.1
---
 .../python-modules/devolo-plc-api/default.nix        | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/devolo-plc-api/default.nix b/pkgs/development/python-modules/devolo-plc-api/default.nix
index 5e3115d660d..8170601914a 100644
--- a/pkgs/development/python-modules/devolo-plc-api/default.nix
+++ b/pkgs/development/python-modules/devolo-plc-api/default.nix
@@ -1,7 +1,6 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, fetchpatch
 , httpx
 , protobuf
 , pytest-asyncio
@@ -10,12 +9,13 @@
 , pytestCheckHook
 , pythonOlder
 , setuptools-scm
+, syrupy
 , zeroconf
 }:
 
 buildPythonPackage rec {
   pname = "devolo-plc-api";
-  version = "1.3.0";
+  version = "1.3.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -24,9 +24,14 @@ buildPythonPackage rec {
     owner = "2Fake";
     repo = "devolo_plc_api";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ika0mypHo7a8GCa2eNhOLIhMZ2ASwJOxV4mmAzvJm0E=";
+    hash = "sha256-wJyBCQ9rk+UwjWhMIeqsIbMR8cXA9Xu+lmubJoOauEg=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace "protobuf>=4.22.0" "protobuf"
+  '';
+
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
   nativeBuildInputs = [
@@ -44,6 +49,7 @@ buildPythonPackage rec {
     pytest-httpx
     pytest-mock
     pytestCheckHook
+    syrupy
   ];
 
   pythonImportsCheck = [

From da3679780d2cae5b4bfafff6bc0ec471ba541c90 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Jun 2023 21:15:01 +0200
Subject: [PATCH 030/107] home-assistant.intents: 2023.4.26 -> 2023.6.5

https://github.com/home-assistant/intents/compare/refs/tags/2023.4.26...2023.6.5
---
 pkgs/servers/home-assistant/intents.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix
index 4444d6e9a24..37cb2abf83c 100644
--- a/pkgs/servers/home-assistant/intents.nix
+++ b/pkgs/servers/home-assistant/intents.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "home-assistant-intents";
-  version = "2023.4.26";
+  version = "2023.6.5";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "home-assistant";
     repo = "intents";
     rev = "refs/tags/${version}";
-    hash = "sha256-l22+scT/4qIU5qWlWURr5wVEBoWNXGqYEaS3IVwG1Zs=";
+    hash = "sha256-ZfPOxTFPQNdZ3Tq8p410RHlLGej+FOqhafD+91MRbRo=";
   };
 
   sourceRoot = "source/package";

From 1f649e2175f974f2c58a51f7593a4edd8ea92f17 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Wed, 7 Jun 2023 21:21:30 +0200
Subject: [PATCH 031/107] python310Packages.pydeconz: 111 -> 113 (#227928)

Diff: https://github.com/Kane610/deconz/compare/refs/tags/v111...v113

Changelog: https://github.com/Kane610/deconz/releases/tag/v112
Changelog: https://github.com/Kane610/deconz/releases/tag/v113
---
 pkgs/development/python-modules/pydeconz/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix
index 7dbf0c8e6c6..a58e69fe025 100644
--- a/pkgs/development/python-modules/pydeconz/default.nix
+++ b/pkgs/development/python-modules/pydeconz/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "pydeconz";
-  version = "111";
+  version = "113";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "Kane610";
     repo = "deconz";
     rev = "refs/tags/v${version}";
-    hash = "sha256-QBun9VT42W9EMvNuLZoe6VnXKXAKEXstDKCU7LXEvNQ=";
+    hash = "sha256-Vf3nYUopaGY5JK//rqqsz47VRHwql1cQcslYbkH3owQ=";
   };
 
   propagatedBuildInputs = [

From 3e7405111b188fc9d2648bf98edd716a68ae0771 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Wed, 7 Jun 2023 21:25:43 +0200
Subject: [PATCH 032/107] python311Packages.python-otbr-api: 1.2.0 -> 2.1.0
 (#235045)

Diff: https://github.com/home-assistant-libs/python-otbr-api/compare/refs/tags/1.2.0...2.1.0

Changelog: https://github.com/home-assistant-libs/python-otbr-api/releases/tag/2.1.0
---
 pkgs/development/python-modules/python-otbr-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-otbr-api/default.nix b/pkgs/development/python-modules/python-otbr-api/default.nix
index 723a4ebe02f..6bf28172e0a 100644
--- a/pkgs/development/python-modules/python-otbr-api/default.nix
+++ b/pkgs/development/python-modules/python-otbr-api/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "python-otbr-api";
-  version = "1.2.0";
+  version = "2.1.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "home-assistant-libs";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-IPglUB+Xla+IjWzHhfG+SDHY/jucg46ppnhHBHKTEiE=";
+    hash = "sha256-LM09hQ5ELWLCymk8oxHcqTngs4mXg59uY2OrSpizQXo=";
   };
 
   nativeBuildInputs = [

From 7e39159f27f05dabae4b597ae90795faea5ea5cb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Wed, 7 Jun 2023 21:29:05 +0200
Subject: [PATCH 033/107] python311Packages.rokuecp: 0.17.1 -> 0.18.0 (#233753)

Diff: https://github.com/ctalkington/python-rokuecp/compare/refs/tags/0.17.1...0.18.0

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

diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix
index d272d07ff19..a6d9f2e8fa0 100644
--- a/pkgs/development/python-modules/rokuecp/default.nix
+++ b/pkgs/development/python-modules/rokuecp/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "rokuecp";
-  version = "0.17.1";
+  version = "0.18.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "ctalkington";
     repo = "python-rokuecp";
     rev = "refs/tags/${version}";
-    hash = "sha256-3GHG4FBGMiF5kNk2gl05xiX9+5tcrUyi4SUCXTa6Qco=";
+    hash = "sha256-YvJ1+o7/S/QNROedYGsP8m99Dr+WpAkfe5YPEN+2ZhU=";
   };
 
   nativeBuildInputs = [

From ab0369154c9b7982451c76ac3eefc390418bb55a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Jun 2023 21:31:06 +0200
Subject: [PATCH 034/107] python310Packages.xiaomi-ble: 0.17.1 -> 0.17.2

https://github.com/Bluetooth-Devices/xiaomi-ble/releases/tag/v0.17.2
---
 pkgs/development/python-modules/xiaomi-ble/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix
index bdb5888f352..2005879e519 100644
--- a/pkgs/development/python-modules/xiaomi-ble/default.nix
+++ b/pkgs/development/python-modules/xiaomi-ble/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "xiaomi-ble";
-  version = "0.17.1";
+  version = "0.17.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-CioXmv5VJBiJx97k69Sp5kaeD59p+OSL14RVse/gYUA=";
+    hash = "sha256-2zS34feelJNVarfe8GEZxBNL45IK+Owl6TlBDOTVvSs=";
   };
 
   nativeBuildInputs = [

From 64131f06f21a7fbbd6552f935c92a373a59a6fa0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Jun 2023 21:32:59 +0200
Subject: [PATCH 035/107] python310Packages.zwave-js-server-python: 0.48.1 ->
 0.49.0

https://github.com/home-assistant-libs/zwave-js-server-python/releases/tag/0.49.0
---
 .../python-modules/zwave-js-server-python/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix
index 56a33cec33a..7c9de5a6fbe 100644
--- a/pkgs/development/python-modules/zwave-js-server-python/default.nix
+++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "zwave-js-server-python";
-  version = "0.48.1";
+  version = "0.49.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "home-assistant-libs";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-fkOzt5dFDbteMMuNAxOfdlsT83dB1528gQooTqv4WB8=";
+    hash = "sha256-6CN2Smwm693RUuRUdqrNKa7j2I3pjmR+QoPfpjti+h8=";
   };
 
   propagatedBuildInputs = [

From 48fe50142614837c19d0cea604735ced216d4814 Mon Sep 17 00:00:00 2001
From: Martino Fontana <tinozzo123@tutanota.com>
Date: Wed, 7 Jun 2023 13:20:52 +0200
Subject: [PATCH 036/107] ludusavi: 0.17.1 -> 0.19.0

Diff: https://github.com/mtkennerly/ludusavi/compare/v0.17.1...v0.19.0

Changelog: https://github.com/mtkennerly/ludusavi/blob/v0.19.0/CHANGELOG.md
---
 pkgs/applications/backup/ludusavi/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/backup/ludusavi/default.nix b/pkgs/applications/backup/ludusavi/default.nix
index eab22b730f6..f55ba109ba1 100644
--- a/pkgs/applications/backup/ludusavi/default.nix
+++ b/pkgs/applications/backup/ludusavi/default.nix
@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ludusavi";
-  version = "0.17.1";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "mtkennerly";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-LTqorrZ7hp9hFGcQ0rdc/U6st9YraXEftDpH7VEShs8=";
+    hash = "sha256-1Na+xGcb15/ZRbuy96qJwPg6Zo7FsGwCUXD3XgzWXo0=";
   };
 
-  cargoSha256 = "sha256-3SijgvIPb+QBAWZaTivw8P5aYjctGfgnVrFYcGl8PyE=";
+  cargoSha256 = "sha256-JjeOODm5xsRM5cJgCDb89cN60SuEeDzTVe6siKVDdcU=";
 
   nativeBuildInputs = [
     cmake

From 81a9774d92ad2a0290278c75b7667d19bbb5a3cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= <hoe.dom@gmx.de>
Date: Sat, 3 Jun 2023 10:18:59 +0200
Subject: [PATCH 037/107] tuxedo-keyboard 3.1.4 -> 3.2.5

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

diff --git a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix
index c3b4fbf82eb..e6eccaa51d7 100644
--- a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix
+++ b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tuxedo-keyboard-${kernel.version}";
-  version = "3.1.4";
+  version = "3.2.5";
 
   src = fetchFromGitHub {
     owner = "tuxedocomputers";
     repo = "tuxedo-keyboard";
     rev = "v${version}";
-    sha256 = "h6+br+JPEItym83MaVt+xo6o/zMtTv8+wsBoTeYa2AM=";
+    hash = "sha256-pSGshUyim06Sqkp5QFzhUjeIz/N3aORvVt6DEyzQLaU=";
   };
 
   buildInputs = [

From 163844f3131b5234369c5a8dd216e6e249b85da3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 6 Jun 2023 19:28:56 +0200
Subject: [PATCH 038/107] ArchiSteamFarm: 5.4.5.2 -> 5.4.6.3

---
 pkgs/applications/misc/ArchiSteamFarm/default.nix  |  6 ++----
 pkgs/applications/misc/ArchiSteamFarm/deps.nix     | 12 ++++++------
 .../misc/ArchiSteamFarm/web-ui/default.nix         |  6 +++---
 .../misc/ArchiSteamFarm/web-ui/update.sh           | 14 ++++----------
 4 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix
index 85e3ba805cc..591dc738e91 100644
--- a/pkgs/applications/misc/ArchiSteamFarm/default.nix
+++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildDotnetModule
 , fetchFromGitHub
 , dotnetCorePackages
@@ -7,19 +6,18 @@
 , zlib
 , openssl
 , callPackage
-, stdenvNoCC
 }:
 
 buildDotnetModule rec {
   pname = "archisteamfarm";
   # nixpkgs-update: no auto update
-  version = "5.4.5.2";
+  version = "5.4.6.3";
 
   src = fetchFromGitHub {
     owner = "justarchinet";
     repo = pname;
     rev = version;
-    sha256 = "sha256-l3qcdgTTpbI4Jdy1jpzyCiAFglJfzBHkb6hLIZ4hDKQ=";
+    hash = "sha256-TAGb3LPS0Jpm3dGGkQbrtTBFCE/xos2ZbNq5UwnrGZY=";
   };
 
   dotnet-runtime = dotnetCorePackages.aspnetcore_7_0;
diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix
index 89995685b4c..8c4bbf9c686 100644
--- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix
+++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix
@@ -61,7 +61,7 @@
   (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "7.0.0"; sha256 = "1f13vsfs1rp9bmdp3khk4mk2fif932d72yxm2wszpsr239x4s2bf"; })
   (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "7.0.0"; sha256 = "1w49rg0n5wb1m5wnays2mmym7qy7bsi2b1zxz97af2rkbw3s3hbd"; })
   (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; })
-  (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.5.0"; sha256 = "0briw00gb5bz9k9kx00p6ghq47w501db7gb6ig5zzmz9hb8lw4a4"; })
+  (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.6.0"; sha256 = "02s98d8nwz5mg4mymcr86qdamy71a29g2091xg452czmd3s3x2di"; })
   (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; })
   (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; })
   (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; })
@@ -71,14 +71,14 @@
   (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; })
   (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; })
   (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; })
-  (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.5.0"; sha256 = "00gz2i8kx4mlq1ywj3imvf7wc6qzh0bsnynhw06z0mgyha1a21jy"; })
+  (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.6.0"; sha256 = "1bnwpwg7k72z06027ip4yi222863r8sv14ck9nj8h64ckiw2r256"; })
   (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
   (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; })
-  (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; })
-  (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.5.0"; sha256 = "17g0k3r5n8grba8kg4nghjyhnq9w8v0w6c2nkyyygvfh8k8x9wh3"; })
+  (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.6.0"; sha256 = "1rz22chnis11dwjrqrcvvmfw80fi2a7756a7ahwy6jlnr250zr61"; })
+  (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.6.0"; sha256 = "16vpicp4q2kbpgr3qwpsxg7srabxqszx23x6smjvvrvz7qmr5v8i"; })
   (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; })
-  (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.0.2"; sha256 = "1pzn95nhmprfvchwshyy87jifzjpvdny21b5yhkqafr150nxlz77"; })
-  (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.0.2"; sha256 = "1yiwi0hi8pn9dv90vz1yw13izap8dv13asxvr9axcliis0ad5iaq"; })
+  (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.0.3"; sha256 = "12f5h28115vv7j17whq7f9fwnww3p7iwfbkq3m24m0si303cgqbw"; })
+  (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.0.3"; sha256 = "0d9nmgj97qpd4w8x609amcawmcywm2q0r2w1p2hvyah0p5s9m0f3"; })
   (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; })
   (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; })
   (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; })
diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
index d158f60f453..783a9fe3b6b 100644
--- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
+++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
@@ -9,11 +9,11 @@ buildNpmPackage {
     repo = "ASF-ui";
     # updated by the update script
     # this is always the commit that should be used with asf-ui from the latest asf version
-    rev = "114c390c92a889b86cf560def28fb8f39bc4fe54";
-    sha256 = "1ajmi2l6xhv3nlnag2kmkblny925irp4gngdc3mniiimw364p826";
+    rev = "3078d92e8b8d79571b771f452a53d1789330c541";
+    hash = "sha256-K3YTgsde9aqtmKuFKjXpoWe6USGpKBlC6eeazuOYTqk=";
   };
 
-  npmDepsHash = "sha256-AY1DFuZkB8tOQd2FzHuNZ31rtLlWujP+3AqsMMB2BhU=";
+  npmDepsHash = "sha256-L+aWsGMUmIsPJRQ4XPg8WOWOqHKcfDQTqUK+vGBHi0Y=";
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh b/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh
index a0c296900e3..7f026383383 100755
--- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh
+++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh
@@ -10,20 +10,14 @@ pushd "$(dirname "$0")"
 ui=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/JustArchiNET/ArchiSteamFarm/contents/ASF-ui?ref=$version" | jq -r .sha)
 
 curl "https://raw.githubusercontent.com/JustArchiNET/ASF-ui/$ui/package-lock.json" -o package-lock.json
-curl "https://raw.githubusercontent.com/JustArchiNET/ASF-ui/$ui/package.json" -o package.json
 
 # update-source-version doesn't work for some reason
 sed -i "s/rev\\s*=\\s*.*/rev = \"$ui\";/" default.nix
-sed -i "s/sha256\\s*=\\s*.*/sha256 = \"$(nix-prefetch-url --unpack "https://github.com/JustArchiNET/ASF-ui/archive/$ui.tar.gz")\";/" default.nix
+sed -i "s/hash\\s*=\\s*.*/hash = \"$(nix-prefetch fetchurl --url "https://github.com/JustArchiNET/ASF-ui/archive/$ui.tar.gz")\";/" default.nix
 
-node2nix \
-  --nodejs-14 \
-  --development \
-  --lock package-lock.json \
-  --node-env ../../../../development/node-packages/node-env.nix \
-  --output node-packages.nix \
-  --composition node-composition.nix \
+npmDepsHash=$(prefetch-npm-deps ./package-lock.json)
+sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'"$npmDepsHash"'"#' -i default.nix
 
-rm package.json package-lock.json
+rm package-lock.json
 
 popd

From 09966984ebbf4f1fef1aee251a109aa7d77fbe42 Mon Sep 17 00:00:00 2001
From: Claudio Bley <claudio.bley@gmail.com>
Date: Mon, 27 Feb 2023 21:00:15 +0100
Subject: [PATCH 039/107] javaPackages: add jogl 2.4.0

---
 .../development/java-modules/jogl/default.nix | 77 ++++++++++++++++++-
 pkgs/top-level/java-packages.nix              |  3 +-
 2 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix
index 7a49bcbda7f..23449e6f057 100644
--- a/pkgs/development/java-modules/jogl/default.nix
+++ b/pkgs/development/java-modules/jogl/default.nix
@@ -1,6 +1,81 @@
-{ lib, stdenv, fetchgit, ant, jdk8, git, xorg, udev, libGL, libGLU }:
+{ coreutils, lib, stdenv, fetchgit, ant, jdk8, jdk11, git, xorg, udev, libGL, libGLU, mesa, xmlstarlet }:
 
 {
+  jogl_2_4_0 =
+    let
+      version = "2.4.0";
+
+      gluegen-src = fetchgit {
+        url = "git://jogamp.org/srv/scm/gluegen.git";
+        rev = "v${version}";
+        hash = "sha256-qQzq7v2vMFeia6gXaNHS3AbOp9HhDRgISp7P++CKErA=";
+        fetchSubmodules = true;
+      };
+      jogl-src = fetchgit {
+        url = "git://jogamp.org/srv/scm/jogl.git";
+        rev = "v${version}";
+        hash = "sha256-PHDq7uFEQfJ2P0eXPUi0DGFR1ob/n5a68otgzpFnfzQ=";
+        fetchSubmodules = true;
+      };
+    in
+    stdenv.mkDerivation {
+      pname = "jogl";
+      inherit version;
+
+      srcs = [ gluegen-src jogl-src ];
+      sourceRoot = ".";
+
+      unpackCmd = "cp -r $curSrc \${curSrc##*-}";
+
+      nativeBuildInputs = [ ant jdk11 git xmlstarlet ];
+      buildInputs = [ udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXi xorg.libXt xorg.libXxf86vm xorg.libXrender mesa ];
+
+      # Workaround build failure on -fno-common toolchains:
+      #   ld: ../obj/Bindingtest1p1Impl_JNI.o:(.bss+0x8): multiple definition of
+      #     `unsigned_size_t_1'; ../obj/TK_Surface_JNI.o:(.bss+0x8): first defined here
+      NIX_CFLAGS_COMPILE = "-fcommon"; # copied from 2.3.2, is this still needed?
+
+      buildPhase = ''
+        ( cd gluegen/make
+          substituteInPlace ../src/java/com/jogamp/common/util/IOUtil.java --replace '#!/bin/true' '#!${coreutils}/bin/true'
+
+          # set timestamp of files in jar to a fixed point in time
+          xmlstarlet ed --inplace \
+             --append //jar --type attr -n modificationtime --value 1980-01-01T00:00Z \
+             build.xml gluegen-cpptasks-base.xml
+
+          ant -Dtarget.sourcelevel=8 -Dtarget.targetlevel=8 -Dtarget.rt.jar='null.jar' )
+
+        ( cd jogl/make
+
+          # force way to do disfunctional "ant -Dsetup.addNativeBroadcom=false" and disable dependency on raspberrypi drivers
+          # if arm/aarch64 support will be added, this block might be commented out on those platforms
+          # on x86 compiling with default "setup.addNativeBroadcom=true" leads to unsatisfied import "vc_dispmanx_resource_delete" in libnewt.so
+          xmlstarlet ed --inplace --delete '//*[@if="setup.addNativeBroadcom"]' build-newt.xml
+
+          # set timestamp of files in jar to a fixed point in time
+          xmlstarlet ed --inplace \
+             --append //jar --type attr -n modificationtime --value 1980-01-01T00:00Z \
+             build.xml build-nativewindow.xml build-jogl.xml
+
+          ant -Dtarget.sourcelevel=8 -Dtarget.targetlevel=8 -Dtarget.rt.jar='null.jar' )
+      '';
+
+      installPhase = ''
+        mkdir -p $out/share/java
+        cp -v $NIX_BUILD_TOP/gluegen/build/gluegen-rt{,-natives-linux-amd64}.jar $out/share/java/
+        cp -v $NIX_BUILD_TOP/jogl/build/jar/jogl-all{,-natives-linux-amd64}.jar  $out/share/java/
+        cp -v $NIX_BUILD_TOP/jogl/build/nativewindow/nativewindow{,-awt,-natives-linux-amd64,-os-drm,-os-x11}.jar  $out/share/java/
+      '';
+
+      meta = with lib; {
+        description = "Java libraries for 3D Graphics, Multimedia and Processing";
+        homepage = "https://jogamp.org/";
+        license = licenses.bsd3;
+        platforms = [ "x86_64-linux" ];
+      };
+    };
+
   jogl_2_3_2 =
     let
       version = "2.3.2";
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index 76954984730..a0dc0405f32 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -274,7 +274,8 @@ in {
     junit_4_12;
 
   inherit (callPackage ../development/java-modules/jogl { })
-    jogl_2_3_2;
+    jogl_2_3_2
+    jogl_2_4_0;
 
   inherit (callPackage ../development/java-modules/log4j { inherit fetchMaven; })
     log4j_1_2_12;

From 2c9092a37779b1350f8f3b06afff2788dac78ec2 Mon Sep 17 00:00:00 2001
From: Claudio Bley <claudio.bley@gmail.com>
Date: Mon, 27 Feb 2023 21:03:49 +0100
Subject: [PATCH 040/107] gephi: 0.9.6 -> 0.10.1

* gephi requires Java 11 to run according to https://gephi.org/users/requirements/
---
 .../science/misc/gephi/default.nix             | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix
index bb17fcc9c28..a5bf1a2da2b 100644
--- a/pkgs/applications/science/misc/gephi/default.nix
+++ b/pkgs/applications/science/misc/gephi/default.nix
@@ -1,20 +1,20 @@
-{ lib, stdenv, fetchFromGitHub, jdk, maven, javaPackages }:
+{ lib, stdenv, fetchFromGitHub, jdk11, maven, javaPackages }:
 
 let
-  version = "0.9.6";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "gephi";
     repo = "gephi";
     rev = "v${version}";
-    sha256 = "sha256-3+tOwcE7TUeexJCugFsx9SgsKeb7ApNqbMEIi9QaKPE=";
+    hash = "sha256-ZNSEaiD32zFfF2ISKa1CmcT9Nq6r5i2rNHooQAcVbn4=";
   };
 
   # perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB)
   deps = stdenv.mkDerivation {
     name = "gephi-${version}-deps";
     inherit src;
-    buildInputs = [ jdk maven ];
+    buildInputs = [ jdk11 maven ];
     buildPhase = ''
       while mvn package -Dmaven.repo.local=$out/.m2 -Dmaven.wagon.rto=5000; [ $? = 1 ]; do
         echo "timeout, restart maven to continue downloading"
@@ -24,7 +24,7 @@ let
     installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete'';
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
-    outputHash = "sha256-kIPsZN0alRAgiMbckQnMWKOKtCZ37D/6MgT17VYcr+s=";
+    outputHash = "sha256-OdW4M5nGEkYkmHpRLM4cBQtk4SJII2uqM8TXb6y4eXk=";
   };
 in
 stdenv.mkDerivation {
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
 
   inherit src;
 
-  buildInputs = [ jdk maven ];
+  buildInputs = [ jdk11 maven ];
 
   buildPhase = ''
     # 'maven.repo.local' must be writable so copy it out of nix store
@@ -49,10 +49,10 @@ stdenv.mkDerivation {
 
     # use self-compiled JOGL to avoid patchelf'ing .so inside jars
     rm $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-{jogl,gluegen}/*.jar
-    cp ${javaPackages.jogl_2_3_2}/share/java/jogl*.jar $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-jogl/
-    cp ${javaPackages.jogl_2_3_2}/share/java/glue*.jar $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-gluegen/
+    cp ${javaPackages.jogl_2_4_0}/share/java/jogl*.jar $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-jogl/
+    cp ${javaPackages.jogl_2_4_0}/share/java/glue*.jar $out/gephi/modules/ext/org.gephi.visualization/org-jogamp-gluegen/
 
-    echo "jdkhome=${jdk}" >> $out/etc/gephi.conf
+    printf "\n\njdkhome=${jdk11}\n" >> $out/etc/gephi.conf
   '';
 
   meta = with lib; {

From 9c5f25911caa1ccbb2a1b1cc642b8289f244e257 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Jun 2023 23:31:26 +0200
Subject: [PATCH 041/107] python310Packages.knx-frontend: init at
 2023.5.31.141540

---
 .../python-modules/knx-frontend/default.nix   | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/python-modules/knx-frontend/default.nix

diff --git a/pkgs/development/python-modules/knx-frontend/default.nix b/pkgs/development/python-modules/knx-frontend/default.nix
new file mode 100644
index 00000000000..15797260ad3
--- /dev/null
+++ b/pkgs/development/python-modules/knx-frontend/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools
+}:
+
+buildPythonPackage rec {
+  pname = "knx-frontend";
+  version = "2023.5.31.141540";
+  format = "pyproject";
+
+  # TODO: source build, uses yarn.lock
+  src = fetchPypi {
+    pname = "knx_frontend";
+    inherit version;
+    hash = "sha256-j0p3PUYnKsyuDaN+nMrIHhxLYhNXVkZQkgsp//ZTsXE=";
+  };
+
+  nativeBuildInputs = [
+    setuptools
+  ];
+
+  pythonImportsCheck = [
+    "knx_frontend"
+  ];
+
+  # no tests
+  doCheck = false;
+
+  meta = with lib; {
+    changelog = "https://github.com/XKNX/knx-frontend/releases/tag/${version}";
+    description = "Home Assistant Panel for managing the KNX integration";
+    homepage = "https://github.com/XKNX/knx-frontend";
+    license = licenses.mit;
+    maintainers = with maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3a1693f83d0..8f25ae5b862 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5495,6 +5495,8 @@ self: super: with self; {
 
   kneed = callPackage ../development/python-modules/kneed { };
 
+  knx-frontend = callPackage ../development/python-modules/knx-frontend { };
+
   kombu = callPackage ../development/python-modules/kombu { };
 
   konnected = callPackage ../development/python-modules/konnected { };

From b57f066dea90ec16a3f24d5d82629c56595b964c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Jun 2023 23:43:50 +0200
Subject: [PATCH 042/107] home-assistant: 2023.5.4 -> 2023.6.0

https://www.home-assistant.io/blog/2023/06/07/release-20236/
---
 .../home-assistant/component-packages.nix     | 71 ++++++++++++++-----
 pkgs/servers/home-assistant/default.nix       | 27 +------
 pkgs/servers/home-assistant/frontend.nix      |  4 +-
 pkgs/servers/home-assistant/intents.nix       |  5 ++
 4 files changed, 65 insertions(+), 42 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 1583198cae3..7bebac1b445 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2023.5.4";
+  version = "2023.6.0";
   components = {
     "3_day_blinds" = ps: with ps; [
     ];
@@ -93,6 +93,9 @@
     "airzone" = ps: with ps; [
       aioairzone
     ];
+    "airzone_cloud" = ps: with ps; [
+      aioairzone-cloud
+    ];
     "aladdin_connect" = ps: with ps; [
       aioaladdinconnect
     ];
@@ -686,6 +689,10 @@
     "datadog" = ps: with ps; [
       datadog
     ];
+    "date" = ps: with ps; [
+    ];
+    "datetime" = ps: with ps; [
+    ];
     "ddwrt" = ps: with ps; [
     ];
     "debugpy" = ps: with ps; [
@@ -902,8 +909,15 @@
     "dweet" = ps: with ps; [
     ]; # missing inputs: dweepy
     "dynalite" = ps: with ps; [
+      aiohttp-cors
       dynalite-devices
-    ];
+      fnv-hash-fast
+      home-assistant-frontend
+      janus
+      pillow
+      psutil-home-assistant
+      sqlalchemy
+    ]; # missing inputs: dynalite_panel
     "eafm" = ps: with ps; [
       aioeafm
     ];
@@ -947,6 +961,8 @@
     "eight_sleep" = ps: with ps; [
       pyeight
     ];
+    "electrasmart" = ps: with ps; [
+    ]; # missing inputs: pyelectra
     "elgato" = ps: with ps; [
       elgato
     ];
@@ -1395,8 +1411,6 @@
     "glances" = ps: with ps; [
       glances-api
     ];
-    "goalfeed" = ps: with ps; [
-    ]; # missing inputs: pysher
     "goalzero" = ps: with ps; [
       goalzero
     ];
@@ -1430,6 +1444,11 @@
     ];
     "google_domains" = ps: with ps; [
     ];
+    "google_generative_ai_conversation" = ps: with ps; [
+      aiohttp-cors
+      hassil
+      home-assistant-intents
+    ]; # missing inputs: google-generativeai
     "google_mail" = ps: with ps; [
       aiohttp-cors
       fnv-hash-fast
@@ -1898,8 +1917,7 @@
       zeroconf
     ];
     "iotawatt" = ps: with ps; [
-      iotawattpy
-    ];
+    ]; # missing inputs: ha-iotawattpy
     "iperf3" = ps: with ps; [
     ]; # missing inputs: iperf3
     "ipma" = ps: with ps; [
@@ -1945,6 +1963,8 @@
     "justnimbus" = ps: with ps; [
       justnimbus
     ];
+    "jvc_projector" = ps: with ps; [
+    ]; # missing inputs: pyjvcprojector
     "kaiterra" = ps: with ps; [
     ]; # missing inputs: kaiterra-async-client
     "kaleidescape" = ps: with ps; [
@@ -2034,8 +2054,15 @@
     ];
     "knx" = ps: with ps; [
       aiohttp-cors
+      fnv-hash-fast
+      home-assistant-frontend
       janus
+      knx-frontend
+      pillow
+      psutil-home-assistant
+      sqlalchemy
       xknx
+      xknxproject
     ];
     "kodi" = ps: with ps; [
       aiohttp-cors
@@ -2577,8 +2604,6 @@
       psutil-home-assistant
       sqlalchemy
     ];
-    "mycroft" = ps: with ps; [
-    ]; # missing inputs: mycroftapi
     "myq" = ps: with ps; [
       pymyq
     ];
@@ -2838,7 +2863,7 @@
       opensensemap-api
     ];
     "opensky" = ps: with ps; [
-    ];
+    ]; # missing inputs: python-opensky
     "opentherm_gw" = ps: with ps; [
       pyotgw
     ];
@@ -2991,6 +3016,8 @@
     ];
     "pioneer" = ps: with ps; [
     ];
+    "piper" = ps: with ps; [
+    ];
     "pjlink" = ps: with ps; [
     ]; # missing inputs: pypjlink2
     "plaato" = ps: with ps; [
@@ -3672,8 +3699,6 @@
     "smarttub" = ps: with ps; [
       python-smarttub
     ];
-    "smarty" = ps: with ps; [
-    ]; # missing inputs: pysmarty
     "smhi" = ps: with ps; [
       smhi-pkg
     ];
@@ -4124,6 +4149,8 @@
       webrtcvad
       zeroconf
     ];
+    "time" = ps: with ps; [
+    ];
     "time_date" = ps: with ps; [
     ];
     "timer" = ps: with ps; [
@@ -4417,9 +4444,6 @@
     ];
     "watson_iot" = ps: with ps; [
     ]; # missing inputs: ibmiotf
-    "watson_tts" = ps: with ps; [
-      ibm-watson
-    ];
     "watttime" = ps: with ps; [
       aiowatttime
     ];
@@ -4446,6 +4470,8 @@
     "whirlpool" = ps: with ps; [
       whirlpool-sixth-sense
     ];
+    "whisper" = ps: with ps; [
+    ];
     "whois" = ps: with ps; [
       whois
     ];
@@ -4557,6 +4583,8 @@
     ];
     "xs1" = ps: with ps; [
     ]; # missing inputs: xs1-api-client
+    "yale_home" = ps: with ps; [
+    ];
     "yale_smart_alarm" = ps: with ps; [
       yalesmartalarmclient
     ];
@@ -4629,6 +4657,13 @@
     "youless" = ps: with ps; [
       youless-api
     ];
+    "youtube" = ps: with ps; [
+      aiohttp-cors
+      fnv-hash-fast
+      google-api-python-client
+      psutil-home-assistant
+      sqlalchemy
+    ];
     "zabbix" = ps: with ps; [
       py-zabbix
     ];
@@ -4723,6 +4758,7 @@
     "airvisual"
     "airvisual_pro"
     "airzone"
+    "airzone_cloud"
     "aladdin_connect"
     "alarm_control_panel"
     "alarmdecoder"
@@ -4809,6 +4845,8 @@
     "crownstone"
     "daikin"
     "datadog"
+    "date"
+    "datetime"
     "debugpy"
     "deconz"
     "default_config"
@@ -4838,7 +4876,7 @@
     "dte_energy_bridge"
     "duckdns"
     "dunehd"
-    "dynalite"
+    "dwd_weather_warnings"
     "eafm"
     "easyenergy"
     "ecobee"
@@ -5001,7 +5039,6 @@
     "intent"
     "intent_script"
     "ios"
-    "iotawatt"
     "ipma"
     "ipp"
     "iqvia"
@@ -5337,6 +5374,7 @@
     "tibber"
     "tile"
     "tilt_ble"
+    "time"
     "time_date"
     "timer"
     "tod"
@@ -5433,6 +5471,7 @@
     "yeelight"
     "yolink"
     "youless"
+    "youtube"
     "zamg"
     "zeroconf"
     "zerproc"
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 72a1525ad73..0c0b34712a5 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -183,16 +183,6 @@ let
         };
       });
 
-      python-roborock = super.python-roborock.overridePythonAttrs (oldAttrs: rec {
-        version = "0.8.3";
-        src = fetchFromGitHub {
-          owner = "humbertogontijo";
-          repo = "python-roborock";
-          rev = "refs/tags/v${version}";
-          hash = "sha256-O7MjxCQ4JwFFC2ibdU8hCPhFPQhV5/LsmDO6vRdyYL0=";
-        };
-      });
-
       python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec {
         pname = "python-slugify";
         version = "4.0.1";
@@ -261,17 +251,6 @@ let
         };
       });
 
-      # Pinned due to API changes in 0.4.0
-      vilfo-api-client = super.vilfo-api-client.overridePythonAttrs (oldAttrs: rec {
-        version = "0.3.3";
-        src = fetchFromGitHub {
-          owner = "ManneW";
-          repo = "vilfo-api-client-python";
-          rev = "v${version}";
-          sha256 = "1gy5gpsg99rcm1cc3m30232za00r9i46sp74zpd12p3vzz1wyyqf";
-        };
-      });
-
       # Pinned due to API changes ~1.0
       vultr = super.vultr.overridePythonAttrs (oldAttrs: rec {
         version = "0.1.2";
@@ -317,7 +296,7 @@ let
   extraBuildInputs = extraPackages python.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "2023.5.4";
+  hassVersion = "2023.6.0";
 
 in python.pkgs.buildPythonApplication rec {
   pname = "homeassistant";
@@ -333,7 +312,7 @@ in python.pkgs.buildPythonApplication rec {
   # Primary source is the pypi sdist, because it contains translations
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-mRiRKMafRkgAOshH/5i6yj379FEzZgXhkdkK557sMaQ=";
+    hash = "sha256-dEszA95EIwGMR2Ztpe7P8weh4FbqGJBkso7nCvTkPDc=";
   };
 
   # Secondary source is git for tests
@@ -341,7 +320,7 @@ in python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     rev = "refs/tags/${version}";
-    hash = "sha256-r28BhC6lBIoxu7Wp/1h+qgPEDaUCqH4snyKk/h/vgyQ=";
+    hash = "sha256-0rhjh/mIevRdisWvTSx9QQjHdY7nMVpuGyTr9sChipk=";
   };
 
   nativeBuildInputs = with python3.pkgs; [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 94d868e3dbb..ff33cc8cee9 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -4,7 +4,7 @@ buildPythonPackage rec {
   # the frontend version corresponding to a specific home-assistant version can be found here
   # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
   pname = "home-assistant-frontend";
-  version = "20230503.3";
+  version = "20230607.0";
   format = "wheel";
 
   src = fetchPypi {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     pname = "home_assistant_frontend";
     dist = "py3";
     python = "py3";
-    hash = "sha256-BOSXRpHgHUygrbd7LaGHFj5aM+Bfp5VkB791tJ5jCwU=";
+    hash = "sha256-O3hAF3QgZHm6q+manxlqWZLlSDxHMr86B3GdwMClxEk=";
   };
 
   # there is nothing to strip in this package
diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix
index 37cb2abf83c..ae247b9e7a0 100644
--- a/pkgs/servers/home-assistant/intents.nix
+++ b/pkgs/servers/home-assistant/intents.nix
@@ -33,6 +33,11 @@ buildPythonPackage rec {
 
   sourceRoot = "source/package";
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace "2023.4.26" "${version}"
+  '';
+
   nativeBuildInputs = [
     hassil
     jinja2

From 4540dad9e7b4962e11864c042fa1d65cdf5d3455 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 7 Jun 2023 23:55:51 +0200
Subject: [PATCH 043/107] nixos/tests/home-assistant: Drop esphome, fix
 post-restart expectation

Mentioning esphome in the config is now causing an error. Check for the
backup module post-restart, not esphome.
---
 nixos/tests/home-assistant.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix
index cef0f97c194..e06c52a5f41 100644
--- a/nixos/tests/home-assistant.nix
+++ b/nixos/tests/home-assistant.nix
@@ -62,7 +62,6 @@ in {
         frontend = {};
 
         # include some popular integrations, that absolutely shouldn't break
-        esphome = {};
         knx = {};
         shelly = {};
         zha = {};
@@ -198,7 +197,7 @@ in {
 
     with subtest("Check that new components get setup after restart"):
         journal = get_journal_since(cursor)
-        for domain in ["esphome"]:
+        for domain in ["backup"]:
             assert f"Setup of domain {domain} took" in journal, f"{domain} setup missing"
 
     with subtest("Check that no errors were logged"):

From e2167c6ff096d8b92442a15768d7aa93acb34951 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 8 Jun 2023 00:01:53 +0200
Subject: [PATCH 044/107] past-time: add changelog to meta

- add format
---
 pkgs/tools/misc/past-time/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/past-time/default.nix b/pkgs/tools/misc/past-time/default.nix
index cc4a4007862..3079b69ad34 100644
--- a/pkgs/tools/misc/past-time/default.nix
+++ b/pkgs/tools/misc/past-time/default.nix
@@ -10,11 +10,12 @@
 buildPythonApplication rec {
   pname = "past-time";
   version = "0.2.1";
+  format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "fabaff";
     repo = pname;
-    rev = version;
+    rev = "refs/tags/${version}";
     sha256 = "0yhc0630rmcx4ia9y6klpx002mavfmqf1s3jb2gz54jlccwqbfgl";
   };
 
@@ -28,11 +29,14 @@ buildPythonApplication rec {
     pytestCheckHook
   ];
 
-  pythonImportsCheck = [ "past_time" ];
+  pythonImportsCheck = [
+    "past_time"
+  ];
 
   meta = with lib; {
     description = "Tool to visualize the progress of the year based on the past days";
     homepage = "https://github.com/fabaff/past-time";
+    changelog = "https://github.com/fabaff/past-time/releases/tag/${version}";
     license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ fab ];
   };

From 5ead2d525b49c4070598b514e5195fa1e8fcf513 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 8 Jun 2023 00:04:49 +0200
Subject: [PATCH 045/107] past-time: migrate to
 python3.pkgs.buildPythonApplication

---
 pkgs/tools/misc/past-time/default.nix | 14 +++++---------
 pkgs/top-level/all-packages.nix       |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/misc/past-time/default.nix b/pkgs/tools/misc/past-time/default.nix
index 3079b69ad34..4e551a041bd 100644
--- a/pkgs/tools/misc/past-time/default.nix
+++ b/pkgs/tools/misc/past-time/default.nix
@@ -1,13 +1,9 @@
 { lib
-, buildPythonApplication
-, click
 , fetchFromGitHub
-, freezegun
-, pytestCheckHook
-, tqdm
+, python3
 }:
 
-buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "past-time";
   version = "0.2.1";
   format = "setuptools";
@@ -16,15 +12,15 @@ buildPythonApplication rec {
     owner = "fabaff";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "0yhc0630rmcx4ia9y6klpx002mavfmqf1s3jb2gz54jlccwqbfgl";
+    hash = "sha256-9LmFOWNUkvKfWHLo4HB1W1UBQL90Gp9UJJ3VDIYBDHo=";
   };
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with python3.pkgs; [
     click
     tqdm
   ];
 
-  nativeCheckInputs = [
+  nativeCheckInputs = with python3.pkgs; [
     freezegun
     pytestCheckHook
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index be33c1d3d06..040b025741b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11437,7 +11437,7 @@ with pkgs;
 
   cnping = callPackage ../tools/networking/cnping { };
 
-  past-time = python3Packages.callPackage ../tools/misc/past-time { };
+  past-time = callPackage ../tools/misc/past-time { };
 
   pastebinit = callPackage ../tools/misc/pastebinit { };
 

From 314c23eaeb572e81e59f14173bdfffcb573154e4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 8 Jun 2023 00:32:15 +0200
Subject: [PATCH 046/107] python310Packages.zigpy-decopnf: drop asynctest

It is only used for testing on python < 3.8 and is unsupported on 3.11.
---
 pkgs/development/python-modules/zigpy-deconz/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix
index 3566158edf4..b9220505c77 100644
--- a/pkgs/development/python-modules/zigpy-deconz/default.nix
+++ b/pkgs/development/python-modules/zigpy-deconz/default.nix
@@ -1,5 +1,4 @@
 { lib
-, asynctest
 , buildPythonPackage
 , fetchFromGitHub
 , pyserial
@@ -31,7 +30,6 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    asynctest
     pytest-asyncio
     pytestCheckHook
   ];

From cb7e043e58d6be9e336cdca976b5e7be9e5234f7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 8 Jun 2023 00:32:53 +0200
Subject: [PATCH 047/107] python310Packages.zigpy-xbee: drop asynctest

It is only used for testing on python < 3.8 and is unsupported on 3.11.
---
 pkgs/development/python-modules/zigpy-xbee/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix
index dc0cfb66596..96b95ee4e64 100644
--- a/pkgs/development/python-modules/zigpy-xbee/default.nix
+++ b/pkgs/development/python-modules/zigpy-xbee/default.nix
@@ -1,8 +1,6 @@
 { lib
-, asynctest
 , buildPythonPackage
 , fetchFromGitHub
-, fetchpatch
 , pyserial
 , pyserial-asyncio
 , pytest-asyncio
@@ -33,7 +31,6 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    asynctest
     pytest-asyncio
     pytestCheckHook
   ];

From 2d29bf70741b8945dfd405535569c4824c4972a1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 8 Jun 2023 00:33:13 +0200
Subject: [PATCH 048/107] home-assistant: migrate to python311

Support for 3.10 will run out in 2023.8.0, and ideally we'll be ahead
of the curve.
---
 pkgs/servers/home-assistant/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 0c0b34712a5..b186ea46bb3 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -3,7 +3,7 @@
 , callPackage
 , fetchFromGitHub
 , fetchPypi
-, python3
+, python311
 , substituteAll
 , ffmpeg-headless
 , inetutils
@@ -278,7 +278,7 @@ let
     })
   ];
 
-  python = python3.override {
+  python = python311.override {
     packageOverrides = lib.composeManyExtensions (defaultOverrides ++ [ packageOverrides ]);
   };
 
@@ -323,7 +323,7 @@ in python.pkgs.buildPythonApplication rec {
     hash = "sha256-0rhjh/mIevRdisWvTSx9QQjHdY7nMVpuGyTr9sChipk=";
   };
 
-  nativeBuildInputs = with python3.pkgs; [
+  nativeBuildInputs = with python.pkgs; [
     setuptools
   ];
 
@@ -479,7 +479,7 @@ in python.pkgs.buildPythonApplication rec {
       getPackages
       python
       supportedComponentsWithTests;
-    pythonPath = python3.pkgs.makePythonPath (componentBuildInputs ++ extraBuildInputs);
+    pythonPath = python.pkgs.makePythonPath (componentBuildInputs ++ extraBuildInputs);
     frontend = python.pkgs.home-assistant-frontend;
     intents = python.pkgs.home-assistant-intents;
     tests = {

From f0e6287cc30a98a8352cd2a5dc2727361731a8ce Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 8 Jun 2023 00:48:55 +0200
Subject: [PATCH 049/107] python311Packages.pyhaversion: disable failing tests

---
 .../python-modules/pyhaversion/default.nix    | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix
index edc05d1aca0..204b8526d87 100644
--- a/pkgs/development/python-modules/pyhaversion/default.nix
+++ b/pkgs/development/python-modules/pyhaversion/default.nix
@@ -23,6 +23,12 @@ buildPythonPackage rec {
     hash = "sha256-HMJqZn0yzN2dP5WTRCbem1Xw8nyH2Hy7oVP4kEKHHAo=";
   };
 
+  postPatch = ''
+    # Upstream doesn't set a version for the tagged releases
+    substituteInPlace setup.py \
+      --replace "main" ${version}
+  '';
+
   propagatedBuildInputs = [
     aiohttp
     awesomeversion
@@ -34,17 +40,16 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  postPatch = ''
-    # Upstream doesn't set a version for the tagged releases
-    substituteInPlace setup.py \
-      --replace "main" ${version}
-  '';
-
-
   pythonImportsCheck = [
     "pyhaversion"
   ];
 
+  disabledTests = [
+    # Error fetching version information from HaVersionSource.SUPERVISOR Server disconnected
+    "test_stable_version"
+    "test_etag"
+  ];
+
   meta = with lib; {
     description = "Python module to the newest version number of Home Assistant";
     homepage = "https://github.com/ludeeus/pyhaversion";

From 062236a112effb08e665fea49873f2d61e732f57 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 8 Jun 2023 01:11:55 +0200
Subject: [PATCH 050/107] python311Packages.favicon: remove pytest-runner

---
 .../python-modules/favicon/default.nix        | 39 ++++++++++++++-----
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/favicon/default.nix b/pkgs/development/python-modules/favicon/default.nix
index 929a67557f5..1b42710b16f 100644
--- a/pkgs/development/python-modules/favicon/default.nix
+++ b/pkgs/development/python-modules/favicon/default.nix
@@ -1,26 +1,47 @@
-{ lib, buildPythonPackage, fetchPypi, requests, beautifulsoup4, pytest, requests-mock,
-  pytest-runner }:
+{ lib
+, beautifulsoup4
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, pythonOlder
+, requests
+, requests-mock
+}:
 
 buildPythonPackage rec {
   pname = "favicon";
   version = "0.7.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6d6b5a78de2a0d0084589f687f384b2ecd6a6527093fec564403b1a30605d7a8";
+    hash = "sha256-bWtaeN4qDQCEWJ9ofzhLLs1qZScJP+xWRAOxowYF16g=";
   };
 
-  buildInputs = [ pytest-runner ];
-  nativeCheckInputs = [ pytest requests-mock ];
-  propagatedBuildInputs = [ requests beautifulsoup4 ];
-
-  checkPhase = ''
-    pytest
+  postPatch = ''
+    sed -i "/pytest-runner/d" setup.py
   '';
 
+  propagatedBuildInputs = [
+    beautifulsoup4
+    requests
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    requests-mock
+  ];
+
+  pythonImportsCheck = [
+    "favicon"
+  ];
+
   meta = with lib; {
     description = "Find a website's favicon";
     homepage = "https://github.com/scottwernervt/favicon";
+    changelog = "https://github.com/scottwernervt/favicon/blob/${version}/CHANGELOG.rst";
     license = licenses.mit;
     maintainers = with maintainers; [ elohmeier ];
   };

From 9cc57907f757dd535f792e0c3820f4478653d715 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 8 Jun 2023 01:21:38 +0200
Subject: [PATCH 051/107] python311Packages.maxcube-api: disable failing tests

Disable the two offending tests and unmark the package as broken.
---
 .../python-modules/maxcube-api/default.nix         | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/maxcube-api/default.nix b/pkgs/development/python-modules/maxcube-api/default.nix
index 5e7b10555bc..e239fde3e1d 100644
--- a/pkgs/development/python-modules/maxcube-api/default.nix
+++ b/pkgs/development/python-modules/maxcube-api/default.nix
@@ -1,9 +1,8 @@
 { lib
 , buildPythonPackage
-, pythonAtLeast
 , pythonOlder
 , fetchFromGitHub
-, unittestCheckHook
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
@@ -23,7 +22,14 @@ buildPythonPackage rec {
     substituteInPlace setup.py --replace "license=license" "license='MIT'"
   '';
 
-  nativeCheckInputs = [ unittestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    "testSendRadioMsgClosesConnectionOnErrorAndRetriesIfReusingConnection"
+    "testSendRadioMsgReusesConnection"
+  ];
 
   pythonImportsCheck = [
     "maxcube"
@@ -31,8 +37,6 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
-    # Tests indicate lack of 3.11 compatibility
-    broken = pythonAtLeast "3.11";
     description = "eQ-3/ELV MAX! Cube Python API";
     homepage = "https://github.com/hackercowboy/python-maxcube-api";
     license = licenses.mit;

From 6ec6e8cda048df9cacd3df1a48576baf40859421 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 8 Jun 2023 01:31:08 +0200
Subject: [PATCH 052/107] home-assistant-component-tests: disable xdist

We have enough components that we can parallelize them when tested in
bulk, but even with one xdist thread some tests fail every once in a
while.
---
 pkgs/servers/home-assistant/tests.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix
index 87aacda6f8c..91a902a8a2d 100644
--- a/pkgs/servers/home-assistant/tests.nix
+++ b/pkgs/servers/home-assistant/tests.nix
@@ -87,7 +87,6 @@ in lib.listToAttrs (map (component: lib.nameValuePair component (
     dontUsePytestXdist = true;
 
     pytestFlagsArray = lib.remove "tests" old.pytestFlagsArray
-      ++ [ "--numprocesses=2" ]
       ++ extraPytestFlagsArray.${component} or [ ]
       ++ [ "tests/components/${component}" ];
 

From c0ef3e612122f0874ab149df1c2b20e1140ef706 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 8 Jun 2023 01:39:52 +0200
Subject: [PATCH 053/107] python310Packages.python-tado: 0.12.0 -> 0.15.0

---
 .../python-modules/python-tado/default.nix    | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/python-tado/default.nix b/pkgs/development/python-modules/python-tado/default.nix
index 2e518b6eced..4f4f62cea91 100644
--- a/pkgs/development/python-modules/python-tado/default.nix
+++ b/pkgs/development/python-modules/python-tado/default.nix
@@ -1,20 +1,33 @@
-{ buildPythonPackage, fetchFromGitHub, lib, pytestCheckHook, pythonOlder, requests }:
+{ buildPythonPackage
+, fetchFromGitHub
+, lib
+, pytestCheckHook
+, pythonOlder
+, requests
+}:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "python-tado";
-  version = "0.12.0";
+  version = "0.15.0";
+  format = "setuptools";
 
   disabled = pythonOlder "3.5";
 
   src = fetchFromGitHub {
     owner = "wmalgadey";
     repo = "PyTado";
-    rev = version;
-    hash = "sha256-n+H6H2ORLizv9cn1P5Cd8wHDWMNonPrs+x+XMQbEzZQ=";
+    # https://github.com/wmalgadey/PyTado/issues/62
+    rev = "674dbc450170a380e76460c22d6ba943dfedb8e9";
+    hash = "sha256-gduqQVw/a64aDzTHFmgZu7OVB53jZb7L5vofzL3Ho6s=";
   };
 
-  propagatedBuildInputs = [ requests ];
-  nativeCheckInputs = [ pytestCheckHook ];
+  propagatedBuildInputs = [
+    requests
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
 
   meta = with lib; {
     description =

From 5975b3f92ab21e708c4b504ef2e2642b4ee65600 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 8 Jun 2023 01:47:23 +0200
Subject: [PATCH 054/107] python311Packages.pyzerproc: disable failing tests

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

diff --git a/pkgs/development/python-modules/pyzerproc/default.nix b/pkgs/development/python-modules/pyzerproc/default.nix
index a453014fe8b..b5eb5491671 100644
--- a/pkgs/development/python-modules/pyzerproc/default.nix
+++ b/pkgs/development/python-modules/pyzerproc/default.nix
@@ -5,6 +5,7 @@
 , fetchFromGitHub
 , pytest-asyncio
 , pytest-mock
+, pythonAtLeast
 , pytestCheckHook
 , pythonOlder
 }:
@@ -38,6 +39,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTestPaths = lib.optionals (pythonAtLeast "3.11") [
+    # unittest.mock.InvalidSpecError: Cannot spec a Mock object.
+    "tests/test_light.py"
+  ];
+
   pythonImportsCheck = [
     "pyzerproc"
   ];

From 207180add1e094ba70fce4cf83569a466364c9c9 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Wed, 7 Jun 2023 23:01:49 -0400
Subject: [PATCH 055/107] erg: init at 0.6.13

https://github.com/erg-lang/erg
---
 pkgs/development/compilers/erg/default.nix | 63 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 +
 2 files changed, 65 insertions(+)
 create mode 100644 pkgs/development/compilers/erg/default.nix

diff --git a/pkgs/development/compilers/erg/default.nix b/pkgs/development/compilers/erg/default.nix
new file mode 100644
index 00000000000..7b0292153b1
--- /dev/null
+++ b/pkgs/development/compilers/erg/default.nix
@@ -0,0 +1,63 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, makeWrapper
+, python3
+, which
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "erg";
+  version = "0.6.13";
+
+  src = fetchFromGitHub {
+    owner = "erg-lang";
+    repo = "erg";
+    rev = "v${version}";
+    hash = "sha256-XwQKtorE1HGRRCCtxQBVbl6O6aTs5Z2/W9n2Am40e8Q=";
+  };
+
+  cargoHash = "sha256-I4hQ78RTkCDKpq7HBNJsKqCiFL9004XvWdwtRdTQQkE=";
+
+  nativeBuildInputs = [
+    makeWrapper
+    python3
+    which
+  ];
+
+  buildFeatures = [ "full" ];
+
+  env = {
+    BUILD_DATE = "1970/01/01 00:00:00";
+    GIT_HASH_SHORT = src.rev;
+  };
+
+  # TODO(figsoda): fix tests
+  doCheck = false;
+
+  # the build script is impure and also assumes we are in a git repository
+  postPatch = ''
+    rm crates/erg_common/build.rs
+  '';
+
+  preBuild = ''
+    export HOME=$(mktemp -d)
+    export CARGO_ERG_PATH=$HOME/.erg
+  '';
+
+  postInstall = ''
+    mkdir -p $out/share
+    mv "$CARGO_ERG_PATH" $out/share/erg
+
+    wrapProgram $out/bin/erg \
+      --set-default ERG_PATH $out/share/erg
+  '';
+
+  meta = with lib; {
+    description = "A statically typed language that can deeply improve the Python ecosystem";
+    homepage = "https://github.com/erg-lang/erg";
+    changelog = "https://github.com/erg-lang/erg/releases/tag/${src.rev}";
+    license = with licenses; [ asl20 mit ];
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 177d3eeea3e..38e849a698d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14907,6 +14907,8 @@ with pkgs;
 
   eql = callPackage ../development/compilers/eql { };
 
+  erg = callPackage ../development/compilers/erg { };
+
   elm2nix = haskell.lib.compose.justStaticExecutables haskellPackages.elm2nix;
 
   elmPackages = recurseIntoAttrs (callPackage ../development/compilers/elm { });

From b0a9abedea509018d76ef25312f18253eee4fd48 Mon Sep 17 00:00:00 2001
From: Victor Engmark <victor@engmark.name>
Date: Thu, 8 Jun 2023 15:05:59 +1200
Subject: [PATCH 056/107] refactor: Use dummy variable name for unused value

As recommended by ShellCheck
<https://github.com/koalaman/shellcheck/wiki/SC2034>.
---
 nixos/modules/config/users-groups.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index d1e9c8072ea..4640a0f3d6b 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -652,7 +652,7 @@ in {
       deps = [ "users" ];
       text = ''
         users=()
-        while IFS=: read -r user hash tail; do
+        while IFS=: read -r user hash _; do
           if [[ "$hash" = "$"* && ! "$hash" =~ ^\''$${cryptSchemeIdPatternGroup}\$ ]]; then
             users+=("$user")
           fi

From 8deaa732a8a4521d81fbaf956a9039a42412b9ab Mon Sep 17 00:00:00 2001
From: Victor Engmark <victor@engmark.name>
Date: Thu, 8 Jun 2023 15:07:07 +1200
Subject: [PATCH 057/107] =?UTF-8?q?refactor:=20Split=20`mkdir=20-m=20?=
 =?UTF-8?q?=E2=80=A6`=20into=20`mkdir`=20+=20`chmod`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As recommended by ShellCheck
<https://www.shellcheck.net/wiki/SC2174>.
---
 nixos/modules/system/activation/activation-script.nix | 9 ++++++---
 nixos/modules/system/boot/binfmt.nix                  | 3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index ddb165a76cc..f23d4809e35 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -217,7 +217,8 @@ in
       ''
         # Various log/runtime directories.
 
-        mkdir -m 1777 -p /var/tmp
+        mkdir -p /var/tmp
+        chmod 1777 /var/tmp
 
         # Empty, immutable home directory of many system accounts.
         mkdir -p /var/empty
@@ -231,7 +232,8 @@ in
 
     system.activationScripts.usrbinenv = if config.environment.usrbinenv != null
       then ''
-        mkdir -m 0755 -p /usr/bin
+        mkdir -p /usr/bin
+        chmod 0755 /usr/bin
         ln -sfn ${config.environment.usrbinenv} /usr/bin/.env.tmp
         mv /usr/bin/.env.tmp /usr/bin/env # atomically replace /usr/bin/env
       ''
@@ -251,7 +253,8 @@ in
           if mountpoint -q "$mountPoint"; then
             local options="remount,$options"
           else
-            mkdir -m 0755 -p "$mountPoint"
+            mkdir -p "$mountPoint"
+            chmod 0755 "$mountPoint"
           fi
           mount -t "$fsType" -o "$options" "$device" "$mountPoint"
         }
diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix
index b003d983d2b..bf1688feb19 100644
--- a/nixos/modules/system/boot/binfmt.nix
+++ b/nixos/modules/system/boot/binfmt.nix
@@ -317,7 +317,8 @@ in {
     environment.etc."binfmt.d/nixos.conf".source = builtins.toFile "binfmt_nixos.conf"
       (lib.concatStringsSep "\n" (lib.mapAttrsToList makeBinfmtLine config.boot.binfmt.registrations));
     system.activationScripts.binfmt = stringAfter [ "specialfs" ] ''
-      mkdir -p -m 0755 /run/binfmt
+      mkdir -p /run/binfmt
+      chmod 0755 /run/binfmt
       ${lib.concatStringsSep "\n" (lib.mapAttrsToList activationSnippet config.boot.binfmt.registrations)}
     '';
     systemd = lib.mkIf (config.boot.binfmt.registrations != {}) {

From 6b9299c6f0c9288cd27e498158448a6e43a7692f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 8 Jun 2023 05:09:45 +0000
Subject: [PATCH 058/107] sec: 2.9.1 -> 2.9.2

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

diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix
index b8950707de7..a611065309f 100644
--- a/pkgs/tools/admin/sec/default.nix
+++ b/pkgs/tools/admin/sec/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sec";
-  version = "2.9.1";
+  version = "2.9.2";
 
   src = fetchFromGitHub {
     owner = "simple-evcorr";
     repo = "sec";
     rev = version;
-    sha256 = "sha256-DKbh6q0opf749tbGsDMVuI5G2UV7faCHUfddH3SGOpo=";
+    sha256 = "sha256-s5xalQfZIrvj8EcLvN0swpYBgRhE1YUoPmQYVFB0lWA=";
   };
 
   buildInputs = [ perl ];

From fe8aa9b77968778c6adc132c5ed1603dcc56e8de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 8 Jun 2023 05:15:32 +0000
Subject: [PATCH 059/107] fend: 1.1.6 -> 1.2.0

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

diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix
index 01517515631..ad65708b435 100644
--- a/pkgs/tools/misc/fend/default.nix
+++ b/pkgs/tools/misc/fend/default.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fend";
-  version = "1.1.6";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "printfn";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-PO8QKZwtiNMlEFT2P61oe5kj6PWsP5uouOOTRtvpyxI=";
+    sha256 = "sha256-vV7P2e6kv6CCHbI5Roz9WElntl3t/5ySXUw3XXEXMv4=";
   };
 
-  cargoHash = "sha256-og2YoPUKKMBqEjryzSGqwLIm44WfKkerNtG2N7yl1wE=";
+  cargoHash = "sha256-oAkZHx33YrwRUUIoooqpy72QCq0ZkAgBZ8W8XDe2fNE=";
 
   nativeBuildInputs = [ pandoc installShellFiles ];
   buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];

From c986d8273e873a3b913a00c49c6d71352b86b088 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 8 Jun 2023 06:10:15 +0000
Subject: [PATCH 060/107] python310Packages.fastdownload: 0.0.6 -> 0.0.7

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

diff --git a/pkgs/development/python-modules/fastdownload/default.nix b/pkgs/development/python-modules/fastdownload/default.nix
index 4a60a704298..934ce6861ad 100644
--- a/pkgs/development/python-modules/fastdownload/default.nix
+++ b/pkgs/development/python-modules/fastdownload/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "fastdownload";
-  version = "0.0.6";
+  version = "0.0.7";
   format = "setuptools";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-1ayb0zx8rFKDgqlq/tVVLqDkh47T5jofHt53r8bWr30=";
+    sha256 = "sha256-IFB+246JQGofvXd15uKj2BpN1jPdUGsOnPDhYT6DHWo=";
   };
 
   propagatedBuildInputs = [ fastprogress fastcore ];

From 6063afae36ed835e5bf0350cdf93ba615067d768 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 8 Jun 2023 06:47:31 +0000
Subject: [PATCH 061/107] tutanota-desktop: 3.112.6 -> 3.113.3

---
 .../networking/mailreaders/tutanota-desktop/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix
index c378fdafe9e..6bb9e653ab7 100644
--- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix
+++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix
@@ -3,12 +3,12 @@ electron, libsecret }:
 
 stdenv.mkDerivation rec {
   pname = "tutanota-desktop";
-  version = "3.112.6";
+  version = "3.113.3";
 
   src = fetchurl {
     url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz";
     name = "tutanota-desktop-${version}.tar.gz";
-    sha256 = "sha256-Kqj6XQkwPU7pmR8JY8f7iMqpOYjvWxS5Yir/YTBPXjM=";
+    sha256 = "sha256-d4yvz0BE0YeZjcH9X/2eGAk5CmJI4CQWblVoU5CO77k=";
   };
 
   nativeBuildInputs = [

From 2caced438f2f31a304f1a78b947a83971904bb64 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 8 Jun 2023 07:16:24 +0000
Subject: [PATCH 062/107] python310Packages.django-oauth-toolkit: 2.2.0 ->
 2.3.0

---
 .../python-modules/django-oauth-toolkit/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix
index fc68d0c4894..5a2a8e5786d 100644
--- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix
+++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "django-oauth-toolkit";
-  version = "2.2.0";
+  version = "2.3.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "jazzband";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-mynchdvrfBGKMeFFb2oDaANhtSCxq85Nibx7GfSY2nQ=";
+    hash = "sha256-oGg5MD9p4PSUVkt5pGLwjAF4SHHf4Aqr+/3FsuFaybY=";
   };
 
   postPatch = ''

From 3dac2557ff0873f8afec1f336740a3f62bec76c8 Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <github@anymore.nl>
Date: Thu, 8 Jun 2023 09:27:10 +0200
Subject: [PATCH 063/107] khal: 0.11.1 -> 0.11.2

Changelog: https://github.com/pimutils/khal/releases/tag/v0.11.2
Diff: https://github.com/pimutils/khal/compare/v0.11.1...v0.11.2
---
 pkgs/applications/misc/khal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index fee202325ba..271d571a531 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -8,13 +8,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "khal";
-  version = "0.11.1";
+  version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "pimutils";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-5wBKo24EKdEUoYhhv1EqMPOjdwUS31d3R24kLdbyvPA=";
+    hash = "sha256-yI33pB/t+UISvSbLUzmsZqBxLF6r8R3j9iPNeosKcYw=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 393f67fe88f5e3f7765868b3ed7a5703d178207d Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Thu, 8 Jun 2023 10:42:07 +0200
Subject: [PATCH 064/107] bdf2psf: 1.220 -> 1.221

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

diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix
index 223fa567d1d..1a75c2ff0af 100644
--- a/pkgs/tools/misc/bdf2psf/default.nix
+++ b/pkgs/tools/misc/bdf2psf/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bdf2psf";
-  version = "1.220";
+  version = "1.221";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
-    sha256 = "sha256-cDpHYuWe3tAh7QSfeYEV4XsUBccdTs3b+0xYYrPKmR4=";
+    sha256 = "XaNAF5+TM1F0qyX/PEwRoiEvO8qmPuMWs+mkWSaHNGg=";
   };
 
   nativeBuildInputs = [ dpkg ];

From 52a6c282270e8acfc91d972063e34b2ec5f12275 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 8 Jun 2023 09:11:12 +0000
Subject: [PATCH 065/107] gitoxide: 0.25.0 -> 0.26.0

---
 pkgs/applications/version-management/gitoxide/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix
index 26a0e3c1786..040595c0e18 100644
--- a/pkgs/applications/version-management/gitoxide/default.nix
+++ b/pkgs/applications/version-management/gitoxide/default.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gitoxide";
-  version = "0.25.0";
+  version = "0.26.0";
 
   src = fetchFromGitHub {
     owner = "Byron";
     repo = "gitoxide";
     rev = "v${version}";
-    sha256 = "sha256-3U/gQz/tJ/IrDd7ZIusJWDEB4nlpTM4miYfTEeEonv4=";
+    sha256 = "sha256-RAcKnS7vLuzXBxasHBxjmrdxyVvexou0SmiVu6ysZOQ=";
   };
 
-  cargoHash = "sha256-VPOivxdqEWQdFYYhSZVe5ji8CS0dKQeElKPeHxfwg4A=";
+  cargoHash = "sha256-w2WfBQoccpE71jOrjeuNF6HPTfY6lxpzg/AUEIngSJo=";
 
   nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ curl ] ++ (if stdenv.isDarwin

From 2cdbd288f9ba8ff9ee5ac42711989a402d443e23 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 8 Jun 2023 09:17:00 +0000
Subject: [PATCH 066/107] python310Packages.jupyter-lsp: 2.0.0 -> 2.2.0

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

diff --git a/pkgs/development/python-modules/jupyter-lsp/default.nix b/pkgs/development/python-modules/jupyter-lsp/default.nix
index ca01f39dae1..f098330666c 100644
--- a/pkgs/development/python-modules/jupyter-lsp/default.nix
+++ b/pkgs/development/python-modules/jupyter-lsp/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "jupyter-lsp";
-  version = "2.0.0";
+  version = "2.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-89n1mdSOCTpLq/vawZTDAzLmJIzkoD1z+nEviMd55Rk=";
+    hash = "sha256-jrvLUzrbQeXWNeuP6ClWsKr78P1EO2xL+pBu3uuGNaE=";
   };
 
   propagatedBuildInputs = [

From ee3e055be9ee3cf2081861c86ae971e2c94eef4a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 8 Jun 2023 09:29:45 +0000
Subject: [PATCH 067/107] liblouis: 3.25.0 -> 3.26.0

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

diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix
index a1ef6b72ee3..d87309111d5 100644
--- a/pkgs/development/libraries/liblouis/default.nix
+++ b/pkgs/development/libraries/liblouis/default.nix
@@ -13,7 +13,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "liblouis";
-  version = "3.25.0";
+  version = "3.26.0";
 
   outputs = [ "out" "dev" "info" "doc" ]
     # configure: WARNING: cannot generate manual pages while cross compiling
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "liblouis";
     repo = "liblouis";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-On5PbBgvDAeD41oGb5EKBtKvi/VXnLsVrTMX7tcwnq4=";
+    hash = "sha256-Kko9qBWdNiZ61Wbb7lUYoSNU1hhRUexPcU3pADv0UHo=";
   };
 
   strictDeps = true;

From 67c8d6782fa2638854144d37bb7762ef00338788 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 8 Jun 2023 09:32:00 +0000
Subject: [PATCH 068/107] hblock: 3.4.1 -> 3.4.2

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

diff --git a/pkgs/tools/networking/hblock/default.nix b/pkgs/tools/networking/hblock/default.nix
index 3505429724d..b3a2b9d6822 100644
--- a/pkgs/tools/networking/hblock/default.nix
+++ b/pkgs/tools/networking/hblock/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "hblock";
-  version = "3.4.1";
+  version = "3.4.2";
 
   src = fetchFromGitHub {
     owner = "hectorm";
     repo = "hblock";
     rev = "v${version}";
-    hash = "sha256-yOX/CsWs5HVH9s0KCzZm6PPqlDJHxz46jJB6KKC7Hsg=";
+    hash = "sha256-wO0xfD1bMRhoU7jorsIenlKJ87DzrtVH66OSZ4UT3MM=";
   };
 
   buildInputs = [ coreutils curl gnugrep gawk ];

From 67b191adcb15cdcc9f14b8beefb3b6608512623b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 8 Jun 2023 12:00:56 +0200
Subject: [PATCH 069/107] python311Packages.homeassistant-stubs: 2023.5.4 ->
 2023.6.0

https://github.com/KapJI/homeassistant-stubs/releases/tag/2023.6.0
---
 pkgs/servers/home-assistant/stubs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix
index 2a5a97ac2d5..90168a5a869 100644
--- a/pkgs/servers/home-assistant/stubs.nix
+++ b/pkgs/servers/home-assistant/stubs.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "homeassistant-stubs";
-  version = "2023.5.4";
+  version = "2023.6.0";
   format = "pyproject";
 
   disabled = python.version != home-assistant.python.version;
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "KapJI";
     repo = "homeassistant-stubs";
     rev = "refs/tags/${version}";
-    hash = "sha256-2vexK+b+Zy1hvOgjOnsyUMxn2zdu6Gr3Sdk6XqEQRH4=";
+    hash = "sha256-efwrTHWc4m4biP7b39OU1GRifoKm49hEUTtIfrNGUeA=";
   };
 
   nativeBuildInputs = [

From ec2a492d4ca2ebe3c9eeef906ee17a04331a7551 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 8 Jun 2023 10:48:12 +0000
Subject: [PATCH 070/107] python310Packages.trimesh: 3.21.7 -> 3.22.0

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

diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix
index 0dcaaa4cbef..cb8cce77fd7 100644
--- a/pkgs/development/python-modules/trimesh/default.nix
+++ b/pkgs/development/python-modules/trimesh/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "trimesh";
-  version = "3.21.7";
+  version = "3.22.0";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-wtGt3PUCUiSIiQRA3NxO1nPE35XQDipWfrwSKdDBhtE=";
+    hash = "sha256-KuE8EVl4VbIFRlddd+Cqvj+aLWU/9ZMgmgyem9inY3Q=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 4ae88178bbfc6853525bc31cac5ae76e7ef8eff5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 8 Jun 2023 10:57:10 +0000
Subject: [PATCH 071/107] python310Packages.textual: 0.26.0 -> 0.27.0

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

diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix
index 3da9319e241..08c0704413c 100644
--- a/pkgs/development/python-modules/textual/default.nix
+++ b/pkgs/development/python-modules/textual/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "textual";
-  version = "0.26.0";
+  version = "0.27.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "Textualize";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-l4zSSROeI55hFnf0C64bbAB+1cATUkS59Uybf7ZmSfs=";
+    hash = "sha256-ag+sJFprYW3IpH+BiMR5eSRUFMBeVuOnF6GTTuXGBHw=";
   };
 
   nativeBuildInputs = [

From cdc819e0d5ec5732f93d136eab375192e0690c7b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 8 Jun 2023 10:58:05 +0000
Subject: [PATCH 072/107] python310Packages.eccodes: 2.30.0 -> 2.30.2

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

diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix
index b2cf7628aec..5f830ba5c51 100644
--- a/pkgs/development/libraries/eccodes/default.nix
+++ b/pkgs/development/libraries/eccodes/default.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "eccodes";
-  version = "2.30.0";
+  version = "2.30.2";
 
   src = fetchurl {
     url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz";
-    sha256 = "sha256-s9yTidBYQaLpyVeqUgmIpUwmBRY95kt+c8CEqu0fw8Q=";
+    sha256 = "sha256-ObleQiGxFtyBhlbQTIKIQFXUiuuqKZDCWeqM3/2kJYI=";
   };
 
   postPatch = ''

From 924193b5e31f19d58207c1e07a38ed30d43ecd92 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 4 Jun 2023 17:38:12 +0800
Subject: [PATCH 073/107] cinnamon.cinnamon-common: fix all hardcode absolute
 paths in applets

This will be helpful to the a11y and the printer applet.
---
 pkgs/desktops/cinnamon/cinnamon-common/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
index e50e14ea8d9..54971c332ca 100644
--- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
@@ -155,13 +155,15 @@ stdenv.mkDerivation rec {
       -e s,/usr/share/locale,/run/current-system/sw/share/locale,g \
       {} +
 
+    # All optional and may introduce circular dependency.
+    find ./files/usr/share/cinnamon/applets -type f -exec sed -i \
+      -e '/^#/!s,/usr/bin,/run/current-system/sw/bin,g' \
+      {} +
+
     sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py
 
     sed "s|'python3'|'${pythonEnv.interpreter}'|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/CinnamonGtkSettings.py
 
-    sed "s|/usr/bin/cinnamon-screensaver-command|/run/current-system/sw/bin/cinnamon-screensaver-command|g" \
-      -i ./files/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js -i ./files/usr/share/cinnamon/applets/user@cinnamon.org/applet.js
-
     sed "s|\"/usr/lib\"|\"${cinnamon-control-center}/lib\"|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/capi.py
 
     sed 's|"lspci"|"${pciutils}/bin/lspci"|g' -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py

From ad888c99e5ca0521720f5e371b41dd8b86953706 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 4 Jun 2023 17:47:07 +0800
Subject: [PATCH 074/107] cinnamon.cinnamon-common: group and sort
 substitutions

This is a cosmetic change. I perfer working under the cinnamon-settings folder for more targeted result.
---
 .../cinnamon/cinnamon-common/default.nix       | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
index 54971c332ca..32248fe9832 100644
--- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
@@ -160,17 +160,15 @@ stdenv.mkDerivation rec {
       -e '/^#/!s,/usr/bin,/run/current-system/sw/bin,g' \
       {} +
 
-    sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py
+    pushd ./files/usr/share/cinnamon/cinnamon-settings
+      sed "s|\"/usr/lib\"|\"${cinnamon-control-center}/lib\"|g" -i ./bin/capi.py
+      sed "s|'python3'|'${pythonEnv.interpreter}'|g" -i ./bin/CinnamonGtkSettings.py
+      sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./bin/SettingsWidgets.py
+      sed "s|msgfmt|${gettext}/bin/msgfmt|g" -i ./bin/Spices.py
+      sed 's|"lspci"|"${pciutils}/bin/lspci"|g' -i ./modules/cs_info.py
+    popd
 
-    sed "s|'python3'|'${pythonEnv.interpreter}'|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/CinnamonGtkSettings.py
-
-    sed "s|\"/usr/lib\"|\"${cinnamon-control-center}/lib\"|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/capi.py
-
-    sed 's|"lspci"|"${pciutils}/bin/lspci"|g' -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py
-
-    sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-cinnamon  -i ./files/usr/bin/cinnamon-session-cinnamon2d
-
-    sed "s|msgfmt|${gettext}/bin/msgfmt|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py
+    sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-{cinnamon,cinnamon2d}
 
     patchShebangs src/data-to-c.pl
   '';

From 4fe173493a7c7786766b4394d37d6916f960e30d Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 4 Jun 2023 17:55:00 +0800
Subject: [PATCH 075/107] cinnamon.cinnamon-common: rewrite some substitutions
 with substituteInPlace

This is a cosmetic change.
This is not a 1:1 port (the cs_info.py one), but substituted content shouldn't change.
---
 pkgs/desktops/cinnamon/cinnamon-common/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
index 32248fe9832..77828a6c105 100644
--- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
@@ -161,11 +161,11 @@ stdenv.mkDerivation rec {
       {} +
 
     pushd ./files/usr/share/cinnamon/cinnamon-settings
-      sed "s|\"/usr/lib\"|\"${cinnamon-control-center}/lib\"|g" -i ./bin/capi.py
-      sed "s|'python3'|'${pythonEnv.interpreter}'|g" -i ./bin/CinnamonGtkSettings.py
-      sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./bin/SettingsWidgets.py
-      sed "s|msgfmt|${gettext}/bin/msgfmt|g" -i ./bin/Spices.py
-      sed 's|"lspci"|"${pciutils}/bin/lspci"|g' -i ./modules/cs_info.py
+      substituteInPlace ./bin/capi.py                     --replace '"/usr/lib"' '"${cinnamon-control-center}/lib"'
+      substituteInPlace ./bin/CinnamonGtkSettings.py      --replace "'python3'" "'${pythonEnv.interpreter}'"
+      substituteInPlace ./bin/SettingsWidgets.py          --replace "/usr/share/sounds" "/run/current-system/sw/share/sounds"
+      substituteInPlace ./bin/Spices.py                   --replace "msgfmt" "${gettext}/bin/msgfmt"
+      substituteInPlace ./modules/cs_info.py              --replace "lspci" "${pciutils}/bin/lspci"
     popd
 
     sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-{cinnamon,cinnamon2d}

From f5a786a4bbb5933b74013fc944a5e2feff77730a Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 4 Jun 2023 18:06:16 +0800
Subject: [PATCH 076/107] cinnamon.cinnamon-common: unbreak
 cinnamon-spice-updater

Cinnamon updates failed: No module named 'cinnamon'
---
 pkgs/desktops/cinnamon/cinnamon-common/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
index 77828a6c105..d7583606792 100644
--- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
@@ -179,8 +179,12 @@ stdenv.mkDerivation rec {
       --prefix XDG_DATA_DIRS : "${gnome.caribou}/share"
     )
 
+    buildPythonPath "$out ${python3.pkgs.xapp}"
+
+    # https://github.com/NixOS/nixpkgs/issues/200397
+    patchPythonScript $out/bin/cinnamon-spice-updater
+
     # https://github.com/NixOS/nixpkgs/issues/129946
-    buildPythonPath "${python3.pkgs.xapp}"
     patchPythonScript $out/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
   '';
 

From 1e8e84a59fdbdcb6a053066eb04d5596feb266ac Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 5 Jun 2023 13:08:33 +0800
Subject: [PATCH 077/107] cinnamon.cinnamon-common: unbreak
 cinnamon-settings-users

ValueError: Namespace Gtk not available
---
 pkgs/desktops/cinnamon/cinnamon-common/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
index d7583606792..0e33b9887ed 100644
--- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
@@ -186,6 +186,9 @@ stdenv.mkDerivation rec {
 
     # https://github.com/NixOS/nixpkgs/issues/129946
     patchPythonScript $out/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
+
+    # Called as `pkexec cinnamon-settings-users.py`.
+    wrapGApp $out/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
   '';
 
   passthru = {

From 64aa3024b585f5eb77d52cafe6476eaba0329197 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 8 Jun 2023 19:33:53 +0800
Subject: [PATCH 078/107] cinnamon.xapp: actually fix gtk3 module target dir

Before: $out/gtk-3.0/modules/libxapp-gtk3-module.so
After: $out/lib/gtk-3.0/modules/libxapp-gtk3-module.so

cat gtk+-3.0.pc | grep "libdir=" says `libdir=${prefix}/lib`, so install this there.

Another package that installs gtk3 module: libcanberra-gtk3
---
 pkgs/desktops/cinnamon/xapp/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/cinnamon/xapp/default.nix b/pkgs/desktops/cinnamon/xapp/default.nix
index 719a8dd3968..e0991247842 100644
--- a/pkgs/desktops/cinnamon/xapp/default.nix
+++ b/pkgs/desktops/cinnamon/xapp/default.nix
@@ -79,12 +79,11 @@ stdenv.mkDerivation rec {
     # Patch pastebin & inxi location
     sed "s|/usr/bin/pastebin|$out/bin/pastebin|" -i scripts/upload-system-info
     sed "s|'inxi'|'${inxi}/bin/inxi'|" -i scripts/upload-system-info
-
-    # Patch gtk3 module target dir
-    substituteInPlace libxapp/meson.build \
-         --replace "gtk3_dep.get_pkgconfig_variable('libdir')" "'$out'"
   '';
 
+  # Fix gtk3 module target dir. Proper upstream solution should be using define_variable.
+  PKG_CONFIG_GTK__3_0_LIBDIR = "${placeholder "out"}/lib";
+
   meta = with lib; {
     homepage = "https://github.com/linuxmint/xapp";
     description = "Cross-desktop libraries and common resources";

From a0aef0bec7ef05e23b80a4ead5db5195b63053d8 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 8 Jun 2023 19:36:06 +0800
Subject: [PATCH 079/107] sticky: 1.14 -> 1.16

https://github.com/linuxmint/sticky/compare/1.14...1.16
---
 pkgs/applications/misc/sticky/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/applications/misc/sticky/default.nix
index 6b90e9689d4..f8581135bb5 100644
--- a/pkgs/applications/misc/sticky/default.nix
+++ b/pkgs/applications/misc/sticky/default.nix
@@ -12,14 +12,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "sticky";
-  version = "1.14";
+  version = "1.16";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-7UZbCbzQ1ZrSzxTUdbA+wsH3p27qj/c/cM4GY/kzG6E=";
+    hash = "sha256-+opzjvSdGwwn1imNzSsfD9rfs4naSXzcMBJRPhKW2WM=";
   };
 
   postPatch = ''

From 523b21a273961d356b6ccfdb59fb655ebe0b4acb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 8 Jun 2023 11:38:04 +0000
Subject: [PATCH 080/107] cpp-utilities: 5.22.0 -> 5.23.0

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

diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix
index f2681736975..001a1ee7eac 100644
--- a/pkgs/development/libraries/cpp-utilities/default.nix
+++ b/pkgs/development/libraries/cpp-utilities/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cpp-utilities";
-  version = "5.22.0";
+  version = "5.23.0";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-c36FzKDAaalKVIrqVSCoslrKVopW77cGdGwfiMbaXe4=";
+    sha256 = "sha256-gZF+dsj+KYrFklnJHT04XSGLdlEdslFmxeStz6jVl24=";
   };
 
   nativeBuildInputs = [ cmake ];

From 3b369e73789c607ef0f8a8521d7f12aad6077678 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 8 Jun 2023 19:38:54 +0800
Subject: [PATCH 081/107] cinnamon.warpinator: 1.6.2 -> 1.6.3

https://github.com/linuxmint/warpinator/compare/1.6.2...1.6.3
---
 pkgs/desktops/cinnamon/warpinator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix
index 6f70d8f9bda..e380eb40ada 100644
--- a/pkgs/desktops/cinnamon/warpinator/default.nix
+++ b/pkgs/desktops/cinnamon/warpinator/default.nix
@@ -33,13 +33,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "warpinator";
-  version = "1.6.2";
+  version = "1.6.3";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-crGW1FBfTEiKqx981EzG414we4icyBv/keGtMlr8UFc=";
+    hash = "sha256-iCq2cwZgsq5/bJqjYuZ6dZLqz2nIpgHCrIQeMVxJNXY=";
   };
 
   nativeBuildInputs = [

From e04a86f07c4ac3b28d97d903fb344c3683f5db3d Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 5 Jun 2023 23:38:56 +0800
Subject: [PATCH 082/107] cinnamon.mint-cursor-themes: 1.0.1 -> 1.0.2

https://github.com/linuxmint/mint-cursor-themes/compare/e17f8a46...d2c1428b
---
 pkgs/desktops/cinnamon/mint-cursor-themes/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix b/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix
index 31b453b0bea..e0402b2f721 100644
--- a/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix
+++ b/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix
@@ -5,14 +5,14 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "mint-cursor-themes";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     # They don't really do tags, this is just a named commit.
-    rev = "e17f8a4620827235dabbe5221bd0ee8c44dad0d5";
-    hash = "sha256-yLUmIVh884uDVkNil7qxf6t/gykipzBvPgzwmY3zvQk=";
+    rev = "d2c1428b499a347c291dafb13c89699fdbdd4be7";
+    hash = "sha256-i2Wf+OKwal9G5hkcAdmGSgX6txu1AHajqqPJdhpJoA0=";
   };
 
   installPhase = ''

From 33e6485a1c884337c7e707202278af695d36f7d9 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 8 Jun 2023 19:41:58 +0800
Subject: [PATCH 083/107] cinnamon.bulky: 2.8 -> 2.9

https://github.com/linuxmint/bulky/compare/2.8...2.9
---
 pkgs/desktops/cinnamon/bulky/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/cinnamon/bulky/default.nix b/pkgs/desktops/cinnamon/bulky/default.nix
index 3858623902e..9b4a7bf6b5f 100644
--- a/pkgs/desktops/cinnamon/bulky/default.nix
+++ b/pkgs/desktops/cinnamon/bulky/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "bulky";
-  version = "2.8";
+  version = "2.9";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "bulky";
     rev = version;
-    hash = "sha256-DZjX4xPyA30TTyOX+VyGSY/FWPX2316CYImDWRma9r0=";
+    hash = "sha256-eCu7AgL4bzstu8vsqBJImRZm1qMVnnycuOShY5fB+C4=";
   };
 
   nativeBuildInputs = [

From 4b8f7098da49ffdb3d663fdebd7cc5c6b762a52f Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 8 Jun 2023 14:48:41 +0300
Subject: [PATCH 084/107] foundationdb: cleanup

---
 nixos/modules/services/databases/foundationdb.md     |  6 +++---
 .../poetry2nix/overrides/build-systems.json          | 12 ------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/services/databases/foundationdb.md b/nixos/modules/services/databases/foundationdb.md
index f852c6888d8..0815c139152 100644
--- a/nixos/modules/services/databases/foundationdb.md
+++ b/nixos/modules/services/databases/foundationdb.md
@@ -6,7 +6,7 @@
 
 *Maintainer:* Austin Seipp
 
-*Available version(s):* 5.1.x, 5.2.x, 6.0.x
+*Available version(s):* 7.1.x
 
 FoundationDB (or "FDB") is an open source, distributed, transactional
 key-value store.
@@ -17,7 +17,7 @@ To enable FoundationDB, add the following to your
 {file}`configuration.nix`:
 ```
 services.foundationdb.enable = true;
-services.foundationdb.package = pkgs.foundationdb52; # FoundationDB 5.2.x
+services.foundationdb.package = pkgs.foundationdb71; # FoundationDB 7.1.x
 ```
 
 The {option}`services.foundationdb.package` option is required, and
@@ -66,7 +66,7 @@ necessary Python modules).
 ```ShellSession
 a@link> cat fdb-status.py
 #! /usr/bin/env nix-shell
-#! nix-shell -i python -p python pythonPackages.foundationdb52
+#! nix-shell -i python -p python pythonPackages.foundationdb71
 
 import fdb
 import json
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json
index ff6b0e933a7..a823186c379 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json
@@ -5761,18 +5761,6 @@
   "fortiosapi": [
     "setuptools"
   ],
-  "foundationdb51": [
-    "setuptools"
-  ],
-  "foundationdb52": [
-    "setuptools"
-  ],
-  "foundationdb60": [
-    "setuptools"
-  ],
-  "foundationdb61": [
-    "setuptools"
-  ],
   "foundationdb71": [
     "setuptools"
   ],

From 6b40b65cca732d0931978d72252a44ccb2290165 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 8 Jun 2023 13:53:02 +0200
Subject: [PATCH 085/107] python310Packages.zigpy-znp: Remove xdist, rerun
 failed tests

Clean out disabled tests, remove xdist because on aarch64-linux I could
see racy tests that were run on an already closed event loop.

Then there was some flakyness, for which rerunfailures made sense to
use, ultimately making the test suite more stable.
---
 .../python-modules/zigpy-znp/default.nix          | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix
index 859bb451203..e110e001c61 100644
--- a/pkgs/development/python-modules/zigpy-znp/default.nix
+++ b/pkgs/development/python-modules/zigpy-znp/default.nix
@@ -6,8 +6,8 @@
 , jsonschema
 , pytest-asyncio
 , pytest-mock
+, pytest-rerunfailures
 , pytest-timeout
-, pytest-xdist
 , pytestCheckHook
 , pythonOlder
 , voluptuous
@@ -44,20 +44,13 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytest-asyncio
     pytest-mock
+    pytest-rerunfailures
     pytest-timeout
-    pytest-xdist
     pytestCheckHook
   ];
 
-  disabledTests = [
-    # https://github.com/zigpy/zigpy-znp/issues/209
-    "test_join_device"
-    "test_permit_join"
-    "test_request_recovery_route_rediscovery_af"
-    "test_request_recovery_route_rediscovery_zdo"
-    "test_zigpy_request"
-    "test_zigpy_request_failure"
-    "test_mgmt_nwk_update_req"
+  pytestFlagsArray = [
+    "--reruns=3"
   ];
 
   pythonImportsCheck = [

From b0613d65f1acfd9b4310b109e55b259524016001 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 8 Jun 2023 14:58:47 +0300
Subject: [PATCH 086/107] foundationdb: 7.1.30 -> 7.1.32

---
 pkgs/servers/foundationdb/cmake.nix   | 4 ++--
 pkgs/servers/foundationdb/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix
index f01b20c9386..337d671275a 100644
--- a/pkgs/servers/foundationdb/cmake.nix
+++ b/pkgs/servers/foundationdb/cmake.nix
@@ -21,7 +21,7 @@ let
 
   makeFdb =
     { version
-    , sha256
+    , hash
     , rev ? "refs/tags/${version}"
     , officialRelease ? true
     , patches ? []
@@ -34,7 +34,7 @@ let
         src = fetchFromGitHub {
           owner = "apple";
           repo  = "foundationdb";
-          inherit rev sha256;
+          inherit rev hash;
         };
 
         buildInputs = [ ssl boost msgpack toml11 ];
diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index 560b4ae892f..b9157dda9e3 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -9,8 +9,8 @@ let
   cmakeBuild = import ./cmake.nix args;
 in {
   foundationdb71 = cmakeBuild {
-    version = "7.1.30";
-    sha256  = "sha256-dAnAE1m2NZLHgP4QJvURBPcxArXvWWdhqEYwh3tU+tU";
+    version = "7.1.32";
+    hash    = "sha256-CNJ4w1ECadj2KtcfbBPBQpXQeq9BAiw54hUgRTWPFzY=";
     boost   = boost178;
     ssl     = openssl;
 

From 93c3b2e75ae9892ff9420a868575a85a0a190271 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 8 Jun 2023 14:37:30 +0200
Subject: [PATCH 087/107] wiki-js: drop node version check

We implemented v18 support, so this is not needed.
---
 pkgs/servers/web-apps/wiki-js/default.nix     |  1 +
 .../web-apps/wiki-js/drop-node-check.patch    | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/servers/web-apps/wiki-js/drop-node-check.patch

diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/servers/web-apps/wiki-js/default.nix
index 374c270689c..20fa13d1739 100644
--- a/pkgs/servers/web-apps/wiki-js/default.nix
+++ b/pkgs/servers/web-apps/wiki-js/default.nix
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
   # [1] https://github.com/requarks/wiki/discussions/6388
   # [2] https://nodejs.org/en/blog/release/v17.0.0
   # [3] https://nodejs.org/en/blog/release/v18.0.0
+  patches = [ ./drop-node-check.patch ];
   nativeBuildInputs = [ jq moreutils ];
   postPatch = ''
     # Dirty hack to implement nodejs-18 support.
diff --git a/pkgs/servers/web-apps/wiki-js/drop-node-check.patch b/pkgs/servers/web-apps/wiki-js/drop-node-check.patch
new file mode 100644
index 00000000000..227649ba10d
--- /dev/null
+++ b/pkgs/servers/web-apps/wiki-js/drop-node-check.patch
@@ -0,0 +1,19 @@
+diff --git a/server/index.js b/server/index.js
+index 7cdb4f80..161ebeb7 100644
+--- a/server/index.js
++++ b/server/index.js
+@@ -8,14 +8,6 @@ const { nanoid } = require('nanoid')
+ const { DateTime } = require('luxon')
+ const { gte } = require('semver')
+ 
+-// ----------------------------------------
+-// Check Node.js version
+-// ----------------------------------------
+-if (gte(process.version, '18.0.0')) {
+-  console.error('You\'re using an unsupported Node.js version. Please read the requirements.')
+-  process.exit(1)
+-}
+-
+ // ----------------------------------------
+ // Init WIKI instance
+ // ----------------------------------------

From 93ef3c8c192411ad4c08d69fce29cf743675d8c9 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 8 Jun 2023 15:43:05 +0300
Subject: [PATCH 088/107] hblock: set platforms

---
 pkgs/tools/networking/hblock/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/networking/hblock/default.nix b/pkgs/tools/networking/hblock/default.nix
index b3a2b9d6822..8d7f25678ed 100644
--- a/pkgs/tools/networking/hblock/default.nix
+++ b/pkgs/tools/networking/hblock/default.nix
@@ -35,5 +35,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/hectorm/hblock";
     license = licenses.mit;
     maintainers = with maintainers; [ alanpearce ];
+    platforms = platforms.unix;
   };
 }

From 926314334a782ccc3ae88ea771d02d5c87d2a8d9 Mon Sep 17 00:00:00 2001
From: Niols <niols@niols.fr>
Date: Wed, 7 Jun 2023 14:51:16 +0200
Subject: [PATCH 089/107] headache: move from ocamlPackages to top-level

---
 .../development/{ocaml-modules => tools}/headache/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix                               | 2 ++
 pkgs/top-level/ocaml-packages.nix                             | 2 --
 3 files changed, 5 insertions(+), 3 deletions(-)
 rename pkgs/development/{ocaml-modules => tools}/headache/default.nix (89%)

diff --git a/pkgs/development/ocaml-modules/headache/default.nix b/pkgs/development/tools/headache/default.nix
similarity index 89%
rename from pkgs/development/ocaml-modules/headache/default.nix
rename to pkgs/development/tools/headache/default.nix
index cb36d87f87f..f156c5950b0 100644
--- a/pkgs/development/ocaml-modules/headache/default.nix
+++ b/pkgs/development/tools/headache/default.nix
@@ -1,4 +1,6 @@
-{ lib, buildDunePackage, fetchFromGitHub, camomile }:
+{ lib, fetchFromGitHub, ocamlPackages }:
+
+with ocamlPackages;
 
 buildDunePackage rec {
   pname = "headache";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a1411e6224..425d36fa3f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5199,6 +5199,8 @@ with pkgs;
 
   hdate = callPackage ../applications/misc/hdate { };
 
+  headache = callPackage ../development/tools/headache { };
+
   heatseeker = callPackage ../tools/misc/heatseeker { };
 
   hebcal = callPackage ../tools/misc/hebcal { };
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 124bf9f4cc5..d8c4a51505f 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -628,8 +628,6 @@ let
 
     hashcons = callPackage ../development/ocaml-modules/hashcons { };
 
-    headache = callPackage ../development/ocaml-modules/headache { };
-
     hex = callPackage ../development/ocaml-modules/hex { };
 
     hidapi = callPackage ../development/ocaml-modules/hidapi { };

From 648efce549ee3b00ba9ffcb2c44c3c7197ea46fe Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 8 Jun 2023 16:20:52 +0300
Subject: [PATCH 090/107] boost1{68-74}: drop

---
 pkgs/top-level/aliases.nix      | 7 +++++++
 pkgs/top-level/all-packages.nix | 7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8b60bff7fab..f4b9a0acc66 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -155,6 +155,13 @@ mapAliases ({
   boost159 = throw "boost159 has been deprecated in favor of the latest version"; # Added 2023-01-01
   boost15x = throw "boost15x has been deprecated in favor of the latest version"; # Added 2023-01-01
   boost160 = throw "boost160 has been deprecated in favor of the latest version"; # Added 2023-01-01
+  boost168 = throw "boost168 has been deprecated in favor of the latest version"; # Added 2023-06-08
+  boost169 = throw "boost169 has been deprecated in favor of the latest version"; # Added 2023-06-08
+  boost16x = throw "boost16x has been deprecated in favor of the latest version"; # Added 2023-06-08
+  boost170 = throw "boost170 has been deprecated in favor of the latest version"; # Added 2023-06-08
+  boost172 = throw "boost172 has been deprecated in favor of the latest version"; # Added 2023-06-08
+  boost173 = throw "boost173 has been deprecated in favor of the latest version"; # Added 2023-06-08
+  boost174 = throw "boost174 has been deprecated in favor of the latest version"; # Added 2023-06-08
   botan = throw "botan has been removed because it did not support a supported openssl version"; # added 2021-12-15
   bpftool = bpftools; # Added 2021-05-03
   bpytop = throw "bpytop has been deprecated by btop"; # Added 2023-02-16
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 425d36fa3f5..68f9f4b56ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19893,12 +19893,6 @@ with pkgs;
   boolstuff = callPackage ../development/libraries/boolstuff { };
 
   inherit (callPackage ../development/libraries/boost { inherit (buildPackages) boost-build; })
-    boost168
-    boost169
-    boost170
-    boost172
-    boost173
-    boost174
     boost175
     boost177
     boost178
@@ -19908,7 +19902,6 @@ with pkgs;
     boost182
   ;
 
-  boost16x = boost169;
   boost17x = boost179;
   boost18x = boost182;
   boost = boost17x;

From 116e050d768f20ce07ec7e46c9454933139972d9 Mon Sep 17 00:00:00 2001
From: Lauren Yim <31467609+cherryblossom000@users.noreply.github.com>
Date: Thu, 8 Jun 2023 10:07:03 +1000
Subject: [PATCH 091/107] spicetify-cli: change sha256 to hash and don't use
 pname

https://github.com/NixOS/nixpkgs/pull/236215#discussion_r1222859377
From SuperSandro2000 on Matrix:
> People should generally not use `pname` wherever possible especially with `finalAttrs` where `pname` could be different.

Co-authored-by: Pol Dellaiera <pol.dellaiera@protonmail.com>
---
 pkgs/applications/misc/spicetify-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix
index b4d4566863b..f80da1360e6 100644
--- a/pkgs/applications/misc/spicetify-cli/default.nix
+++ b/pkgs/applications/misc/spicetify-cli/default.nix
@@ -6,9 +6,9 @@ buildGoModule rec {
 
   src = fetchFromGitHub {
     owner = "spicetify";
-    repo = pname;
+    repo = "spicetify-cli";
     rev = "v${version}";
-    sha256 = "sha256-6pOFDQqzxA1eHI66BHL9Yst1PtGyJzhmFveCErBA2pU=";
+    hash = "sha256-6pOFDQqzxA1eHI66BHL9Yst1PtGyJzhmFveCErBA2pU=";
   };
 
   vendorHash = "sha256-g0SuXDzYjg0mGzeDuB2tQnVnDmTiL5vw0r9QWSgIs3Q=";

From 902f57541619dba9e330f2adcb2be5d4f5cfd518 Mon Sep 17 00:00:00 2001
From: stepech <29132060+stepech@users.noreply.github.com>
Date: Wed, 7 Jun 2023 23:09:13 +0200
Subject: [PATCH 092/107] burpsuite: 2023.5.2 -> 2023.5.3

https://portswigger.net/burp/releases/professional-community-2023-5-3
---
 pkgs/tools/networking/burpsuite/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix
index 922133daa81..840890a12ed 100644
--- a/pkgs/tools/networking/burpsuite/default.nix
+++ b/pkgs/tools/networking/burpsuite/default.nix
@@ -1,6 +1,6 @@
 { lib, fetchurl, jdk, buildFHSEnv, unzip, makeDesktopItem }:
 let
-  version = "2023.5.2";
+  version = "2023.5.3";
 
   src = fetchurl {
     name = "burpsuite.jar";
@@ -8,7 +8,7 @@ let
       "https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar"
       "https://web.archive.org/web/https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar"
     ];
-    sha256 = "0afcea8603a57e531792764a37e16e7c90634cca06eb51e6e8b031f0283d84ce";
+    sha256 = "e2e9a9b307b5b54daf724ae7f5fda22b9cbd8382a4c72e18b85ac39b3e8a16ab";
   };
 
   name = "burpsuite-${version}";

From caf6f41e2e1b05525e127f5ab5eb2c335ae40a91 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Thu, 25 May 2023 19:02:28 +0200
Subject: [PATCH 093/107] nixosTests.initrd-luks-empty-passphrase: mount the
 host nix store

This is necessary because this test relies on switching the root fs to an empty one which
does not have a Nix store available in stage 1, therefore, we have to make this test
host-store only.

A better fix in the long term is to evaluate whether this is worth to enable a proper
Nix store image for it with EROFS?
---
 nixos/tests/initrd-luks-empty-passphrase.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/tests/initrd-luks-empty-passphrase.nix b/nixos/tests/initrd-luks-empty-passphrase.nix
index d2805f2f173..521456e7e0b 100644
--- a/nixos/tests/initrd-luks-empty-passphrase.nix
+++ b/nixos/tests/initrd-luks-empty-passphrase.nix
@@ -18,6 +18,11 @@ in {
       emptyDiskImages = [ 512 ];
       useBootLoader = true;
       useEFIBoot = true;
+      # This requires to have access
+      # to a host Nix store as
+      # the new root device is /dev/vdb
+      # an empty 512MiB drive, containing no Nix store.
+      mountHostNixStore = true;
     };
 
     boot.loader.systemd-boot.enable = true;

From 955a77e1c4ad08c1b5952718d1ef16b8bbbdbd60 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Thu, 25 May 2023 19:05:03 +0200
Subject: [PATCH 094/107] nixosTests.systemd-initrd-btrfs-raid: mount the host
 Nix store

Same rationale as caf6f41e2e1.
---
 nixos/tests/systemd-initrd-btrfs-raid.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/tests/systemd-initrd-btrfs-raid.nix b/nixos/tests/systemd-initrd-btrfs-raid.nix
index c9cdf0060b1..9196033789c 100644
--- a/nixos/tests/systemd-initrd-btrfs-raid.nix
+++ b/nixos/tests/systemd-initrd-btrfs-raid.nix
@@ -6,6 +6,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
     virtualisation = {
       emptyDiskImages = [ 512 512 ];
       useBootLoader = true;
+      # Booting off the BTRFS RAID requires an available init script from the Nix store
+      mountHostNixStore = true;
       useEFIBoot = true;
     };
     boot.loader.systemd-boot.enable = true;

From de7f3cb2fa53380da6ef3da5c74e5b6a25e3e3c9 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Thu, 25 May 2023 19:06:38 +0200
Subject: [PATCH 095/107] nixosTests.systemd-initrd-luks-fido2: mount the host
 Nix store

Same rationale as caf6f41e2e1.
---
 nixos/tests/systemd-initrd-luks-fido2.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/tests/systemd-initrd-luks-fido2.nix b/nixos/tests/systemd-initrd-luks-fido2.nix
index e80d95f79c7..32c79b731d8 100644
--- a/nixos/tests/systemd-initrd-luks-fido2.nix
+++ b/nixos/tests/systemd-initrd-luks-fido2.nix
@@ -6,6 +6,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
     virtualisation = {
       emptyDiskImages = [ 512 ];
       useBootLoader = true;
+      # Booting off the encrypted disk requires having a Nix store available for the init script
+      mountHostNixStore = true;
       useEFIBoot = true;
       qemu.package = lib.mkForce (pkgs.qemu_test.override { canokeySupport = true; });
       qemu.options = [ "-device canokey,file=/tmp/canokey-file" ];

From db811f12eb5393c4a1113139713d4a4937209c22 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Thu, 25 May 2023 19:07:08 +0200
Subject: [PATCH 096/107] nixosTests.systemd-initrd-swraid: mount the host Nix
 store

Same rationale as caf6f41e2e1.
---
 nixos/tests/systemd-initrd-swraid.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/tests/systemd-initrd-swraid.nix b/nixos/tests/systemd-initrd-swraid.nix
index d201ba99a20..0d5a1c6354d 100644
--- a/nixos/tests/systemd-initrd-swraid.nix
+++ b/nixos/tests/systemd-initrd-swraid.nix
@@ -6,6 +6,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
     virtualisation = {
       emptyDiskImages = [ 512 512 ];
       useBootLoader = true;
+      # Booting off the RAID requires an available init script
+      mountHostNixStore = true;
       useEFIBoot = true;
     };
     boot.loader.systemd-boot.enable = true;

From e190364fd72815d636bc2c7a48752155643f75fc Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Thu, 25 May 2023 19:07:40 +0200
Subject: [PATCH 097/107] nixosTests.systemd-initrd-networkd-ssh: mount the
 host Nix store

Same rationale as caf6f41e2e1.
---
 nixos/tests/systemd-initrd-networkd-ssh.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/tests/systemd-initrd-networkd-ssh.nix b/nixos/tests/systemd-initrd-networkd-ssh.nix
index 943552613be..526aa16efdd 100644
--- a/nixos/tests/systemd-initrd-networkd-ssh.nix
+++ b/nixos/tests/systemd-initrd-networkd-ssh.nix
@@ -10,6 +10,8 @@ import ./make-test-python.nix ({ lib, ... }: {
       virtualisation = {
         emptyDiskImages = [ 4096 ];
         useBootLoader = true;
+        # Booting off the encrypted disk requires an available init script from the Nix store
+        mountHostNixStore = true;
         useEFIBoot = true;
       };
 

From efe64826c9a9a7feb6148c60c888d7ce9d882011 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Thu, 25 May 2023 19:07:54 +0200
Subject: [PATCH 098/107] nixosTests.systemd-initrd-luks-tpm2: mount the host
 Nix store

Same rationale as caf6f41e2e1.
---
 nixos/tests/systemd-initrd-luks-tpm2.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/tests/systemd-initrd-luks-tpm2.nix b/nixos/tests/systemd-initrd-luks-tpm2.nix
index 734ef38579f..73aa190ad62 100644
--- a/nixos/tests/systemd-initrd-luks-tpm2.nix
+++ b/nixos/tests/systemd-initrd-luks-tpm2.nix
@@ -6,6 +6,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
     virtualisation = {
       emptyDiskImages = [ 512 ];
       useBootLoader = true;
+      # Booting off the TPM2-encrypted device requires an available init script
+      mountHostNixStore = true;
       useEFIBoot = true;
       qemu.options = ["-chardev socket,id=chrtpm,path=/tmp/mytpm1/swtpm-sock -tpmdev emulator,id=tpm0,chardev=chrtpm -device tpm-tis,tpmdev=tpm0"];
     };

From bbfedea0a147acc3593fe948cb5ac77fed7a0d51 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Thu, 25 May 2023 19:08:19 +0200
Subject: [PATCH 099/107] nixosTests.systemd-initrd-luks-password: mount the
 host Nix store

Same rationale as caf6f41e2e1.
---
 nixos/tests/systemd-initrd-luks-password.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/tests/systemd-initrd-luks-password.nix b/nixos/tests/systemd-initrd-luks-password.nix
index 2dd3f304e82..a90a59feed6 100644
--- a/nixos/tests/systemd-initrd-luks-password.nix
+++ b/nixos/tests/systemd-initrd-luks-password.nix
@@ -6,6 +6,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
     virtualisation = {
       emptyDiskImages = [ 512 512 ];
       useBootLoader = true;
+      # Booting off the encrypted disk requires an available init script
+      mountHostNixStore = true;
       useEFIBoot = true;
     };
     boot.loader.systemd-boot.enable = true;

From c1f0de6e2006b0c60f0fae602e073415574fd0eb Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Thu, 25 May 2023 19:10:16 +0200
Subject: [PATCH 100/107] nixosTests.systemd-initrd-luks-keyfile: mount the
 host Nix store

Same rationale as caf6f41e2e1.
---
 nixos/tests/systemd-initrd-luks-keyfile.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/tests/systemd-initrd-luks-keyfile.nix b/nixos/tests/systemd-initrd-luks-keyfile.nix
index 257243d92a1..5ca0f48c333 100644
--- a/nixos/tests/systemd-initrd-luks-keyfile.nix
+++ b/nixos/tests/systemd-initrd-luks-keyfile.nix
@@ -14,6 +14,8 @@ in {
     virtualisation = {
       emptyDiskImages = [ 512 ];
       useBootLoader = true;
+      # Necessary to boot off the encrypted disk because it requires a init script coming from the Nix store
+      mountHostNixStore = true;
       useEFIBoot = true;
     };
     boot.loader.systemd-boot.enable = true;

From 59891e405d1e6ac03d41d0ccc711fe6c0da7d192 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Thu, 25 May 2023 19:10:44 +0200
Subject: [PATCH 101/107] nixosTests.systemd-initrd-networkd-ssh: bootDevice ->
 rootDevice

Missed deprecation fixup during the bootDisk PR.
---
 nixos/tests/systemd-initrd-networkd-ssh.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/systemd-initrd-networkd-ssh.nix b/nixos/tests/systemd-initrd-networkd-ssh.nix
index 526aa16efdd..46dbdf53739 100644
--- a/nixos/tests/systemd-initrd-networkd-ssh.nix
+++ b/nixos/tests/systemd-initrd-networkd-ssh.nix
@@ -16,9 +16,9 @@ import ./make-test-python.nix ({ lib, ... }: {
       };
 
       specialisation.encrypted-root.configuration = {
-        virtualisation.bootDevice = "/dev/mapper/root";
+        virtualisation.rootDevice = "/dev/mapper/root";
         boot.initrd.luks.devices = lib.mkVMOverride {
-          root.device = "/dev/vdc";
+          root.device = "/dev/vdb";
         };
         boot.initrd.systemd.enable = true;
         boot.initrd.network = {
@@ -63,7 +63,7 @@ import ./make-test-python.nix ({ lib, ... }: {
 
     server.wait_for_unit("multi-user.target")
     server.succeed(
-        "echo somepass | cryptsetup luksFormat --type=luks2 /dev/vdc",
+        "echo somepass | cryptsetup luksFormat --type=luks2 /dev/vdb",
         "bootctl set-default nixos-generation-1-specialisation-encrypted-root.conf",
         "sync",
     )

From ff3936e14b727d3a29d1a3212d6919055ac61804 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Fri, 26 May 2023 17:17:35 +0200
Subject: [PATCH 102/107] nixos/tests/lvm2/systemd-stage-1: mount the host Nix
 store

Same rationale as in caf6f41e2e1.
---
 nixos/tests/lvm2/systemd-stage-1.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/tests/lvm2/systemd-stage-1.nix b/nixos/tests/lvm2/systemd-stage-1.nix
index b711cd22d7f..b581f2b2350 100644
--- a/nixos/tests/lvm2/systemd-stage-1.nix
+++ b/nixos/tests/lvm2/systemd-stage-1.nix
@@ -65,6 +65,8 @@ in import ../make-test-python.nix ({ pkgs, ... }: {
       emptyDiskImages = [ 8192 8192 ];
       useBootLoader = true;
       useEFIBoot = true;
+      # To boot off the LVM disk, we need to have a init script which comes from the Nix store.
+      mountHostNixStore = true;
     };
     boot.loader.systemd-boot.enable = true;
     boot.loader.efi.canTouchEfiVariables = true;

From 89952f7bb678de4c51dcc8f42110fe9ad1f52260 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Thu, 8 Jun 2023 16:18:58 +0200
Subject: [PATCH 103/107] nixosTests.luks: mount the host Nix store

Same rationale as in caf6f41e2e1.
---
 nixos/tests/luks.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/tests/luks.nix b/nixos/tests/luks.nix
index c2b95c6a95f..d5ac550a3c5 100644
--- a/nixos/tests/luks.nix
+++ b/nixos/tests/luks.nix
@@ -7,6 +7,8 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
       emptyDiskImages = [ 512 512 ];
       useBootLoader = true;
       useEFIBoot = true;
+      # To boot off the encrypted disk, we need to have a init script which comes from the Nix store
+      mountHostNixStore = true;
     };
     boot.loader.systemd-boot.enable = true;
 

From 97a5d1c93afc02b2b29e13fd7449855576b5504e Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 8 Jun 2023 17:57:33 +0300
Subject: [PATCH 104/107] xconq: add darwin support

---
 pkgs/games/xconq/default.nix    | 10 ++++++++--
 pkgs/top-level/all-packages.nix |  5 +----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/xconq/default.nix b/pkgs/games/xconq/default.nix
index ee6748676bd..78a7949d1a9 100644
--- a/pkgs/games/xconq/default.nix
+++ b/pkgs/games/xconq/default.nix
@@ -19,7 +19,13 @@ stdenv.mkDerivation rec {
     "--with-tkconfig=${tk}/lib"
   ];
 
-  CXXFLAGS = " --std=c++11 ";
+  env.CXXFLAGS = toString [
+    "-std=c++11"
+    "-DUSE_INTERP_RESULT"
+    "-Wno-writable-strings"
+  ];
+
+  enableParallelBuilding = true;
 
   hardeningDisable = [ "format" ];
 
@@ -49,7 +55,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "A programmable turn-based strategy game";
     maintainers = with maintainers; [ raskin ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     license = licenses.gpl2;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 68f9f4b56ff..a2b243f3867 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -37379,10 +37379,7 @@ with pkgs;
 
   xbomb = callPackage ../games/xbomb { };
 
-  xconq = callPackage ../games/xconq {
-    tcl = tcl-8_5;
-    tk = tk-8_5;
-  };
+  xconq = callPackage ../games/xconq { };
 
   xcowsay = callPackage ../games/xcowsay { };
 

From 4b951d921e8d249a6f62fb4980bb9a9e152cdba4 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Thu, 8 Jun 2023 17:03:50 +0200
Subject: [PATCH 105/107] grafana-agent: 0.33.2 -> 0.34.0

https://github.com/grafana/agent/blob/v0.34.0/CHANGELOG.md
https://github.com/grafana/agent/releases/tag/v0.34.0
diff: https://github.com/grafana/agent/compare/v0.33.2...v0.34.0
---
 pkgs/servers/monitoring/grafana-agent/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix
index 342969746a6..8055990c1a2 100644
--- a/pkgs/servers/monitoring/grafana-agent/default.nix
+++ b/pkgs/servers/monitoring/grafana-agent/default.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "grafana-agent";
-  version = "0.33.2";
+  version = "0.34.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "grafana";
     repo = "agent";
-    hash = "sha256-9/1EzRIuWpXbEVA6WIy5WAHFkJgPoqABLfvgA7DB/oU=";
+    hash = "sha256-OIvLgI853qQ4Nc8xBKfwWKohyW/b53UBxpNauAgOS48=";
   };
 
-  vendorHash = "sha256-ZeSK5sTU/ey0pe303Y5eZi7D25lTXaQHJsPLDQ/tB+s=";
+  vendorHash = "sha256-BfEnMGP3IMtJwOjZRFpNc58PaQ116U/p9jRsiGdIpCQ=";
   proxyVendor = true; # darwin/linux hash mismatch
 
   ldflags = let

From 88e640fd68115e424b7f539bf2496b69db2563db Mon Sep 17 00:00:00 2001
From: teh <tehunger@gmail.com>
Date: Thu, 8 Jun 2023 17:09:56 +0100
Subject: [PATCH 106/107] jsonnet: Build with cmake (#236510)

The current build doesn't install all necessary libraries to
use jsonnet from c/c++
---
 .../development/compilers/jsonnet/default.nix | 25 +++++++------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix
index 20bde279be4..a4aec00711f 100644
--- a/pkgs/development/compilers/jsonnet/default.nix
+++ b/pkgs/development/compilers/jsonnet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, jekyll, fetchFromGitHub }:
+{ stdenv, lib, jekyll, cmake, fetchFromGitHub, gtest }:
 
 stdenv.mkDerivation rec {
   pname = "jsonnet";
@@ -12,28 +12,21 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-FtVJE9alEl56Uik+nCpJMV5DMVVmRCnE1xMAiWdK39Y=";
   };
 
-  nativeBuildInputs = [ jekyll ];
+  nativeBuildInputs = [ jekyll cmake ];
+  buildInputs = [ gtest ];
+
+  cmakeFlags = ["-DBUILD_STATIC_LIBS=ON" "-DUSE_SYSTEM_GTEST=ON" ];
 
   enableParallelBuilding = true;
 
-  makeFlags = [
-    "jsonnet"
-    "jsonnetfmt"
-    "libjsonnet.so"
-  ];
-
   # Upstream writes documentation in html, not in markdown/rst, so no
   # other output formats, sorry.
-  preBuild = ''
-    jekyll build --source ./doc --destination ./html
+  postBuild = ''
+    jekyll build --source ../doc --destination ./html
   '';
 
-  installPhase = ''
-    mkdir -p $out/bin $out/lib $out/include $out/share/doc/jsonnet
-    cp jsonnet $out/bin/
-    cp jsonnetfmt $out/bin/
-    cp libjsonnet*.so $out/lib/
-    cp -a include/*.h $out/include/
+  postInstall = ''
+    mkdir -p $out/share/doc/jsonnet
     cp -r ./html $out/share/doc/jsonnet
   '';
 

From 588e307c659fe78c17d9d35e12d5226bfc0d3273 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 8 Jun 2023 18:32:04 +0300
Subject: [PATCH 107/107] kde/gear: 23.04.1 -> 23.04.2

---
 pkgs/applications/kde/angelfish.nix |    2 +-
 pkgs/applications/kde/fetch.sh      |    2 +-
 pkgs/applications/kde/srcs.nix      | 2048 +++++++++++++--------------
 3 files changed, 1026 insertions(+), 1026 deletions(-)

diff --git a/pkgs/applications/kde/angelfish.nix b/pkgs/applications/kde/angelfish.nix
index 1b8855e3e8d..7e46fdeb0a5 100644
--- a/pkgs/applications/kde/angelfish.nix
+++ b/pkgs/applications/kde/angelfish.nix
@@ -22,7 +22,7 @@
 , srcs
 
 # provided as callPackage input to enable easier overrides through overlays
-, cargoSha256 ? "sha256-whMfpElpFB7D+dHHJrbwINFL4bVpHTlcZX+mdBfiqEE="
+, cargoSha256 ? "sha256-Cgcat/ZJH8I/RzUVWaO24R2lh+tB5foqDnH8Yjs4K1k="
 }:
 
 mkDerivation rec {
diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index 4cc13782233..a7def126a97 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.1/src -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/release-service/23.04.2/src -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 25db29ad649..b557804adf2 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -4,2051 +4,2051 @@
 
 {
   akonadi = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/akonadi-23.04.1.tar.xz";
-      sha256 = "0khfg1pdz9kr7wyzq6n1b93v75x04nn6qz35yrx5h8ap5m384r9q";
-      name = "akonadi-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/akonadi-23.04.2.tar.xz";
+      sha256 = "1ad6vxrgq45kk9i1wn4kqakdb6c3rngws00zdxnvfqsji5pbi4ay";
+      name = "akonadi-23.04.2.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/akonadi-calendar-23.04.1.tar.xz";
-      sha256 = "1wblc53xv0dyaqxfqz234f47rd9fv3pfxdk4jzw07sz3vq2vc0cf";
-      name = "akonadi-calendar-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/akonadi-calendar-23.04.2.tar.xz";
+      sha256 = "1dsms2bamkm4hjsv8bpzkzrrz9m4qkwasxcms5calg1bk8bfbwsw";
+      name = "akonadi-calendar-23.04.2.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/akonadi-calendar-tools-23.04.1.tar.xz";
-      sha256 = "1641sc6xr3pbsj47b62blz0gxqj1s1im9180jw1kd2zqsn86fpcx";
-      name = "akonadi-calendar-tools-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/akonadi-calendar-tools-23.04.2.tar.xz";
+      sha256 = "0h850akabylgzflbj4vnva36rnk6v19s34zan5470wdg58gf3bmz";
+      name = "akonadi-calendar-tools-23.04.2.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/akonadi-contacts-23.04.1.tar.xz";
-      sha256 = "02d7c9zmgrxwx1b7m8xdg64r85r1mf7yrr2qa5qv68h9fyz0df10";
-      name = "akonadi-contacts-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/akonadi-contacts-23.04.2.tar.xz";
+      sha256 = "0nsxnj4wl0a6d59mk21cim0ik7dyzmz4gw3qmzpzidi3hql532pl";
+      name = "akonadi-contacts-23.04.2.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/akonadi-import-wizard-23.04.1.tar.xz";
-      sha256 = "1xmv75b2hj761bi891ww6dmax0xcwjbzmmkvz9w3yvw1v90a5jjm";
-      name = "akonadi-import-wizard-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/akonadi-import-wizard-23.04.2.tar.xz";
+      sha256 = "0sd0ahi034vfdmqz66gv1z2s5mk4237x1r0pb3q8sbzlr44mizj2";
+      name = "akonadi-import-wizard-23.04.2.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/akonadi-mime-23.04.1.tar.xz";
-      sha256 = "1yc5nk3cxc94rzjy9q70i4nrwx43lfkcp0p86akjqzkf0yp7cjyc";
-      name = "akonadi-mime-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/akonadi-mime-23.04.2.tar.xz";
+      sha256 = "00j8vy5bx55b2lpwsl00gb2sbz7bj0dfjqxiznl6na2vjjdhp9l8";
+      name = "akonadi-mime-23.04.2.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/akonadi-notes-23.04.1.tar.xz";
-      sha256 = "0f0qp7a93bvnfzjnfsz2r0jl794kb4wbdgmzwyd7k4a64s2pzlj4";
-      name = "akonadi-notes-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/akonadi-notes-23.04.2.tar.xz";
+      sha256 = "10cs1ibj8xlckpp4rc7fsbghzjj8rwkzdl75zwc1vr62gv0d2jmj";
+      name = "akonadi-notes-23.04.2.tar.xz";
     };
   };
   akonadi-search = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/akonadi-search-23.04.1.tar.xz";
-      sha256 = "0lcwshcgy0mnq75kcf172sdniq0smjzqy46icqh7dfd98p9rwd68";
-      name = "akonadi-search-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/akonadi-search-23.04.2.tar.xz";
+      sha256 = "0ms2w9h50jhw283558rh19g8b6j3ma62cp2pnr0j6i6zgdy1fds0";
+      name = "akonadi-search-23.04.2.tar.xz";
     };
   };
   akonadiconsole = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/akonadiconsole-23.04.1.tar.xz";
-      sha256 = "1zy7lzha0fnj307h2im42lyp916cpb1nd1ixlag2n16zx01ibg6y";
-      name = "akonadiconsole-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/akonadiconsole-23.04.2.tar.xz";
+      sha256 = "0pbpqzhzf13dysj9wc9bnraj7c9xmhg1g4lcsbfspbl3dj8965pq";
+      name = "akonadiconsole-23.04.2.tar.xz";
     };
   };
   akregator = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/akregator-23.04.1.tar.xz";
-      sha256 = "1m86sk5wjffyvzqzb86c7bvj6v7glmpkib4dvwrv6dyf80jgb9fl";
-      name = "akregator-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/akregator-23.04.2.tar.xz";
+      sha256 = "079gymxwrcga945101qh6msmi9vm7424znjarq3p6w4hi7y0chy1";
+      name = "akregator-23.04.2.tar.xz";
     };
   };
   alligator = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/alligator-23.04.1.tar.xz";
-      sha256 = "08mc0kdkgkff7ksvwjrmy7h571qy0r48i7hi256z6yysvn31mj3h";
-      name = "alligator-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/alligator-23.04.2.tar.xz";
+      sha256 = "00lb2b3mhwrhisy8djnyf479bic2cj21l3938n256cigl06g4hz2";
+      name = "alligator-23.04.2.tar.xz";
     };
   };
   analitza = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/analitza-23.04.1.tar.xz";
-      sha256 = "1c3liydmpwr64d1iv7m3mrq7v4xkcvl5w60mhw4z2mpzs0pqncpr";
-      name = "analitza-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/analitza-23.04.2.tar.xz";
+      sha256 = "0h7nsl4lss34y838dfl98kjx2kp8vdvn3xrnsvzhnzr1fzffapcv";
+      name = "analitza-23.04.2.tar.xz";
     };
   };
   angelfish = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/angelfish-23.04.1.tar.xz";
-      sha256 = "1x5fqa6i0043lyhh1pz34qmk8dnck43g0ikqcxwa0w4z279fdk46";
-      name = "angelfish-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/angelfish-23.04.2.tar.xz";
+      sha256 = "0lyj8n5w2jnmszms9zrwc3rkhk80ad02x77g181lpcfxgwyy2q0q";
+      name = "angelfish-23.04.2.tar.xz";
     };
   };
   ark = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/ark-23.04.1.tar.xz";
-      sha256 = "1d154gqnkg1rvmcwzzdcs3fca6al3rx5qjaqpy638cv7nafijlj8";
-      name = "ark-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/ark-23.04.2.tar.xz";
+      sha256 = "1b34wh1x5nyqv0zzm2gmrp77b33ihvhi0xqslpxp4rzc5856sf6y";
+      name = "ark-23.04.2.tar.xz";
     };
   };
   artikulate = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/artikulate-23.04.1.tar.xz";
-      sha256 = "1gwgywam39bzfcnrc2z4q4j0flilzhjvb6lm6aanx6zjhfhqr4ni";
-      name = "artikulate-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/artikulate-23.04.2.tar.xz";
+      sha256 = "183lhxvwr58xmrc5mai0ny8syi91xxhj1s389qb5l8vgrbx1yhax";
+      name = "artikulate-23.04.2.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/audiocd-kio-23.04.1.tar.xz";
-      sha256 = "1ipkc5dajk9qbjf1awk9dgs5hqibbnhkzja9n4z66g5zslhhwa6n";
-      name = "audiocd-kio-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/audiocd-kio-23.04.2.tar.xz";
+      sha256 = "1wjvaz9lg2fjsrj4jhhz56km7dcilh4kf5zbmnlvm75paij0ih1c";
+      name = "audiocd-kio-23.04.2.tar.xz";
     };
   };
   audiotube = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/audiotube-23.04.1.tar.xz";
-      sha256 = "0plvvia88ac1kfp9rmlgpcviknfvymk4v61455pxd0pzn768iik0";
-      name = "audiotube-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/audiotube-23.04.2.tar.xz";
+      sha256 = "1p4dbys64cjaczh6fkli1qkf5g24nqwd594g4246q2gbdwphp3zv";
+      name = "audiotube-23.04.2.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/baloo-widgets-23.04.1.tar.xz";
-      sha256 = "0iypxszifvy2agqk0mv9w7ss7fm8dpqjaw65ckqpgfj6lyf1wih0";
-      name = "baloo-widgets-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/baloo-widgets-23.04.2.tar.xz";
+      sha256 = "0rlbm49hl4ri75aqrfz2l98as5snm4c8a1g0a3ladc0sh691786k";
+      name = "baloo-widgets-23.04.2.tar.xz";
     };
   };
   blinken = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/blinken-23.04.1.tar.xz";
-      sha256 = "1h86w9ds9dzkj9blx0ksrcyrnj8rwljdk25gw8fgxjp9xim2k370";
-      name = "blinken-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/blinken-23.04.2.tar.xz";
+      sha256 = "1wqwyg2zwap78shw2q75k2cd28v8z0szn67il619bib6a9riyri7";
+      name = "blinken-23.04.2.tar.xz";
     };
   };
   bomber = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/bomber-23.04.1.tar.xz";
-      sha256 = "0z5fiqz6fr6pkxnck0q8xsmd66cd5a5s8967gy47xh88i4w75iq3";
-      name = "bomber-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/bomber-23.04.2.tar.xz";
+      sha256 = "0hbp9gjpwbwxwgszp1ck3nh705bh72h52agcdvxab5i3qclrhsig";
+      name = "bomber-23.04.2.tar.xz";
     };
   };
   bovo = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/bovo-23.04.1.tar.xz";
-      sha256 = "0a3ixz5c1rlndxfmickpb3wmg8m25hnxina8h9mvbbp11zx5694v";
-      name = "bovo-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/bovo-23.04.2.tar.xz";
+      sha256 = "0jjbz57il7cm4qp2s1g9wj36qvmpn48dcyic0yqklqcl4ppiqv9w";
+      name = "bovo-23.04.2.tar.xz";
     };
   };
   calendarsupport = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/calendarsupport-23.04.1.tar.xz";
-      sha256 = "1h4m85fk5kah2nn91irs35nmf3zmgfq99ql3q7qzcbcbnyci0a12";
-      name = "calendarsupport-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/calendarsupport-23.04.2.tar.xz";
+      sha256 = "1pjmr114jjvlkac98nsq06bbh1zl84kvrn4zk9mrhsqxxwd1zbrd";
+      name = "calendarsupport-23.04.2.tar.xz";
     };
   };
   calindori = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/calindori-23.04.1.tar.xz";
-      sha256 = "1ki06m1l0vrszsk4dqfsx7g97id4wjk1ak5n8xpkr0kny82zkqjs";
-      name = "calindori-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/calindori-23.04.2.tar.xz";
+      sha256 = "1fbixskhvsqck7wsqv8qmcg7a9kx1sicdzcwdkbjpq8wzdk8vi5g";
+      name = "calindori-23.04.2.tar.xz";
     };
   };
   cantor = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/cantor-23.04.1.tar.xz";
-      sha256 = "0m7c2lhwyl6p4ajcy4lmv5wqqy6p3xn2phdav12qb953k5y0nh63";
-      name = "cantor-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/cantor-23.04.2.tar.xz";
+      sha256 = "14299x66iqdflpbzx1fjv2nxbhjhlsi380k56z2jvln18zalv1ki";
+      name = "cantor-23.04.2.tar.xz";
     };
   };
   cervisia = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/cervisia-23.04.1.tar.xz";
-      sha256 = "1q3266ql16krhm46y729kn8m67i336bknyi54b8ax9n00pgsrsh7";
-      name = "cervisia-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/cervisia-23.04.2.tar.xz";
+      sha256 = "050aa55kh6wgzq141b0y9cfsdfhrjpwd8xymjgj8p1fwkwhhy62c";
+      name = "cervisia-23.04.2.tar.xz";
     };
   };
   colord-kde = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/colord-kde-23.04.1.tar.xz";
-      sha256 = "03va1w2gdh42jnwpscb7660lmgxgpc913bz3kincpp0gzq269siw";
-      name = "colord-kde-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/colord-kde-23.04.2.tar.xz";
+      sha256 = "0ldm3frxjj3x1xq773mxlbz2af6ffa3rh6azp8jp419skq99j7xq";
+      name = "colord-kde-23.04.2.tar.xz";
     };
   };
   dolphin = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/dolphin-23.04.1.tar.xz";
-      sha256 = "1p856qfjfpaz6fxb8d0lvn4sd0qz6v558rkikq2glbfn0vxx04rq";
-      name = "dolphin-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/dolphin-23.04.2.tar.xz";
+      sha256 = "0iv1gzci2j50ds1m6ln9znbda678swaqrl989qlsf0fi3ag9jkil";
+      name = "dolphin-23.04.2.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/dolphin-plugins-23.04.1.tar.xz";
-      sha256 = "1dfx7k82xh9wa5y6rv0i956nr1nz9rnwpjxgr8vxmg6h51fn08jr";
-      name = "dolphin-plugins-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/dolphin-plugins-23.04.2.tar.xz";
+      sha256 = "1psxfnxwf43cq4cswizdl768nbvr4pnbw15nrs6zzqs4jysf1ldw";
+      name = "dolphin-plugins-23.04.2.tar.xz";
     };
   };
   dragon = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/dragon-23.04.1.tar.xz";
-      sha256 = "1xn8mxqkm56dx9qizphvkd0xjg9xjbkhqpn50x26yvym6gsmz93w";
-      name = "dragon-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/dragon-23.04.2.tar.xz";
+      sha256 = "15cxdc86qkyhjv8gr84az7i747jdx9lr8gjc3lfr7dgs8daj7r3g";
+      name = "dragon-23.04.2.tar.xz";
     };
   };
   elisa = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/elisa-23.04.1.tar.xz";
-      sha256 = "0fjkb057zm23rafv5zv0faj73538dm8ldq78rdxg3nm4hf72kaq3";
-      name = "elisa-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/elisa-23.04.2.tar.xz";
+      sha256 = "0ypay50as6iiizpmbz03gjs37fa62js0j77yr98wmma1k9xx8vyi";
+      name = "elisa-23.04.2.tar.xz";
     };
   };
   eventviews = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/eventviews-23.04.1.tar.xz";
-      sha256 = "04i24i2d95gmjhar5r8zpyff02615s2rvz2z5688d1lwjfdhkxnj";
-      name = "eventviews-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/eventviews-23.04.2.tar.xz";
+      sha256 = "02315f7bh9zy4jlw3ry8a89iv7f517m7ks991pabbrssrq5004by";
+      name = "eventviews-23.04.2.tar.xz";
     };
   };
   falkon = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/falkon-23.04.1.tar.xz";
-      sha256 = "00lz04vr54yj35r0q12j4kdp1xayzqfyi3lsjplhmybd9lic0sy5";
-      name = "falkon-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/falkon-23.04.2.tar.xz";
+      sha256 = "1jd2g89nrzm3xgjb6lr4prjhhhddw4x9sc3g8cc3y7c213x04hn1";
+      name = "falkon-23.04.2.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/ffmpegthumbs-23.04.1.tar.xz";
-      sha256 = "0bza8md28d5gy0ykibr0zfhgq6fpkparb0z2axp40s1vk6h769fq";
-      name = "ffmpegthumbs-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/ffmpegthumbs-23.04.2.tar.xz";
+      sha256 = "034ck09snsmf51b407y3wi7cm5c0x7b00cchczi1hq3fv92cb0gv";
+      name = "ffmpegthumbs-23.04.2.tar.xz";
     };
   };
   filelight = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/filelight-23.04.1.tar.xz";
-      sha256 = "0j73bbhqgy8ahjqy9pm0haqxalfpcb0w09kghvsyjvrxf7d0kh3q";
-      name = "filelight-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/filelight-23.04.2.tar.xz";
+      sha256 = "03c5v45mak0wsd2w63wnd8x8a33ac5cs54ri64mip775g42a13rw";
+      name = "filelight-23.04.2.tar.xz";
     };
   };
   ghostwriter = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/ghostwriter-23.04.1.tar.xz";
-      sha256 = "0b4gpkh8k57fr8yawlcl5v1bbpfhbwkgk7cn747h3q54lfkq4wdc";
-      name = "ghostwriter-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/ghostwriter-23.04.2.tar.xz";
+      sha256 = "1nmxxy0q5d8dh9ifjqyr3b0cm55g1hixrq80rnb9afl6f29ir2yv";
+      name = "ghostwriter-23.04.2.tar.xz";
     };
   };
   granatier = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/granatier-23.04.1.tar.xz";
-      sha256 = "1r1vn88kkcrbjd8h81zwpwgxms8pxz8rcqdjv485yaa69lrph97h";
-      name = "granatier-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/granatier-23.04.2.tar.xz";
+      sha256 = "0k130rwdmqals75w2m94ldc2sx8cgqrp6jyp9pkz5s56w27jllyl";
+      name = "granatier-23.04.2.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/grantlee-editor-23.04.1.tar.xz";
-      sha256 = "0gykv9mf4z5kam03chwmhja58zm09w4fk7kk447bk9ssdn0psiaq";
-      name = "grantlee-editor-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/grantlee-editor-23.04.2.tar.xz";
+      sha256 = "0rb7chgrgk9wcjl01rcy53sfc4db19lfaw0cs1m8mj4h195r2ig5";
+      name = "grantlee-editor-23.04.2.tar.xz";
     };
   };
   grantleetheme = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/grantleetheme-23.04.1.tar.xz";
-      sha256 = "1qg11pq5gaw896si8hka0lpqq0a29xhhs6n7scav8mrb725rd2mz";
-      name = "grantleetheme-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/grantleetheme-23.04.2.tar.xz";
+      sha256 = "06gcgb0k65a2qv6q3wkizwrkwdicw32fm0kkp80hlmjyhgmbda6b";
+      name = "grantleetheme-23.04.2.tar.xz";
     };
   };
   gwenview = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/gwenview-23.04.1.tar.xz";
-      sha256 = "1mdhr3z10lhscpd7d4bs1vy2ibvp78323ll5ijhsl3pjk5cp875i";
-      name = "gwenview-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/gwenview-23.04.2.tar.xz";
+      sha256 = "08kr8wqng3nm2rldi381p56l32vpn8zwd1m1k21fllqsjd4ya7dz";
+      name = "gwenview-23.04.2.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/incidenceeditor-23.04.1.tar.xz";
-      sha256 = "1l0ipc4vdyri1c72ybmcind6vcsm8gmwsy0s4mh8xgqs52m0w94z";
-      name = "incidenceeditor-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/incidenceeditor-23.04.2.tar.xz";
+      sha256 = "1kd2cwzrhldc4b0j77kwpza5km2k4ql2rqgbxi5c6w64qnpvy0xk";
+      name = "incidenceeditor-23.04.2.tar.xz";
     };
   };
   itinerary = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/itinerary-23.04.1.tar.xz";
-      sha256 = "1l0ab5vc9780fc5mk8sk44ryhd6mj8f314x262mgm5b9y5283wj9";
-      name = "itinerary-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/itinerary-23.04.2.tar.xz";
+      sha256 = "1ssiwv6i2gfvbr08km6maxi47mdsgsdl8h9wl6p2b8pl56qlrqbl";
+      name = "itinerary-23.04.2.tar.xz";
     };
   };
   juk = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/juk-23.04.1.tar.xz";
-      sha256 = "1z38kf7jiwm19qzi662q5l23g86afq61wyvjlfawny851iqxb283";
-      name = "juk-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/juk-23.04.2.tar.xz";
+      sha256 = "16rhaf5m98657vamsy5irkav0y3ivxhl7rmi147b3xqdl2v4mi3a";
+      name = "juk-23.04.2.tar.xz";
     };
   };
   k3b = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/k3b-23.04.1.tar.xz";
-      sha256 = "0s4rbcvqrpjni03nd3njldsyhpvg5pypryjc9blqmr3id5fnkw9q";
-      name = "k3b-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/k3b-23.04.2.tar.xz";
+      sha256 = "0vkr9s4xnyzscnjd7h2z8bs50djdxfn99xyws0pjwi7c7iia4ixx";
+      name = "k3b-23.04.2.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kaccounts-integration-23.04.1.tar.xz";
-      sha256 = "0lhfqcqvnw6vaszd1iyifljxx4fzwgikrhpwgavgx4nlkrrc9p05";
-      name = "kaccounts-integration-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kaccounts-integration-23.04.2.tar.xz";
+      sha256 = "0mbdrvhga3xvj7z5nwr8j77yh94r0bl4iivcld1jnhsz1y7wkshh";
+      name = "kaccounts-integration-23.04.2.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kaccounts-providers-23.04.1.tar.xz";
-      sha256 = "1vrzd924fl9sdr3kyr88mhr5dsk8avjg00h6jvq91cxl8n94r6wn";
-      name = "kaccounts-providers-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kaccounts-providers-23.04.2.tar.xz";
+      sha256 = "0i8a57cgz0fv1qmd4dbrz1f65h35026nhfmpi5qh4yg9hjh0sd8h";
+      name = "kaccounts-providers-23.04.2.tar.xz";
     };
   };
   kaddressbook = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kaddressbook-23.04.1.tar.xz";
-      sha256 = "1qmzz94q17ljrqm6qmm7jvgbi5ipw4y5s84cya4c2gw78yc0f323";
-      name = "kaddressbook-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kaddressbook-23.04.2.tar.xz";
+      sha256 = "08h5h1jldkxr7chbcxpqdgpzscid35428mx1s80m7qpq4a2ybdlh";
+      name = "kaddressbook-23.04.2.tar.xz";
     };
   };
   kajongg = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kajongg-23.04.1.tar.xz";
-      sha256 = "1jpigjsy4k59kyvmn65qkcv2h5j3jrijjiv7ikxpmpj6fa4babvq";
-      name = "kajongg-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kajongg-23.04.2.tar.xz";
+      sha256 = "1fzm3akl6wjyspqd941nc4anqsk9axpi6g66l89i0vc51rgg8wdh";
+      name = "kajongg-23.04.2.tar.xz";
     };
   };
   kalarm = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kalarm-23.04.1.tar.xz";
-      sha256 = "1skziiw85jizg5k1l0b0hq3l8kcasqmz1b7yi1zmw3n9jj36n11k";
-      name = "kalarm-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kalarm-23.04.2.tar.xz";
+      sha256 = "060fhdxnq3h9vvizgl5a0bkf6wfj9q4kyhip72kb4sgdlqf03ajk";
+      name = "kalarm-23.04.2.tar.xz";
     };
   };
   kalendar = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kalendar-23.04.1.tar.xz";
-      sha256 = "1c5afrmfaci03wzrxv60mwsapcdn17sxqhhp07hfcv5xa6p7cf3p";
-      name = "kalendar-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kalendar-23.04.2.tar.xz";
+      sha256 = "1adwr9s4fmiczw5fsjklxl7sh1qmdfiqj1yd0ikzxh488dr2qmqr";
+      name = "kalendar-23.04.2.tar.xz";
     };
   };
   kalgebra = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kalgebra-23.04.1.tar.xz";
-      sha256 = "0661g7nyv7hmjdmhf2xmslsx5iw7361ih7bavd9w22kpms18nqa6";
-      name = "kalgebra-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kalgebra-23.04.2.tar.xz";
+      sha256 = "1vya7lxwbm7nmh0aj6yxjz8akpw4yf32j9s84zr6lnb3b8drhwlz";
+      name = "kalgebra-23.04.2.tar.xz";
     };
   };
   kalk = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kalk-23.04.1.tar.xz";
-      sha256 = "19lwd1q92h8km1fijgz4xk4vy57zaviylbhr5raxlp8ibfasnj4p";
-      name = "kalk-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kalk-23.04.2.tar.xz";
+      sha256 = "10svgv8qmpxjrzrni3psm959pkak32nbn4mh5nz75lipqg2d3c4h";
+      name = "kalk-23.04.2.tar.xz";
     };
   };
   kalzium = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kalzium-23.04.1.tar.xz";
-      sha256 = "1s8vifs56viiyghc7kvlmbjznwf9brq0q20qjavy9aiq4hnkffc3";
-      name = "kalzium-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kalzium-23.04.2.tar.xz";
+      sha256 = "1lcc1zf2jxl6xwc49k2vp8ai4qmar43iz8qq0ldlaxpxlj30x544";
+      name = "kalzium-23.04.2.tar.xz";
     };
   };
   kamera = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kamera-23.04.1.tar.xz";
-      sha256 = "1z2sdh03hv22rva6v9csm3x54vajlg1p70r8y24fzj75hg83jlwa";
-      name = "kamera-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kamera-23.04.2.tar.xz";
+      sha256 = "07hx7nz5n5n8id2nilrhcln1xjkibcagfbx3i3fgmvwysmygyyfg";
+      name = "kamera-23.04.2.tar.xz";
     };
   };
   kamoso = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kamoso-23.04.1.tar.xz";
-      sha256 = "06hwnashqnq6zag4ymwfk3ll3f7j7xxjqgqpvrvfxfag7fnzgar3";
-      name = "kamoso-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kamoso-23.04.2.tar.xz";
+      sha256 = "0mvbscq492vv9zq84dqy15v0wlg91071dz30lhshpmyilxibivwg";
+      name = "kamoso-23.04.2.tar.xz";
     };
   };
   kanagram = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kanagram-23.04.1.tar.xz";
-      sha256 = "0w830lhqpmi86n37gkg53j57l1ybwrgknginnyd19qlkajxx8v6d";
-      name = "kanagram-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kanagram-23.04.2.tar.xz";
+      sha256 = "0f85flkil6n201h1m22mp7g6hr8b81xyl5gl6a6c26zf5jmc6fsq";
+      name = "kanagram-23.04.2.tar.xz";
     };
   };
   kapman = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kapman-23.04.1.tar.xz";
-      sha256 = "1w2hfd1g1mncwzv3xmgl48flcpp2g42vw9r57rdncrslipincqm6";
-      name = "kapman-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kapman-23.04.2.tar.xz";
+      sha256 = "1021rhfs3akifrnmlsqn0p02jl1bhb700ma19hqwzaw1asy8hazp";
+      name = "kapman-23.04.2.tar.xz";
     };
   };
   kapptemplate = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kapptemplate-23.04.1.tar.xz";
-      sha256 = "1as8nwpxfcaz4sf8l6mb4bbns1m2qja4aqvkplzz1avwhq3pw4p0";
-      name = "kapptemplate-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kapptemplate-23.04.2.tar.xz";
+      sha256 = "102h2s338xbgfb60lch5hhpf0rqkrdccyiim7rywlbvrnyb2j7dy";
+      name = "kapptemplate-23.04.2.tar.xz";
     };
   };
   kasts = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kasts-23.04.1.tar.xz";
-      sha256 = "0ih7mjgbvf8z68sn6ifnhdrmaccsgr9gff61901xwl14rpkqy46m";
-      name = "kasts-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kasts-23.04.2.tar.xz";
+      sha256 = "0sg0xxcsihz48g4fsmsipy3y0xc020i51g7f71f3pm5bwprprif6";
+      name = "kasts-23.04.2.tar.xz";
     };
   };
   kate = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kate-23.04.1.tar.xz";
-      sha256 = "1w0piqxrbmcxpzga5gqiii2a03dqd58a8wac0vj40s3hx47lnf2w";
-      name = "kate-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kate-23.04.2.tar.xz";
+      sha256 = "11a4yyb3wg6q32wn18mr2igq2zbms3g8jcz6siqxf70grfih7cbx";
+      name = "kate-23.04.2.tar.xz";
     };
   };
   katomic = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/katomic-23.04.1.tar.xz";
-      sha256 = "1a639yq1v2glhjmdcwb79mr36pdc12mjfraxzm1lijb8wz0pbxjz";
-      name = "katomic-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/katomic-23.04.2.tar.xz";
+      sha256 = "0f1k55l6fnmadyk2y069n3qiwbx3x3l9i9dwrjnpwrl1icy53j54";
+      name = "katomic-23.04.2.tar.xz";
     };
   };
   kbackup = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kbackup-23.04.1.tar.xz";
-      sha256 = "08zb8hj5b1m0kvx82nz9dsaxzv6a1l7r3fhgbpbyzlrdlhlz79n8";
-      name = "kbackup-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kbackup-23.04.2.tar.xz";
+      sha256 = "1vckim2nn3flvk3in7gcsl5c46q9n5q8kcjcaqsvh9wyfkmifl11";
+      name = "kbackup-23.04.2.tar.xz";
     };
   };
   kblackbox = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kblackbox-23.04.1.tar.xz";
-      sha256 = "0n98wisc0qz7jz7jx5vi20wjap5zxb119ppyfhvwv80z8z3ilcp4";
-      name = "kblackbox-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kblackbox-23.04.2.tar.xz";
+      sha256 = "0p4smv8s8hj9cq7cqh4zw604jnharqv2pcrj27lqzhid6rqraciq";
+      name = "kblackbox-23.04.2.tar.xz";
     };
   };
   kblocks = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kblocks-23.04.1.tar.xz";
-      sha256 = "10555jr2vgp3vgib1088w5sc2nv4wsfd986xylrgpd60gqkqz15k";
-      name = "kblocks-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kblocks-23.04.2.tar.xz";
+      sha256 = "1y6psrvv32mwrff327f7njdv0fyqgyqp23j123lp7822dmq06kax";
+      name = "kblocks-23.04.2.tar.xz";
     };
   };
   kbounce = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kbounce-23.04.1.tar.xz";
-      sha256 = "0mj4jl69xf51y3rvz6w1srqk9v3ykbqfyk15aiavpaj9zlqwy7nv";
-      name = "kbounce-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kbounce-23.04.2.tar.xz";
+      sha256 = "0g8mdwclki82bbjix4qjyq7ncjbnhpk5gjjr0k84wawq7rszknc8";
+      name = "kbounce-23.04.2.tar.xz";
     };
   };
   kbreakout = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kbreakout-23.04.1.tar.xz";
-      sha256 = "158h4j5jfadm5j15a56hh430idds5ys1mmsnwih7d848xd7migks";
-      name = "kbreakout-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kbreakout-23.04.2.tar.xz";
+      sha256 = "14xlmvnfsn54v5g4ik44nxqcw70qx9ra7dhv5aw0xmsmcg1m15mw";
+      name = "kbreakout-23.04.2.tar.xz";
     };
   };
   kbruch = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kbruch-23.04.1.tar.xz";
-      sha256 = "1vdw66qxn1q93w9ji5qiyl26ixdwc1pfvrr94jzblyyh4n7ynp5j";
-      name = "kbruch-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kbruch-23.04.2.tar.xz";
+      sha256 = "07n6bhhxwa2csk0x7xif4w8psrk328lwihcb6a53jm2wnl2z55pk";
+      name = "kbruch-23.04.2.tar.xz";
     };
   };
   kcachegrind = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kcachegrind-23.04.1.tar.xz";
-      sha256 = "1sklcai026ai8kqrmw6zf442zflsc8zkrcmylfibzwcvn6gngm4i";
-      name = "kcachegrind-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kcachegrind-23.04.2.tar.xz";
+      sha256 = "00jrj69zqnjmfyprc1g0ilfnn43g9nbh8vnhj62nwfayx34prccv";
+      name = "kcachegrind-23.04.2.tar.xz";
     };
   };
   kcalc = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kcalc-23.04.1.tar.xz";
-      sha256 = "0crnh0b9zksflrywjnq6ch7qbmch6nqwdiy5ixkhv89pbrmkajly";
-      name = "kcalc-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kcalc-23.04.2.tar.xz";
+      sha256 = "1fzr2nrlzdnm9japxmcd4d90sj3frhham8yidrxzxhnbcry7x5xd";
+      name = "kcalc-23.04.2.tar.xz";
     };
   };
   kcalutils = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kcalutils-23.04.1.tar.xz";
-      sha256 = "0bf09sdfxp6k538086yfqg9c9093jszqnwv56d67gqa2w6wi5by6";
-      name = "kcalutils-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kcalutils-23.04.2.tar.xz";
+      sha256 = "1pbq6vgqv6qpgcrbf7kray5rjnqnpwk7c358k2bcd9zavvv3slq9";
+      name = "kcalutils-23.04.2.tar.xz";
     };
   };
   kcharselect = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kcharselect-23.04.1.tar.xz";
-      sha256 = "00p19r9ybbdbg7mj9jldjb003p1hv2v60xkpsy2r33q68sqjmgj2";
-      name = "kcharselect-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kcharselect-23.04.2.tar.xz";
+      sha256 = "10sgwkxp6d3j52inx18b3gqmcl0jykyb5x4gfx0ds6jci19wafqx";
+      name = "kcharselect-23.04.2.tar.xz";
     };
   };
   kclock = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kclock-23.04.1.tar.xz";
-      sha256 = "0sxs434slvkc93n46n7sgmcahf5yr2ci00v5wj6hfmqwbkb8c795";
-      name = "kclock-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kclock-23.04.2.tar.xz";
+      sha256 = "1d6nsf0qf8w5bvmf4s51qh4rrrg0ypnq64xgfhmjsyawb8r8vx4k";
+      name = "kclock-23.04.2.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kcolorchooser-23.04.1.tar.xz";
-      sha256 = "0agk945vmp0b7ywlyhrcjszspipr8j0s93pr5p8kvyw1ldl3z6pz";
-      name = "kcolorchooser-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kcolorchooser-23.04.2.tar.xz";
+      sha256 = "17sjwnvp2kz7j578n9l8cpfbvx0pfxqysmkqcfwwk7xjsnmjlxm3";
+      name = "kcolorchooser-23.04.2.tar.xz";
     };
   };
   kcron = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kcron-23.04.1.tar.xz";
-      sha256 = "0nazn3656nqwlk6gzqvl5bhfxilqd0xa8mg2xwx8kn9lm7jn79i0";
-      name = "kcron-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kcron-23.04.2.tar.xz";
+      sha256 = "1lqglsy8q7jfjzq35ix9hrn9gj55b9mzm8h0cijh8hrhf47niwk4";
+      name = "kcron-23.04.2.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kde-dev-scripts-23.04.1.tar.xz";
-      sha256 = "01p5dc55ap54gfz6p7q579pz0sbcmr6xqc41dr1dc46fy4wrd9in";
-      name = "kde-dev-scripts-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kde-dev-scripts-23.04.2.tar.xz";
+      sha256 = "0y72sm2dl392nydwwh71ys4pwcrdxxpiisxshnfgsv6hbximq64f";
+      name = "kde-dev-scripts-23.04.2.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kde-dev-utils-23.04.1.tar.xz";
-      sha256 = "06a8avax50lb8y65jsbfk6bmnby6cihswfx3g8jkq2k6jw8ksa81";
-      name = "kde-dev-utils-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kde-dev-utils-23.04.2.tar.xz";
+      sha256 = "03cc347bg0ph30m3wv3gpblihp7hnnp8xhfgb911ws9qwg2ywzky";
+      name = "kde-dev-utils-23.04.2.tar.xz";
     };
   };
   kde-inotify-survey = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kde-inotify-survey-23.04.1.tar.xz";
-      sha256 = "1m5x2v8b2wr74bmcga27dc51r3n8r4j27zc0z9nvgbm9baj902qf";
-      name = "kde-inotify-survey-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kde-inotify-survey-23.04.2.tar.xz";
+      sha256 = "1jlhan5n4rkvbqpb2ppq8qvnas76zwaw2a988317rlwx56ncma3y";
+      name = "kde-inotify-survey-23.04.2.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kdebugsettings-23.04.1.tar.xz";
-      sha256 = "18pqzrjp8yi874v5arkbr9rw0bg72mh54mlzinyyrjplrv783ihr";
-      name = "kdebugsettings-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kdebugsettings-23.04.2.tar.xz";
+      sha256 = "11jd8rh1ciswy7w9pm3nmc7w0gpyzbg3d5hknrnw6byld92fj6md";
+      name = "kdebugsettings-23.04.2.tar.xz";
     };
   };
   kdeconnect-kde = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kdeconnect-kde-23.04.1.tar.xz";
-      sha256 = "1i09gnbq74y1c7qcqgjzpa5ns4zai7wxsxggikz6ak58pvh382q7";
-      name = "kdeconnect-kde-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kdeconnect-kde-23.04.2.tar.xz";
+      sha256 = "002s8kxmwqnfkq674rd67sjqh0xc2kyp0y1sc0cnwzpg18zbxnrf";
+      name = "kdeconnect-kde-23.04.2.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kdeedu-data-23.04.1.tar.xz";
-      sha256 = "17n33lbq1hw6dhrwlwv82a3wynz0g8asza16xi398bayavjlsndg";
-      name = "kdeedu-data-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kdeedu-data-23.04.2.tar.xz";
+      sha256 = "1zp897cnb79422nfyg0nxn2z50zsikyppywazkry6s5zf0gnp7ds";
+      name = "kdeedu-data-23.04.2.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kdegraphics-mobipocket-23.04.1.tar.xz";
-      sha256 = "0hb9rhibh093gff3df58c6xwqd4s35rn75mqxmz3jikwnszsgpa8";
-      name = "kdegraphics-mobipocket-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kdegraphics-mobipocket-23.04.2.tar.xz";
+      sha256 = "00nq83sgkfhniqywbl1f7bs45slbr5fajhzh1wdwq5pv3fdg568x";
+      name = "kdegraphics-mobipocket-23.04.2.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kdegraphics-thumbnailers-23.04.1.tar.xz";
-      sha256 = "1bp3dgg3kjhksnrjvp6i3nm73fkldn6j0fqa99s8zfbavdyx64a5";
-      name = "kdegraphics-thumbnailers-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kdegraphics-thumbnailers-23.04.2.tar.xz";
+      sha256 = "1442ln7aygkqhzhb40blb0s9q83rw6hamslg9gx10nkbp5966i99";
+      name = "kdegraphics-thumbnailers-23.04.2.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kdenetwork-filesharing-23.04.1.tar.xz";
-      sha256 = "1hggmk79k1mfsf7l3sx05dh7iahdlfsgq6spidkl026ngmd21nwi";
-      name = "kdenetwork-filesharing-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kdenetwork-filesharing-23.04.2.tar.xz";
+      sha256 = "1wkqv6bh7cr92l77z084gl829c2sw1fgjzkqwd8c62qckbzrxwyc";
+      name = "kdenetwork-filesharing-23.04.2.tar.xz";
     };
   };
   kdenlive = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kdenlive-23.04.1.tar.xz";
-      sha256 = "0jyhwyc1f2fnh2jn0hvhniav87mrda2y2zni1mlm1s0p038g2z4m";
-      name = "kdenlive-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kdenlive-23.04.2.tar.xz";
+      sha256 = "14jr4mx8z5ysk5w9agbg74nrkgksxkrs7xv3ibl3c98d00p4yxcg";
+      name = "kdenlive-23.04.2.tar.xz";
     };
   };
   kdepim-addons = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kdepim-addons-23.04.1.tar.xz";
-      sha256 = "0k0hsj9a234hcy66ppj4alfdn4hnfsd4gfqj2533hh5jkkkki39d";
-      name = "kdepim-addons-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kdepim-addons-23.04.2.tar.xz";
+      sha256 = "167ppghvs4yj24plpd756116jifi0ampd4bmyngini17cihyd6sx";
+      name = "kdepim-addons-23.04.2.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kdepim-runtime-23.04.1.tar.xz";
-      sha256 = "0wws45pi3n45jq67svmhwfxqqlr640dmya7jg83md08vsgvg1svl";
-      name = "kdepim-runtime-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kdepim-runtime-23.04.2.tar.xz";
+      sha256 = "0w4gyavraz2i59wvwgr5fl6q79gm7a58a2yp07wj3s7ra0pkfzcq";
+      name = "kdepim-runtime-23.04.2.tar.xz";
     };
   };
   kdesdk-kio = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kdesdk-kio-23.04.1.tar.xz";
-      sha256 = "1qrffia117vrrb4fpg5s39yjdfjjz6iyjybrr2hh8pc9w10q6rkp";
-      name = "kdesdk-kio-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kdesdk-kio-23.04.2.tar.xz";
+      sha256 = "11sbhncbb16ccgg4g0q68xhmmrk93wgdhdq9v54sba52vv19ln1f";
+      name = "kdesdk-kio-23.04.2.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kdesdk-thumbnailers-23.04.1.tar.xz";
-      sha256 = "18p5h0nmpj1ip8ccfm6hajs3b992ara6k1g0dh1wx14hcd1cxvib";
-      name = "kdesdk-thumbnailers-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kdesdk-thumbnailers-23.04.2.tar.xz";
+      sha256 = "19f1mbvr3ji0ar17655g2ksdwd458kxq5fpg036mq25g19yfsx91";
+      name = "kdesdk-thumbnailers-23.04.2.tar.xz";
     };
   };
   kdev-php = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kdev-php-23.04.1.tar.xz";
-      sha256 = "1v4zkzsm9ikq1x3z90mc24243aqjmfr7gmnnbj1warvagm26fv5x";
-      name = "kdev-php-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kdev-php-23.04.2.tar.xz";
+      sha256 = "1j4nc11aqsjihv47wlihswjr2287hjr84bpfj2qkb5a4xa3414w7";
+      name = "kdev-php-23.04.2.tar.xz";
     };
   };
   kdev-python = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kdev-python-23.04.1.tar.xz";
-      sha256 = "0kn8bdb6sgcgp48rm1sgzbjrhvr6kiy4jpckp3qmrlnijl6hkl18";
-      name = "kdev-python-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kdev-python-23.04.2.tar.xz";
+      sha256 = "1d3xrhmdn5ckb5nm6cjvm62ddqbd63wjazqvjv063mykl0xf31l7";
+      name = "kdev-python-23.04.2.tar.xz";
     };
   };
   kdevelop = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kdevelop-23.04.1.tar.xz";
-      sha256 = "15rjcp9yzzh1ls8bzylcvy25rl38zbxv3dckvhyl9njg4sqdklv3";
-      name = "kdevelop-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kdevelop-23.04.2.tar.xz";
+      sha256 = "1ns74hfxrbv0jby1hm4saacvlwr12v2cg1pjyfy3zswbs0s1p9ws";
+      name = "kdevelop-23.04.2.tar.xz";
     };
   };
   kdf = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kdf-23.04.1.tar.xz";
-      sha256 = "1b43izzasbw4nmin314ayrbs0cl0ha1mbmc8hp0vjiic7m33i679";
-      name = "kdf-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kdf-23.04.2.tar.xz";
+      sha256 = "1njvla721gi47lfbmysb2xqpix4s4s6n5whx0klg1lhak55fi8dk";
+      name = "kdf-23.04.2.tar.xz";
     };
   };
   kdialog = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kdialog-23.04.1.tar.xz";
-      sha256 = "0gypmx95df4xdshdlfvcaxhrryf41kym1aq1jrvg3grkmqdyxmw8";
-      name = "kdialog-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kdialog-23.04.2.tar.xz";
+      sha256 = "06jrxs7m79c65gbhsnz1b9vmbh67j5m7kzzcpml1dw0ryg158h7c";
+      name = "kdialog-23.04.2.tar.xz";
     };
   };
   kdiamond = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kdiamond-23.04.1.tar.xz";
-      sha256 = "021m71m1vfkmy93kj5pg8q8yxwicgfxqsbvdw5r8g1igmd54db82";
-      name = "kdiamond-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kdiamond-23.04.2.tar.xz";
+      sha256 = "010l189h5i4j81cawz13935j66rrx6gkdkpgly5ndylfyj0zs86w";
+      name = "kdiamond-23.04.2.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/keditbookmarks-23.04.1.tar.xz";
-      sha256 = "0cc2fnin1i70ldhl6g2xv36n80s02dl99ga18ykhx4dx4c37q26d";
-      name = "keditbookmarks-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/keditbookmarks-23.04.2.tar.xz";
+      sha256 = "0znwfqz2v5yq97dax8ipyp0d9glq1n7n0dh7lnnrp7mwhw26h0s1";
+      name = "keditbookmarks-23.04.2.tar.xz";
     };
   };
   keysmith = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/keysmith-23.04.1.tar.xz";
-      sha256 = "06qmp1qgv5axaf3fc5ir5yfpjxpdv0aqd5p78pwsqn3k2h3262cf";
-      name = "keysmith-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/keysmith-23.04.2.tar.xz";
+      sha256 = "1fzavm1bhm0x625v0zsjyyvnw5719drjqm2brhifsmxml8ipq5hq";
+      name = "keysmith-23.04.2.tar.xz";
     };
   };
   kfind = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kfind-23.04.1.tar.xz";
-      sha256 = "07ar25hk4ah29ljq3q3mdbxmqiks80z9yjq5hc6fbjw6yy3gbzb1";
-      name = "kfind-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kfind-23.04.2.tar.xz";
+      sha256 = "0f6wjv2h3dlbs2w97k5vjmwkdfin9xqbr8r4509bjicyc7g6vzpr";
+      name = "kfind-23.04.2.tar.xz";
     };
   };
   kfloppy = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kfloppy-23.04.1.tar.xz";
-      sha256 = "0cydxyfj6nz4mm9qq9igx542dr3z37mzl0hw7l35sdryr8j9qhif";
-      name = "kfloppy-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kfloppy-23.04.2.tar.xz";
+      sha256 = "1qmakmkfz8a8b38qb9hd1czrhfhjfi218lnc0x39qj9l7b9h1w9f";
+      name = "kfloppy-23.04.2.tar.xz";
     };
   };
   kfourinline = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kfourinline-23.04.1.tar.xz";
-      sha256 = "0wdsxklk9ijwma81h89n0sgzgcg6sbbm33d3ylq9gvjfzbzm5857";
-      name = "kfourinline-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kfourinline-23.04.2.tar.xz";
+      sha256 = "0n5knx6l1ql6f1vcl1z7cbzvh5z82wvc0nncy70ckh6bdsdip69n";
+      name = "kfourinline-23.04.2.tar.xz";
     };
   };
   kgeography = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kgeography-23.04.1.tar.xz";
-      sha256 = "10fngaassp6z9v14zmcl757lq77nrr51ax09sa3g0fihgdv5nwf5";
-      name = "kgeography-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kgeography-23.04.2.tar.xz";
+      sha256 = "0gra6626ak9k1ysxk1k24jl17l70x1g1zh7gvx4qyvlvmj4rz2w4";
+      name = "kgeography-23.04.2.tar.xz";
     };
   };
   kget = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kget-23.04.1.tar.xz";
-      sha256 = "0vmns0z3319di8ymjl1cswl99kaym8rbsdc2hvzf0mwkhkj987vq";
-      name = "kget-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kget-23.04.2.tar.xz";
+      sha256 = "14hlqfdj4nqd3as7did33rrkskkzx7zsa1i5il8g3s8xv63aahq4";
+      name = "kget-23.04.2.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kgoldrunner-23.04.1.tar.xz";
-      sha256 = "14xzqlx5v7r47mkrf8c23aa4lldqs6zi4xyfh97hy2v0n7kxlc5n";
-      name = "kgoldrunner-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kgoldrunner-23.04.2.tar.xz";
+      sha256 = "0gpmhl1a4ihb7m16r4dgmm47cdxj3j6422cam9kbfh7x9pk6rv7i";
+      name = "kgoldrunner-23.04.2.tar.xz";
     };
   };
   kgpg = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kgpg-23.04.1.tar.xz";
-      sha256 = "02k8x8q8s77yz2f54b9zag0nvi5c2xkjk70nvblg45rn01sqj03i";
-      name = "kgpg-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kgpg-23.04.2.tar.xz";
+      sha256 = "1li16mmjfsb9s9v11inrpk3z85ca7vkpnxr0nwafcv9vpq86lngy";
+      name = "kgpg-23.04.2.tar.xz";
     };
   };
   khangman = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/khangman-23.04.1.tar.xz";
-      sha256 = "1ir693gr8606p3hj4a81f0pzs98k3hdxwhh6pmq8hprvwl2rpdgj";
-      name = "khangman-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/khangman-23.04.2.tar.xz";
+      sha256 = "0g5781rqmhw403v2mdhjywzisgs8zk4717y2m7h1p0pnnvr4iwwh";
+      name = "khangman-23.04.2.tar.xz";
     };
   };
   khelpcenter = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/khelpcenter-23.04.1.tar.xz";
-      sha256 = "15f8d55jx9xvxg46z5z6lq913c8afz6djy6vv0hqa5fqzkjw23gz";
-      name = "khelpcenter-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/khelpcenter-23.04.2.tar.xz";
+      sha256 = "0qxzlcmgy0bgnjp29rxg9bww935fppi72749b41bmp1r30knxsxq";
+      name = "khelpcenter-23.04.2.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kidentitymanagement-23.04.1.tar.xz";
-      sha256 = "0fp2316b26hhhc5y92h08kqcdnmg46h885mcimv4nmk3dq3sirp4";
-      name = "kidentitymanagement-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kidentitymanagement-23.04.2.tar.xz";
+      sha256 = "1mrhwvy4z7bnzp8ybcc8j8bvy0wsc702cbg4ryb947bdjxn2hssj";
+      name = "kidentitymanagement-23.04.2.tar.xz";
     };
   };
   kig = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kig-23.04.1.tar.xz";
-      sha256 = "0m30zvcmx3ay9ac0zypfzsq95dasam58lipxb3y7wisrf3qpgvqf";
-      name = "kig-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kig-23.04.2.tar.xz";
+      sha256 = "0apf4rcl1np9664mm7i8xw0bz7b6qp2p56miii1p1aw55sdqvxr1";
+      name = "kig-23.04.2.tar.xz";
     };
   };
   kigo = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kigo-23.04.1.tar.xz";
-      sha256 = "1kk05hzvgp2bzlqkc92kigr21yxl908pys17dmjpll5rriprfrmc";
-      name = "kigo-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kigo-23.04.2.tar.xz";
+      sha256 = "0lpf6fn7c197rqd9qdcswlyzaz5w73n5gqjz3sbf1rnyq4gl2z22";
+      name = "kigo-23.04.2.tar.xz";
     };
   };
   killbots = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/killbots-23.04.1.tar.xz";
-      sha256 = "0c3lqyw919gpihvx4k9irn4c1kin08glqpqwqkgy34vafyp0661b";
-      name = "killbots-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/killbots-23.04.2.tar.xz";
+      sha256 = "1n335hff3n2a9gw8gjjhxvvkla27psh6qx9g2lzwvr6hm8dakd53";
+      name = "killbots-23.04.2.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kimagemapeditor-23.04.1.tar.xz";
-      sha256 = "0dnd2dsisid19jq36nh57a508m6208z4s14ij50y760pd80ikzqq";
-      name = "kimagemapeditor-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kimagemapeditor-23.04.2.tar.xz";
+      sha256 = "0gc1gr8wjqksn1i5sxvdv7bzy9p0clb8pgcyn981k120g16g5cjl";
+      name = "kimagemapeditor-23.04.2.tar.xz";
     };
   };
   kimap = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kimap-23.04.1.tar.xz";
-      sha256 = "0rhnhh7wdzai81xic1fx2jk8mcb3n9mmlrxv2hin3zrn7a6v2qh5";
-      name = "kimap-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kimap-23.04.2.tar.xz";
+      sha256 = "1pl4nw3mk4ixsswgs8ybldhkgqirws7b3kxk0rqmsppmv37a3i5w";
+      name = "kimap-23.04.2.tar.xz";
     };
   };
   kio-admin = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kio-admin-23.04.1.tar.xz";
-      sha256 = "15bcl2idcd42sbhj5w1dp4z3p205y1d8x9z3rbwsbgaxzdr3hv6x";
-      name = "kio-admin-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kio-admin-23.04.2.tar.xz";
+      sha256 = "1llv47a6rry9macqfa2ipdzijy87sf8j46scbmvvff0kpi5nc5hf";
+      name = "kio-admin-23.04.2.tar.xz";
     };
   };
   kio-extras = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kio-extras-23.04.1.tar.xz";
-      sha256 = "1n9a33zma7n5sljwmb7jfgl5xwq5k6773x17bjw6fmx9z626nw6q";
-      name = "kio-extras-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kio-extras-23.04.2.tar.xz";
+      sha256 = "1h8qg94d0baa36gfiy150mm6pgvjwqwng8carx7fqv9psj3hivc8";
+      name = "kio-extras-23.04.2.tar.xz";
     };
   };
   kio-gdrive = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kio-gdrive-23.04.1.tar.xz";
-      sha256 = "0019bw8bhm9h787q87lhjw6b8bib7p59cww16d7ibiixkrmzkcx9";
-      name = "kio-gdrive-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kio-gdrive-23.04.2.tar.xz";
+      sha256 = "0ngb2rk3k5ymwqmm1kw5i3gs1p99j2cmc64rcvsvl3m385gkp0id";
+      name = "kio-gdrive-23.04.2.tar.xz";
     };
   };
   kio-zeroconf = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kio-zeroconf-23.04.1.tar.xz";
-      sha256 = "0i5mvm2ps28jn395ldjj8ff36nybvlzwkximrjbwh5ydy9y4psf6";
-      name = "kio-zeroconf-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kio-zeroconf-23.04.2.tar.xz";
+      sha256 = "0vglal9gfzryhzkm4ivls9zmlc9a2jkwhisas5nyacld9m1ax0dz";
+      name = "kio-zeroconf-23.04.2.tar.xz";
     };
   };
   kipi-plugins = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kipi-plugins-23.04.1.tar.xz";
-      sha256 = "1alqjm95xsd0413icrgkg33wm9gvwvnrv8qpmpw999dyaa6fkfm1";
-      name = "kipi-plugins-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kipi-plugins-23.04.2.tar.xz";
+      sha256 = "06j2b7w5p0jp7c3l7kpyj5xp8h39i3sjzz1ig8pyr1wwqh3pa4dy";
+      name = "kipi-plugins-23.04.2.tar.xz";
     };
   };
   kirigami-gallery = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kirigami-gallery-23.04.1.tar.xz";
-      sha256 = "06x6zv87qvcw71a8vfan5v663s9g68y6gpck6a9hij5dyvvdbv6x";
-      name = "kirigami-gallery-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kirigami-gallery-23.04.2.tar.xz";
+      sha256 = "11j216dmrsvd7y3g00n5v4zr7wc9ax26zpi77xl8985jwxndb4wf";
+      name = "kirigami-gallery-23.04.2.tar.xz";
     };
   };
   kiriki = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kiriki-23.04.1.tar.xz";
-      sha256 = "1ldpmpvkrapwxhky274hr6liycgm06izr96adgv1xizal704p79m";
-      name = "kiriki-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kiriki-23.04.2.tar.xz";
+      sha256 = "124w7kvh7rzv3lzk9bkvdkbwid9kzvd385f86vw3in539l0wynid";
+      name = "kiriki-23.04.2.tar.xz";
     };
   };
   kiten = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kiten-23.04.1.tar.xz";
-      sha256 = "12cfm6nxdrwyvms66lmxmz2l60ipbr1x48hapiyvmyyipcz5vwqa";
-      name = "kiten-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kiten-23.04.2.tar.xz";
+      sha256 = "06fksilzf1vmpv9ffb6ml2by4h195qq9lhqrynpx5bfmjnwdihdy";
+      name = "kiten-23.04.2.tar.xz";
     };
   };
   kitinerary = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kitinerary-23.04.1.tar.xz";
-      sha256 = "0gr53w1jzrlyjllfg6d0bv0x7g3d2fvqgsgbnhnfafm9ipmapmpz";
-      name = "kitinerary-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kitinerary-23.04.2.tar.xz";
+      sha256 = "0dxqi4jrfhvhnivmdckfigp2zbf03gv9y9pjickl5jinm2ijv2ki";
+      name = "kitinerary-23.04.2.tar.xz";
     };
   };
   kjournald = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kjournald-23.04.1.tar.xz";
-      sha256 = "0mkrnflkavbsr0kk1chnkd3y91fp49s6dd518akmgsic24ggsayb";
-      name = "kjournald-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kjournald-23.04.2.tar.xz";
+      sha256 = "0wddjfixd0fcw7abjy4vr5sf6h4hvrip7bn1aqy0mgzh8jhp49y3";
+      name = "kjournald-23.04.2.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kjumpingcube-23.04.1.tar.xz";
-      sha256 = "07prv17v8p9cxl0akq5gd8g6ld4mypdij91cqd3gd18kmm97wmqv";
-      name = "kjumpingcube-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kjumpingcube-23.04.2.tar.xz";
+      sha256 = "1n3fckb7x3nsr81bgpv7bhgwsj7v7m8d3dfvjg0k12ddshpq6yg9";
+      name = "kjumpingcube-23.04.2.tar.xz";
     };
   };
   kldap = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kldap-23.04.1.tar.xz";
-      sha256 = "1kk4mg9z1b9mg8h0zipma6l7apya2yg64ng3ki8xm3lr7w165200";
-      name = "kldap-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kldap-23.04.2.tar.xz";
+      sha256 = "0hn3w2kjwn3r08p6cbk7xmvlga413ckslyrfnx5r904fkam43kyc";
+      name = "kldap-23.04.2.tar.xz";
     };
   };
   kleopatra = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kleopatra-23.04.1.tar.xz";
-      sha256 = "0agqn8pylc4n62hxxfl8r8imr25n2wbxg29msn3k0yk0fnjsj2gc";
-      name = "kleopatra-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kleopatra-23.04.2.tar.xz";
+      sha256 = "1qx7lvapwjas4xy635krd50d134xcp6mddp77v9664fnns028cnw";
+      name = "kleopatra-23.04.2.tar.xz";
     };
   };
   klettres = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/klettres-23.04.1.tar.xz";
-      sha256 = "06618wznl891gbvjwz4gj3y2bgvqb7px46zka8yn70ripdzcdsyx";
-      name = "klettres-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/klettres-23.04.2.tar.xz";
+      sha256 = "0r7mggfz62wn6kv9qd5sbvxarmchslfvf1m8krdf6ycpid22p16i";
+      name = "klettres-23.04.2.tar.xz";
     };
   };
   klickety = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/klickety-23.04.1.tar.xz";
-      sha256 = "1vc8vp29gg8g57dpy0mg2l0g8sx21v8v4mpmyrndvd7azm268xjv";
-      name = "klickety-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/klickety-23.04.2.tar.xz";
+      sha256 = "180zr2ldk8pbqy8md538kv3gl8b25pjczs2nv4grji32zr5m035x";
+      name = "klickety-23.04.2.tar.xz";
     };
   };
   klines = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/klines-23.04.1.tar.xz";
-      sha256 = "0sxm5nmq7inwbc40zi5lwc5i5ykh33l5lyjljd5vcs26av00yplp";
-      name = "klines-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/klines-23.04.2.tar.xz";
+      sha256 = "1vi4fw9n23qjkxp5acpgqkl7khl9p047bakxqpis163d4xxl7pni";
+      name = "klines-23.04.2.tar.xz";
     };
   };
   kmag = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kmag-23.04.1.tar.xz";
-      sha256 = "16aazm0czvqbq20jdkxrpizl9yipd0jhaghrqrgps35vkrvksy08";
-      name = "kmag-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kmag-23.04.2.tar.xz";
+      sha256 = "022i7p4rs4d4g7hxizms8b8gqgmqdb04cayn47fmlahi9y3m7805";
+      name = "kmag-23.04.2.tar.xz";
     };
   };
   kmahjongg = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kmahjongg-23.04.1.tar.xz";
-      sha256 = "00ihfbvf0k5ralkykj8522nhmd7kyr0n47xpdx77f19w9wf464rw";
-      name = "kmahjongg-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kmahjongg-23.04.2.tar.xz";
+      sha256 = "1k5i56qp44vbawamlm2l18xw7lxrc1dgv5q3cgx3mwv0a8xiv1r8";
+      name = "kmahjongg-23.04.2.tar.xz";
     };
   };
   kmail = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kmail-23.04.1.tar.xz";
-      sha256 = "0bwrlh5i5zxgqji0fk41r59r67aw7nppv1ypk8dkg2k1hmiqgckg";
-      name = "kmail-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kmail-23.04.2.tar.xz";
+      sha256 = "1rp4lpabjy0c5qxdp5yxah53n2bm9h4lw8r78jbph09v2namp808";
+      name = "kmail-23.04.2.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kmail-account-wizard-23.04.1.tar.xz";
-      sha256 = "1g46wpxy2d7s5y38y5vfy71bwrscgr675wbyj040qaqs5jn5wh1y";
-      name = "kmail-account-wizard-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kmail-account-wizard-23.04.2.tar.xz";
+      sha256 = "0ngzggmx17y939c79rl9dydkrq678r1kwkb1is4b0l362xzlchhf";
+      name = "kmail-account-wizard-23.04.2.tar.xz";
     };
   };
   kmailtransport = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kmailtransport-23.04.1.tar.xz";
-      sha256 = "0c6qlaxcmj5iyyvz8zw5829pp81jamfg2rpsp7pgzclwd5p9ry3j";
-      name = "kmailtransport-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kmailtransport-23.04.2.tar.xz";
+      sha256 = "0yrbzdl4l7h9b1jfkafg4v86lj0nkh4ma30w3jllc525g7pldbf1";
+      name = "kmailtransport-23.04.2.tar.xz";
     };
   };
   kmbox = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kmbox-23.04.1.tar.xz";
-      sha256 = "0cml2bm1k18lnhf92x755xn9pbxgy4z7nr0gqqf8zxjym3p3169j";
-      name = "kmbox-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kmbox-23.04.2.tar.xz";
+      sha256 = "1adyir1mnqi1y7hndvigk0vxhqf9r75j2vlk1jlqb1x8b883x2bc";
+      name = "kmbox-23.04.2.tar.xz";
     };
   };
   kmime = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kmime-23.04.1.tar.xz";
-      sha256 = "1mmvzl8w9jkxga7mlj3c3qzmcj3v152bc5rqd9va2bp1lyxvivx0";
-      name = "kmime-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kmime-23.04.2.tar.xz";
+      sha256 = "02kc9rqn163hxsi9v0m0nbiq4akajxmj4fak7aff7fli7m3a59qa";
+      name = "kmime-23.04.2.tar.xz";
     };
   };
   kmines = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kmines-23.04.1.tar.xz";
-      sha256 = "0m1k4nh9wh9qd5xirvv0af5z4fl9klp2j2q2wsr6cxymczlspz9a";
-      name = "kmines-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kmines-23.04.2.tar.xz";
+      sha256 = "1lflb2kq4w3r385m6wsgz7m0mr5l57l2hgs9jydbsldv8bckrz2a";
+      name = "kmines-23.04.2.tar.xz";
     };
   };
   kmix = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kmix-23.04.1.tar.xz";
-      sha256 = "1paln4yynbk97jwld88cdqa6wj3alqqvs1c49c0n2mscnl691j4j";
-      name = "kmix-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kmix-23.04.2.tar.xz";
+      sha256 = "1n5lydagk1i8shk9bl2vph4639503xp5mybb7m82wqbafpf31arc";
+      name = "kmix-23.04.2.tar.xz";
     };
   };
   kmousetool = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kmousetool-23.04.1.tar.xz";
-      sha256 = "1qxbazh14i2w6ll1c980b7qsfj1ls5lj7hjdd0krzxskf999q23a";
-      name = "kmousetool-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kmousetool-23.04.2.tar.xz";
+      sha256 = "0fxrafrypa8iir9008sd6gz8i6xpkrqlgcyswhwmh2rmcdp2m564";
+      name = "kmousetool-23.04.2.tar.xz";
     };
   };
   kmouth = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kmouth-23.04.1.tar.xz";
-      sha256 = "03ppsfac560az572mv5y18bkfxbbaa6nxrssc5l982fjvc3xngw6";
-      name = "kmouth-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kmouth-23.04.2.tar.xz";
+      sha256 = "0vqqac4simnq3g49w9qcn6ycn4gx896sw18sw71jlasm6396y19h";
+      name = "kmouth-23.04.2.tar.xz";
     };
   };
   kmplot = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kmplot-23.04.1.tar.xz";
-      sha256 = "1y3kyd02ksm6hjpyzal5nq4sj8yipnrp0hfdfhqlv79xyyjk200s";
-      name = "kmplot-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kmplot-23.04.2.tar.xz";
+      sha256 = "0cq41x4xxz9aq1lcj6xznh0ivjrfmwi5cgkflq4fvgdf0rm4yg00";
+      name = "kmplot-23.04.2.tar.xz";
     };
   };
   knavalbattle = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/knavalbattle-23.04.1.tar.xz";
-      sha256 = "10h6jhrk676fq7v178hsqmk5yq5sbppm69bh27n2915abm9w5ssd";
-      name = "knavalbattle-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/knavalbattle-23.04.2.tar.xz";
+      sha256 = "1xxig207ly2wi76pcm8zklm640ccm76b8kizbyh3ipfa45jzgmqi";
+      name = "knavalbattle-23.04.2.tar.xz";
     };
   };
   knetwalk = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/knetwalk-23.04.1.tar.xz";
-      sha256 = "1vr9cgp6pm344s7syhxdyl9pgjkyh9h5nh8dsk8mbqs5gbnn3dds";
-      name = "knetwalk-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/knetwalk-23.04.2.tar.xz";
+      sha256 = "14acvvrih83jfll41y6wa22dxbba1v66qk2an3340jn4mhfyl10s";
+      name = "knetwalk-23.04.2.tar.xz";
     };
   };
   knights = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/knights-23.04.1.tar.xz";
-      sha256 = "0yng5vr3g6lalpjkfaxwrihn9x8vs78n6firbvw2hmjlvj4ycybg";
-      name = "knights-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/knights-23.04.2.tar.xz";
+      sha256 = "1s5bznqmr0apnbk52w63qcbdaa8sj3695syi2hmc3ic62mh354zx";
+      name = "knights-23.04.2.tar.xz";
     };
   };
   knotes = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/knotes-23.04.1.tar.xz";
-      sha256 = "0r30qln0hdib5sd6x8qy3r1fn2im55wnim07zvp5wy9a4pynwzzl";
-      name = "knotes-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/knotes-23.04.2.tar.xz";
+      sha256 = "0nib6awq7f44fi8g6fggrzywhapm9r6aqlyfih9v6zwsq4wr8yzq";
+      name = "knotes-23.04.2.tar.xz";
     };
   };
   koko = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/koko-23.04.1.tar.xz";
-      sha256 = "0vdhrw5b20zcp3d83wvk9mcvn04c45v4hpirm01kw5yx998ak9gp";
-      name = "koko-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/koko-23.04.2.tar.xz";
+      sha256 = "0vnghplis166352dq9z6g0m6bfqgaf54ic1a9d4vj4yx3q4iy2s2";
+      name = "koko-23.04.2.tar.xz";
     };
   };
   kolf = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kolf-23.04.1.tar.xz";
-      sha256 = "1cknqhlrnqv4wq1kz6sv5r4xsxk5ndi2izajifixi4n75dq135ad";
-      name = "kolf-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kolf-23.04.2.tar.xz";
+      sha256 = "1231apl6sah1b1nmr8wmp9kj1vq5v2vmlzch1jydxqk44hw5j8vw";
+      name = "kolf-23.04.2.tar.xz";
     };
   };
   kollision = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kollision-23.04.1.tar.xz";
-      sha256 = "0ay1lxpzkrdj0jax0q8nkb49snb9sffrh2gg4fshzblk18b7kzff";
-      name = "kollision-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kollision-23.04.2.tar.xz";
+      sha256 = "136lhbydphpmxyzpsfgz1l69vli1v4nz790g0wa998ky1pl2zqg5";
+      name = "kollision-23.04.2.tar.xz";
     };
   };
   kolourpaint = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kolourpaint-23.04.1.tar.xz";
-      sha256 = "1mpj1dvxjimr43dpblg76bml70dw5z8rs6f8gp71k1i117bvw617";
-      name = "kolourpaint-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kolourpaint-23.04.2.tar.xz";
+      sha256 = "1470plhfrm72j1yyz6shg31c1mcylrv0fb71m5ay3q62w1m6xhpy";
+      name = "kolourpaint-23.04.2.tar.xz";
     };
   };
   kompare = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kompare-23.04.1.tar.xz";
-      sha256 = "0vfikmyin566y2jg4b3iajsywdcl5653g7bai7f619751vhfx4a8";
-      name = "kompare-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kompare-23.04.2.tar.xz";
+      sha256 = "1kslasbg3c4kimza3fc9z52cnylfyzc6ks31km7sb5g8in4xd2mm";
+      name = "kompare-23.04.2.tar.xz";
     };
   };
   kongress = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kongress-23.04.1.tar.xz";
-      sha256 = "0dl6xz4wvbfq2war9vsagl4jscp1db59inhf45iixqy09qkkrfij";
-      name = "kongress-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kongress-23.04.2.tar.xz";
+      sha256 = "1f07r2s5s5c5ng6kawq7w540c0509zbzxmz847mm5w0arz94i33i";
+      name = "kongress-23.04.2.tar.xz";
     };
   };
   konqueror = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/konqueror-23.04.1.tar.xz";
-      sha256 = "10f7j11bmalcp14r27a0f04jlsjmxjksygccls5ls89avzwm2l8d";
-      name = "konqueror-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/konqueror-23.04.2.tar.xz";
+      sha256 = "0s7bwxk758h73ggzcli16syinqigpzimvsg196iaq8nl5hjpxsry";
+      name = "konqueror-23.04.2.tar.xz";
     };
   };
   konquest = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/konquest-23.04.1.tar.xz";
-      sha256 = "1l4lcdhwxcrxbqn0cmw7c6yfyi6q1ncpw8qphnj0hff55wgr5942";
-      name = "konquest-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/konquest-23.04.2.tar.xz";
+      sha256 = "0knrk1fqdhd323b2rqd9nwssplxvmalqhpl68d568x4lggl00vbl";
+      name = "konquest-23.04.2.tar.xz";
     };
   };
   konsole = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/konsole-23.04.1.tar.xz";
-      sha256 = "165n0idnpwdxsf8757wj1pkxawf824an8nvwqp1aqg7rzfd19ldr";
-      name = "konsole-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/konsole-23.04.2.tar.xz";
+      sha256 = "1spc7vr46jb62428lb78zlmahz8q5d6na10v1rv88hl8vrg5djdc";
+      name = "konsole-23.04.2.tar.xz";
     };
   };
   kontact = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kontact-23.04.1.tar.xz";
-      sha256 = "1l433smhldzryphcqyvxy6hmwxdbb3c9077nwni01phfsj2lbiaf";
-      name = "kontact-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kontact-23.04.2.tar.xz";
+      sha256 = "1zjq3kw8589mj2pw8avi4x19ifg0zrjjqpyb06y0ryghzmbvlgjs";
+      name = "kontact-23.04.2.tar.xz";
     };
   };
   kontactinterface = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kontactinterface-23.04.1.tar.xz";
-      sha256 = "1l3xjylf1s12gcmda0cjxwni16mw7v6bcn6rxv19wlq6wcnk5y42";
-      name = "kontactinterface-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kontactinterface-23.04.2.tar.xz";
+      sha256 = "1m5fjx7f2ias7lmqb631dzfa4r43bqygj68lfmkv2drdrahnymir";
+      name = "kontactinterface-23.04.2.tar.xz";
     };
   };
   kontrast = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kontrast-23.04.1.tar.xz";
-      sha256 = "0ls661kzc8c7h95j6wpb7alqqgdb03b8pw2p4prk26fvallhsypv";
-      name = "kontrast-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kontrast-23.04.2.tar.xz";
+      sha256 = "1p21z3wac8w8inrmddn347da2kssind71mwgc1rnikcrsf26cplx";
+      name = "kontrast-23.04.2.tar.xz";
     };
   };
   konversation = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/konversation-23.04.1.tar.xz";
-      sha256 = "13500cr5vlcydsfh891xh6pm0fviwwsgsi03xy06sdrspxp78l1p";
-      name = "konversation-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/konversation-23.04.2.tar.xz";
+      sha256 = "1ml7p0dfn8vkpq6djh5gajbabzg0xbbwg5f2cnagzp7307flz8h1";
+      name = "konversation-23.04.2.tar.xz";
     };
   };
   kopeninghours = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kopeninghours-23.04.1.tar.xz";
-      sha256 = "1ny8v6wmxd4sh25bpr0pyjrcfa225i0qvm2hpr696vffcg3dsz9y";
-      name = "kopeninghours-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kopeninghours-23.04.2.tar.xz";
+      sha256 = "16zswxwjlkbzfcxj8pbwgp1s0ifpp0n597r4c4ina4hmf7c9h0fn";
+      name = "kopeninghours-23.04.2.tar.xz";
     };
   };
   kopete = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kopete-23.04.1.tar.xz";
-      sha256 = "1v76y2n0vgksk5shzymsciy05qsfbv7k2h5gj8rpd9ia5k7m0gdr";
-      name = "kopete-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kopete-23.04.2.tar.xz";
+      sha256 = "0rmdjxgj29241my4ilykf7rqvjm5jq12x1pi24fs4897yly54z8f";
+      name = "kopete-23.04.2.tar.xz";
     };
   };
   korganizer = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/korganizer-23.04.1.tar.xz";
-      sha256 = "1shvd8gghnml7md9sjgicmy8lpza4l0mvkm4nj811hpc1wzkbia6";
-      name = "korganizer-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/korganizer-23.04.2.tar.xz";
+      sha256 = "14pfqprpxwr2gny9v6mdvjsx0fnx2rh836i875a0z8m5ari00fsi";
+      name = "korganizer-23.04.2.tar.xz";
     };
   };
   kosmindoormap = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kosmindoormap-23.04.1.tar.xz";
-      sha256 = "169c97lcj7h25hwkfkgiklb363f8z93bn9azmcndshlqyi4brwhf";
-      name = "kosmindoormap-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kosmindoormap-23.04.2.tar.xz";
+      sha256 = "1vrn0dk2hwj6s423q4z1d07f5r3n7ngskd8yj6pznglgihs9kfy7";
+      name = "kosmindoormap-23.04.2.tar.xz";
     };
   };
   kpat = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kpat-23.04.1.tar.xz";
-      sha256 = "1061rgiq5iz4f54483svwv6cz1cll36d9pw4hsmdq9rv7fs223v5";
-      name = "kpat-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kpat-23.04.2.tar.xz";
+      sha256 = "0hhrjjpcr6qfmn7gp4s1lc81shjc9474w293jiglsm71cgiq658r";
+      name = "kpat-23.04.2.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kpimtextedit-23.04.1.tar.xz";
-      sha256 = "1akasv0b8m60242r171f76yhx4hp2saf4l0dz3kyyq2zvns2rw4r";
-      name = "kpimtextedit-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kpimtextedit-23.04.2.tar.xz";
+      sha256 = "0jrfnwrywhhjhi7x89xwdz0k71zx9r2yxha03f2caxgy5gi3r11z";
+      name = "kpimtextedit-23.04.2.tar.xz";
     };
   };
   kpkpass = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kpkpass-23.04.1.tar.xz";
-      sha256 = "0lqfml6ibbx8k2hpsf07rxypkpl0s2fck5kfwq26gjizlisxr77v";
-      name = "kpkpass-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kpkpass-23.04.2.tar.xz";
+      sha256 = "1n2wbmhpm33n909yyxi3bj65d51na9bdjak9zx5srkyayirwh3x8";
+      name = "kpkpass-23.04.2.tar.xz";
     };
   };
   kpmcore = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kpmcore-23.04.1.tar.xz";
-      sha256 = "07q80cx7axs02rwzvjgcsdy60rx0d982x6731imglqkh4vq2llil";
-      name = "kpmcore-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kpmcore-23.04.2.tar.xz";
+      sha256 = "1p4a0dv1ffkz35s35vf9xm3bs2hy0wj48vw7v7w2qh2280a9rnqk";
+      name = "kpmcore-23.04.2.tar.xz";
     };
   };
   kpublictransport = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kpublictransport-23.04.1.tar.xz";
-      sha256 = "1slmix7yyh3xmzaxals71yn40mckzxmqb5qjhs0j7cffm2h152yl";
-      name = "kpublictransport-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kpublictransport-23.04.2.tar.xz";
+      sha256 = "077l3x82dzfiysg2jmiw0r129b77bi9zlf8izlxnxm6icf39kc5l";
+      name = "kpublictransport-23.04.2.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kqtquickcharts-23.04.1.tar.xz";
-      sha256 = "0xmxz15f2w2xcr3821rkckwph6p59anak24lnc9khcg3qzlzszys";
-      name = "kqtquickcharts-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kqtquickcharts-23.04.2.tar.xz";
+      sha256 = "094ppmk0kzcfigcl71dzkaq8bmw7xgb6njn5dz37rzcd0mhnahdn";
+      name = "kqtquickcharts-23.04.2.tar.xz";
     };
   };
   krdc = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/krdc-23.04.1.tar.xz";
-      sha256 = "0yc8i595bw2bmmc9dy1vscnankrcx9h7k99v727w3gbwnm7yby0i";
-      name = "krdc-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/krdc-23.04.2.tar.xz";
+      sha256 = "170awyj15bbql1vx8wfymn0x52l368wl94hgbkhybydhdyf7g3jv";
+      name = "krdc-23.04.2.tar.xz";
     };
   };
   krecorder = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/krecorder-23.04.1.tar.xz";
-      sha256 = "177sj65i8vlkrkzfbd4rk2gsn6iqrrwiwlhr4p7r3sm0s8zsgg2h";
-      name = "krecorder-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/krecorder-23.04.2.tar.xz";
+      sha256 = "00wa8gqjfg2s27f1kkmm2mgfdx0myc9w3y4gww0dmj0xr422lj73";
+      name = "krecorder-23.04.2.tar.xz";
     };
   };
   kreversi = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kreversi-23.04.1.tar.xz";
-      sha256 = "0ipnz7bil5cqihk7pmig5bh0852yzbik7cawm78229bx434ihihj";
-      name = "kreversi-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kreversi-23.04.2.tar.xz";
+      sha256 = "0kd7z49qa9a9vvkyrq695vgvk3rg39cywdq66yj7q9jnf8i6cikl";
+      name = "kreversi-23.04.2.tar.xz";
     };
   };
   krfb = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/krfb-23.04.1.tar.xz";
-      sha256 = "0b8r00sfnly0raxqcw724fv9llim188s7k6k799g7ibirql9lgvg";
-      name = "krfb-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/krfb-23.04.2.tar.xz";
+      sha256 = "117g2dh0fxm74v69dxhriwjqi6p8vr38djrhy5i07930avjxgjv2";
+      name = "krfb-23.04.2.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kross-interpreters-23.04.1.tar.xz";
-      sha256 = "03s27hswcgxgmsjv26g2099az8i7hikdb9axf5kmmxlr0yshmfx5";
-      name = "kross-interpreters-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kross-interpreters-23.04.2.tar.xz";
+      sha256 = "06ai28vzp96f692ss03q6i3arfng4lryf763rdchdrdlfbid92w1";
+      name = "kross-interpreters-23.04.2.tar.xz";
     };
   };
   kruler = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kruler-23.04.1.tar.xz";
-      sha256 = "11npnymar2r2h1hij2yxxqbjcvxvf4l6a8sif4hx0n1svb0i4v0l";
-      name = "kruler-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kruler-23.04.2.tar.xz";
+      sha256 = "0j4dwg0rg9i0gcd4r7wq9lnlnjwdz8nmy9ipb9m7443n0qf6j96k";
+      name = "kruler-23.04.2.tar.xz";
     };
   };
   ksanecore = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/ksanecore-23.04.1.tar.xz";
-      sha256 = "13844jarjnsrc99hnh4mw5rkqivhwaqbhp2nb6j8wc0pr8sfs5lj";
-      name = "ksanecore-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/ksanecore-23.04.2.tar.xz";
+      sha256 = "1pk4cigdl5da9i4db4w62g5qapjiiw8jjbk49bgms9skdmmnrkxf";
+      name = "ksanecore-23.04.2.tar.xz";
     };
   };
   kshisen = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kshisen-23.04.1.tar.xz";
-      sha256 = "0xid1019gzjq0sdrh8shln6zxwyqciczwcng0ipj783fi2rsq7n9";
-      name = "kshisen-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kshisen-23.04.2.tar.xz";
+      sha256 = "07qf3lzwjrm8bldrwlx18iyrjn0jgyawxkiavf29mz2h8p4gfs85";
+      name = "kshisen-23.04.2.tar.xz";
     };
   };
   ksirk = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/ksirk-23.04.1.tar.xz";
-      sha256 = "1n02fw6ajdf1649pi246851y8hmx876jzz6624gidablk9715y2v";
-      name = "ksirk-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/ksirk-23.04.2.tar.xz";
+      sha256 = "10jr67c9npmr16nlpxvyqs5rzi8f09c3a9qdqmna5r6hsgz674cv";
+      name = "ksirk-23.04.2.tar.xz";
     };
   };
   ksmtp = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/ksmtp-23.04.1.tar.xz";
-      sha256 = "1x5w3p5acnhyiykrn8d8m27dp268nwrwziqjnmcac0s3irv8fl4q";
-      name = "ksmtp-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/ksmtp-23.04.2.tar.xz";
+      sha256 = "1mxyk2bm0hn282qw92wrp0hj82gkh9aqgp3i56iala9pg5gy3q10";
+      name = "ksmtp-23.04.2.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/ksnakeduel-23.04.1.tar.xz";
-      sha256 = "1hz0h4n470b8mj34jr7j5wjasbkmr46vxygszblc5cmfzj1vj4j6";
-      name = "ksnakeduel-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/ksnakeduel-23.04.2.tar.xz";
+      sha256 = "08il2vgrvvdi9plh9bs7p4bhnxnj4sa6ks8r1j3q2mg36hghsv53";
+      name = "ksnakeduel-23.04.2.tar.xz";
     };
   };
   kspaceduel = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kspaceduel-23.04.1.tar.xz";
-      sha256 = "1dlyil8w1ry6kn7wsf33fzq3jjylp6lrqvnycsr5rxzfgvgdf2rl";
-      name = "kspaceduel-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kspaceduel-23.04.2.tar.xz";
+      sha256 = "1rxdl8h2rbdg93nnr0rllk0laagb50ya37pyr4pkadms0gfl07nr";
+      name = "kspaceduel-23.04.2.tar.xz";
     };
   };
   ksquares = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/ksquares-23.04.1.tar.xz";
-      sha256 = "0gp5bnhz06c1v6xxw0fdab2kswwmlxlcwd33lhmp4iy9h610cmih";
-      name = "ksquares-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/ksquares-23.04.2.tar.xz";
+      sha256 = "1v7jgxz7g163ahcny7v3lnr6kn9blx75g7av13q1h64hclfldwl0";
+      name = "ksquares-23.04.2.tar.xz";
     };
   };
   ksudoku = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/ksudoku-23.04.1.tar.xz";
-      sha256 = "1rji3hhxxvcxjjndcnn2wfw2d51ypdwl22frgksn9b5962yndbyh";
-      name = "ksudoku-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/ksudoku-23.04.2.tar.xz";
+      sha256 = "069hz42chpff1a9fsi8d2ph6lryq371c625f73s4h4xxv3wqnixb";
+      name = "ksudoku-23.04.2.tar.xz";
     };
   };
   ksystemlog = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/ksystemlog-23.04.1.tar.xz";
-      sha256 = "1jpp0fklg1cn5m8pmch2lrzayijirsg07b3yg3kd73b4p17x5aqm";
-      name = "ksystemlog-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/ksystemlog-23.04.2.tar.xz";
+      sha256 = "12mgh8s3g82ar9jf58pxq22khbcz6j1ar0kyqwrr9m1fq0w0210h";
+      name = "ksystemlog-23.04.2.tar.xz";
     };
   };
   kteatime = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kteatime-23.04.1.tar.xz";
-      sha256 = "0iib2rcw42h6vdzb2l8s33qy618l9a3x05f10kzkw0wq8afvb20v";
-      name = "kteatime-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kteatime-23.04.2.tar.xz";
+      sha256 = "01140k8gabr4lkg3frr91bvckp825mnpzp05pbnfayds8g9x6vrv";
+      name = "kteatime-23.04.2.tar.xz";
     };
   };
   ktimer = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/ktimer-23.04.1.tar.xz";
-      sha256 = "15x88gp3y89iwmi01c20alr8nr164g96lr5xx3gs4rxq2jqa1yyg";
-      name = "ktimer-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/ktimer-23.04.2.tar.xz";
+      sha256 = "0icdjci7qw0fsmdx8hd96x1hd4vljwi6jmmjy3b4f50wm2lks66n";
+      name = "ktimer-23.04.2.tar.xz";
     };
   };
   ktnef = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/ktnef-23.04.1.tar.xz";
-      sha256 = "0mipghpbncr0pk30yv100y4d12gy513jvvbd5fs4s3xg622lnzib";
-      name = "ktnef-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/ktnef-23.04.2.tar.xz";
+      sha256 = "1s1nc6hgmwnmsllic0z6wxadgd3w1zq85skd51b7akxxmay7mlfs";
+      name = "ktnef-23.04.2.tar.xz";
     };
   };
   ktorrent = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/ktorrent-23.04.1.tar.xz";
-      sha256 = "1n156r080mxy7dxfixfc2zld9msqa1f4gy847dazisvag4cv73w4";
-      name = "ktorrent-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/ktorrent-23.04.2.tar.xz";
+      sha256 = "0vfhd0ahxxbg8rcvav4gr1f16v65hx40p0i923jbl8pmhxlla9r1";
+      name = "ktorrent-23.04.2.tar.xz";
     };
   };
   ktouch = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/ktouch-23.04.1.tar.xz";
-      sha256 = "1dawydacvmivqxffr24gp96n2fl8666fm3y1v0iw3wvs3qy2z8z4";
-      name = "ktouch-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/ktouch-23.04.2.tar.xz";
+      sha256 = "0vgm2vvw54wnb6qwqy4hiki7l3rinn486ci6b1y2db0s37p90y61";
+      name = "ktouch-23.04.2.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/ktp-accounts-kcm-23.04.1.tar.xz";
-      sha256 = "1d2386r1qfrpzkh9cakzwf131casdmygsn48kwra3ikxjk0zkqqy";
-      name = "ktp-accounts-kcm-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/ktp-accounts-kcm-23.04.2.tar.xz";
+      sha256 = "0zyv0sjjcanl800cfv1kf2j0fsrh8ikv8ma09rv93sqlbm0ls0m7";
+      name = "ktp-accounts-kcm-23.04.2.tar.xz";
     };
   };
   ktp-approver = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/ktp-approver-23.04.1.tar.xz";
-      sha256 = "10dj5ylw7z83c5ix9r8al64gkr1dwhac5zz84993pj69przp4ycr";
-      name = "ktp-approver-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/ktp-approver-23.04.2.tar.xz";
+      sha256 = "1bis9g1dcrs90jz977jav3bwm8g4cl8kjv4kz8bqzwf3zx8c72rf";
+      name = "ktp-approver-23.04.2.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/ktp-auth-handler-23.04.1.tar.xz";
-      sha256 = "1009d90aadli3hqwwjskaslk5z36i9i97z0qqpb8zcsd8a04jyj4";
-      name = "ktp-auth-handler-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/ktp-auth-handler-23.04.2.tar.xz";
+      sha256 = "04v5p0iy1i993ynz7c927acfz54w9345wz589d1yly1k847z73ny";
+      name = "ktp-auth-handler-23.04.2.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/ktp-call-ui-23.04.1.tar.xz";
-      sha256 = "03z0j5kf7bvcb2z8700f43c067y2awy24cypakla7r3n1syy81gd";
-      name = "ktp-call-ui-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/ktp-call-ui-23.04.2.tar.xz";
+      sha256 = "1acm6zqn64rn6x8i3fr6aw074s0652ciqag7gny60bf1hcbcgm2g";
+      name = "ktp-call-ui-23.04.2.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/ktp-common-internals-23.04.1.tar.xz";
-      sha256 = "13ndn88pk3jqnz90dqmh2zx0qbrcbfvgzww4pf122j7lpmigxyhk";
-      name = "ktp-common-internals-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/ktp-common-internals-23.04.2.tar.xz";
+      sha256 = "1k8b5si1f5y3l8rl7wg2lf0j21gpvzjicv4gxv918ilml984xbi4";
+      name = "ktp-common-internals-23.04.2.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/ktp-contact-list-23.04.1.tar.xz";
-      sha256 = "022d33v1h5pxmz1k8knvdfrfg6jqmfsxkvmi4c2xny1ink5857bv";
-      name = "ktp-contact-list-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/ktp-contact-list-23.04.2.tar.xz";
+      sha256 = "1gd7bsmdv8h8m3mjfizfxgpdh8lqsy70g9hgc2b4n0ihsa6jgf7m";
+      name = "ktp-contact-list-23.04.2.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/ktp-contact-runner-23.04.1.tar.xz";
-      sha256 = "0dgf68y0z53fz9h2mrhrijfn0c50f7z72d3p799rfm6kg2p83yx8";
-      name = "ktp-contact-runner-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/ktp-contact-runner-23.04.2.tar.xz";
+      sha256 = "0singwk6vq6b8jqsxfdd2prry5yrkrrklyma09ab6ibmwlx76qqc";
+      name = "ktp-contact-runner-23.04.2.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/ktp-desktop-applets-23.04.1.tar.xz";
-      sha256 = "0kp5r55gi88jgl9lpyi1bczrl1i6dpd4ry6923f4f0l5gv7pjhzh";
-      name = "ktp-desktop-applets-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/ktp-desktop-applets-23.04.2.tar.xz";
+      sha256 = "0hnpni0qj2f2i4dszjjp7g3wbp3xgn9n9yb0lw2k82yslji95gv3";
+      name = "ktp-desktop-applets-23.04.2.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/ktp-filetransfer-handler-23.04.1.tar.xz";
-      sha256 = "1jaflk4n56pz7x92906lpksl289dxpk6kik3ncr2dm4sc3131c2c";
-      name = "ktp-filetransfer-handler-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/ktp-filetransfer-handler-23.04.2.tar.xz";
+      sha256 = "07addbgl5r8pfx7vdkrhx96gfakgi2ff2751wnpqiy846g4v2myf";
+      name = "ktp-filetransfer-handler-23.04.2.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/ktp-kded-module-23.04.1.tar.xz";
-      sha256 = "133rz5ywpd090wgsg45ply21qf3i0vbgimf5zl9irllmjb9wkibp";
-      name = "ktp-kded-module-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/ktp-kded-module-23.04.2.tar.xz";
+      sha256 = "0j86r59cnfkrci5gkiqv0f9a8c9d9sw2lbbzxihyrnjph32wx3x5";
+      name = "ktp-kded-module-23.04.2.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/ktp-send-file-23.04.1.tar.xz";
-      sha256 = "048mjrj0gx4q9cxc5ysnccdag1bji020p838qc8ax8csqcj2znw6";
-      name = "ktp-send-file-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/ktp-send-file-23.04.2.tar.xz";
+      sha256 = "1s98bgz7lcqxk12s8gxzl2jscbr95wdsjh3wn9xc6nls4h9vl4pn";
+      name = "ktp-send-file-23.04.2.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/ktp-text-ui-23.04.1.tar.xz";
-      sha256 = "1nvj3c7kvd44w67nq74j2w0nh9idzmxfr8b67jv6m8zbm6yihj2h";
-      name = "ktp-text-ui-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/ktp-text-ui-23.04.2.tar.xz";
+      sha256 = "1nhsx9pw6plx4jxmw9qhf04dh89fvmbsv06f1zw3phcnfzii81c1";
+      name = "ktp-text-ui-23.04.2.tar.xz";
     };
   };
   ktrip = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/ktrip-23.04.1.tar.xz";
-      sha256 = "05gwhkcwp5mv0iqf8kp0xaikfc7zihqq729jjx7hgwhq30nkg2wm";
-      name = "ktrip-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/ktrip-23.04.2.tar.xz";
+      sha256 = "0npm3xhphd384pv0gyjh2w7ldvdaifzna70vxk5lw9xw6c9l2p7d";
+      name = "ktrip-23.04.2.tar.xz";
     };
   };
   ktuberling = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/ktuberling-23.04.1.tar.xz";
-      sha256 = "0rpb00ag2v8v7cy75vkb5silk84qiqzf6by8dm5fppzbpg4l690n";
-      name = "ktuberling-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/ktuberling-23.04.2.tar.xz";
+      sha256 = "0g9ipgipnpfsc20qvc1pgh9fba093rdmiv4jjmsmggk4k1yrshdh";
+      name = "ktuberling-23.04.2.tar.xz";
     };
   };
   kturtle = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kturtle-23.04.1.tar.xz";
-      sha256 = "0pd8560b5x8x2b760x2jljkz9sq54p2lgrfnsn1x67lh9a66yz8g";
-      name = "kturtle-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kturtle-23.04.2.tar.xz";
+      sha256 = "0l7gjdm306vn66xffg8vx884dv477sxpg4gamqfzbyrqzgmp1600";
+      name = "kturtle-23.04.2.tar.xz";
     };
   };
   kubrick = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kubrick-23.04.1.tar.xz";
-      sha256 = "18s35p7mf3ds3b53miyygix9yj60v6f715ji6lw1c736xv67cnwg";
-      name = "kubrick-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kubrick-23.04.2.tar.xz";
+      sha256 = "0rc23zyl639aj0vykhyr304msr7gbaiw3b1v1vvnnylwq89r5ynr";
+      name = "kubrick-23.04.2.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kwalletmanager-23.04.1.tar.xz";
-      sha256 = "0jrw4fyg2r4cfl0wfggxxm66xjdmjs5h79b1x60rd7sw8xxdw23h";
-      name = "kwalletmanager-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kwalletmanager-23.04.2.tar.xz";
+      sha256 = "00f1jlyscfp6y7dcdyrs2h4n7dfbdbl8cfl3r65c2d2qyxjp6i7h";
+      name = "kwalletmanager-23.04.2.tar.xz";
     };
   };
   kwave = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kwave-23.04.1.tar.xz";
-      sha256 = "19xfiyrp4ls8qsazm2csh05xg2rqbah1z57bplrfiw61kkn8g26x";
-      name = "kwave-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kwave-23.04.2.tar.xz";
+      sha256 = "0m8rq0x0hlaqwxwjcpqprnm708id4gmnj0vgdhyhl4xd9w52cn6b";
+      name = "kwave-23.04.2.tar.xz";
     };
   };
   kweather = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kweather-23.04.1.tar.xz";
-      sha256 = "1p16k0fjxyw2vc5sgcy6c940p841m0g8s44s6sr3lcyp2rbdhfra";
-      name = "kweather-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kweather-23.04.2.tar.xz";
+      sha256 = "1lcvr22igq5cryjgk53kp3xil3dn8ahag6hn20mha33cvakcapfk";
+      name = "kweather-23.04.2.tar.xz";
     };
   };
   kwordquiz = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/kwordquiz-23.04.1.tar.xz";
-      sha256 = "0b2iq844kcwz6cis5v63lvmd2cfkpqpb848va18c1l07bl61ilmr";
-      name = "kwordquiz-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/kwordquiz-23.04.2.tar.xz";
+      sha256 = "04hdn0x330zrqv37gg2ps7y7gb2d6xvj9lnrkbjv0h5r1vyskw5b";
+      name = "kwordquiz-23.04.2.tar.xz";
     };
   };
   libgravatar = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/libgravatar-23.04.1.tar.xz";
-      sha256 = "17bwsr7ia3rjiwxcs6b8vrxqm32h5hbw43xc2z0b27bf17x0f4cz";
-      name = "libgravatar-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/libgravatar-23.04.2.tar.xz";
+      sha256 = "13skhc3ndpw7ldanc4yxrvc004h4rsvrir6rr9xww5xwf397f03n";
+      name = "libgravatar-23.04.2.tar.xz";
     };
   };
   libkcddb = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/libkcddb-23.04.1.tar.xz";
-      sha256 = "0hp20s9jxxywj6722kr3ys2pv7f8v4qgdxbx3xpf513jyqdglfh9";
-      name = "libkcddb-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/libkcddb-23.04.2.tar.xz";
+      sha256 = "117k4wsdk2w6m1gwh1dkdzyc2yjp731pmwsca6nghyghdhdk57ai";
+      name = "libkcddb-23.04.2.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/libkcompactdisc-23.04.1.tar.xz";
-      sha256 = "0vg5nmxd2c6x4ii68ykff41ky4anzw3489zcv6r5p09zpyzrn5j8";
-      name = "libkcompactdisc-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/libkcompactdisc-23.04.2.tar.xz";
+      sha256 = "13smvqx8wswr7vwl0v2cp6xwb4gbyimbmzlyvi5qlyrs7wrmzc93";
+      name = "libkcompactdisc-23.04.2.tar.xz";
     };
   };
   libkdcraw = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/libkdcraw-23.04.1.tar.xz";
-      sha256 = "008pwmyi7p92qfqa8f9v4app3vbq28agdrb6clx8pzs3hj01p9hl";
-      name = "libkdcraw-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/libkdcraw-23.04.2.tar.xz";
+      sha256 = "0sgcjvibciyhmp4jvrgys40qijjzxshq9c4m79faad15sk091mr5";
+      name = "libkdcraw-23.04.2.tar.xz";
     };
   };
   libkdegames = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/libkdegames-23.04.1.tar.xz";
-      sha256 = "0q9fg90f2d6108ai2fgnvv9viqjawpzbrk98iiya6qidl9syr2w9";
-      name = "libkdegames-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/libkdegames-23.04.2.tar.xz";
+      sha256 = "14r5ccgmswqfp2hqifqr79cxjah9q6q45hybvcq0z615fd933v05";
+      name = "libkdegames-23.04.2.tar.xz";
     };
   };
   libkdepim = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/libkdepim-23.04.1.tar.xz";
-      sha256 = "0a5fv8bnjswx5mfr7a70ipmzrhzzzr43dfmk5kls2jf54854lr6h";
-      name = "libkdepim-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/libkdepim-23.04.2.tar.xz";
+      sha256 = "0321vcnl48bjggqnhsrgddffafc7nrz9v9l4zwlbl90girynpi8i";
+      name = "libkdepim-23.04.2.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/libkeduvocdocument-23.04.1.tar.xz";
-      sha256 = "1bzh0scr51xfiifgx42ywbb5sm653myqw5k9jgczw7jjlqmww8mf";
-      name = "libkeduvocdocument-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/libkeduvocdocument-23.04.2.tar.xz";
+      sha256 = "0j832wnsy0wqx0jzrcmglyjk848dvldk9q3fvhm065bmgxmf034w";
+      name = "libkeduvocdocument-23.04.2.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/libkexiv2-23.04.1.tar.xz";
-      sha256 = "0xg236xgdpr9dh82za37a4migs4pim2798hgraqb78xf1q74259s";
-      name = "libkexiv2-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/libkexiv2-23.04.2.tar.xz";
+      sha256 = "0108i2rkdmfgf9mkrmz6q1apjz9235nrvl8j70zf776z5y86bq64";
+      name = "libkexiv2-23.04.2.tar.xz";
     };
   };
   libkgapi = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/libkgapi-23.04.1.tar.xz";
-      sha256 = "10gqvi9bq55sfv5z2a2bqbjchs72xdxhrbqc52gzzyxqyy7w006x";
-      name = "libkgapi-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/libkgapi-23.04.2.tar.xz";
+      sha256 = "0mlq7s08a1s6szvgrbwafw9ch3rh1gjczsnacz4wagkmbpk8dv8l";
+      name = "libkgapi-23.04.2.tar.xz";
     };
   };
   libkipi = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/libkipi-23.04.1.tar.xz";
-      sha256 = "15hly8gcvja7g1wyhmlz1rkfy9vb5sncklppvh5vijycpg5183vb";
-      name = "libkipi-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/libkipi-23.04.2.tar.xz";
+      sha256 = "0bsjlrghmsln5pgw381xpphbwi70f4h624whvcr2wns64l8nnzwq";
+      name = "libkipi-23.04.2.tar.xz";
     };
   };
   libkleo = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/libkleo-23.04.1.tar.xz";
-      sha256 = "16c4dmlqbxkbs8w855s95hggi559y5g7niw2fc8hw0iry9f3j7xm";
-      name = "libkleo-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/libkleo-23.04.2.tar.xz";
+      sha256 = "1id48i7zgfpn1jhx4fzz3nq1cg9lxc9d1f6jf9rwhbjwfxh8siqv";
+      name = "libkleo-23.04.2.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/libkmahjongg-23.04.1.tar.xz";
-      sha256 = "1624sqwbqsvwdsz5rglbjp4p25xl7im02hgdqmq758r2yrwcrvdw";
-      name = "libkmahjongg-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/libkmahjongg-23.04.2.tar.xz";
+      sha256 = "19x1a3m202vf6r5v8dmv3vybp6411gclz1lpwv6cfd5lnz3h5rlq";
+      name = "libkmahjongg-23.04.2.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/libkomparediff2-23.04.1.tar.xz";
-      sha256 = "1w4bk4an4jcirn37w12yjgfm7yv3p5g39qhhnh9afw7j5ilwif5h";
-      name = "libkomparediff2-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/libkomparediff2-23.04.2.tar.xz";
+      sha256 = "1459v0f8fb8chz11lvj9y899kxny3s3lyq2i6k7ikv4m1v0rb1cm";
+      name = "libkomparediff2-23.04.2.tar.xz";
     };
   };
   libksane = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/libksane-23.04.1.tar.xz";
-      sha256 = "1zx1kskj624cad1qgk35q8kbkav59xrnxcfkw6dixciznadxpbxf";
-      name = "libksane-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/libksane-23.04.2.tar.xz";
+      sha256 = "1xv67y6fnqjrphjkmwr3qc1wi2dd5pciwh9rgybdw26y2k2lyx20";
+      name = "libksane-23.04.2.tar.xz";
     };
   };
   libksieve = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/libksieve-23.04.1.tar.xz";
-      sha256 = "1f91vs0wn32a38qmlf55d0jsgxpszpw233g1zdy1z1samk7yx9n4";
-      name = "libksieve-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/libksieve-23.04.2.tar.xz";
+      sha256 = "119b0xy5j2lgkrg9bdvbs635b5s5vvi3qmbq0jzsalg8m7mhw7yr";
+      name = "libksieve-23.04.2.tar.xz";
     };
   };
   libktorrent = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/libktorrent-23.04.1.tar.xz";
-      sha256 = "1kim80vxar57q4zwm6jbik3bh3pq6ndlaxn1ilnnnb1rchl1bjv3";
-      name = "libktorrent-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/libktorrent-23.04.2.tar.xz";
+      sha256 = "04hnh659rcabjy9f34dx841ybm1b7k1gxca8jn2jcj21fvp78x4y";
+      name = "libktorrent-23.04.2.tar.xz";
     };
   };
   lokalize = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/lokalize-23.04.1.tar.xz";
-      sha256 = "1a7w1vm3mf5wdsq76h8br42a8h11d2hpkxsvnv98lzkxv56rb5dz";
-      name = "lokalize-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/lokalize-23.04.2.tar.xz";
+      sha256 = "044v4h60r88gwwl23nd5ys2rfryds9zczvqzkdcigyccnmvdcc31";
+      name = "lokalize-23.04.2.tar.xz";
     };
   };
   lskat = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/lskat-23.04.1.tar.xz";
-      sha256 = "1p36gmhv9whxn01ia3fip269qibpi75qq0nrs402pq1hz4kh3433";
-      name = "lskat-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/lskat-23.04.2.tar.xz";
+      sha256 = "084p1mqzjvc56jv6gzjq9mz0kxycxd4bpi7fz3qqys43043xh2jj";
+      name = "lskat-23.04.2.tar.xz";
     };
   };
   mailcommon = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/mailcommon-23.04.1.tar.xz";
-      sha256 = "0xypbxknbwivdfnd7315n5dyp1n6yc4lbbkqw2kxxm0k8db8v8qd";
-      name = "mailcommon-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/mailcommon-23.04.2.tar.xz";
+      sha256 = "0mq8wkb44z8wma3ils03dlv9jch7gcj96wsbkrk6vsmsbrrq49fh";
+      name = "mailcommon-23.04.2.tar.xz";
     };
   };
   mailimporter = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/mailimporter-23.04.1.tar.xz";
-      sha256 = "0p0plgzlzv5khxc4vwq94xmsq02djwp81wdbvphmamfg6nmkqsb8";
-      name = "mailimporter-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/mailimporter-23.04.2.tar.xz";
+      sha256 = "0xg7mkgzdzyh2b9wxnb70wn00f2b0adivr1y5lpy7kxk4vkrkrdk";
+      name = "mailimporter-23.04.2.tar.xz";
     };
   };
   marble = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/marble-23.04.1.tar.xz";
-      sha256 = "1lll89zy8cnbb48vvbg31z03ixxwrh5af9wisd3gvh9awy9if7nl";
-      name = "marble-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/marble-23.04.2.tar.xz";
+      sha256 = "16x0knvwd6s9xyjfynrg5fmd3rkvcv7m70bygxrfqwbcvd9qq79v";
+      name = "marble-23.04.2.tar.xz";
     };
   };
   markdownpart = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/markdownpart-23.04.1.tar.xz";
-      sha256 = "1r8qrq7i0rnl8z3g9j53cqq6r83ybr389vr4m2arprc8c7lkfv3y";
-      name = "markdownpart-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/markdownpart-23.04.2.tar.xz";
+      sha256 = "00yhdkc43x2v5kwb50k1k61cl8bin908mpxqb7xn716a03rhj3pw";
+      name = "markdownpart-23.04.2.tar.xz";
     };
   };
   mbox-importer = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/mbox-importer-23.04.1.tar.xz";
-      sha256 = "08pih979gwz7bmas9c652apjriqib0kajxfdv7563wwm56fh0yyb";
-      name = "mbox-importer-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/mbox-importer-23.04.2.tar.xz";
+      sha256 = "1wq37bim4aj3bs7w78iwfbkz5hgsbzfv703723nbigx4sqrwp4pc";
+      name = "mbox-importer-23.04.2.tar.xz";
     };
   };
   messagelib = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/messagelib-23.04.1.tar.xz";
-      sha256 = "1cgvr23p2iwnllbk1a951sv5kl9dv5dqj63xwv4accply7602zib";
-      name = "messagelib-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/messagelib-23.04.2.tar.xz";
+      sha256 = "13nq2kprckw4czmkjbkcyjzshlv9qwvzychbnfcv9i61pvkcr7wv";
+      name = "messagelib-23.04.2.tar.xz";
     };
   };
   minuet = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/minuet-23.04.1.tar.xz";
-      sha256 = "07s6ncs1b4a27djv3qh6dd424rzvfmpmiq9465nlr4jkc2hy5kj8";
-      name = "minuet-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/minuet-23.04.2.tar.xz";
+      sha256 = "0515kjmff2vq23mlr6w9w727rxm68sgjx5f7qn0nh9x7rmpd5yqz";
+      name = "minuet-23.04.2.tar.xz";
     };
   };
   neochat = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/neochat-23.04.1.tar.xz";
-      sha256 = "1ym5q7gy6h86m50ikn1bdnpcqiaghpw285cgic5h71qdw2jbs067";
-      name = "neochat-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/neochat-23.04.2.tar.xz";
+      sha256 = "0q09mw9b04krwls2mz5xnxjxm8lg5gdd5zyigy0kkpxpl5gfs8pl";
+      name = "neochat-23.04.2.tar.xz";
     };
   };
   okular = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/okular-23.04.1.tar.xz";
-      sha256 = "1dqxkhqd6ih9rmb69yvpvw9yivw5i2vsh6h7ccqwb6jxd7w71i0w";
-      name = "okular-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/okular-23.04.2.tar.xz";
+      sha256 = "09d8mcs3lr0638h0slrhi5njrk4jdfy6n6x222pwlzf4f6zg51jz";
+      name = "okular-23.04.2.tar.xz";
     };
   };
   palapeli = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/palapeli-23.04.1.tar.xz";
-      sha256 = "0adj99yas78jkzacyxaafqbzl7fn4jb9ryjsanx00y02l9hz8fs0";
-      name = "palapeli-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/palapeli-23.04.2.tar.xz";
+      sha256 = "0sm4rysv3m10sm4yz7cd4f9f8n0vrff94b53bxv3b3j6zffg323x";
+      name = "palapeli-23.04.2.tar.xz";
     };
   };
   parley = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/parley-23.04.1.tar.xz";
-      sha256 = "0lfx5akl1y7na3jyi94hgshv932amk9pgbl0v3hnd8vsfza3xqan";
-      name = "parley-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/parley-23.04.2.tar.xz";
+      sha256 = "1k92lb953h375qgdjb1ybazf50qgzy6bhjnc8rqv3rpvm8qx9rpf";
+      name = "parley-23.04.2.tar.xz";
     };
   };
   partitionmanager = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/partitionmanager-23.04.1.tar.xz";
-      sha256 = "0prj4p56dc95f25msqibgi0g8rg0n9vq60hb3k5388490gyzmiw8";
-      name = "partitionmanager-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/partitionmanager-23.04.2.tar.xz";
+      sha256 = "1v7wl6w49ihnvk9yq0yvjy5ypjggg5h9fcvqzy5qxfmra4s05aji";
+      name = "partitionmanager-23.04.2.tar.xz";
     };
   };
   picmi = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/picmi-23.04.1.tar.xz";
-      sha256 = "0c8axjwv6bd04adm64iazy23hpxfv1rq3lnqbarzrr54wfhvaqcf";
-      name = "picmi-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/picmi-23.04.2.tar.xz";
+      sha256 = "0hns60wircykckabwlyfrcws7a5aa61s8xw0iaiqvfhxrq52q404";
+      name = "picmi-23.04.2.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/pim-data-exporter-23.04.1.tar.xz";
-      sha256 = "1i367m1n7l7xxp9yk6dcjzhdizl54qamba4mw75nrn97dq59fcdk";
-      name = "pim-data-exporter-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/pim-data-exporter-23.04.2.tar.xz";
+      sha256 = "0j9wz2kawjhpg35p9s8mdcycm93kmqp3pd182ic78nl0jq02xgx4";
+      name = "pim-data-exporter-23.04.2.tar.xz";
     };
   };
   pim-sieve-editor = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/pim-sieve-editor-23.04.1.tar.xz";
-      sha256 = "02kmfd97k70wcg967zwvli8fz2pp9i34mjdgj59as0mnmzq9crzc";
-      name = "pim-sieve-editor-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/pim-sieve-editor-23.04.2.tar.xz";
+      sha256 = "0ib1pxwv5ir7gkg3415kyfp84cd7rfl1q66b8wssrl9b2ik0fz6m";
+      name = "pim-sieve-editor-23.04.2.tar.xz";
     };
   };
   pimcommon = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/pimcommon-23.04.1.tar.xz";
-      sha256 = "1lrabkiqqm4g46w1awqll5a0sikhm318i14aszxpiy1vn8kqn12k";
-      name = "pimcommon-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/pimcommon-23.04.2.tar.xz";
+      sha256 = "1vrb6ljfbn056iajnfksisbcvrf9lnvj4rz5fmdfbdcm017mids4";
+      name = "pimcommon-23.04.2.tar.xz";
     };
   };
   plasmatube = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/plasmatube-23.04.1.tar.xz";
-      sha256 = "0c69909my3a7pgvv5vh1c1l57cymvs937lsf0xj3s0ab4bkdkmh2";
-      name = "plasmatube-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/plasmatube-23.04.2.tar.xz";
+      sha256 = "1hcaiynwpya4x7j8cwr6lliph9pv0g1n0sr8wykl97dxmafd8hx0";
+      name = "plasmatube-23.04.2.tar.xz";
     };
   };
   poxml = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/poxml-23.04.1.tar.xz";
-      sha256 = "17jhv0n5mr56ghcdhc6a5qhpxx18c4gkr04nn7qv6c5hr0djfd72";
-      name = "poxml-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/poxml-23.04.2.tar.xz";
+      sha256 = "1b8gj4i9h8pk9rff7sc208n2jfyz696n0wyq72xa929xcf2s6nl5";
+      name = "poxml-23.04.2.tar.xz";
     };
   };
   print-manager = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/print-manager-23.04.1.tar.xz";
-      sha256 = "1xqvslqsqn39hdmw2dyfs7nd5n57zb3xas5lwbqf5na3zswl5h60";
-      name = "print-manager-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/print-manager-23.04.2.tar.xz";
+      sha256 = "02pcgk39vjcs47lxha72w19bq6lsw26x16cm511m8367ak3mnisn";
+      name = "print-manager-23.04.2.tar.xz";
     };
   };
   qmlkonsole = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/qmlkonsole-23.04.1.tar.xz";
-      sha256 = "1n01xikav041wwcgqq3g9i1k5xfqjafk54jfn68lkn00ykrbh2bi";
-      name = "qmlkonsole-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/qmlkonsole-23.04.2.tar.xz";
+      sha256 = "010z6k5h1mlxxk6wy2kvhhkp28iy0lh6nfja21fsby5dly4cl9dz";
+      name = "qmlkonsole-23.04.2.tar.xz";
     };
   };
   rocs = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/rocs-23.04.1.tar.xz";
-      sha256 = "0g2zwhjkjbl8hj9bm8k5xglmcxb87nw04c2hiznh43s5l4clm7sb";
-      name = "rocs-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/rocs-23.04.2.tar.xz";
+      sha256 = "0s1ggzcsps66035innf1cpcszh4aj8ivhw7w1bkddmnwi7h3369h";
+      name = "rocs-23.04.2.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/signon-kwallet-extension-23.04.1.tar.xz";
-      sha256 = "03bzb4h1dwbkcs1k09w2gj2ddklplgnamhyrdczn69qrk3qyx73r";
-      name = "signon-kwallet-extension-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/signon-kwallet-extension-23.04.2.tar.xz";
+      sha256 = "15na2x7n0zvmi991rc94ddcyczihdr7jrl5vrjb91wxc9sgkyyyj";
+      name = "signon-kwallet-extension-23.04.2.tar.xz";
     };
   };
   skanlite = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/skanlite-23.04.1.tar.xz";
-      sha256 = "0vng8vfk2vfccqqhpw2j16f6dd1wpln4pizrw1hzrvrwfga7aaz6";
-      name = "skanlite-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/skanlite-23.04.2.tar.xz";
+      sha256 = "18faqsn3h8km1py4ixxi33ip4r895y2ac75swz4yyy8zya3y0x3l";
+      name = "skanlite-23.04.2.tar.xz";
     };
   };
   skanpage = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/skanpage-23.04.1.tar.xz";
-      sha256 = "1zc52n24f9c9wyh8ndh4l7y7a1nh2fqi8gi97y0a6q32pkwbnshi";
-      name = "skanpage-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/skanpage-23.04.2.tar.xz";
+      sha256 = "0y4j3s0qsw27lg1544fb4fhsync0ac86dnmrlzqpk4px9dax9516";
+      name = "skanpage-23.04.2.tar.xz";
     };
   };
   spectacle = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/spectacle-23.04.1.tar.xz";
-      sha256 = "0kc24wxsr1q1clzjssqi36afdsbqdl3fcvw2plnaald4cr1jwk06";
-      name = "spectacle-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/spectacle-23.04.2.tar.xz";
+      sha256 = "0ncn62j5v5bpnq49dcpj754qg2i780jayap1fw5jgj3arxrg72r7";
+      name = "spectacle-23.04.2.tar.xz";
     };
   };
   step = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/step-23.04.1.tar.xz";
-      sha256 = "1gcfrk33d3101l8ib9fk121wi8bhj0hgd9w3r8l4nj6s5gx5nj9f";
-      name = "step-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/step-23.04.2.tar.xz";
+      sha256 = "0sbcmif596k9mxy9kmalj1vbaxkmxy7cmv5lizvf7npi8p41944c";
+      name = "step-23.04.2.tar.xz";
     };
   };
   svgpart = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/svgpart-23.04.1.tar.xz";
-      sha256 = "1d31sd00ffjrbsfnmylcr69w84nzag31h65kpjhbymm23mvyl1w1";
-      name = "svgpart-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/svgpart-23.04.2.tar.xz";
+      sha256 = "0jbnywjlq43nw17mgivzwswm9h7vd92zy4xxcwcq4ba40b3q0g69";
+      name = "svgpart-23.04.2.tar.xz";
     };
   };
   sweeper = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/sweeper-23.04.1.tar.xz";
-      sha256 = "1bg573plp9h8lfx65vbwwv3v7hypd9p43v2ivpvlkkvkhgzggigh";
-      name = "sweeper-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/sweeper-23.04.2.tar.xz";
+      sha256 = "0pccqybn382gavv7wngdran11pqzirw6aa45mxq1jbaa79vnz39c";
+      name = "sweeper-23.04.2.tar.xz";
     };
   };
   telly-skout = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/telly-skout-23.04.1.tar.xz";
-      sha256 = "0638bxqdwd2hchz4jfxg7cp5k35sqq5yjh0w4qn0335g0dakcarq";
-      name = "telly-skout-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/telly-skout-23.04.2.tar.xz";
+      sha256 = "07b0vq7l9xq74zmym28lhzvqgmx570ph9wwigijcls714ycskinb";
+      name = "telly-skout-23.04.2.tar.xz";
     };
   };
   tokodon = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/tokodon-23.04.1.tar.xz";
-      sha256 = "1v4h0zfafsgirkvvqdsmz63kbds68s1m6y1695qk48ld620p9qc1";
-      name = "tokodon-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/tokodon-23.04.2.tar.xz";
+      sha256 = "1bv292qzsr4bylwkc0hj3jjdc0qlvb25jyrlngmy36ad9p64zz6c";
+      name = "tokodon-23.04.2.tar.xz";
     };
   };
   umbrello = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/umbrello-23.04.1.tar.xz";
-      sha256 = "16ccl3cx66gmcc4kvfhwnjmxdvdwkwmkb28jzmda1jfx408hasnw";
-      name = "umbrello-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/umbrello-23.04.2.tar.xz";
+      sha256 = "007vnyh3yawimwy5z9xvqqxwv4y2j9gp50hz6909zdvz6h8k2r1f";
+      name = "umbrello-23.04.2.tar.xz";
     };
   };
   yakuake = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/yakuake-23.04.1.tar.xz";
-      sha256 = "08fx90f46vsn2s1zr6g78fnd7cqpqjshb87i4i9401g0l73f5dw9";
-      name = "yakuake-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/yakuake-23.04.2.tar.xz";
+      sha256 = "1r0s16zjlcjrb0y3m4pgrxan2g99k6pciwnajl8x2bfx8wcr6418";
+      name = "yakuake-23.04.2.tar.xz";
     };
   };
   zanshin = {
-    version = "23.04.1";
+    version = "23.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/23.04.1/src/zanshin-23.04.1.tar.xz";
-      sha256 = "08a1mbrw1rr774s57i44b0x0flw27hj8g1qvnva96rpyab7zzrbi";
-      name = "zanshin-23.04.1.tar.xz";
+      url = "${mirror}/stable/release-service/23.04.2/src/zanshin-23.04.2.tar.xz";
+      sha256 = "0lp86i94vynflvn6ifzrnbap6kmn4a6ydrxqz73m2y8rgsbxx0sm";
+      name = "zanshin-23.04.2.tar.xz";
     };
   };
 }