From 0c4ceee4e4ac4e28c6a4fdce2bdd770806d44b51 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Sat, 13 Jul 2024 16:14:04 -0700
Subject: [PATCH 01/52] build2: 0.16.0 -> 0.17.0

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

diff --git a/pkgs/development/tools/build-managers/build2/default.nix b/pkgs/development/tools/build-managers/build2/default.nix
index bbe1739392fe..c420bd8c7320 100644
--- a/pkgs/development/tools/build-managers/build2/default.nix
+++ b/pkgs/development/tools/build-managers/build2/default.nix
@@ -17,7 +17,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "build2";
-  version = "0.16.0";
+  version = "0.17.0";
 
   outputs = [ "out" "dev" "doc" "man" ];
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://pkg.cppget.org/1/alpha/build2/build2-${version}.tar.gz";
-    hash = "sha256-ZK4+UACsAs51bC1dE0sIxmCiHlH3pYGPWJNsl61oSOY=";
+    hash = "sha256-Kx5X/GV3GjFSbjo1mzteiHnnm4mr6+NAKIR/mEE+IdA=";
   };
 
   patches = [

From 07524c2f27f8f3f13b42dc9b4e27e17fda447b5f Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Sat, 13 Jul 2024 16:14:56 -0700
Subject: [PATCH 02/52] libbutl: 0.16.0 -> 0.17.0

Changelog: https://git.build2.org/cgit/libbutl/log
---
 pkgs/development/libraries/libbutl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libbutl/default.nix b/pkgs/development/libraries/libbutl/default.nix
index aee951a51d6c..65fe845ff25a 100644
--- a/pkgs/development/libraries/libbutl/default.nix
+++ b/pkgs/development/libraries/libbutl/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libbutl";
-  version = "0.16.0";
+  version = "0.17.0";
 
   outputs = [ "out" "dev" "doc" ];
 
   src = fetchurl {
     url = "https://pkg.cppget.org/1/alpha/build2/libbutl-${version}.tar.gz";
-    hash = "sha256-MGL6P/lG2sJdJXZiTcDvdy4jmU+2jYHsvaX4eEO9J2g=";
+    hash = "sha256-sFqaEf6s2rF1YcZjw5J6oY5ol5PbO9vy6NseKjrvTvs=";
   };
 
   nativeBuildInputs = [

From 4fa15953375ca4dcafe76b4447ae50abfeec42d8 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Sat, 13 Jul 2024 16:15:18 -0700
Subject: [PATCH 03/52] bpkg: 0.16.0 -> 0.17.0

Changelog: https://git.build2.org/cgit/bpkg/tree/NEWS
---
 pkgs/development/tools/build-managers/build2/bpkg.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/build2/bpkg.nix b/pkgs/development/tools/build-managers/build2/bpkg.nix
index e395322df420..e4d212858690 100644
--- a/pkgs/development/tools/build-managers/build2/bpkg.nix
+++ b/pkgs/development/tools/build-managers/build2/bpkg.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "bpkg";
-  version = "0.16.0";
+  version = "0.17.0";
 
   outputs = [ "out" "doc" "man" ];
 
   src = fetchurl {
     url = "https://pkg.cppget.org/1/alpha/build2/bpkg-${version}.tar.gz";
-    hash = "sha256-sxzVidVL8dpoH82IevcwjcIWj4LQzliGv9zasTYqeok=";
+    hash = "sha256-Yw6wvTqO+VfCo91B2BUT0A8OIN0MVhGK1USYM7hgGMs=";
   };
 
   strictDeps = true;

From 692a94157c825ba69518aea04a972811664bf84c Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Sat, 13 Jul 2024 16:15:29 -0700
Subject: [PATCH 04/52] bdep: 0.16.0 -> 0.17.0

Changelog: https://git.build2.org/cgit/bdep/tree/NEWS
---
 pkgs/development/tools/build-managers/build2/bdep.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/build2/bdep.nix b/pkgs/development/tools/build-managers/build2/bdep.nix
index 90a58e4f1b51..a1a77db45e1b 100644
--- a/pkgs/development/tools/build-managers/build2/bdep.nix
+++ b/pkgs/development/tools/build-managers/build2/bdep.nix
@@ -11,12 +11,12 @@
 
 stdenv.mkDerivation rec {
   pname = "bdep";
-  version = "0.16.0";
+  version = "0.17.0";
 
   outputs = [ "out" "doc" "man" ];
   src = fetchurl {
     url = "https://pkg.cppget.org/1/alpha/build2/bdep-${version}.tar.gz";
-    hash = "sha256-5w8Ng8TS8g+Nkbixn5txg4FGi57TSfc6ii+2wh8apCo=";
+    hash = "sha256-+2Hl5kanxWJmOpfePAvvSBSmG3kZLQv/kYIkT4J+kaQ=";
   };
 
   strictDeps = true;

From 46d4396c678cb66e7f5bf1afa18b99a76045fd83 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Sat, 13 Jul 2024 16:15:50 -0700
Subject: [PATCH 05/52] libodb: 2.5.0-b.25 -> 2.5.0-b.27

Changelog: https://git.codesynthesis.com/cgit/odb/libodb/tree/NEWS
---
 pkgs/development/libraries/libodb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libodb/default.nix b/pkgs/development/libraries/libodb/default.nix
index c016fc657d6f..b83e4d5c6816 100644
--- a/pkgs/development/libraries/libodb/default.nix
+++ b/pkgs/development/libraries/libodb/default.nix
@@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "libodb";
-  version = "2.5.0-b.25";
+  version = "2.5.0-b.27";
 
   outputs = [ "out" "dev" "doc" ];
 
   src = fetchurl {
     url = "https://pkg.cppget.org/1/beta/odb/libodb-${version}.tar.gz";
-    hash = "sha256-G634kVRbgwfBmIh8QqUclr/xvY3o0ouVmp/jxJrHzcs=";
+    hash = "sha256-04Et/wHYsWvJPLlcL0J2iOPV2SBFC6J32EleGw38K2Q=";
   };
 
   nativeBuildInputs = [ build2 ];

From 428fd4f85bd3e64b2f829b912517ceb2db544f58 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Sat, 13 Jul 2024 16:15:57 -0700
Subject: [PATCH 06/52] libodb-sqlite: 2.5.0-b.25 -> 2.5.0-b.27

Changelog: https://git.codesynthesis.com/cgit/odb/libodb-sqlite/tree/NEWS
---
 pkgs/development/libraries/libodb-sqlite/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libodb-sqlite/default.nix b/pkgs/development/libraries/libodb-sqlite/default.nix
index 9ac1153deee2..547ff807d441 100644
--- a/pkgs/development/libraries/libodb-sqlite/default.nix
+++ b/pkgs/development/libraries/libodb-sqlite/default.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "libodb-sqlite";
-  version = "2.5.0-b.25";
+  version = "2.5.0-b.27";
 
   outputs = [ "out" "dev" "doc" ];
 
   src = fetchurl {
     url = "https://pkg.cppget.org/1/beta/odb/libodb-sqlite-${version}.tar.gz";
-    hash = "sha256-Ko40WZErbL77B4eoJ5FFko/gTFYhADGlBzxPLuy8Wqc=";
+    hash = "sha256-jpxtY/VMkh88IzqGYgedu5TZGVIbPpy/FZNvUaOMf+w=";
   };
 
   nativeBuildInputs = [

From f01d2608de02fb7d1213d386259b0e3332248c1a Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Sat, 13 Jul 2024 16:16:17 -0700
Subject: [PATCH 07/52] libbpkg: 0.16.0 -> 0.17.0

Changelog: https://git.build2.org/cgit/libbpkg/log
---
 pkgs/development/libraries/libbpkg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libbpkg/default.nix b/pkgs/development/libraries/libbpkg/default.nix
index 6315b5df0f05..969654b675a2 100644
--- a/pkgs/development/libraries/libbpkg/default.nix
+++ b/pkgs/development/libraries/libbpkg/default.nix
@@ -8,12 +8,12 @@
 
 stdenv.mkDerivation rec {
   pname = "libbpkg";
-  version = "0.16.0";
+  version = "0.17.0";
   outputs = [ "out" "dev" "doc" ];
 
   src = fetchurl {
     url = "https://pkg.cppget.org/1/alpha/build2/libbpkg-${version}.tar.gz";
-    hash = "sha256-h3Stt1n1057ASf3n16plr5cNGIKOjHiiuOfqrcCJ5tA=";
+    hash = "sha256-4P4+uJGWB3iblYPuErJNr8c7/pS2UhN6LXr7MY2rWDY=";
   };
 
   nativeBuildInputs = [

From feb1211f0a3a68ef8254f064033417a9d6d11318 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Sat, 13 Jul 2024 16:22:38 -0700
Subject: [PATCH 08/52] build2.bootstrap: 0.16.0 -> 0.17.0

---
 pkgs/development/tools/build-managers/build2/bootstrap.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/build2/bootstrap.nix b/pkgs/development/tools/build-managers/build2/bootstrap.nix
index 0e1297506d4a..c06be28e462a 100644
--- a/pkgs/development/tools/build-managers/build2/bootstrap.nix
+++ b/pkgs/development/tools/build-managers/build2/bootstrap.nix
@@ -6,10 +6,10 @@
 }:
 stdenv.mkDerivation rec {
   pname = "build2-bootstrap";
-  version = "0.16.0";
+  version = "0.17.0";
   src = fetchurl {
     url = "https://download.build2.org/${version}/build2-toolchain-${version}.tar.xz";
-    hash = "sha256-I3k/aCoXsdlcgLvYSSRHNe1Zo+JzYVKapIZdJ3b/itw=";
+    hash = "sha256-NyKonqht90JTnQ+Ru0Qp/Ua79mhVOjUHgKY0EbZIv10=";
   };
   patches = [
     # Pick up sysdirs from NIX_LDFLAGS

From 5bc31cf591df699233e3f41c51e4a7f20ef65cbe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 22 Aug 2024 19:19:05 +0000
Subject: [PATCH 09/52] tidb: 8.1.0 -> 8.3.0

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

diff --git a/pkgs/servers/tidb/default.nix b/pkgs/servers/tidb/default.nix
index c5da10baaa3c..3c251dacb7d2 100644
--- a/pkgs/servers/tidb/default.nix
+++ b/pkgs/servers/tidb/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "tidb";
-  version = "8.1.0";
+  version = "8.3.0";
 
   src = fetchFromGitHub {
     owner = "pingcap";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-i8soETbTWmFZQqKYcRoLXVIgFCQxHDvXZbJNjDmS8Jo=";
+    sha256 = "sha256-dlLT1vwRZ6vbfCRcMxevJQ99T2Aq4qaAVwitmcd9yJ4=";
   };
 
-  vendorHash = "sha256-RNYL5tb6d8NhNiOm3x8sgo1SEc8+uMdWgYor/VL3C6s=";
+  vendorHash = "sha256-NZv4DrPygSNCcK0A7VTGz0wIuHSR+Tf5Dhf5JuqiQ5A=";
 
   ldflags = [
     "-X github.com/pingcap/tidb/pkg/parser/mysql.TiDBReleaseVersion=${version}"

From 20291241fdb8fd44961d44f6df51929b507d1fe3 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Tue, 3 Sep 2024 10:37:37 +0200
Subject: [PATCH 10/52] wstunnel: the ping frequency can now also be configured
 for the server

See: https://github.com/erebe/wstunnel/pull/338
---
 nixos/modules/services/networking/wstunnel.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/networking/wstunnel.nix b/nixos/modules/services/networking/wstunnel.nix
index 941e3e7366de..c05e00809357 100644
--- a/nixos/modules/services/networking/wstunnel.nix
+++ b/nixos/modules/services/networking/wstunnel.nix
@@ -48,6 +48,13 @@ let
       };
     };
 
+    # The original argument name `websocketPingFrequency` is a misnomer, as the frequency is the inverse of the interval.
+    websocketPingInterval = lib.mkOption {
+      description = "Frequency at which the client will send websocket ping to the server.";
+      type = lib.types.nullOr lib.types.ints.unsigned;
+      default = null;
+    };
+
     loggingLevel = lib.mkOption {
       description = ''
         Passed to --log-lvl
@@ -232,13 +239,6 @@ let
           default = true;
         };
 
-        # The original argument name `websocketPingFrequency` is a misnomer, as the frequency is the inverse of the interval.
-        websocketPingInterval = lib.mkOption {
-          description = "Frequency at which the client will send websocket ping to the server.";
-          type = lib.types.nullOr lib.types.ints.unsigned;
-          default = null;
-        };
-
         upgradeCredentials = lib.mkOption {
           description = ''
             Use these credentials to authenticate during the HTTP upgrade request
@@ -321,6 +321,7 @@ let
                   tls-certificate =
                     if useACMEHost != null then "${certConfig.directory}/fullchain.pem" else "${tlsCertificate}";
                   tls-private-key = if useACMEHost != null then "${certConfig.directory}/key.pem" else "${tlsKey}";
+                  websocket-ping-frequency-sec = websocketPingInterval;
                 } extraArgs
               )
             } \

From 0a899446e8050cd992e28fecb691a919101caf75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Sep 2024 01:01:39 +0000
Subject: [PATCH 11/52] fulcio: 1.6.3 -> 1.6.4

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

diff --git a/pkgs/tools/security/fulcio/default.nix b/pkgs/tools/security/fulcio/default.nix
index 494486021c67..9f3207dbc6ce 100644
--- a/pkgs/tools/security/fulcio/default.nix
+++ b/pkgs/tools/security/fulcio/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "fulcio";
-  version = "1.6.3";
+  version = "1.6.4";
 
   src = fetchFromGitHub {
     owner = "sigstore";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-JoJ7kYL5EJOI6TwMh0arMXXnj/Y93szrvlFsv0FJn3w=";
+    hash = "sha256-eRf504i9kYQua/p0SNlDGNeXa9ztoyz6M8nukhRyzIY=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -20,7 +20,7 @@ buildGoModule rec {
       find "$out" -name .git -print0 | xargs -0 rm -rf
     '';
   };
-  vendorHash = "sha256-Xv+wiG3MRAE49Wu+FoHBIXz8B2mnqzzcDCchgYjZC/o=";
+  vendorHash = "sha256-VTJhQrsqwGHq8211N3pUf4fmU4H90gRWYJTdEufNGg4=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 32a1f2f245f82e366162b827f79720abcbf14e92 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Sep 2024 16:14:06 +0000
Subject: [PATCH 12/52] asterisk: 20.9.2 -> 20.9.3

---
 pkgs/servers/asterisk/versions.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/asterisk/versions.json b/pkgs/servers/asterisk/versions.json
index 69cc9af11021..19e2e2651d11 100644
--- a/pkgs/servers/asterisk/versions.json
+++ b/pkgs/servers/asterisk/versions.json
@@ -1,14 +1,14 @@
 {
   "asterisk_18": {
-    "sha256": "11af7b24a7e027282696dda9370e812dcc5214e7ffb802ba42ee4ef3444c03b4",
-    "version": "18.24.2"
+    "sha256": "70af95d1067a5afec7acbf98a242d853ae5dc8637c8f20d1f30d0dcf96eadb29",
+    "version": "18.24.3"
   },
   "asterisk_20": {
-    "sha256": "acc85a66f3b2a0e2784f4c551b8b0241a2393c47ff353543ae63b5dcf434b1ca",
-    "version": "20.9.2"
+    "sha256": "3d3d3c558f0ca9c3209a6aa7c561c2b85a1ab1b4099d4995f33c917b4cff9ee4",
+    "version": "20.9.3"
   },
   "asterisk_21": {
-    "sha256": "a14f8e13c3099343ed3df45252965866d93642644404512ce4492b18ecc1a187",
-    "version": "21.4.2"
+    "sha256": "bd9f492d3a9e6a5c9f0a69440402be61285d14df9dc7049377f29f9cbecfeeda",
+    "version": "21.4.3"
   }
 }

From 7d8908a49941c1e8e7a11050bafa9f8e68cb229f Mon Sep 17 00:00:00 2001
From: sarahec <sarahec@nextquestion.net>
Date: Sun, 25 Aug 2024 13:08:17 -0700
Subject: [PATCH 13/52] code-cursor: init at 0.40.4

---
 pkgs/by-name/co/code-cursor/package.nix | 76 +++++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 pkgs/by-name/co/code-cursor/package.nix

diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix
new file mode 100644
index 000000000000..a2f9a62ce378
--- /dev/null
+++ b/pkgs/by-name/co/code-cursor/package.nix
@@ -0,0 +1,76 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  appimageTools,
+  makeWrapper,
+  writeShellApplication,
+  curl,
+  yq,
+  common-updater-scripts,
+}:
+let
+  pname = "cursor";
+  version = "0.40.4";
+  appKey = "230313mzl4w4u92";
+  src = fetchurl {
+    url = "https://download.todesktop.com/${appKey}/cursor-0.40.4-build-2409052yfcjagw2-x86_64.AppImage";
+    hash = "sha256-ZURE8UoLPw+Qo1e4xuwXgc+JSwGrgb/6nfIGXMacmSg=";
+  };
+  appimageContents = appimageTools.extractType2 { inherit version pname src; };
+in
+stdenvNoCC.mkDerivation {
+  inherit pname version;
+
+  src = appimageTools.wrapType2 { inherit version pname src; };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/
+    cp -r bin $out/bin
+
+    mkdir -p $out/share/cursor
+    cp -a ${appimageContents}/locales $out/share/cursor
+    cp -a ${appimageContents}/resources $out/share/cursor
+    cp -a ${appimageContents}/usr/share/icons $out/share/
+    install -Dm 644 ${appimageContents}/cursor.desktop -t $out/share/applications/
+
+    substituteInPlace $out/share/applications/cursor.desktop --replace-fail "AppRun" "cursor"
+
+    wrapProgram $out/bin/cursor \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}} --no-update"
+
+    runHook postInstall
+  '';
+
+  passthru = {
+    updateScript = lib.getExe (writeShellApplication {
+      name = "update-cursor";
+      runtimeInputs = [
+        curl
+        yq
+        common-updater-scripts
+      ];
+      text = ''
+        set -o errexit
+        latestLinux="$(curl -s https://download.todesktop.com/${appKey}/latest-linux.yml)"
+        version="$(echo "$latestLinux" | yq -r .version)"
+        filename="$(echo "$latestLinux" | yq -r '.files[] | .url | select(. | endswith(".AppImage"))')"
+        update-source-version cursor "$version" "" "https://download.todesktop.com/${appKey}/$filename" --source-key=src.src
+      '';
+    });
+  };
+
+  meta = {
+    description = "AI-powered code editor built on vscode";
+    homepage = "https://cursor.com";
+    license = lib.licenses.unfree;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with lib.maintainers; [ sarahec ];
+    platforms = [ "x86_64-linux" ];
+    mainProgram = "cursor";
+  };
+}

From 4a208d7c65eac5e807b2b8b238d9001ee2ffdac6 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sun, 8 Sep 2024 23:41:04 +0200
Subject: [PATCH 14/52] cook-framework: init at 2.2.1

---
 pkgs/by-name/co/cook-framework/package.nix | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 pkgs/by-name/co/cook-framework/package.nix

diff --git a/pkgs/by-name/co/cook-framework/package.nix b/pkgs/by-name/co/cook-framework/package.nix
new file mode 100644
index 000000000000..8d8591750945
--- /dev/null
+++ b/pkgs/by-name/co/cook-framework/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "cook-framework";
+  version = "2.2.1";
+
+  src = fetchFromGitHub {
+    owner = "glitchedgitz";
+    repo = "cook";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-DK0kbvM11t64nGkrzThZgSruHTCHAPP374YPWmoM50g=";
+  };
+
+  sourceRoot = "${src.name}/v2";
+
+  vendorHash = "sha256-VpNr06IiVKpMsJXzcKCuNfJ+T+zeA9dMBMp6jeCRgn8=";
+
+  doCheck = false; # uses network to fetch data sources
+
+  meta = {
+    description = "Wordlist generator, splitter, merger, finder, saver for security researchers, bug bounty and hackers";
+    homepage = "https://github.com/glitchedgitz/cook";
+    changelog = "https://github.com/glitchedgitz/cook/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    mainProgram = "cook";
+    maintainers = with lib.maintainers; [ tomasajt ];
+  };
+}

From 9bffc1352a6ed8db45ae4236e88da56c06faf385 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 9 Sep 2024 01:20:17 +0000
Subject: [PATCH 15/52] quarkus: 3.14.1 -> 3.14.2

---
 pkgs/by-name/qu/quarkus/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/qu/quarkus/package.nix b/pkgs/by-name/qu/quarkus/package.nix
index 18f47753c8fd..407d19d50b39 100644
--- a/pkgs/by-name/qu/quarkus/package.nix
+++ b/pkgs/by-name/qu/quarkus/package.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "quarkus-cli";
-  version = "3.14.1";
+  version = "3.14.2";
 
   src = fetchurl {
     url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz";
-    hash = "sha256-OiA45lItW5IhOboxS+/kcUxvuVuJmvT+m6wX1REGUGI=";
+    hash = "sha256-LYh+vWOMghjdwBXqgbdQd945+OX2lKbRTFJ1GIzOyH0=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 7f17e857c2e4094036e0cbe8ac6b78d0235e220f Mon Sep 17 00:00:00 2001
From: Marco Rebhan <me@dblsaiko.net>
Date: Sun, 24 Mar 2024 18:47:34 +0100
Subject: [PATCH 16/52] nix-plugin-pijul: init at 0.1.4

---
 pkgs/by-name/ni/nix-plugin-pijul/package.nix | 90 ++++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 pkgs/by-name/ni/nix-plugin-pijul/package.nix

diff --git a/pkgs/by-name/ni/nix-plugin-pijul/package.nix b/pkgs/by-name/ni/nix-plugin-pijul/package.nix
new file mode 100644
index 000000000000..0b78c43ba6f1
--- /dev/null
+++ b/pkgs/by-name/ni/nix-plugin-pijul/package.nix
@@ -0,0 +1,90 @@
+{
+  lib,
+  stdenv,
+  fetchzip,
+  cmake,
+  pkg-config,
+  boost,
+  howard-hinnant-date,
+  nix,
+
+  # for tests
+  runCommand,
+  pijul,
+  nixVersions,
+  nix-plugin-pijul,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "nix-plugin-pijul";
+  version = "0.1.4";
+
+  src = fetchzip {
+    url = "https://dblsaiko.net/pub/nix-plugin-pijul/nix-plugin-pijul-${finalAttrs.version}.tar.gz";
+    hash = "sha256-X25tFqcAgNWmkMxbfXGx8KJ25BV6sFWAQM9NvjQeSmQ=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    boost
+    howard-hinnant-date
+    nix
+  ];
+
+  passthru.tests = let
+    localRepoCheck = nix:
+      runCommand "localRepoCheck-${nix.name}"
+      {
+        nativeBuildInputs = [
+          pijul
+          nix
+        ];
+      }
+      ''
+        export HOME=$(mktemp -d)
+        export EDITOR=true
+        pijul identity new --no-link --no-prompt --display-name 'Test User' --email 'test@example.com'
+
+        pijul init repo
+        cd repo
+
+        echo "it works" > foo
+        pijul add foo
+        pijul record --message 'Add foo'
+
+        output=$(
+          nix \
+            --option plugin-files ${nix-plugin-pijul.override {inherit nix;}}/lib/nix/plugins/pijul.so \
+            --extra-experimental-features 'nix-command flakes' \
+            eval --impure --raw --expr "builtins.readFile ((builtins.fetchTree \"pijul+file://$PWD\") + \"/foo\")"
+        )
+
+        echo $output
+
+        [[ "$output" = "it works" ]]
+
+        mkdir $out
+      '';
+  in {
+    stable = localRepoCheck nixVersions.stable;
+    latest = localRepoCheck nixVersions.latest;
+    git = localRepoCheck nixVersions.git;
+    nix_2_18 = localRepoCheck nixVersions.nix_2_18;
+    nix_2_19 = localRepoCheck nixVersions.nix_2_19;
+    nix_2_20 = localRepoCheck nixVersions.nix_2_20;
+    nix_2_21 = localRepoCheck nixVersions.nix_2_21;
+    nix_2_22 = localRepoCheck nixVersions.nix_2_22;
+    nix_2_23 = localRepoCheck nixVersions.nix_2_23;
+  };
+
+  meta = {
+    description = "Plugin to add Pijul support to the Nix package manager";
+    homepage = "https://nest.pijul.com/dblsaiko/nix-plugin-pijul";
+    license = lib.licenses.lgpl3Plus;
+    maintainers = [lib.maintainers.dblsaiko];
+    platforms = lib.platforms.unix;
+  };
+})

From 4d183800f55a5ffee2959f902013c037213fd494 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Mon, 9 Sep 2024 20:39:58 +0800
Subject: [PATCH 17/52] keypunch: 1.0 -> 3.1

---
 pkgs/by-name/ke/keypunch/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ke/keypunch/package.nix b/pkgs/by-name/ke/keypunch/package.nix
index 31365c7431ce..420b7ff0de6a 100644
--- a/pkgs/by-name/ke/keypunch/package.nix
+++ b/pkgs/by-name/ke/keypunch/package.nix
@@ -18,19 +18,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "keypunch";
-  version = "1.0";
+  version = "3.1";
 
   src = fetchFromGitHub {
     owner = "bragefuglseth";
     repo = "keypunch";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-S4RckHwrVVQrxy9QngTisNM4+cMM+1dXucwEDnM98Rg=";
+    hash = "sha256-2S5S7SvMYdEOOrF3SiwpbijsgHcSIyWEVJB41jbrn1A=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
-    name = "${finalAttrs.pname}-${finalAttrs.version}";
-    inherit (finalAttrs) src;
-    hash = "sha256-YzENAGy7zEu1dyuhme+x+gJQlE74Vw0JZvRso0vNQXs=";
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-sD+wy1D6nl333PxlDz73YtnfBEmDzb+kNZkZI8JbfSg=";
   };
 
   strictDeps = true;

From 58ec2867859613da33cf08e674f70224335c42eb Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Giraudeau <jb@giraudeau.info>
Date: Mon, 9 Sep 2024 14:25:07 +0200
Subject: [PATCH 18/52] nixos/gancio: actually enable ssl by default.

---
 nixos/modules/services/web-apps/gancio.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/web-apps/gancio.nix b/nixos/modules/services/web-apps/gancio.nix
index 0a2db3bce5f8..893f5702518a 100644
--- a/nixos/modules/services/web-apps/gancio.nix
+++ b/nixos/modules/services/web-apps/gancio.nix
@@ -157,11 +157,18 @@ in
     };
 
     nginx = mkOption {
-      type = types.submodule (import ../web-servers/nginx/vhost-options.nix { inherit config lib; });
+      type = types.submodule (
+        lib.recursiveUpdate (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) {
+          # enable encryption by default,
+          # as sensitive login credentials should not be transmitted in clear text.
+          options.forceSSL.default = true;
+          options.enableACME.default = true;
+        }
+      );
       default = { };
       example = {
-        enableACME = true;
-        forceSSL = true;
+        enableACME = false;
+        forceSSL = false;
       };
       description = "Extra configuration for the nginx virtual host of gancio.";
     };
@@ -260,8 +267,6 @@ in
       virtualHosts."${cfg.settings.hostname}" = mkMerge [
         cfg.nginx
         {
-          enableACME = mkDefault true;
-          forceSSL = mkDefault true;
           locations = {
             "/" = {
               index = "index.html";

From 6162e8b74cba9405472444ec7fce994ce367bb54 Mon Sep 17 00:00:00 2001
From: Callum Leslie <git@cleslie.uk>
Date: Mon, 9 Sep 2024 13:46:15 +0100
Subject: [PATCH 19/52] thrift-ls: init at 0.2.1

---
 pkgs/by-name/th/thrift-ls/package.nix | 32 +++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 pkgs/by-name/th/thrift-ls/package.nix

diff --git a/pkgs/by-name/th/thrift-ls/package.nix b/pkgs/by-name/th/thrift-ls/package.nix
new file mode 100644
index 000000000000..b41880c6a97d
--- /dev/null
+++ b/pkgs/by-name/th/thrift-ls/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "thrift-ls";
+  version = "0.2.1";
+
+  src = fetchFromGitHub {
+    owner = "joyme123";
+    repo = "thrift-ls";
+    rev = "v${version}";
+    hash = "sha256-ywrb1pOpqHnVhb9MA2cgkF5croA9iqtvLxvVmeloOpE=";
+  };
+
+  vendorHash = "sha256-YoZ2dku84065Ygh9XU6dOwmCkuwX0r8a0Oo8c1HPsS4=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  meta = {
+    description = "Thrift Language Server";
+    homepage = "https://github.com/joyme123/thrift-ls";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ callumio ];
+    mainProgram = "thrift-ls";
+  };
+}

From b473e96d0395d78adbdee89c1d9490fd3ac11207 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 14 Jul 2024 00:40:02 +0000
Subject: [PATCH 20/52] libngspice: 42 -> 43

---
 pkgs/development/libraries/libngspice/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix
index eb6a057dcae3..3578441dd61a 100644
--- a/pkgs/development/libraries/libngspice/default.nix
+++ b/pkgs/development/libraries/libngspice/default.nix
@@ -7,15 +7,17 @@
 , withNgshared ? true
 , libXaw
 , libXext
+, llvmPackages
+, readline
 }:
 
 stdenv.mkDerivation rec {
   pname = "${lib.optionalString withNgshared "lib"}ngspice";
-  version = "42";
+  version = "43";
 
   src = fetchurl {
     url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz";
-    hash = "sha256-c3/jhGqyMzolDfrfHtbr4YYK8dil/154A8dyzEJW5Qo=";
+    hash = "sha256-FN1qbwhTHyBRwTrmN5CkVwi9Q/PneIamqEiYwpexNpk=";
   };
 
   nativeBuildInputs = [
@@ -25,9 +27,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     fftw
+    readline
   ] ++ lib.optionals (!withNgshared) [
     libXaw
     libXext
+  ] ++ lib.optionals stdenv.isDarwin [
+    llvmPackages.openmp
   ];
 
   configureFlags = lib.optionals withNgshared [

From 56ba562feb21fa93dd48b4e17864cae98fee7b59 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 9 Sep 2024 19:54:01 +0000
Subject: [PATCH 21/52] n8n: 1.55.3 -> 1.57.0

---
 pkgs/by-name/n8/n8n/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix
index 11f59068bd55..87a6a64ea9d4 100644
--- a/pkgs/by-name/n8/n8n/package.nix
+++ b/pkgs/by-name/n8/n8n/package.nix
@@ -18,18 +18,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "n8n";
-  version = "1.55.3";
+  version = "1.57.0";
 
   src = fetchFromGitHub {
     owner = "n8n-io";
     repo = "n8n";
     rev = "n8n@${finalAttrs.version}";
-    hash = "sha256-SgDw0je16Qf0ohzrVUjJM6FFovWxM2mvZjvfKkEESos=";
+    hash = "sha256-0ShG/9Hj132mbNC06HzduMCosAefufbI1M/KJUYK1TQ=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-KvSsWf1EHCQ46M4Z4wqyYb4mW9y9kNwB9e090YC1ZWs=";
+    hash = "sha256-EfK8cmfkVebc/kIYaW+Eje1oPW1EpVpa2/jMs+KE5wg=";
   };
 
   nativeBuildInputs = [

From 276a3f2a71cad6f38118715c96da5729c912824b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 9 Sep 2024 22:25:35 +0000
Subject: [PATCH 22/52] sploitscan: 0.10.5 -> 0.11.0

---
 pkgs/by-name/sp/sploitscan/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sp/sploitscan/package.nix b/pkgs/by-name/sp/sploitscan/package.nix
index dcd8695e9365..63c2859408b0 100644
--- a/pkgs/by-name/sp/sploitscan/package.nix
+++ b/pkgs/by-name/sp/sploitscan/package.nix
@@ -5,14 +5,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "sploitscan";
-  version = "0.10.5";
+  version = "0.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "xaitax";
     repo = "SploitScan";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-41NR31x/pJttBxv66t5g3s2PwlSBgsk0ybiH7xFs18k=";
+    rev = "refs/tags/v.${version}";
+    hash = "sha256-d9s0j/78arKnbDCgMJMdUVF/RPfnAl59WAiJ0UvCCUU=";
   };
 
   pythonRelaxDeps = [

From c751311f1015e58c833a0fe9971068aa3448231b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 01:17:16 +0000
Subject: [PATCH 23/52] mpris-notifier: 0.1.7 -> 0.1.9

---
 pkgs/by-name/mp/mpris-notifier/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mp/mpris-notifier/package.nix b/pkgs/by-name/mp/mpris-notifier/package.nix
index 43f455a37b18..b48c5e6d7e43 100644
--- a/pkgs/by-name/mp/mpris-notifier/package.nix
+++ b/pkgs/by-name/mp/mpris-notifier/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mpris-notifier";
-  version = "0.1.7";
+  version = "0.1.9";
 
   src = fetchFromGitHub {
     owner = "l1na-forever";
     repo = "mpris-notifier";
     rev = "v${version}";
-    hash = "sha256-B1nfVsn95oe2FlHFjb9O4tfL/EqsZZ4JGF0mbJcCg2Y=";
+    hash = "sha256-s7/eN2gn8VmNtrI9zEBASs7jzxgfszJjNlXR7IVr3G4=";
   };
 
-  cargoHash = "sha256-8WzG712/soPgooyR35L8aFIRfPC2MvV3vCcPbkTgoF0=";
+  cargoHash = "sha256-DTB1Ranz2oeuWVMuFNe+kjuQFnPqBoDeqxuYFU9svSs=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.Security

From 728096d788cfca7546330d5cef6e07f04371ee9e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 02:04:30 +0000
Subject: [PATCH 24/52] python312Packages.django-anymail: 11.1 -> 12.0

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

diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix
index ca5f881f3a3a..2c69453d7959 100644
--- a/pkgs/development/python-modules/django-anymail/default.nix
+++ b/pkgs/development/python-modules/django-anymail/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "django-anymail";
-  version = "11.1";
+  version = "12.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "anymail";
     repo = "django-anymail";
     rev = "refs/tags/v${version}";
-    hash = "sha256-gJrGrezaRY0htS+ouNj1sOBR7jMYvQC1oqn/smzExtc=";
+    hash = "sha256-TuEEwxwgZVv97Ns4sRWdQjaNymE03nj8CTiU9S6ynZ8=";
   };
 
   build-system = [ hatchling ];

From 065aa2c8f71b5f115c95b0872585c0611e04774b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 02:06:58 +0000
Subject: [PATCH 25/52] python312Packages.elementpath: 4.4.0 -> 4.5.0

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

diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix
index d8a89c437ade..9c2532d6132c 100644
--- a/pkgs/development/python-modules/elementpath/default.nix
+++ b/pkgs/development/python-modules/elementpath/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "elementpath";
-  version = "4.4.0";
+  version = "4.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "sissaschool";
     repo = "elementpath";
     rev = "refs/tags/v${version}";
-    hash = "sha256-n1Ps0CybeLeDR5E4UnqmSkbFe0SXyplomEGDchAweSY=";
+    hash = "sha256-zyJ+UtPTGEziIlucIXN1dIzfN5sfLkeOia7tiqOGFjk=";
   };
 
   build-system = [ setuptools ];

From c6409268aaf79f9d6902bcf39b4ef2cba6a3969b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 02:08:46 +0000
Subject: [PATCH 26/52] python312Packages.html2image: 2.0.4.3 -> 2.0.5

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

diff --git a/pkgs/development/python-modules/html2image/default.nix b/pkgs/development/python-modules/html2image/default.nix
index 4d7252b1c305..c53b9280eb59 100644
--- a/pkgs/development/python-modules/html2image/default.nix
+++ b/pkgs/development/python-modules/html2image/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "html2image";
-  version = "2.0.4.3";
+  version = "2.0.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "vgalin";
     repo = "html2image";
-    rev = version;
-    hash = "sha256-BDl2Kibp1WOAOYNlXa2aaEgQTitk+OZu72OgytciZYI=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-k5y89nUF+fhUj9uzTAPkkAdOb2TsTL2jm/ZXwHlxu/A=";
   };
 
   postPatch = ''

From 6b2772275bea06491cf54c87b375a50b575d811e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 02:24:01 +0000
Subject: [PATCH 27/52] python312Packages.google-cloud-pubsub: 2.23.0 -> 2.23.1

---
 .../python-modules/google-cloud-pubsub/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
index 94b11b4513fc..a564a85d45d6 100644
--- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix
+++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-pubsub";
-  version = "2.23.0";
+  version = "2.23.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_pubsub";
     inherit version;
-    hash = "sha256-zz1vKrEbXI38CqfUyuXuHWa0CNlmbxdiycF+JpzYtlg=";
+    hash = "sha256-4f3nm1tktyEpCvTAIpB6/LuDUS2S9OXDNMORz7sCKss=";
   };
 
   build-system = [ setuptools ];

From 6e235943c873659ba42826e9c5e832d51fb75623 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 02:28:10 +0000
Subject: [PATCH 28/52] python312Packages.weatherflow4py: 0.2.23 -> 0.3.3

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

diff --git a/pkgs/development/python-modules/weatherflow4py/default.nix b/pkgs/development/python-modules/weatherflow4py/default.nix
index ac48a838ff5a..a149dfe3ff38 100644
--- a/pkgs/development/python-modules/weatherflow4py/default.nix
+++ b/pkgs/development/python-modules/weatherflow4py/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "weatherflow4py";
-  version = "0.2.23";
+  version = "0.3.3";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "jeeftor";
     repo = "weatherflow4py";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ghdjQyZPLFzgmrB2ppzNbqM/D2/zW872tw4emzInLBY=";
+    hash = "sha256-mJxRfjkkBruGjz+UthrzlMqz6Rlk9zrGHjzB4qYYlQ0=";
   };
 
   build-system = [ poetry-core ];

From 4ad5bc4c012020ac88667c267cf43e25ad148296 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 02:44:18 +0000
Subject: [PATCH 29/52] python312Packages.google-nest-sdm: 5.0.0 -> 5.0.1

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

diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix
index bf576a7e5423..699430682d4b 100644
--- a/pkgs/development/python-modules/google-nest-sdm/default.nix
+++ b/pkgs/development/python-modules/google-nest-sdm/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "google-nest-sdm";
-  version = "5.0.0";
+  version = "5.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "allenporter";
     repo = "python-google-nest-sdm";
     rev = "refs/tags/${version}";
-    hash = "sha256-1jN3X7Cxh2yX58Hup89bW16mc8F/C3CsUcz91FZHo70=";
+    hash = "sha256-oooWPQ4O7+FjCzIoBwm+jgGTkG7eFwekbIAEbJh44I4=";
   };
 
   build-system = [ setuptools ];

From baa6137ad637cbb245bd926a7998d65d48995bef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 03:02:41 +0000
Subject: [PATCH 30/52] python312Packages.ollama: 0.3.2 -> 0.3.3

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

diff --git a/pkgs/development/python-modules/ollama/default.nix b/pkgs/development/python-modules/ollama/default.nix
index 59d262c5eb2f..4f5266494e5c 100644
--- a/pkgs/development/python-modules/ollama/default.nix
+++ b/pkgs/development/python-modules/ollama/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "ollama";
-  version = "0.3.2";
+  version = "0.3.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "ollama";
     repo = "ollama-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-PFujhac1Y1q4sy/bhaPYw6cHuoiholaNoDNhtQW8IW4=";
+    hash = "sha256-27OJwPvHBxCdaiHk8EQ2s1OeBzgsrzp1MjgKHNgvz+A=";
   };
 
   postPatch = ''

From 5f97b1604d9c3a0fe5186d5f9c71cb6404e2907e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 03:06:19 +0000
Subject: [PATCH 31/52] yara-x: 0.7.0 -> 0.8.0

---
 pkgs/by-name/ya/yara-x/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix
index dad01808b4c6..3f2d74eabd8c 100644
--- a/pkgs/by-name/ya/yara-x/package.nix
+++ b/pkgs/by-name/ya/yara-x/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "yara-x";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "VirusTotal";
     repo = "yara-x";
     rev = "refs/tags/v${version}";
-    hash = "sha256-nzTksznwyLncQO2c2+ZI0Bn9kNXl6GthFCrkz3ihS3w=";
+    hash = "sha256-xCybcDRswxRHiPf0ultIahxSPqn0YonmR4Kah38wJuw=";
   };
 
-  cargoHash = "sha256-+0aroLCmi2HPILCxLBFzjtHPpe6f6AMkoPdH5CjoyEo=";
+  cargoHash = "sha256-6CDzOxvktJc6AnFOm6OJp3cD2bZ0XCY5HLIoEmP59es=";
 
   nativeBuildInputs = [ cmake installShellFiles ];
 

From d7423b75c9bc95adfa7547b13b482a0464f4a192 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Mon, 9 Sep 2024 20:59:54 +0800
Subject: [PATCH 32/52] clash-verge-rev: add meta for internal package

---
 pkgs/by-name/cl/clash-verge-rev/package.nix   | 19 ++++++++++++++++++-
 pkgs/by-name/cl/clash-verge-rev/service.nix   |  3 ++-
 pkgs/by-name/cl/clash-verge-rev/unwrapped.nix |  2 +-
 pkgs/by-name/cl/clash-verge-rev/webui.nix     |  3 ++-
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix
index 7c912f2acd8a..5499a5e74270 100644
--- a/pkgs/by-name/cl/clash-verge-rev/package.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/package.nix
@@ -27,6 +27,20 @@ let
     hash = "sha256-HyRTOqPj4SnV9gktqRegxOYz9c8mQHOX+IrdZlHhYpo=";
   };
 
+  meta-unwrapped = {
+    description = "Clash GUI based on tauri";
+    homepage = "https://github.com/clash-verge-rev/clash-verge-rev";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
+      Guanran928
+      bot-wxt1221
+    ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
+  };
+
   service-cargo-hash = "sha256-NBeHR6JvdCp06Ug/UEtLY2tu3iCmlsCU0x8umRbJXLU=";
 
   service = callPackage ./service.nix {
@@ -36,6 +50,7 @@ let
       service-cargo-hash
       pname
       ;
+    meta = meta-unwrapped;
   };
 
   webui = callPackage ./webui.nix {
@@ -44,6 +59,8 @@ let
       src
       pname
       ;
+    meta = meta-unwrapped;
+
   };
 
   sysproxy-hash = "sha256-TEC51s/viqXUoEH9rJev8LdC2uHqefInNcarxeogePk=";
@@ -55,8 +72,8 @@ let
       src
       sysproxy-hash
       webui
-      meta
       ;
+    meta = meta-unwrapped;
   };
 
   meta = {
diff --git a/pkgs/by-name/cl/clash-verge-rev/service.nix b/pkgs/by-name/cl/clash-verge-rev/service.nix
index dbf125829793..21baad40d3f7 100644
--- a/pkgs/by-name/cl/clash-verge-rev/service.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/service.nix
@@ -7,10 +7,11 @@
   pname,
   webkitgtk,
   service-cargo-hash,
+  meta,
 }:
 rustPlatform.buildRustPackage {
   pname = "${pname}-service";
-  inherit version;
+  inherit version meta;
 
   src = src-service;
   sourceRoot = "${src-service.name}";
diff --git a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
index 7212ba2623ff..64386c552dce 100644
--- a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
@@ -13,7 +13,7 @@
   openssl,
 }:
 rustPlatform.buildRustPackage {
-  inherit version src;
+  inherit version src meta;
   pname = "${pname}-unwrapped";
   sourceRoot = "${src.name}/src-tauri";
 
diff --git a/pkgs/by-name/cl/clash-verge-rev/webui.nix b/pkgs/by-name/cl/clash-verge-rev/webui.nix
index 355350d2d471..c35dca01a34c 100644
--- a/pkgs/by-name/cl/clash-verge-rev/webui.nix
+++ b/pkgs/by-name/cl/clash-verge-rev/webui.nix
@@ -5,9 +5,10 @@
   pnpm,
   nodejs,
   stdenv,
+  meta,
 }:
 stdenv.mkDerivation {
-  inherit version src;
+  inherit version src meta;
   pname = "${pname}-webui";
   pnpmDeps = pnpm.fetchDeps {
     inherit pname version src;

From 323f66e1e7b1127d5db4d5d3f6ae527a124f8064 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Tue, 10 Sep 2024 13:00:32 +0800
Subject: [PATCH 33/52] cameractrls: 0.6.6 -> 0.6.7

---
 pkgs/by-name/ca/cameractrls/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cameractrls/package.nix b/pkgs/by-name/ca/cameractrls/package.nix
index 2b715397150c..d56b75124ddc 100644
--- a/pkgs/by-name/ca/cameractrls/package.nix
+++ b/pkgs/by-name/ca/cameractrls/package.nix
@@ -39,14 +39,14 @@ let
 in
 python3Packages.buildPythonApplication rec {
   pname = "cameractrls";
-  version = "0.6.6";
+  version = "0.6.7";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "soyersoyer";
     repo = "cameractrls";
     rev = "v${version}";
-    hash = "sha256-QjjLd5L+8Slxc3ywurhsWp1pZ2E1Y7NOdnCV2ZYBlqU=";
+    hash = "sha256-MM+Py8tHtqJWIGmGg3RaIhJa0E1zM3hXOnTOqXPuejw=";
   };
 
   postPatch = ''
@@ -125,7 +125,7 @@ python3Packages.buildPythonApplication rec {
       presets at device connection).
     '';
     homepage = "https://github.com/soyersoyer/cameractrls";
-    license = lib.licenses.gpl3Plus;
+    license = lib.licenses.lgpl3Plus;
     mainProgram = mainExecutable;
     maintainers = with lib.maintainers; [ aleksana ];
     platforms = lib.platforms.linux;

From d7dc57b67310f06374e63d51860a6997a27ae4fd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 05:00:56 +0000
Subject: [PATCH 34/52] python312Packages.clarifai-grpc: 10.8.0 -> 10.8.4

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

diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix
index 32c6fee45373..1210cc0cf353 100644
--- a/pkgs/development/python-modules/clarifai-grpc/default.nix
+++ b/pkgs/development/python-modules/clarifai-grpc/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "clarifai-grpc";
-  version = "10.8.0";
+  version = "10.8.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "Clarifai";
     repo = "clarifai-python-grpc";
     rev = "refs/tags/${version}";
-    hash = "sha256-Jp5pH1KZY9JoRKGOLeBqF9CC7UoRHC9wFOBPD9t5AR8=";
+    hash = "sha256-5HDPEFn43JQyNTp9nJapBpoigoFtgyPZ5HXulMsjc8s=";
   };
 
   build-system = [ setuptools ];

From 17aec19b9a03a646da4341fcf2e0a3672970f663 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 05:45:03 +0000
Subject: [PATCH 35/52] renovate: 38.62.0 -> 38.73.5

---
 pkgs/by-name/re/renovate/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix
index 02d4db11319b..8dbf447958d3 100644
--- a/pkgs/by-name/re/renovate/package.nix
+++ b/pkgs/by-name/re/renovate/package.nix
@@ -21,13 +21,13 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
   pname = "renovate";
-  version = "38.62.0";
+  version = "38.73.5";
 
   src = fetchFromGitHub {
     owner = "renovatebot";
     repo = "renovate";
     rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-Wv7kSKuiyqVpl0EQIygF0R8h9PMH6yI5ezXhz1hbzd8=";
+    hash = "sha256-+kracgelM8VOIgEtDfaXWokNZgiwl+s/k1yx6RxQk0c=";
   };
 
   postPatch = ''
@@ -44,7 +44,7 @@ stdenv'.mkDerivation (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-n2CnyjabKQ9D72OBdEqeHoxOJsKlLD2rJPRs50AWCXU=";
+    hash = "sha256-J61fOjANS7WKd3HLaqJZE1m2jFrMTknW6SGdy/yVIKg=";
   };
 
   env.COREPACK_ENABLE_STRICT = 0;

From 28108159e3ac34437a49c74f59eb225549f08b4c Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 9 Sep 2024 15:30:05 -0400
Subject: [PATCH 36/52] telegram-desktop: 5.5.1 -> 5.5.2

Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.5.1...v5.5.2

Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.5.2
---
 .../instant-messengers/telegram/telegram-desktop/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
index 5cf73100ab56..78d6a1da58ef 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
@@ -63,14 +63,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "telegram-desktop";
-  version = "5.5.1";
+  version = "5.5.2";
 
   src = fetchFromGitHub {
     owner = "telegramdesktop";
     repo = "tdesktop";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-PTa79SbSsOyWlZJ0ad4w6YIiChLzqaSZGRmzyq5qVK0=";
+    hash = "sha256-5edk3+RusCq93A6mkzCoegxr6J2fRc9rtGk6IpGHBAY=";
   };
 
   patches = [

From 1b449528cc56cbfa2be8383a847da43c4f281e4e Mon Sep 17 00:00:00 2001
From: Nicolas Goudry <goudry.nicolas@gmail.com>
Date: Tue, 10 Sep 2024 08:59:40 +0200
Subject: [PATCH 37/52] gitkraken: 10.2.0 -> 10.3.0

---
 .../applications/version-management/gitkraken/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 80c890046895..43db0277225c 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -59,24 +59,24 @@ with lib;
 
 let
   pname = "gitkraken";
-  version = "10.2.0";
+  version = "10.3.0";
 
   throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
 
   srcs = {
     x86_64-linux = fetchzip {
       url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
-      hash = "sha256-NY7IgUt6Q27Pz1K46xL4LYFBwTJdT+fvsFDM2OhoPWg=";
+      hash = "sha256-5WICLLuv+NL++fgm7p/ScyEvzwVqcXNI6eXGr4e9k20=";
     };
 
     x86_64-darwin = fetchzip {
       url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
-      hash = "sha256-e7zIMJNMdFy7/8zsV3nH1OT76xNznoSPRUVhoLfR6QI=";
+      hash = "sha256-zkQQR90pdYGIZf3OmAdKc1SlotgdSRGJaYsA1n74aZk=";
     };
 
     aarch64-darwin = fetchzip {
       url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip";
-      hash = "sha256-YjGH9tKbJaYc5qENBCCpJGWWFJIQTD8O2H3onhMwGrw=";
+      hash = "sha256-WYBXupyunpAaoHmA4dHfd/oruP20rYsIq5mO4/dDsoM=";
     };
   };
 

From 9bc2866b4efc47d6a423ab9cab5ebdbd16ac745b Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Tue, 10 Sep 2024 08:18:58 +0100
Subject: [PATCH 38/52] homepage-dashboard: 0.9.6 -> 0.9.8

---
 pkgs/servers/homepage-dashboard/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/homepage-dashboard/default.nix b/pkgs/servers/homepage-dashboard/default.nix
index 788cd01d067a..71a610ecd9a5 100644
--- a/pkgs/servers/homepage-dashboard/default.nix
+++ b/pkgs/servers/homepage-dashboard/default.nix
@@ -16,8 +16,8 @@ let
   dashboardIcons = fetchFromGitHub {
     owner = "walkxcode";
     repo = "dashboard-icons";
-    rev = "a02a5999fe56948671721da8b0830cdd5b609ed7"; # Until 2024-02-25
-    hash = "sha256-s0Doh4j6CH66fZoQKMt4yc7aLStNFGMVoDp5dvs7+pk=";
+    rev = "be82e22c418f5980ee2a13064d50f1483df39c8c"; # Until 2024-07-21
+    hash = "sha256-z69DKzKhCVNnNHjRM3dX/DD+WJOL9wm1Im1nImhBc9Y=";
   };
 
   installLocalIcons = ''
@@ -29,16 +29,16 @@ let
 in
 buildNpmPackage rec {
   pname = "homepage-dashboard";
-  version = "0.9.6";
+  version = "0.9.8";
 
   src = fetchFromGitHub {
     owner = "gethomepage";
     repo = "homepage";
     rev = "v${version}";
-    hash = "sha256-jUKXAqq6Oj8CmOuBUlsf0zDIcK+3MX/czzNDmakN9VM=";
+    hash = "sha256-WfNUBjg/D3g6GE9ljZZ2lcHBx4XA2ObKjGgQ1VNanv8=";
   };
 
-  npmDepsHash = "sha256-YjcF8FkURnTurcJ0Iq0ghv/bhu5sFA860jXrn3TkRds=";
+  npmDepsHash = "sha256-PKqOeTspwlnKhQz65Z2C+GmQu6YTMRyaROgF8dZOdV8=";
 
   preBuild = ''
     mkdir -p config

From cb714bfbd4d1d791448e02177026d40f4c9eb266 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 10 Sep 2024 14:18:38 +0700
Subject: [PATCH 39/52] ubootOrangePi5Plus: init

This adds the uboot version used for the Xunlong Orange Pi 5 Plus.
---
 pkgs/misc/uboot/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 295cb525a646..351c5788584a 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -389,6 +389,14 @@ in {
     filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin" ];
   };
 
+  ubootOrangePi5Plus = buildUBoot {
+    defconfig = "orangepi-5-plus-rk3588_defconfig";
+    extraMeta.platforms = ["aarch64-linux"];
+    BL31 = "${armTrustedFirmwareRK3588}/bl31.elf";
+    ROCKCHIP_TPL = rkbin.TPL_RK3588;
+    filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin" ];
+  };
+
   ubootOrangePiPc = buildUBoot {
     defconfig = "orangepi_pc_defconfig";
     extraMeta.platforms = ["armv7l-linux"];

From e13fbae7cb266182c0710c8257b5624646ce14d4 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 10 Sep 2024 14:33:42 +0700
Subject: [PATCH 40/52] ubootOrangePi5Plus: expose

Follow-up to #340945, I cherry-picked this from another worktree and
forgot to add this too.

uboot builds have to be explicitly also listed in all-packages.nix.
---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b7d7090ab678..f05250c36af9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27167,6 +27167,7 @@ with pkgs;
     ubootOlimexA64Teres1
     ubootOrangePi3
     ubootOrangePi5
+    ubootOrangePi5Plus
     ubootOrangePiPc
     ubootOrangePiZeroPlus2H5
     ubootOrangePiZero

From 215204e8d9c62c291894274fa47c8078314b8cfa Mon Sep 17 00:00:00 2001
From: Saturn <90934664+Saturn745@users.noreply.github.com>
Date: Tue, 10 Sep 2024 08:04:17 +0000
Subject: [PATCH 41/52] klipperscreen: 0.3.2 -> 0.4.3 (#340939)

* maintainers: add saturn745

* klipperscreen: 0.3.2 -> 0.4.3

---------

Co-authored-by: Saturn745 <codeberg.sw1mx@slmail.me>
---
 maintainers/maintainer-list.nix                  | 7 +++++++
 pkgs/applications/misc/klipperscreen/default.nix | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 156f700c49a3..dfcbe955346b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18547,6 +18547,13 @@
     githubId = 695473;
     name = "Sascha Grunert";
   };
+  saturn745 = {
+    email = "git-commits.rk7uq@aleeas.com";
+    github = "saturn745";
+    githubId = 90934664;
+    name = "Saturn745";
+    matrix = "@galaxyyy:matrix.org";
+  };
   saulecabrera = {
     name = "Saúl Cabrera";
     email = "saulecabrera@gmail.com";
diff --git a/pkgs/applications/misc/klipperscreen/default.nix b/pkgs/applications/misc/klipperscreen/default.nix
index 5364d090f75d..fea8dbc80e23 100644
--- a/pkgs/applications/misc/klipperscreen/default.nix
+++ b/pkgs/applications/misc/klipperscreen/default.nix
@@ -6,14 +6,14 @@
 , gitUpdater
 }: python3.pkgs.buildPythonApplication rec {
   pname = "KlipperScreen";
-  version = "0.3.2";
+  version = "0.4.3";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "jordanruthe";
     repo = "KlipperScreen";
     rev = "v${version}";
-    hash = "sha256-LweO5EVWr3OxziHrjtQDdWyUBCVUJ17afkw7RCZWgcg=";
+    hash = "sha256-6hMefH9VcNnWhKdQRs7cPVL86LEDRSLaxygmi15HdLI=";
   };
 
   nativeBuildInputs = [
@@ -49,7 +49,7 @@
     description = "Touchscreen GUI for the Klipper 3D printer firmware";
     homepage = "https://github.com/jordanruthe/KlipperScreen";
     license = licenses.agpl3Only;
-    maintainers = with maintainers; [ cab404 ];
+    maintainers = with maintainers; [ cab404 saturn745 ];
     mainProgram = "KlipperScreen";
   };
 }

From 1166bb68ce1427d232df5bce79da63449f44b105 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 3 Sep 2024 22:28:12 +0000
Subject: [PATCH 42/52] klipper: 0.12.0-unstable-2024-08-14 ->
 0.12.0-unstable-2024-09-01

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

diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix
index 5bca109ec16c..d2a772a17530 100644
--- a/pkgs/servers/klipper/default.nix
+++ b/pkgs/servers/klipper/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "klipper";
-  version = "0.12.0-unstable-2024-08-14";
+  version = "0.12.0-unstable-2024-09-01";
 
   src = fetchFromGitHub {
     owner = "KevinOConnor";
     repo = "klipper";
-    rev = "d81eb557d7f2aad5e22e3633fbcd53a4d60ac5d1";
-    sha256 = "sha256-O6W2xiG5rZzD/40ytIFo4HovKq0ml0oCV6amcAQhoUs=";
+    rev = "08a1c9f12760ee6d89db2b82e76c7d93453212db";
+    sha256 = "sha256-bVHSiWqswum4ykVpPTt11wJSGnSjJnMT8OUvbYGFopY=";
   };
 
   sourceRoot = "${src.name}/klippy";

From e521ac602864c397b6afee82fa553dacae563c55 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 10 Sep 2024 10:34:15 +0200
Subject: [PATCH 43/52] python312Packages.html2image: refactor

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

diff --git a/pkgs/development/python-modules/html2image/default.nix b/pkgs/development/python-modules/html2image/default.nix
index c53b9280eb59..bcf78da3db8f 100644
--- a/pkgs/development/python-modules/html2image/default.nix
+++ b/pkgs/development/python-modules/html2image/default.nix
@@ -21,13 +21,13 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-    --replace poetry.masonry.api poetry.core.masonry.api \
-    --replace "poetry>=" "poetry-core>="
+    --replace-fail poetry.masonry.api poetry.core.masonry.api \
+    --replace-fail "poetry>=" "poetry-core>="
   '';
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     requests
     websocket-client
   ];

From 11d2b2760bf73c20291c0e344798288734194d7c Mon Sep 17 00:00:00 2001
From: Sebastian Sellmeier <mail@sebastian-sellmeier.de>
Date: Sun, 8 Sep 2024 22:23:16 +0200
Subject: [PATCH 44/52] esphome: 2024.8.1 -> 2024.8.3

https://github.com/esphome/esphome/releases/tag/2024.8.3
https://github.com/esphome/esphome/releases/tag/2024.8.2
---
 pkgs/tools/misc/esphome/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix
index 487cac6becda..59649a048e6d 100644
--- a/pkgs/tools/misc/esphome/default.nix
+++ b/pkgs/tools/misc/esphome/default.nix
@@ -21,14 +21,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "esphome";
-  version = "2024.8.1";
+  version = "2024.8.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-wjvbnqlhg4AHJLQvjWysDXBjECc1sV5ilx1jk8IzILw=";
+    hash = "sha256-AeiEP1D2u2u8LMNKdBvoA2M3uO6Z9oSG2i5HwGin80M=";
   };
 
   nativeBuildInputs = with python.pkgs; [

From ba83562611efa8133c459ed6cb3cc5c4a79866e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 12 Aug 2024 19:29:47 +0000
Subject: [PATCH 45/52] kics: 2.0.1 -> 2.1.2

---
 pkgs/tools/admin/kics/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/admin/kics/default.nix b/pkgs/tools/admin/kics/default.nix
index 6db54ce50949..205e439c2271 100644
--- a/pkgs/tools/admin/kics/default.nix
+++ b/pkgs/tools/admin/kics/default.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "kics";
-  version = "2.0.1";
+  version = "2.1.2";
 
   src = fetchFromGitHub {
     owner = "Checkmarx";
     repo = "kics";
     rev = "v${version}";
-    hash = "sha256-4WYrKWkcf7AJjogWQcNsIZiCfxf4CmhLW/GJFUWfQzw=";
+    hash = "sha256-UTDqsTW/niTvSTYInM5UD9f7RU3f5R4etuLvoTmNn/M=";
   };
 
-  vendorHash = "sha256-N3MJhuzMJW40aMrAyuBsNciwZaNq0K4IUd+0re17AOI=";
+  vendorHash = "sha256-nUNpiXta+Om0Lmd9z0uaCctv2uBrPDsZ1fhHcd8sSWs=";
 
   subPackages = [ "cmd/console" ];
 
@@ -26,8 +26,8 @@ buildGoModule rec {
 
   ldflags = [
     "-s" "-w"
-    "-X github.com/Checkmarx/kics/internal/constant.SCMCommits=${version}"
-    "-X github.com/Checkmarx/kics/internal/constants.Version=${version}"
+    "-X github.com/Checkmarx/kics/v2/internal/constants.SCMCommit=${version}"
+    "-X github.com/Checkmarx/kics/v2/internal/constants.Version=${version}"
   ];
 
   passthru.tests.version = testers.testVersion {

From 446599a6f8c58755e08f346a8c6d20899ab33039 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 09:41:03 +0000
Subject: [PATCH 46/52] yandex-music: 5.14.0 -> 5.15.0

---
 pkgs/by-name/ya/yandex-music/info.json    | 8 ++++----
 pkgs/by-name/ya/yandex-music/package.nix  | 4 ++--
 pkgs/by-name/ya/yandex-music/ym_info.json | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ya/yandex-music/info.json b/pkgs/by-name/ya/yandex-music/info.json
index abd8451dd321..7564f59339cc 100644
--- a/pkgs/by-name/ya/yandex-music/info.json
+++ b/pkgs/by-name/ya/yandex-music/info.json
@@ -1,7 +1,7 @@
 {
   "branch": "master",
-  "commit_hash": "8d7a26f3f3095044dd08422d9bca5607aa173103",
-  "commit_message": "Merge pull request #105 from byBenPuls/master",
-  "date": "2024-09-02",
-  "tag": "v5.14.0"
+  "commit_hash": "98fed92683e2e5a49999d04b5559edd02eddf627",
+  "commit_message": "Update packages",
+  "date": "2024-09-10",
+  "tag": "v5.15.0"
 }
diff --git a/pkgs/by-name/ya/yandex-music/package.nix b/pkgs/by-name/ya/yandex-music/package.nix
index a4a450af0b4a..a26e729d7b16 100644
--- a/pkgs/by-name/ya/yandex-music/package.nix
+++ b/pkgs/by-name/ya/yandex-music/package.nix
@@ -14,13 +14,13 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "yandex-music";
-  version = "5.14.0";
+  version = "5.15.0";
 
   src = fetchFromGitHub {
     owner = "cucumber-sp";
     repo = "yandex-music-linux";
     rev = "v${version}";
-    hash = "sha256-M0UcnrYtlrRY1sN65UPXcgEAzcdSpKWeHn4kbLDRRaw=";
+    hash = "sha256-c+OKyhbgpXMryc6QQH4b5cePlqyHeSfDh4kT2rU+Tpo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ya/yandex-music/ym_info.json b/pkgs/by-name/ya/yandex-music/ym_info.json
index 7ea7db9e9cda..49ff918d36a8 100644
--- a/pkgs/by-name/ya/yandex-music/ym_info.json
+++ b/pkgs/by-name/ya/yandex-music/ym_info.json
@@ -1,9 +1,9 @@
 {
   "ym": {
-    "version": "5.14.0",
-    "exe_name": "Yandex_Music_x64_5.14.0.exe",
-    "exe_link": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.14.0.exe",
-    "exe_sha256": "b7a0a974666e68b5ed324a72ca9f53dcbdb35271e2b48fe5adc6bc6c8876e03d"
+    "version": "5.15.0",
+    "exe_name": "Yandex_Music_x64_5.15.0.exe",
+    "exe_link": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.15.0.exe",
+    "exe_sha256": "14396a25b35199f28175d3c15924ec75560cbae6f5fb6767ec7f326637723e36"
   },
   "electron": {
     "version": "29.4.6",

From 757fe30b6379b7fdc7b7de87fd4c8758f9979f47 Mon Sep 17 00:00:00 2001
From: Dionysis Grigoropoulos <dgrig@erethon.com>
Date: Tue, 10 Sep 2024 12:47:25 +0300
Subject: [PATCH 47/52] CONTRIBUTING.md: Update link to committers issue

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8d99e465cc0e..d13585fc144d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -354,7 +354,7 @@ The following paragraphs about how to deal with unactive contributors is just a
 Please note that contributors with commit rights unactive for more than three months will have their commit rights revoked.
 -->
 
-Please see the discussion in [GitHub nixpkgs issue #50105](https://github.com/NixOS/nixpkgs/issues/50105) for information on how to proceed to be granted this level of access.
+Please see the discussion in [GitHub nixpkgs issue #321665](https://github.com/NixOS/nixpkgs/issues/321665) for information on how to proceed to be granted this level of access.
 
 In a case a contributor definitively leaves the Nix community, they should create an issue or post on [Discourse](https://discourse.nixos.org) with references of packages and modules they maintain so the maintainership can be taken over by other contributors.
 

From 4637858ca04f703326e3929fc356a354b441231d Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 10 Sep 2024 13:25:30 +0300
Subject: [PATCH 48/52] kdePackages: Plasma 6.1.4 -> 6.1.5

---
 pkgs/kde/generated/sources/plasma.json | 384 ++++++++++++-------------
 1 file changed, 192 insertions(+), 192 deletions(-)

diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json
index 1dbb8340e05c..6d1081703184 100644
--- a/pkgs/kde/generated/sources/plasma.json
+++ b/pkgs/kde/generated/sources/plasma.json
@@ -1,322 +1,322 @@
 {
   "bluedevil": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/bluedevil-6.1.4.tar.xz",
-    "hash": "sha256-cPjpXMm1kSBOgjJ4kkBHqeOWWwOFv5oSIgEy5sAMFA8="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/bluedevil-6.1.5.tar.xz",
+    "hash": "sha256-KZWNoIsyQr2kJDiYnuPsuB04bKW+cjMlBuXPDe0LcHc="
   },
   "breeze": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/breeze-6.1.4.tar.xz",
-    "hash": "sha256-Imcm3zewPLyuFUCfy13Dtp9WCu5oVB5AHivXYIDaAaU="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/breeze-6.1.5.tar.xz",
+    "hash": "sha256-VEkXfJBhP5e0dK53YoXM/G6Gc2kdEgM32VNwyefIPLI="
   },
   "breeze-grub": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/breeze-grub-6.1.4.tar.xz",
-    "hash": "sha256-kU++NVAJnd4PBufxsixTui7iF+7Dz+d3GntvbWxicAQ="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/breeze-grub-6.1.5.tar.xz",
+    "hash": "sha256-ezzwtCaAG9dLvWuPDcSvN7E3UPl7817c006moU0gCQk="
   },
   "breeze-gtk": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/breeze-gtk-6.1.4.tar.xz",
-    "hash": "sha256-Xlv86u28XdtpPxd17QAuWBmyYXgyGjHclNO/2NYQrsk="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/breeze-gtk-6.1.5.tar.xz",
+    "hash": "sha256-lgw98EdCPoXh8zvbYLcb3HSGuZQdideFMQ3r5QG9RtE="
   },
   "breeze-plymouth": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/breeze-plymouth-6.1.4.tar.xz",
-    "hash": "sha256-6XdesIkZALeHBnBNjIpCY5cMrHUzmL8REcXkhzevL/4="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/breeze-plymouth-6.1.5.tar.xz",
+    "hash": "sha256-Z2H6s/bVdWhjWwfBwjRgqRaBLgSXk3IYAdd6xd+O1gs="
   },
   "discover": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/discover-6.1.4.tar.xz",
-    "hash": "sha256-ZOc+mQvr4TomFCRfA761HFAnwoX8eTMJos/3nmFW0oQ="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/discover-6.1.5.tar.xz",
+    "hash": "sha256-biz1n6wst5JCDtbfZT+AMH1uM9bmrpwa8oJ6k7rjy40="
   },
   "drkonqi": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/drkonqi-6.1.4.tar.xz",
-    "hash": "sha256-a5cXw7BrkHFLQLw/iyiNJM2uI5Bgk2JXfuDh6QHgOFs="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/drkonqi-6.1.5.tar.xz",
+    "hash": "sha256-Dhsn5OjrUdEcO9SnyfA5my6qP6tr6H3fQNKL4N6ujb8="
   },
   "flatpak-kcm": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/flatpak-kcm-6.1.4.tar.xz",
-    "hash": "sha256-5Bt38ewwuLIkDLCQA0EOYB2s3VkhIuCFNeXFsVeCvhI="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/flatpak-kcm-6.1.5.tar.xz",
+    "hash": "sha256-UI99mL0UEkIUdG8kSAT+3c0kWIyw63xYA5B7IlE9KQo="
   },
   "kactivitymanagerd": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/kactivitymanagerd-6.1.4.tar.xz",
-    "hash": "sha256-mJZSw3G6gRw+ubFhswaH9Gyv/DvB+skXVUx5UUqYcMA="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/kactivitymanagerd-6.1.5.tar.xz",
+    "hash": "sha256-P4r9onN4eALVzUa/dvjxRn7OHyHIO7qmUTQ1d1UjgQ8="
   },
   "kde-cli-tools": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/kde-cli-tools-6.1.4.tar.xz",
-    "hash": "sha256-1thK/HG6tr7EXKhzM7JhaUkgzCJGNFs2PMRp7a2uGuI="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/kde-cli-tools-6.1.5.tar.xz",
+    "hash": "sha256-wPM2Bir4AIBFTKOahatgvKHseoVOhMCdSSgwsRB5AxM="
   },
   "kdecoration": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/kdecoration-6.1.4.tar.xz",
-    "hash": "sha256-h/DgCGkHjhBIVRkqtC22PR1qTSul6QvzU2kIteS3u/E="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/kdecoration-6.1.5.tar.xz",
+    "hash": "sha256-POFs6mWdhj9465PVZ7+VKz9mRAvs1CSwbSBB/wZ53vc="
   },
   "kde-gtk-config": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/kde-gtk-config-6.1.4.tar.xz",
-    "hash": "sha256-s9TlyNoudSW9I8d6hUaOOnzzsanZyeiuaofiB6P5gBk="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/kde-gtk-config-6.1.5.tar.xz",
+    "hash": "sha256-Yx5Z9SYZ3alA0gWU3FUAjC8ZLacF5sXb+m0lF1CHti4="
   },
   "kdeplasma-addons": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/kdeplasma-addons-6.1.4.tar.xz",
-    "hash": "sha256-izOaflDG+fOj0UyvEF2D5/OhW7yWdDF+OdVV+6G+mhI="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/kdeplasma-addons-6.1.5.tar.xz",
+    "hash": "sha256-Nrb54cA+UupOXQQJoHhhF8gkcWYWny0KIh8g8a6riGM="
   },
   "kgamma": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/kgamma-6.1.4.tar.xz",
-    "hash": "sha256-vSCIKmZ2p2oGIGtCQ2irSu9yeYcepUYbvYUi2sFxinw="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/kgamma-6.1.5.tar.xz",
+    "hash": "sha256-L0Psa0q6wnJJsQFZTxnyIv5+WUcFT1JSwRqdnsIKtCw="
   },
   "kglobalacceld": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/kglobalacceld-6.1.4.tar.xz",
-    "hash": "sha256-bLSTvqMxaskW6H9WAimal/HwL9wBZppS6iUiOmCFrag="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/kglobalacceld-6.1.5.tar.xz",
+    "hash": "sha256-3A4Kl34Lrhd4jnAwvsONZVrvYMzgG3QOSPVXmkcx06o="
   },
   "kinfocenter": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/kinfocenter-6.1.4.tar.xz",
-    "hash": "sha256-F539wiT/ZvHWkkVlYLHJ8N10tWjiMzRxgjFnCawlINk="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/kinfocenter-6.1.5.tar.xz",
+    "hash": "sha256-CXauQ3Vrbdv05w51DLF/Qi2r52BMXi+CSrTx4BYa5dA="
   },
   "kmenuedit": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/kmenuedit-6.1.4.tar.xz",
-    "hash": "sha256-xqLXReZAKEPbCrxjPv9jYtbk0tgO9OpbB9PZxdwK39A="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/kmenuedit-6.1.5.tar.xz",
+    "hash": "sha256-/LJ6g6VVT7VlRjO+0Iy2CJhlcuMPXkJBYHo1TsidZVY="
   },
   "kpipewire": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/kpipewire-6.1.4.tar.xz",
-    "hash": "sha256-qxFtVv2Kazbaa1lfWXz0OD2O0XH45iXcpnt6RkUzcTQ="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/kpipewire-6.1.5.tar.xz",
+    "hash": "sha256-JbMs/K/zUvDErNpXRq3/0uOyi1/wZIUhvehijKcUWkk="
   },
   "krdp": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/krdp-6.1.4.tar.xz",
-    "hash": "sha256-dN6OGFvmfTW91mpBlMedf+TZh5SjPsm+kVQzyGvFkcs="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/krdp-6.1.5.tar.xz",
+    "hash": "sha256-qR3iyOi2/oUu3u5QtyLyq+vDs4R31++TX55re3znxrc="
   },
   "kscreen": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/kscreen-6.1.4.tar.xz",
-    "hash": "sha256-mf5k7bCX/IKF7CvTIi0C/LXJVg0p/L5B9/S4mLHjMa8="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/kscreen-6.1.5.tar.xz",
+    "hash": "sha256-QWap9tWI7v3BntnZqeD4Jlq0mZviSLoRtI7jU+y8UR8="
   },
   "kscreenlocker": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/kscreenlocker-6.1.4.tar.xz",
-    "hash": "sha256-HccK6N42XT7EH49aM7Rgma3VplDCNGn3pz9yyFs663M="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/kscreenlocker-6.1.5.tar.xz",
+    "hash": "sha256-oOqDVBIqKOCsxuxgSnZY/uWwDxJcwJ6nWMm5G/PH8Pw="
   },
   "ksshaskpass": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/ksshaskpass-6.1.4.tar.xz",
-    "hash": "sha256-W3Izf5OaqBRI6JK9PLYvWb120M0PnYBwAUYDP7vZZQw="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/ksshaskpass-6.1.5.tar.xz",
+    "hash": "sha256-NN1y8r94XdS2yYlEvU5ETb60a7Xy10xblbrtghxnGPE="
   },
   "ksystemstats": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/ksystemstats-6.1.4.tar.xz",
-    "hash": "sha256-pBETmZ+QdzzYfy5u10solTu6fA9vnQ1xMWSF7jvAg5w="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/ksystemstats-6.1.5.tar.xz",
+    "hash": "sha256-hCW7nwdiNNFn6vaJt09ynioFYcNnRz6KhPq0pMOcaJM="
   },
   "kwallet-pam": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/kwallet-pam-6.1.4.tar.xz",
-    "hash": "sha256-cySxPgMnz7c/20reiUjK0XuFTgIkHfqcF8urhY8vLjY="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/kwallet-pam-6.1.5.tar.xz",
+    "hash": "sha256-swysTx4mY3dlR5U6YhCTcdX5tDRKjfkgeILx4d3koD8="
   },
   "kwayland": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/kwayland-6.1.4.tar.xz",
-    "hash": "sha256-hpHAbmWsLHOd5IQsDRIZV577SuGGS4YU3HSkZF3Vl3Q="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/kwayland-6.1.5.tar.xz",
+    "hash": "sha256-Z6PhVzC9o2Bz8wQivcIa7ie/IF++7BorgCDJ0al/jak="
   },
   "kwayland-integration": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/kwayland-integration-6.1.4.tar.xz",
-    "hash": "sha256-XB4oE4Yh2AYd75CGQsahPqttMRkoUFL2oeF3lLOAzk4="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/kwayland-integration-6.1.5.tar.xz",
+    "hash": "sha256-I8YQID8b+qzMgnGOYK2qMz4x3UKDfU6E3/DPgOYUxog="
   },
   "kwin": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/kwin-6.1.4.tar.xz",
-    "hash": "sha256-/P/ORo3qI6ksrTOsGxJkxVwHmdSX9U9rjiNDnc2t6zo="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/kwin-6.1.5.tar.xz",
+    "hash": "sha256-ugqs4yMZW1itv94U7HTN1MKMIR14pWfESvcPM23Ks/c="
   },
   "kwrited": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/kwrited-6.1.4.tar.xz",
-    "hash": "sha256-z76mnrm3S33+/m1m8Jso3os0jMt8rF7sZUtKRlJFgUs="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/kwrited-6.1.5.tar.xz",
+    "hash": "sha256-oFnd8o7Oi0OYml6ofkR/o/Ajea7HmKHefLWaWqoqlhg="
   },
   "layer-shell-qt": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/layer-shell-qt-6.1.4.tar.xz",
-    "hash": "sha256-YjnS3GvvU4a5SOwhgCAqGPdeI/N5AsLXQQ+zgR37Mmg="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/layer-shell-qt-6.1.5.tar.xz",
+    "hash": "sha256-0Ry1X3XW64kE5IzQloVwQ6bamQCxw0t6xXFubkbw7TI="
   },
   "libkscreen": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/libkscreen-6.1.4.tar.xz",
-    "hash": "sha256-cwJivuy8YnC5avwNP7v+tUa044OIkiKzhdB67LQsZns="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/libkscreen-6.1.5.tar.xz",
+    "hash": "sha256-WPUjqd/gely5dY1g9qfxyfQBICifg1UVpOLY1tbaTGU="
   },
   "libksysguard": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/libksysguard-6.1.4.tar.xz",
-    "hash": "sha256-0qeuvJVxzoG0ynkJW3Sg2RgpwkkwPSJGIDggOkxWxbE="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/libksysguard-6.1.5.tar.xz",
+    "hash": "sha256-rQH6LGZPgs4kt9YXvBmUIGN2Nz+b1krjE7Mof9WKArk="
   },
   "libplasma": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/libplasma-6.1.4.tar.xz",
-    "hash": "sha256-Kv4xTZlg6G4NF5mqwmkExWZb4pNNXZ1chTO6liprhBA="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/libplasma-6.1.5.tar.xz",
+    "hash": "sha256-d8K4Ot5pmawOUmmk6HKEQ6fWGUbWjQu0EQarQpKnnMk="
   },
   "milou": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/milou-6.1.4.tar.xz",
-    "hash": "sha256-coA8zCCnhG7kWY/h6yyFobz+aKxeI3ZuS0tgelJyAII="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/milou-6.1.5.tar.xz",
+    "hash": "sha256-QFFIoS7n/siTiPmbxUhVB1SMhRLeIroDAlFURCc1OQo="
   },
   "ocean-sound-theme": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/ocean-sound-theme-6.1.4.tar.xz",
-    "hash": "sha256-ogAEz6y4sNzp5d63LXVe6Wv9GOtzB6ChuCnDL9ylb1w="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/ocean-sound-theme-6.1.5.tar.xz",
+    "hash": "sha256-ro+lnDo8PTekOOOrXtEcwAjqBFAZU3cL2euTJwBRKTU="
   },
   "oxygen": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/oxygen-6.1.4.tar.xz",
-    "hash": "sha256-A2AX2f33J2TLS7B4lypdlcYdYvhlEAxW71qBHjGrqdU="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/oxygen-6.1.5.tar.xz",
+    "hash": "sha256-B0HWside8AtZPvXjHKJniZ1zvD8W0TLJKkLnZ+wCVzU="
   },
   "oxygen-sounds": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/oxygen-sounds-6.1.4.tar.xz",
-    "hash": "sha256-aHXpmEzhnHnsGZ9uju0f2FoIinhmlxCoj2ErWCqjQck="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/oxygen-sounds-6.1.5.tar.xz",
+    "hash": "sha256-ZpCkniLRWmpogrh/clqdo7xJYXe4mjlSsBVVqYu0RqU="
   },
   "plasma5support": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/plasma5support-6.1.4.tar.xz",
-    "hash": "sha256-yZ/VDWSW988SPRHjdnkLy81sgGcK9+kD7gKVrULdRNY="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/plasma5support-6.1.5.tar.xz",
+    "hash": "sha256-BWNYUiLFMz4iee/agpw2oTl0HJ4M86024+gJaEDAF9E="
   },
   "plasma-activities": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/plasma-activities-6.1.4.tar.xz",
-    "hash": "sha256-7LOVeSNL/+uPUYq30ZZAkbMW8Pl8JRyJCZLud7j1IoY="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/plasma-activities-6.1.5.tar.xz",
+    "hash": "sha256-s1P7564w9qBO9PgdPgJQZUoPmFmp70MhTInHi5JOKEs="
   },
   "plasma-activities-stats": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/plasma-activities-stats-6.1.4.tar.xz",
-    "hash": "sha256-kvrmvylZTF/pliUIa8lPW7q5knYPlta0Mk6Txex/IHc="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/plasma-activities-stats-6.1.5.tar.xz",
+    "hash": "sha256-JiBQpTiU3gbxND+x1QtuAPeXo+NJMW7d/re1Fs3cDd8="
   },
   "plasma-browser-integration": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/plasma-browser-integration-6.1.4.tar.xz",
-    "hash": "sha256-1r+a6v48iw5lzB78SEbQwhI20Elh3qjG1qezPi1MPFU="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/plasma-browser-integration-6.1.5.tar.xz",
+    "hash": "sha256-Q2JcNeo57uvtesyXWazGCHGrwdK4jcnnuQivpMAJiqo="
   },
   "plasma-desktop": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/plasma-desktop-6.1.4.tar.xz",
-    "hash": "sha256-g7iX9gL73LjVcZCMJ/IwPh+LqN3tM8GwN1JDfEEkh9E="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/plasma-desktop-6.1.5.tar.xz",
+    "hash": "sha256-2eI2yamjMti3tO3eRMZdCw7Djqda3Fu/ohpsTH9CYcI="
   },
   "plasma-disks": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/plasma-disks-6.1.4.tar.xz",
-    "hash": "sha256-eV9r2rov6XnVg2R5ER/D1vxrKgs1W0jIMz21q7XfTEc="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/plasma-disks-6.1.5.tar.xz",
+    "hash": "sha256-XXZpwBnovmaLmF1z1/D9sxWYSpCsewzx45ibgJRubEo="
   },
   "plasma-firewall": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/plasma-firewall-6.1.4.tar.xz",
-    "hash": "sha256-yz8cmu0MZZ4KvKPIIEGGDr9ACfDnMQPrVlKZtIo3u2Q="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/plasma-firewall-6.1.5.tar.xz",
+    "hash": "sha256-TtMb3Y8CEScpR1GM8uvqVHu8RLfPxvbz50fsyRi0r0I="
   },
   "plasma-integration": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/plasma-integration-6.1.4.tar.xz",
-    "hash": "sha256-CKEoI/14574E4j8d0fXubrFTXKtWEjfW79Sw0DLcqnQ="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/plasma-integration-6.1.5.tar.xz",
+    "hash": "sha256-FatL93CRJOxP54QiggkByO+3+7kiRVdr5XyEdIKl7Js="
   },
   "plasma-mobile": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/plasma-mobile-6.1.4.tar.xz",
-    "hash": "sha256-lJsF1BwFpadOS3qqoFBg/B5AabOPT87AbCnLy/kjMNI="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/plasma-mobile-6.1.5.tar.xz",
+    "hash": "sha256-z1vUSN34Lfw6Zh4I6va0al5wa+yzDuwYfppXTokILa0="
   },
   "plasma-nano": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/plasma-nano-6.1.4.tar.xz",
-    "hash": "sha256-hE59Cmt4GSgN85e6mcRNQsJ1A5N7/yoTpqxDrrjYiMI="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/plasma-nano-6.1.5.tar.xz",
+    "hash": "sha256-weZFmXGZ/l4kn7JKA4kkhlcL3kgVPVLUkDQ58wlLosY="
   },
   "plasma-nm": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/plasma-nm-6.1.4.tar.xz",
-    "hash": "sha256-FK9HEIzzKvaMANDOb7NifztKkeLgV6bvW6j8/Lb1BeE="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/plasma-nm-6.1.5.tar.xz",
+    "hash": "sha256-ywTdrwDXKOoLS10QizOJ1GLOUHhyb4tlXzjeMw7rIfU="
   },
   "plasma-pa": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/plasma-pa-6.1.4.tar.xz",
-    "hash": "sha256-NEvUYKj2qf9E6/cT9kWfsdxcOrHD7aWs9m+8kfPkc00="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/plasma-pa-6.1.5.tar.xz",
+    "hash": "sha256-ckwFkdvr3l+WxBYxbJAOiPSmbXSJBe0cp05hUjV6dZE="
   },
   "plasma-sdk": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/plasma-sdk-6.1.4.tar.xz",
-    "hash": "sha256-8GZKIu6Z9BUFC8LtWD2KE3IUrLKCkwyw8eDZsX7Sc0o="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/plasma-sdk-6.1.5.tar.xz",
+    "hash": "sha256-jQ1OheR9KCSblR88mX9ghVoQyt7Ze+o0FAc5flUbjEY="
   },
   "plasma-systemmonitor": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/plasma-systemmonitor-6.1.4.tar.xz",
-    "hash": "sha256-JipI0p2gYbx2qnwkkE1IKLwt7AtmQKz/zjeZGUxL5Fc="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/plasma-systemmonitor-6.1.5.tar.xz",
+    "hash": "sha256-C17szwR1FiWfcgXBQ4FC1KglLq3gC7hhtm1IMbsDpwQ="
   },
   "plasma-thunderbolt": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/plasma-thunderbolt-6.1.4.tar.xz",
-    "hash": "sha256-gahEJUn8r3wA/VESR0jB1IhcUTrCSwq4nwSGbabtTGw="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/plasma-thunderbolt-6.1.5.tar.xz",
+    "hash": "sha256-lAKt8+6u1MXvynGXVbWfLShk2prV/YHSKzqPX9bjrmA="
   },
   "plasma-vault": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/plasma-vault-6.1.4.tar.xz",
-    "hash": "sha256-NKT/TFub9v51xOqwIl2uohwlEpF53vyJsLkuyxp7yN8="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/plasma-vault-6.1.5.tar.xz",
+    "hash": "sha256-ULE1v9sVmUd0QSJ4hwn4kSp2Ew0pIOqXdc5AL3p9xAQ="
   },
   "plasma-welcome": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/plasma-welcome-6.1.4.tar.xz",
-    "hash": "sha256-pK22ef6cdc3cUVOmMTgJoRtMRxndEFkNBE0pNcfVO34="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/plasma-welcome-6.1.5.tar.xz",
+    "hash": "sha256-Euzp59YcPsaiP+k1dmdBbiaAKrr9xp8kXMPZagXvnZY="
   },
   "plasma-workspace": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/plasma-workspace-6.1.4.tar.xz",
-    "hash": "sha256-yyCZ3TnAsj/0sFyM9leEUYcHXTH3X+QfD+Ae3OVsjVY="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/plasma-workspace-6.1.5.tar.xz",
+    "hash": "sha256-wp4Vo+1CRG+Ze34WlYZPhev/CE4uzlgckUoNio4mWuc="
   },
   "plasma-workspace-wallpapers": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/plasma-workspace-wallpapers-6.1.4.tar.xz",
-    "hash": "sha256-iPZcI2CNeTMXzDaeqO792rJuYaIcptQ0oCDv7ppbQ8Q="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/plasma-workspace-wallpapers-6.1.5.tar.xz",
+    "hash": "sha256-qOpCuZslRm1S0/5Vcsn7w4cJvxNwVEiOk3+HDzNU7gI="
   },
   "plymouth-kcm": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/plymouth-kcm-6.1.4.tar.xz",
-    "hash": "sha256-K1U6vuM4JPLWEtW2Qd3pkL746Qvw7L13zF6gSHwDNFw="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/plymouth-kcm-6.1.5.tar.xz",
+    "hash": "sha256-Bz4D+KhROOBdiGcqXB4GIjjjSz3t5BGPKRHCAMBVWHU="
   },
   "polkit-kde-agent-1": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/polkit-kde-agent-1-6.1.4.tar.xz",
-    "hash": "sha256-ePqZS3Eqq82+/e8MBfr9oEasPOTlBlfYGjzDD6Jd278="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/polkit-kde-agent-1-6.1.5.tar.xz",
+    "hash": "sha256-CWXl/61DKj5u6eNVQO/Le0CDIApIxp2R5SXAmke5IPY="
   },
   "powerdevil": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/powerdevil-6.1.4.tar.xz",
-    "hash": "sha256-oalm4uJJgwXjM5fvJ9+mjRAlX8twmbDZHF7ajUKQE+U="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/powerdevil-6.1.5.tar.xz",
+    "hash": "sha256-BQ4cb88H2izXv+IqYYqpFQS7KwC9MapoEhuQPN6dhF0="
   },
   "print-manager": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/print-manager-6.1.4.tar.xz",
-    "hash": "sha256-xXR79USAS6EhED0mRP/dblLtgEZWgpLMohdROnbQDt8="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/print-manager-6.1.5.tar.xz",
+    "hash": "sha256-pJRE4WoHlZUxU2UlF8ZlcamYujjc2IYWa4gjHpbIzhI="
   },
   "qqc2-breeze-style": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/qqc2-breeze-style-6.1.4.tar.xz",
-    "hash": "sha256-j7m8QVb53JIMY7DYr6pKrLcutlDpB8BtrN44v9VdUWg="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/qqc2-breeze-style-6.1.5.tar.xz",
+    "hash": "sha256-a0tsDwiy7OO12hyJ3mzhBiHY4mt/q+2/YBA6XyyK+EU="
   },
   "sddm-kcm": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/sddm-kcm-6.1.4.tar.xz",
-    "hash": "sha256-IE9gmeyxQOtYjOkHT/zBRCES4pHSzd7obDGYPJ9OFKA="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/sddm-kcm-6.1.5.tar.xz",
+    "hash": "sha256-AJI1F003IHnuOq31HgvX2ho4LRhSrmWwuWcQsiZpjpw="
   },
   "systemsettings": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/systemsettings-6.1.4.tar.xz",
-    "hash": "sha256-wOomYnfMt1mns7nFidYJlnTz4/YD56pHHtidxq0AfaM="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/systemsettings-6.1.5.tar.xz",
+    "hash": "sha256-B0J66nzuCzSrzD732q8D1ivfcgXKP5ccjT+u3AunT9c="
   },
   "wacomtablet": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/wacomtablet-6.1.4.tar.xz",
-    "hash": "sha256-Uy8DnsW7JltwxlyeDiiwNh39Tzt71Z4nj0nZ26szf4k="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/wacomtablet-6.1.5.tar.xz",
+    "hash": "sha256-IerMb3eC/fnKcYndlP2OyRAzAs9gWY91chY18N8MREo="
   },
   "xdg-desktop-portal-kde": {
-    "version": "6.1.4",
-    "url": "mirror://kde/stable/plasma/6.1.4/xdg-desktop-portal-kde-6.1.4.tar.xz",
-    "hash": "sha256-OMoV/YbV/vLMeayY9WtM09k879MugtOyJGu3dALcp7I="
+    "version": "6.1.5",
+    "url": "mirror://kde/stable/plasma/6.1.5/xdg-desktop-portal-kde-6.1.5.tar.xz",
+    "hash": "sha256-CdE8DAb93AgySdH1vpB+Jx6jnwH1d9N9JnQ7Ad9aaXg="
   }
 }
\ No newline at end of file

From 9e5a44bcfc9b513413f71b3162fa56d4229dbc45 Mon Sep 17 00:00:00 2001
From: nicoo <nicoo@debian.org>
Date: Tue, 10 Sep 2024 10:53:46 +0000
Subject: [PATCH 49/52] nixos/podman: set `preferLocalBuild` on trivial
 `runCommand`s (#340980)

---
 nixos/modules/virtualisation/podman/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix
index 5a1317f437a1..aa1d383738ad 100644
--- a/nixos/modules/virtualisation/podman/default.nix
+++ b/nixos/modules/virtualisation/podman/default.nix
@@ -21,6 +21,7 @@ let
     {
       outputs = [ "out" "man" ];
       inherit (podmanPackage) meta;
+      preferLocalBuild = true;
     } ''
     mkdir -p $out/bin
     ln -s ${podmanPackage}/bin/podman $out/bin/docker
@@ -235,7 +236,10 @@ in
       systemd.tmpfiles.packages = [
         # The /run/podman rule interferes with our podman group, so we remove
         # it and let the systemd socket logic take care of it.
-        (pkgs.runCommand "podman-tmpfiles-nixos" { package = cfg.package; } ''
+        (pkgs.runCommand "podman-tmpfiles-nixos" {
+          package = cfg.package;
+          preferLocalBuild = true;
+        } ''
           mkdir -p $out/lib/tmpfiles.d/
           grep -v 'D! /run/podman 0700 root root' \
             <$package/lib/tmpfiles.d/podman.conf \

From 432bfec0264157e5485768897a70b5193c2015a7 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Giraudeau <jb@giraudeau.info>
Date: Mon, 9 Sep 2024 15:20:59 +0200
Subject: [PATCH 50/52] nixos/gancio: use unix socket between nginx and gancio

---
 nixos/modules/services/web-apps/gancio.nix | 25 +++++++++++-----------
 nixos/tests/gancio.nix                     |  2 +-
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/web-apps/gancio.nix b/nixos/modules/services/web-apps/gancio.nix
index 893f5702518a..5f14ff46cb19 100644
--- a/nixos/modules/services/web-apps/gancio.nix
+++ b/nixos/modules/services/web-apps/gancio.nix
@@ -59,19 +59,12 @@ in
             description = "The URL path under which the server is reachable.";
           };
           server = {
-            host = mkOption {
-              type = types.str;
-              default = "localhost";
-              example = "::";
+            socket = mkOption {
+              type = types.path;
+              readOnly = true;
+              default = "/run/gancio/socket";
               description = ''
-                The address (IPv4, IPv6 or DNS) for the gancio server to listen on.
-              '';
-            };
-            port = mkOption {
-              type = types.port;
-              default = 13120;
-              description = ''
-                Port number of the gancio server to listen on.
+                The unix socket for the gancio server to listen on.
               '';
             };
           };
@@ -231,6 +224,10 @@ in
 
         serviceConfig = {
           ExecStart = "${getExe cfg.package} start ${configFile}";
+          # set umask so that nginx can write to the server socket
+          # FIXME: upstream socket permission configuration in Nuxt
+          UMask = "0002";
+          RuntimeDirectory = "gancio";
           StateDirectory = "gancio";
           WorkingDirectory = "/var/lib/gancio";
           LogsDirectory = "gancio";
@@ -274,12 +271,14 @@ in
             };
             "@proxy" = {
               proxyWebsockets = true;
-              proxyPass = "http://${cfg.settings.server.host}:${toString cfg.settings.server.port}";
+              proxyPass = "http://unix:${cfg.settings.server.socket}";
               recommendedProxySettings = true;
             };
           };
         }
       ];
     };
+    # for nginx to access gancio socket
+    users.users."${config.services.nginx.user}".extraGroups = [ config.users.users.${cfg.user}.group ];
   };
 }
diff --git a/nixos/tests/gancio.nix b/nixos/tests/gancio.nix
index 1dc5fd8b5606..8f4696d6f6cc 100644
--- a/nixos/tests/gancio.nix
+++ b/nixos/tests/gancio.nix
@@ -71,7 +71,7 @@ import ./make-test-python.nix (
       server.wait_for_unit("postgresql")
       server.wait_for_unit("gancio")
       server.wait_for_unit("nginx")
-      server.wait_for_open_port(13120)
+      server.wait_for_file("/run/gancio/socket")
       server.wait_for_open_port(80)
 
       # Check can create user via cli

From 3a33b6c3a846f3abca1e18d09563579b5081f6ac Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Giraudeau <jb@giraudeau.info>
Date: Tue, 10 Sep 2024 09:31:35 +0200
Subject: [PATCH 51/52] nixos/gancio: set default value for settings.baseurl

---
 nixos/modules/services/web-apps/gancio.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/web-apps/gancio.nix b/nixos/modules/services/web-apps/gancio.nix
index 5f14ff46cb19..fa55db762c46 100644
--- a/nixos/modules/services/web-apps/gancio.nix
+++ b/nixos/modules/services/web-apps/gancio.nix
@@ -54,9 +54,12 @@ in
           };
           baseurl = mkOption {
             type = types.str;
-            default = "";
-            example = "/gancio";
-            description = "The URL path under which the server is reachable.";
+            default = "http${
+              lib.optionalString config.services.nginx.virtualHosts."${cfg.settings.hostname}".enableACME "s"
+            }://${cfg.settings.hostname}";
+            defaultText = lib.literalExpression ''"https://''${cfg.settings.hostname}"'';
+            example = "https://demo.gancio.org/gancio";
+            description = "The full URL under which the server is reachable.";
           };
           server = {
             socket = mkOption {

From 7438ebd9431243aa0b01502fae89c022e4facb0c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 21:14:53 +1000
Subject: [PATCH 52/52] viddy: 1.1.0 -> 1.1.2 (#340972)

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

diff --git a/pkgs/tools/misc/viddy/default.nix b/pkgs/tools/misc/viddy/default.nix
index 5c534a7b974f..c6e83e3c4b1e 100644
--- a/pkgs/tools/misc/viddy/default.nix
+++ b/pkgs/tools/misc/viddy/default.nix
@@ -6,21 +6,21 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "viddy";
-  version = "1.1.0";
+  version = "1.1.2";
 
   src = fetchFromGitHub {
     owner = "sachaos";
     repo = "viddy";
     rev = "v${version}";
-    hash = "sha256-dsvPNMNT1CXB6Wgq438wRHt9og+4uFWgiWPore4mRE0=";
+    hash = "sha256-vlPG7nYWCNfhZJOm6qmYNK5OwkckVZFRQWMhDX2vWTc=";
   };
 
-  cargoHash = "sha256-18OEOV8kET+UcLd15YultkonbXBEY/AwBHFNw4YTAPk=";
+  cargoHash = "sha256-YM73+f/a1iE+lRots/CNfYcU8iZ7xiAKjDHOIywOo6o=";
 
   # requires nightly features
   env.RUSTC_BOOTSTRAP = 1;
 
-  env.VERGEN_BUILD_DATE = "2024-09-01"; # managed via the update script
+  env.VERGEN_BUILD_DATE = "2024-09-05"; # managed via the update script
   env.VERGEN_GIT_DESCRIBE = "Nixpkgs";
 
   passthru.updateScript.command = [ ./update.sh ];