From 185948bd01dd80e856a27788b2b6cf787410279f Mon Sep 17 00:00:00 2001
From: Michael Hoang <enzime@users.noreply.github.com>
Date: Fri, 30 Aug 2024 01:15:37 +1000
Subject: [PATCH 01/49] tailscale: only autoconnect after backend is up

Previously, if this service started before the backend is up,
`StatusText` would be empty leading to the service trying to run
`tailscale up` even if this device is already logged in.
---
 nixos/modules/services/networking/tailscale.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix
index a690dc610e82..b00af075d02f 100644
--- a/nixos/modules/services/networking/tailscale.nix
+++ b/nixos/modules/services/networking/tailscale.nix
@@ -121,10 +121,16 @@ in {
       serviceConfig = {
         Type = "oneshot";
       };
-      script = ''
-        status=$(${config.systemd.package}/bin/systemctl show -P StatusText tailscaled.service)
-        if [[ $status != Connected* ]]; then
-          ${cfg.package}/bin/tailscale up --auth-key 'file:${cfg.authKeyFile}' ${escapeShellArgs cfg.extraUpFlags}
+      # https://github.com/tailscale/tailscale/blob/v1.72.1/ipn/backend.go#L24-L32
+      script = let
+        statusCommand = "${lib.getExe cfg.package} status --json | ${lib.getExe pkgs.jq} -r '.BackendState'";
+      in ''
+        while [[ "$(${statusCommand})" == "NoState" ]]; do
+          sleep 0.5
+        done
+        status=$(${statusCommand})
+        if [[ "$status" == "NeedsLogin" || "$status" == "NeedsMachineAuth" ]]; then
+          ${lib.getExe cfg.package} up --auth-key 'file:${cfg.authKeyFile}' ${escapeShellArgs cfg.extraUpFlags}
         fi
       '';
     };
@@ -137,7 +143,7 @@ in {
         Type = "oneshot";
       };
       script = ''
-        ${cfg.package}/bin/tailscale set ${escapeShellArgs cfg.extraSetFlags}
+        ${lib.getExe cfg.package} set ${escapeShellArgs cfg.extraSetFlags}
       '';
     };
 

From ea0225eebfa7df6f66061bcd8c71d9ed4a2b608a Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Tue, 20 Aug 2024 23:09:42 +0200
Subject: [PATCH 02/49] opera: 111.0.5168.61 -> 113.0.5230.47

It bumps the underlying Chromium version from 125.0.6422.143 to 127.0.6533.120.
It is still vulnerable to publicly known vulnerabilities but I'm
guessing it is still an improvement...

Changelog:
https://blogs.opera.com/desktop/changelog-for-112/
https://blogs.opera.com/desktop/changelog-for-113/
---
 pkgs/applications/networking/browsers/opera/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index 36327e521994..429923f6268a 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -51,11 +51,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "opera";
-  version = "111.0.5168.61";
+  version = "113.0.5230.47";
 
   src = fetchurl {
     url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
-    hash = "sha256-O2QqosmhhFk6KfiAdlpDYOsZUqGhvtwzYFi2I90Hemo=";
+    hash = "sha256-0RQTcROUv85yE6ceLkyF09/++WrvK828h5hoN1QYpCE=";
   };
 
   unpackPhase = "dpkg-deb -x $src .";

From ecc89624769f0183cf34f921cd7e8b9d8b44358d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Sep 2024 00:46:53 +0000
Subject: [PATCH 03/49] bitwarden-directory-connector: 2024.3.2 -> 2024.9.0

---
 .../security/bitwarden-directory-connector/default.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/bitwarden-directory-connector/default.nix b/pkgs/tools/security/bitwarden-directory-connector/default.nix
index 7546f4262697..65b682a0fcf8 100644
--- a/pkgs/tools/security/bitwarden-directory-connector/default.nix
+++ b/pkgs/tools/security/bitwarden-directory-connector/default.nix
@@ -13,14 +13,14 @@
 let
   common = { name, npmBuildScript, installPhase }: buildNpmPackage rec {
     pname = name;
-    version = "2024.3.2";
+    version = "2024.9.0";
     nodejs = nodejs_18;
 
     src = fetchFromGitHub {
       owner = "bitwarden";
       repo = "directory-connector";
       rev = "v${version}";
-      hash = "sha256-CB5HrT+p63zANg1SEoynk6hPPW5DcC9Qfo2+QDy2iwc=";
+      hash = "sha256-Vop5Y1prdjA5SOQsA1HNBr3IBhe9Ya8d8M6CsS9xohg=";
     };
 
     postPatch = ''
@@ -32,7 +32,7 @@ let
         --replace-fail "AppImage" "dir"
     '';
 
-    npmDepsHash = "sha256-6WYNaF6z8OwWmi/Mv091LsuTUEUhWd8cDD11QKE8A5U=";
+    npmDepsHash = "sha256-8rmZSl5K2l97QHaNtcfW202TtcEa3HIjEjO/AkaZkdQ=";
 
     env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 

From d25d241e3819fbeded149f6e2cd4d89d0887cdb0 Mon Sep 17 00:00:00 2001
From: Michael Hoang <Enzime@users.noreply.github.com>
Date: Thu, 12 Sep 2024 23:06:23 +1000
Subject: [PATCH 04/49] Update nixos/modules/services/networking/tailscale.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 nixos/modules/services/networking/tailscale.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix
index b00af075d02f..2acae677390c 100644
--- a/nixos/modules/services/networking/tailscale.nix
+++ b/nixos/modules/services/networking/tailscale.nix
@@ -123,7 +123,7 @@ in {
       };
       # https://github.com/tailscale/tailscale/blob/v1.72.1/ipn/backend.go#L24-L32
       script = let
-        statusCommand = "${lib.getExe cfg.package} status --json | ${lib.getExe pkgs.jq} -r '.BackendState'";
+        statusCommand = "${lib.getExe cfg.package} status --json --peers=false | ${lib.getExe pkgs.jq} -r '.BackendState'";
       in ''
         while [[ "$(${statusCommand})" == "NoState" ]]; do
           sleep 0.5

From 0b134745fbae93afc3e0751fe1429e10bb6656e1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Sep 2024 08:56:10 +0000
Subject: [PATCH 05/49] docker-buildx: 0.16.2 -> 0.17.0

---
 pkgs/applications/virtualization/docker/buildx.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix
index 2230e31231e7..f4bc4000f938 100644
--- a/pkgs/applications/virtualization/docker/buildx.nix
+++ b/pkgs/applications/virtualization/docker/buildx.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "docker-buildx";
-  version = "0.16.2";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "buildx";
     rev = "v${version}";
-    hash = "sha256-s4VLuOLPNZGThnvr20EBddxKkreWf3B4D0RRx9OwJiw=";
+    hash = "sha256-KYPOeDI1g7hUwS7gvKiuOck/2MwvnawP1ZgDAfo4brA=";
   };
 
   doCheck = false;

From 89bc5a229aff2d61239ed300f891a006d0ade0be Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Sep 2024 12:45:50 +0000
Subject: [PATCH 06/49] docker-compose: 2.29.2 -> 2.29.3

---
 pkgs/applications/virtualization/docker/compose.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix
index 264a8ae288ec..e72797bea8e0 100644
--- a/pkgs/applications/virtualization/docker/compose.nix
+++ b/pkgs/applications/virtualization/docker/compose.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "docker-compose";
-  version = "2.29.2";
+  version = "2.29.3";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "compose";
     rev = "v${version}";
-    hash = "sha256-UR2O8xBfoFew9G7RjyfXpdA0BcilKBp9Maj3Z+T7Kbw=";
+    hash = "sha256-t9NyBW9wUwwMB2VAqRUn8KosQFuqWFwuG4Z6KmHXmXc=";
   };
 
   postPatch = ''
@@ -16,7 +16,7 @@ buildGoModule rec {
     rm -rf e2e/
   '';
 
-  vendorHash = "sha256-5pBpTXayAo/YbZsYwBuEU8CSTQGzKoyQ5QLzh2McCt8=";
+  vendorHash = "sha256-hhqNKueE5mJzGbhHqu/Cg9uQJ4v6I8q7+h4MB0MsJww=";
 
   ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
 

From 36671a03acbae2a55391a4d2669775396fd99ccd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Sep 2024 15:39:23 +0000
Subject: [PATCH 07/49] vitess: 20.0.1 -> 20.0.2

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

diff --git a/pkgs/development/tools/database/vitess/default.nix b/pkgs/development/tools/database/vitess/default.nix
index 09969c80c4e3..1363cf66b304 100644
--- a/pkgs/development/tools/database/vitess/default.nix
+++ b/pkgs/development/tools/database/vitess/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "vitess";
-  version = "20.0.1";
+  version = "20.0.2";
 
   src = fetchFromGitHub {
     owner = "vitessio";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-OkVBV/Fj2OKxkxjVBdTAyiGETuLw7OvV0KInp533iM8=";
+    hash = "sha256-I+pz8bz/H1mg7cQnPiJZxYr1gyzajMLVqg8yHbBXYLc=";
   };
 
   vendorHash = "sha256-ZDPDL7vJoPv5pIS5xhHAgLiZsiF2B85KNnqGQJPk1SQ=";

From 8bb3c5af95bad56de011d0990b3ffd71ae23b672 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Sep 2024 16:51:26 +0000
Subject: [PATCH 08/49] opengrok: 1.13.20 -> 1.13.21

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

diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix
index 21bd640fb480..3390127d678a 100644
--- a/pkgs/development/tools/misc/opengrok/default.nix
+++ b/pkgs/development/tools/misc/opengrok/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "opengrok";
-  version = "1.13.20";
+  version = "1.13.21";
 
   # binary distribution
   src = fetchurl {
     url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz";
-    hash = "sha256-qlD1zm2eCQm27N268tht0jtsSiCi3A31XCTFXG9jB0Y=";
+    hash = "sha256-xzg2KTZpa8DkxifQH7Q6pvyNEZj/mnXkBktNThMbI5k=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 5821bf91fffdd58a463c6af2ffcf8eab80f846e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Sep 2024 00:56:51 +0000
Subject: [PATCH 09/49] easyrsa: 3.2.0 -> 3.2.1

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

diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix
index d2639bdf5352..9705315f8dd0 100644
--- a/pkgs/tools/networking/easyrsa/default.nix
+++ b/pkgs/tools/networking/easyrsa/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "easyrsa";
-  version = "3.2.0";
+  version = "3.2.1";
 
   src = fetchFromGitHub {
     owner = "OpenVPN";
     repo = "easy-rsa";
     rev = "v${version}";
-    hash = "sha256-hjebDE7Ts93vtoOTquFbfTWdInhI7HXc4pRxIsvNLtg=";
+    hash = "sha256-/c2Redb6whfM2D8hHBrcSaQ3YsBESLjeoKFb5a2lFbQ=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 064bee57239a9a4c7da46f2e686d9a26e3da6d87 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Sep 2024 01:11:12 +0000
Subject: [PATCH 10/49] jacktrip: 2.3.1 -> 2.4.0

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

diff --git a/pkgs/applications/audio/jacktrip/default.nix b/pkgs/applications/audio/jacktrip/default.nix
index e54828e3cdcf..4d20e7a66b39 100644
--- a/pkgs/applications/audio/jacktrip/default.nix
+++ b/pkgs/applications/audio/jacktrip/default.nix
@@ -11,7 +11,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.3.1";
+  version = "2.4.0";
   pname = "jacktrip";
 
   src = fetchFromGitHub {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     repo = "jacktrip";
     rev = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-p5NXGmWIzi8M177bPzMKfXMmyMgS1qZuWHdCtBBLeDA=";
+    hash = "sha256-sTCzmQ/dq12ZmkbarVX1jpSODlBf9OuSB1XwKUnfV64=";
   };
 
   preConfigure = ''

From 054b14e67631e16406ef8418f5e9488f23b94e72 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Sep 2024 04:17:48 +0000
Subject: [PATCH 11/49] ansible-lint: 24.7.0 -> 24.9.0

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

diff --git a/pkgs/tools/admin/ansible/lint.nix b/pkgs/tools/admin/ansible/lint.nix
index bc6e325ea142..f161f75c1d3a 100644
--- a/pkgs/tools/admin/ansible/lint.nix
+++ b/pkgs/tools/admin/ansible/lint.nix
@@ -6,13 +6,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "ansible-lint";
-  version = "24.7.0";
+  version = "24.9.0";
   format = "pyproject";
 
   src = fetchPypi {
     inherit version;
     pname = "ansible_lint";
-    hash = "sha256-yi7cfk6AzxnfSyjL9MEY92HObN1qXvnIVh5FTtevWiQ=";
+    hash = "sha256-uMnJTGw7xotDvPewZ+KG+CAeNBdyx9Pb2wNk7KsrOUQ=";
   };
 
   postPatch = ''

From 554ec1c0f0444d649f7e94c4ebe67e61d74a0f8f Mon Sep 17 00:00:00 2001
From: Euan Kemp <euank@euank.com>
Date: Mon, 27 May 2024 22:07:09 +0900
Subject: [PATCH 12/49] nixos/tests: add postgresql wal2json test

This test should ensure wal2json functions.
I'm planning to upgrade wal2json, so it seems nice to have a test here.

It passes on my machine.
---
 nixos/tests/all-tests.nix                    |  1 +
 nixos/tests/postgresql-wal2json.nix          | 60 ++++++++++++++++
 nixos/tests/postgresql/wal2json/LICENSE      | 27 +++++++
 nixos/tests/postgresql/wal2json/README.md    | 11 +++
 nixos/tests/postgresql/wal2json/example2.out | 74 ++++++++++++++++++++
 nixos/tests/postgresql/wal2json/example2.sql | 31 ++++++++
 nixos/tests/postgresql/wal2json/example3.out | 12 ++++
 nixos/tests/postgresql/wal2json/example3.sql | 26 +++++++
 pkgs/servers/sql/postgresql/ext/wal2json.nix |  7 +-
 9 files changed, 248 insertions(+), 1 deletion(-)
 create mode 100644 nixos/tests/postgresql-wal2json.nix
 create mode 100644 nixos/tests/postgresql/wal2json/LICENSE
 create mode 100644 nixos/tests/postgresql/wal2json/README.md
 create mode 100644 nixos/tests/postgresql/wal2json/example2.out
 create mode 100644 nixos/tests/postgresql/wal2json/example2.sql
 create mode 100644 nixos/tests/postgresql/wal2json/example3.out
 create mode 100644 nixos/tests/postgresql/wal2json/example3.sql

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 6c9ff9fb9c20..92fa7fbbfd7e 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -805,6 +805,7 @@ in {
   postgresql-jit = handleTest ./postgresql-jit.nix {};
   postgresql-wal-receiver = handleTest ./postgresql-wal-receiver.nix {};
   postgresql-tls-client-cert = handleTest ./postgresql-tls-client-cert.nix {};
+  postgresql-wal2json = handleTest ./postgresql-wal2json.nix {};
   powerdns = handleTest ./powerdns.nix {};
   powerdns-admin = handleTest ./powerdns-admin.nix {};
   power-profiles-daemon = handleTest ./power-profiles-daemon.nix {};
diff --git a/nixos/tests/postgresql-wal2json.nix b/nixos/tests/postgresql-wal2json.nix
new file mode 100644
index 000000000000..043ad48cbc6e
--- /dev/null
+++ b/nixos/tests/postgresql-wal2json.nix
@@ -0,0 +1,60 @@
+{
+  system ? builtins.currentSystem,
+  config ? { },
+  pkgs ? import ../.. { inherit system config; },
+  postgresql ? null,
+}:
+
+let
+  makeTest = import ./make-test-python.nix;
+  # Makes a test for a PostgreSQL package, given by name and looked up from `pkgs`.
+  makeTestAttribute = name: {
+    inherit name;
+    value = makePostgresqlWal2jsonTest pkgs."${name}";
+  };
+
+  makePostgresqlWal2jsonTest =
+    postgresqlPackage:
+    makeTest {
+      name = "postgresql-wal2json-${postgresqlPackage.name}";
+      meta.maintainers = with pkgs.lib.maintainers; [ euank ];
+
+      nodes.machine = {
+        services.postgresql = {
+          package = postgresqlPackage;
+          enable = true;
+          extraPlugins = with postgresqlPackage.pkgs; [ wal2json ];
+          settings = {
+            wal_level = "logical";
+            max_replication_slots = "10";
+            max_wal_senders = "10";
+          };
+        };
+      };
+
+      testScript = ''
+        machine.wait_for_unit("postgresql")
+        machine.succeed(
+            "sudo -u postgres psql -qAt -f ${./postgresql/wal2json/example2.sql} postgres > /tmp/example2.out"
+        )
+        machine.succeed(
+            "diff ${./postgresql/wal2json/example2.out} /tmp/example2.out"
+        )
+        machine.succeed(
+            "sudo -u postgres psql -qAt -f ${./postgresql/wal2json/example3.sql} postgres > /tmp/example3.out"
+        )
+        machine.succeed(
+            "diff ${./postgresql/wal2json/example3.out} /tmp/example3.out"
+        )
+      '';
+    };
+
+in
+# By default, create one test per postgresql version
+if postgresql == null then
+  builtins.listToAttrs (
+    map makeTestAttribute (builtins.attrNames (import ../../pkgs/servers/sql/postgresql pkgs))
+  )
+# but if postgresql is set, we're being made as a passthru test for a specific postgres + wal2json version, just run one
+else
+  makePostgresqlWal2jsonTest postgresql
diff --git a/nixos/tests/postgresql/wal2json/LICENSE b/nixos/tests/postgresql/wal2json/LICENSE
new file mode 100644
index 000000000000..e3e82163fc09
--- /dev/null
+++ b/nixos/tests/postgresql/wal2json/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2013-2024, Euler Taveira de Oliveira
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.
+
+* Neither the name of the Euler Taveira de Oliveira nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/nixos/tests/postgresql/wal2json/README.md b/nixos/tests/postgresql/wal2json/README.md
new file mode 100644
index 000000000000..796bf810d757
--- /dev/null
+++ b/nixos/tests/postgresql/wal2json/README.md
@@ -0,0 +1,11 @@
+Data in this folder taken from the wal2json README's examples [here](https://github.com/eulerto/wal2json/tree/75629c2e1e81a12350cc9d63782fc53252185d8d#sql-functions)
+
+They are used under the terms of the BSD-3 License, a copy of which is included
+in this directory.
+
+These files have been lightly modified in order to make their output more reproducible.
+
+Changes:
+- `\o /dev/null` has been added before commands that print LSNs since LSNs aren't reproducible
+- `now()` has been replaced with a hardcoded timestamp string for reproducibility
+- The test is run with `--quiet`, and the expected output has been trimmed accordingly
diff --git a/nixos/tests/postgresql/wal2json/example2.out b/nixos/tests/postgresql/wal2json/example2.out
new file mode 100644
index 000000000000..0a089e112270
--- /dev/null
+++ b/nixos/tests/postgresql/wal2json/example2.out
@@ -0,0 +1,74 @@
+init
+{
+	"change": [
+		{
+			"kind": "message",
+			"transactional": false,
+			"prefix": "wal2json",
+			"content": "this non-transactional message will be delivered even if you rollback the transaction"
+		}
+	]
+}
+{
+	"change": [
+		{
+			"kind": "insert",
+			"schema": "public",
+			"table": "table2_with_pk",
+			"columnnames": ["a", "b", "c"],
+			"columntypes": ["integer", "character varying(30)", "timestamp without time zone"],
+			"columnvalues": [1, "Backup and Restore", "2018-03-27 12:05:29.914496"]
+		}
+		,{
+			"kind": "insert",
+			"schema": "public",
+			"table": "table2_with_pk",
+			"columnnames": ["a", "b", "c"],
+			"columntypes": ["integer", "character varying(30)", "timestamp without time zone"],
+			"columnvalues": [2, "Tuning", "2018-03-27 12:05:29.914496"]
+		}
+		,{
+			"kind": "insert",
+			"schema": "public",
+			"table": "table2_with_pk",
+			"columnnames": ["a", "b", "c"],
+			"columntypes": ["integer", "character varying(30)", "timestamp without time zone"],
+			"columnvalues": [3, "Replication", "2018-03-27 12:05:29.914496"]
+		}
+		,{
+			"kind": "message",
+			"transactional": true,
+			"prefix": "wal2json",
+			"content": "this message will be delivered"
+		}
+		,{
+			"kind": "delete",
+			"schema": "public",
+			"table": "table2_with_pk",
+			"oldkeys": {
+				"keynames": ["a", "c"],
+				"keytypes": ["integer", "timestamp without time zone"],
+				"keyvalues": [1, "2018-03-27 12:05:29.914496"]
+			}
+		}
+		,{
+			"kind": "delete",
+			"schema": "public",
+			"table": "table2_with_pk",
+			"oldkeys": {
+				"keynames": ["a", "c"],
+				"keytypes": ["integer", "timestamp without time zone"],
+				"keyvalues": [2, "2018-03-27 12:05:29.914496"]
+			}
+		}
+		,{
+			"kind": "insert",
+			"schema": "public",
+			"table": "table2_without_pk",
+			"columnnames": ["a", "b", "c"],
+			"columntypes": ["integer", "numeric(5,2)", "text"],
+			"columnvalues": [1, 2.34, "Tapir"]
+		}
+	]
+}
+stop
diff --git a/nixos/tests/postgresql/wal2json/example2.sql b/nixos/tests/postgresql/wal2json/example2.sql
new file mode 100644
index 000000000000..ec474381bb4d
--- /dev/null
+++ b/nixos/tests/postgresql/wal2json/example2.sql
@@ -0,0 +1,31 @@
+CREATE TABLE table2_with_pk (a SERIAL, b VARCHAR(30), c TIMESTAMP NOT NULL, PRIMARY KEY(a, c));
+CREATE TABLE table2_without_pk (a SERIAL, b NUMERIC(5,2), c TEXT);
+
+SELECT 'init' FROM pg_create_logical_replication_slot('test_slot', 'wal2json');
+
+BEGIN;
+INSERT INTO table2_with_pk (b, c) VALUES('Backup and Restore', '2018-03-27 12:05:29.914496');
+INSERT INTO table2_with_pk (b, c) VALUES('Tuning', '2018-03-27 12:05:29.914496');
+INSERT INTO table2_with_pk (b, c) VALUES('Replication', '2018-03-27 12:05:29.914496');
+
+-- Avoid printing wal LSNs since they're not reproducible, so harder to assert on
+\o /dev/null
+SELECT pg_logical_emit_message(true, 'wal2json', 'this message will be delivered');
+SELECT pg_logical_emit_message(true, 'pgoutput', 'this message will be filtered');
+\o
+
+DELETE FROM table2_with_pk WHERE a < 3;
+\o /dev/null
+SELECT pg_logical_emit_message(false, 'wal2json', 'this non-transactional message will be delivered even if you rollback the transaction');
+\o
+
+INSERT INTO table2_without_pk (b, c) VALUES(2.34, 'Tapir');
+-- it is not added to stream because there isn't a pk or a replica identity
+UPDATE table2_without_pk SET c = 'Anta' WHERE c = 'Tapir';
+COMMIT;
+
+SELECT data FROM pg_logical_slot_get_changes('test_slot', NULL, NULL, 'pretty-print', '1', 'add-msg-prefixes', 'wal2json');
+SELECT 'stop' FROM pg_drop_replication_slot('test_slot');
+
+DROP TABLE table2_with_pk;
+DROP TABLE table2_without_pk;
diff --git a/nixos/tests/postgresql/wal2json/example3.out b/nixos/tests/postgresql/wal2json/example3.out
new file mode 100644
index 000000000000..e20d2a8aefd7
--- /dev/null
+++ b/nixos/tests/postgresql/wal2json/example3.out
@@ -0,0 +1,12 @@
+init
+{"action":"M","transactional":false,"prefix":"wal2json","content":"this non-transactional message will be delivered even if you rollback the transaction"}
+{"action":"B"}
+{"action":"I","schema":"public","table":"table3_with_pk","columns":[{"name":"a","type":"integer","value":1},{"name":"b","type":"character varying(30)","value":"Backup and Restore"},{"name":"c","type":"timestamp without time zone","value":"2019-12-29 04:58:34.806671"}]}
+{"action":"I","schema":"public","table":"table3_with_pk","columns":[{"name":"a","type":"integer","value":2},{"name":"b","type":"character varying(30)","value":"Tuning"},{"name":"c","type":"timestamp without time zone","value":"2019-12-29 04:58:34.806671"}]}
+{"action":"I","schema":"public","table":"table3_with_pk","columns":[{"name":"a","type":"integer","value":3},{"name":"b","type":"character varying(30)","value":"Replication"},{"name":"c","type":"timestamp without time zone","value":"2019-12-29 04:58:34.806671"}]}
+{"action":"M","transactional":true,"prefix":"wal2json","content":"this message will be delivered"}
+{"action":"D","schema":"public","table":"table3_with_pk","identity":[{"name":"a","type":"integer","value":1},{"name":"c","type":"timestamp without time zone","value":"2019-12-29 04:58:34.806671"}]}
+{"action":"D","schema":"public","table":"table3_with_pk","identity":[{"name":"a","type":"integer","value":2},{"name":"c","type":"timestamp without time zone","value":"2019-12-29 04:58:34.806671"}]}
+{"action":"I","schema":"public","table":"table3_without_pk","columns":[{"name":"a","type":"integer","value":1},{"name":"b","type":"numeric(5,2)","value":2.34},{"name":"c","type":"text","value":"Tapir"}]}
+{"action":"C"}
+stop
diff --git a/nixos/tests/postgresql/wal2json/example3.sql b/nixos/tests/postgresql/wal2json/example3.sql
new file mode 100644
index 000000000000..6d94e261f51a
--- /dev/null
+++ b/nixos/tests/postgresql/wal2json/example3.sql
@@ -0,0 +1,26 @@
+CREATE TABLE table3_with_pk (a SERIAL, b VARCHAR(30), c TIMESTAMP NOT NULL, PRIMARY KEY(a, c));
+CREATE TABLE table3_without_pk (a SERIAL, b NUMERIC(5,2), c TEXT);
+
+SELECT 'init' FROM pg_create_logical_replication_slot('test_slot', 'wal2json');
+
+BEGIN;
+INSERT INTO table3_with_pk (b, c) VALUES('Backup and Restore', '2019-12-29 04:58:34.806671');
+INSERT INTO table3_with_pk (b, c) VALUES('Tuning', '2019-12-29 04:58:34.806671');
+INSERT INTO table3_with_pk (b, c) VALUES('Replication', '2019-12-29 04:58:34.806671');
+\o /dev/null
+SELECT pg_logical_emit_message(true, 'wal2json', 'this message will be delivered');
+SELECT pg_logical_emit_message(true, 'pgoutput', 'this message will be filtered');
+DELETE FROM table3_with_pk WHERE a < 3;
+SELECT pg_logical_emit_message(false, 'wal2json', 'this non-transactional message will be delivered even if you rollback the transaction');
+\o
+
+INSERT INTO table3_without_pk (b, c) VALUES(2.34, 'Tapir');
+-- it is not added to stream because there isn't a pk or a replica identity
+UPDATE table3_without_pk SET c = 'Anta' WHERE c = 'Tapir';
+COMMIT;
+
+SELECT data FROM pg_logical_slot_get_changes('test_slot', NULL, NULL, 'format-version', '2', 'add-msg-prefixes', 'wal2json');
+SELECT 'stop' FROM pg_drop_replication_slot('test_slot');
+
+DROP TABLE table3_with_pk;
+DROP TABLE table3_without_pk;
diff --git a/pkgs/servers/sql/postgresql/ext/wal2json.nix b/pkgs/servers/sql/postgresql/ext/wal2json.nix
index 26d4cb0c1541..32483849019c 100644
--- a/pkgs/servers/sql/postgresql/ext/wal2json.nix
+++ b/pkgs/servers/sql/postgresql/ext/wal2json.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, postgresql }:
+{ lib, callPackage, stdenv, fetchFromGitHub, postgresql }:
 
 stdenv.mkDerivation rec {
   pname = "wal2json";
@@ -20,6 +20,11 @@ stdenv.mkDerivation rec {
     install -D -t $out/share/postgresql/extension sql/*.sql
   '';
 
+  passthru.tests.wal2json = lib.recurseIntoAttrs (callPackage ../../../../../nixos/tests/postgresql-wal2json.nix {
+    inherit (stdenv) system;
+    inherit postgresql;
+  });
+
   meta = with lib; {
     description = "PostgreSQL JSON output plugin for changeset extraction";
     homepage = "https://github.com/eulerto/wal2json";

From 4620fbd2d497ff0d9b9e69a6310e5da3254a1152 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Sun, 15 Sep 2024 14:16:14 +0900
Subject: [PATCH 13/49] era: init at 0.1.3

---
 pkgs/by-name/er/era/package.nix | 45 +++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 pkgs/by-name/er/era/package.nix

diff --git a/pkgs/by-name/er/era/package.nix b/pkgs/by-name/er/era/package.nix
new file mode 100644
index 000000000000..cbe15bd7b47e
--- /dev/null
+++ b/pkgs/by-name/er/era/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  deno,
+  makeWrapper,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "era";
+  version = "0.1.3";
+
+  src = fetchFromGitHub {
+    owner = "kyoheiu";
+    repo = "era";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-OOPVLY9kg4TmKSrpHgsOmAmeDPbX5df0bX51lA6DvcY=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/{bin,lib}
+    cp -r $src/{src,LICENSE,README.md} $out/lib
+    makeWrapper ${lib.getExe deno} $out/bin/era \
+      --set DENO_NO_UPDATE_CHECK "1" \
+      --add-flags "run -A $out/lib/src/main.ts"
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Rainy clock in your terminal";
+    homepage = "https://github.com/kyoheiu/era";
+    changelog = "https://github.com/kyoheiu/era/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ natsukium ];
+    mainProgram = "era";
+    inherit (deno.meta) platforms;
+  };
+})

From 7ff0f59a9b86ea253bffbd285d18b85b03cddcbb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Sep 2024 13:31:02 +0000
Subject: [PATCH 14/49] pcm: 202405 -> 202409

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

diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix
index 5c111952727d..0ce82515d1d0 100644
--- a/pkgs/os-specific/linux/pcm/default.nix
+++ b/pkgs/os-specific/linux/pcm/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pcm";
-  version = "202405";
+  version = "202409";
 
   src = fetchFromGitHub {
     owner = "opcm";
     repo = "pcm";
     rev = version;
-    hash = "sha256-yEe1lWbvafc3N3+K9WMMlIXVVX+fVO8QsuKdyIqiKAg=";
+    hash = "sha256-eCFyk6V1wpTImDKbsSiwgnqIduh62YG8GK0jxZL04Yc=";
   };
 
   nativeBuildInputs = [ cmake ];

From 8593782e73ab88e9d3ade074b87075ecb44a525d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Sep 2024 11:37:14 +0000
Subject: [PATCH 15/49] python312Packages.githubkit: 0.11.9 -> 0.11.10

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

diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix
index a58ee3362693..d27a9e672da2 100644
--- a/pkgs/development/python-modules/githubkit/default.nix
+++ b/pkgs/development/python-modules/githubkit/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "githubkit";
-  version = "0.11.9";
+  version = "0.11.10";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "yanyongyu";
     repo = "githubkit";
     rev = "refs/tags/v${version}";
-    hash = "sha256-aN8LTWDtzj04w0dQvUVMJ2QhHWaFK4ml1ZoLO2LmKTY=";
+    hash = "sha256-04Cy4NtC3+/qv4kFcDB1aszmO6x1TguhCOF0CqxYPtw=";
   };
 
   pythonRelaxDeps = [ "hishel" ];

From b799802ef71eefb1e6cf3379912fe5f9e83a0310 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Sep 2024 16:19:07 +0000
Subject: [PATCH 16/49] python312Packages.mkdocs-material: 9.5.34 -> 9.5.35

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

diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix
index cbf15d0754a3..45b009ad9293 100644
--- a/pkgs/development/python-modules/mkdocs-material/default.nix
+++ b/pkgs/development/python-modules/mkdocs-material/default.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "mkdocs-material";
-  version = "9.5.34";
+  version = "9.5.35";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     owner = "squidfunk";
     repo = "mkdocs-material";
     rev = "refs/tags/${version}";
-    hash = "sha256-Gozh4/c9IvhgTU87RWSshlXOWQ3sdtxLA8SQuD/JSEg=";
+    hash = "sha256-iiukdgkC2B8xWf8abtiSWjEBiCwk/2+1iJqkV9d43VQ=";
   };
 
   nativeBuildInputs = [

From b9ba772e16f1aa79724bc65b7aebf3122ee2b206 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Wed, 18 Sep 2024 15:50:32 -0700
Subject: [PATCH 17/49] nextcloud*: only test corresponding version

---
 pkgs/servers/nextcloud/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 677359abdb09..0234ee067bb2 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -18,7 +18,9 @@ let
     };
 
     passthru = {
-      tests = nixosTests.nextcloud;
+      tests = lib.filterAttrs (
+        key: _: (lib.hasSuffix (lib.versions.major version) key)
+      ) nixosTests.nextcloud;
       inherit packages;
     };
 

From 6eccab7d779a6c189dd8b4627add9c38ef5a94a9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Sep 2024 09:31:24 +0000
Subject: [PATCH 18/49] vivaldi: 6.9.3447.41 -> 6.9.3447.46

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

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 652cf97de4c1..e9582cbdd985 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -24,7 +24,7 @@ let
   vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
 in stdenv.mkDerivation rec {
   pname = "vivaldi";
-  version = "6.9.3447.41";
+  version = "6.9.3447.46";
 
   suffix = {
     aarch64-linux = "arm64";
@@ -34,8 +34,8 @@ in stdenv.mkDerivation rec {
   src = fetchurl {
     url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
     hash = {
-      aarch64-linux = "sha256-Up2n7G3vatsQC9JKF1A1jAIBbdWm9UhL/75AXuxDCsg=";
-      x86_64-linux = "sha256-Hcd8W8bDlRUT/zPYP+aiJnUmepS38KuK0wRFYB3uW1Y=";
+      aarch64-linux = "sha256-r0u7u5R0lMI65zsTxIU0y5A+swJYLAj42ptJWVvFdxs=";
+      x86_64-linux = "sha256-hIdgyh6c+SbeeT6uY1aN7OCPY+U2GGX6V7eHdwgyuzc=";
     }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };
 

From cd85a62bc257b4177823359a20986deddaa4dc0b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 16 Sep 2024 20:45:30 +0200
Subject: [PATCH 19/49] postgresql_jit.pkgs.postgis: fix build on darwin

We introduced LTO in #294504. At that time, we still needed to use LLVM
/ lld to make this work on darwin. For this to work for extensions, they
would need to set CFLAGS=-fuse-ld=lld, too. However, since #307880
landed, we don't need to do this anymore in the first place, LTO just
works out of the box on darwin.

Resolves #342362
---
 pkgs/servers/sql/postgresql/generic.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index dcb286dd3077..474ca2563ba1 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -47,7 +47,7 @@ let
     pname = "postgresql";
 
     stdenv' =
-      if jitSupport then
+      if jitSupport && !stdenv.cc.isClang then
         overrideCC llvmPackages.stdenv (llvmPackages.stdenv.cc.override {
           # LLVM bintools are not used by default, but are needed to make -flto work below.
           bintools = llvmPackages.bintools;
@@ -126,7 +126,6 @@ let
     # and allows splitting them cleanly.
     env.CFLAGS = "-fdata-sections -ffunction-sections"
       + (if stdenv'.cc.isClang then " -flto" else " -fmerge-constants -Wl,--gc-sections")
-      + lib.optionalString (stdenv'.isDarwin && jitSupport) " -fuse-ld=lld"
       # Makes cross-compiling work when xml2-config can't be executed on the host.
       # Fixed upstream in https://github.com/postgres/postgres/commit/0bc8cebdb889368abdf224aeac8bc197fe4c9ae6
       + lib.optionalString (olderThan "13") " -I${libxml2.dev}/include/libxml2";

From d191b12188d3864ca0808e8b7823b24afd5ac981 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 19 Sep 2024 17:42:29 +0000
Subject: [PATCH 20/49] python312Packages.osxphotos: 0.68.5 -> 0.68.6

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

diff --git a/pkgs/development/python-modules/osxphotos/default.nix b/pkgs/development/python-modules/osxphotos/default.nix
index 118e59dc8279..ab4f7e0c0520 100644
--- a/pkgs/development/python-modules/osxphotos/default.nix
+++ b/pkgs/development/python-modules/osxphotos/default.nix
@@ -35,14 +35,14 @@
 
 buildPythonPackage rec {
   pname = "osxphotos";
-  version = "0.68.5";
+  version = "0.68.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "RhetTbull";
     repo = "osxphotos";
     rev = "refs/tags/v${version}";
-    hash = "sha256-JhtbbtiCxIGurRAFvk7UP9qzyXw1CCaGlyLHGs/G/uE=";
+    hash = "sha256-5cKxlfm4i743bJlS2HVPBO1Fbvz1c6wgkkG8Vle8Ajo=";
   };
 
   build-system = [ setuptools ];

From c85d4998d19a1e4bfbe55330b1b2166c2f90475f Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Thu, 19 Sep 2024 19:23:57 -0400
Subject: [PATCH 21/49] brave: 1.69.168 -> 1.70.117

https://community.brave.com/t/release-channel-1-70-117/569641
---
 pkgs/applications/networking/browsers/brave/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index a78454196e39..1dddb46519fc 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ])
     if stdenv.isAarch64 then
       rec {
         pname = "brave";
-        version = "1.69.168";
+        version = "1.70.117";
         url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-        hash = "sha256-ZSFhbj/Tw+jOaFP2HHnn74DO2w4l37upS+rxLcF5P9I=";
+        hash = "sha256-FUomXWnIbuW8H0/r+fKEmMG8qO0vBAKUS9kijCbH5Mc=";
         platform = "aarch64-linux";
       }
     else if stdenv.isx86_64 then
       rec {
         pname = "brave";
-        version = "1.69.168";
+        version = "1.70.117";
         url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-        hash = "sha256-smLyA4eZAw62BfbPPFKjKaZd8FJ1FMSV1SUWXCFCzD4=";
+        hash = "sha256-54puHFpg3zqgORoqale9ZNgokn7q8fbI+240azFqrlQ=";
         platform = "x86_64-linux";
       }
     else

From c3948c21ef00fbf8ef02f3c2922e84ba72e8a62b Mon Sep 17 00:00:00 2001
From: bobby3605 <sonic921150@gmail.com>
Date: Tue, 17 Sep 2024 00:35:32 -0500
Subject: [PATCH 22/49] glslang: build shared libraries shared libraries are
 required for some of the c++ api classes such as TShader

---
 pkgs/development/compilers/glslang/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix
index 9d67dde87c2d..5c39c5d5c1f0 100644
--- a/pkgs/development/compilers/glslang/default.nix
+++ b/pkgs/development/compilers/glslang/default.nix
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake python3 bison jq ];
 
+  cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
+
   postPatch = ''
     cp --no-preserve=mode -r "${spirv-tools.src}" External/spirv-tools
     ln -s "${spirv-headers.src}" External/spirv-tools/external/spirv-headers

From 5e2e7fb592614bba232bea4a62c69f03abf80cec Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 20 Sep 2024 08:48:52 +0200
Subject: [PATCH 23/49] python312Packages.dissect-cobaltstrike: marks as broken
 with dissect-cstruct 4

Compatibility with dissect.struct 4.x

https://github.com/fox-it/dissect.cobaltstrike/issues/53
---
 .../python-modules/dissect-cobaltstrike/default.nix            | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix
index 3924f0c5164b..973cd01a7aa4 100644
--- a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix
+++ b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix
@@ -78,5 +78,8 @@ buildPythonPackage rec {
     changelog = "https://github.com/fox-it/dissect.cobaltstrike/releases/tag/${version}";
     license = licenses.agpl3Only;
     maintainers = with maintainers; [ fab ];
+    # Compatibility with dissect.struct 4.x
+    # https://github.com/fox-it/dissect.cobaltstrike/issues/53
+    broken = versionAtLeast dissect-cstruct.version "4";
   };
 }

From 325611350ccfde0f7200c37afc5923905d499fc3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Sep 2024 17:05:00 +0000
Subject: [PATCH 24/49] microsoft-edge: 128.0.2739.67 -> 129.0.2792.52

---
 .../networking/browsers/microsoft-edge/default.nix   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix
index 3946aff88551..7c903058c234 100644
--- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix
+++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix
@@ -1,20 +1,20 @@
 {
   beta = import ./browser.nix {
     channel = "beta";
-    version = "129.0.2792.21";
+    version = "129.0.2792.52";
     revision = "1";
-    hash = "sha256-NrDRroKyjY9zC9KoMWaEPAPnu+JNNDZwLVbuDvoUG1M=";
+    hash = "sha256-KurkG/OxoKOcBcFXj9xhQVSidc2L6bzrDY8c2OmSQro=";
   };
   dev = import ./browser.nix {
     channel = "dev";
-    version = "130.0.2808.0";
+    version = "130.0.2835.2";
     revision = "1";
-    hash = "sha256-6mqStxS9HJvfKbrGqQGlqQKXc2SnvOycirPihfnkaLI=";
+    hash = "sha256-szxMnqw7tUvASsxsYacrQ3StofUJHBWHIhF3EfGIVAs=";
   };
   stable = import ./browser.nix {
     channel = "stable";
-    version = "128.0.2739.67";
+    version = "129.0.2792.52";
     revision = "1";
-    hash = "sha256-Y8PxyAibuEhwKJpqnhtBy1F2Kn+ONw6NVtC25R+fFVo=";
+    hash = "sha256-tiq6PwDrH8ZctfyDza9W3WOsj7NArv4XyMPGWU7fW7A=";
   };
 }

From cf7a6f79f101cbcdcb760e84c1f42c79c2faff23 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Sep 2024 20:05:53 +0000
Subject: [PATCH 25/49] python312Packages.pyduotecno: 2024.5.1 -> 2024.9.0

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

diff --git a/pkgs/development/python-modules/pyduotecno/default.nix b/pkgs/development/python-modules/pyduotecno/default.nix
index e8ea8acf0c4c..7333019c9055 100644
--- a/pkgs/development/python-modules/pyduotecno/default.nix
+++ b/pkgs/development/python-modules/pyduotecno/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "pyduotecno";
-  version = "2024.5.1";
+  version = "2024.9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "Cereal2nd";
     repo = "pyDuotecno";
     rev = "refs/tags/${version}";
-    hash = "sha256-huzv7f1Aq/n3cD9S4oXqGQogq7VpPpzAUqkOhiB879A=";
+    hash = "sha256-h4OB4V4O645QAPdtO+OtLWffTuA7xlzIveIl+Cyhg3w=";
   };
 
   build-system = [ setuptools ];

From 95568022517fdc051fa153243d880eb9d3a5020a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Sep 2024 20:37:51 +0000
Subject: [PATCH 26/49] python312Packages.faraday-plugins: 1.19.0 -> 1.19.1

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

diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix
index 21897db2c843..9111890efd0f 100644
--- a/pkgs/development/python-modules/faraday-plugins/default.nix
+++ b/pkgs/development/python-modules/faraday-plugins/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "faraday-plugins";
-  version = "1.19.0";
+  version = "1.19.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "infobyte";
     repo = "faraday_plugins";
     rev = "refs/tags/${version}";
-    hash = "sha256-ZKib2tpL7Yn3yWuyZFOQ3saNQLwrUEeuojSMpoTy89M=";
+    hash = "sha256-XWPj348kAuA9BF7Y2/hX712eLRfUZ9kH3oL1jb17/K0=";
   };
 
   postPatch = ''

From fcd82800bc3f0a4d7cf94faeb2de780e1892092c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Sep 2024 21:24:24 +0000
Subject: [PATCH 27/49] woodpecker-plugin-git: 2.5.2 -> 2.6.0

---
 .../woodpecker-plugin-git/default.nix                       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix b/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix
index 6c6fe743896a..c8d28fa69dd2 100644
--- a/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix
+++ b/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "woodpecker-plugin-git";
-  version = "2.5.2";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "woodpecker-ci";
     repo = "plugin-git";
     rev = "refs/tags/${version}";
-    hash = "sha256-61WjfeHc8Qyl3RqgafVe1/y8cBOnL8i/fHOAIP4RCdI=";
+    hash = "sha256-ffP4CmvoxmXdwrWWOG2HIoz1pgmxTUdG5rPsgJ1+3do=";
   };
 
-  vendorHash = "sha256-rUXi3oaawTJoGPmVxmdR1v2eh8BIvCBjxJBz3XRygEg=";
+  vendorHash = "sha256-wB1Uv7ZSIEHzR8z96hwXScoGA31uhoql/wwAH3Olj2E=";
 
   CGO_ENABLED = "0";
 

From cfe68dd60539225412eadbb720dac4c861d1d4db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Sep 2024 21:45:45 +0000
Subject: [PATCH 28/49] python312Packages.apkinspector: 1.3.1 -> 1.3.2

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

diff --git a/pkgs/development/python-modules/apkinspector/default.nix b/pkgs/development/python-modules/apkinspector/default.nix
index 0b5539795ec4..e6ebec3b320d 100644
--- a/pkgs/development/python-modules/apkinspector/default.nix
+++ b/pkgs/development/python-modules/apkinspector/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "apkinspector";
-  version = "1.3.1";
+  version = "1.3.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "erev0s";
     repo = "apkInspector";
     rev = "refs/tags/v${version}";
-    hash = "sha256-zVMY1KMUCSqctAAHOEFXM9yT1X0PDC75ETshF+fc4pU=";
+    hash = "sha256-trEbm9EFZLoFBWKKOlbI305r+8GdSmU5zWPnNhb5qzQ=";
   };
 
   build-system = [ poetry-core ];

From dc750b823725a2c13bf9f94b15e86c6e7e72864e Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Fri, 20 Sep 2024 23:43:39 +0200
Subject: [PATCH 29/49] postgresqlPackages.postgis: 3.4.2 -> 3.4.3

---
 pkgs/servers/sql/postgresql/ext/postgis.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix
index 5b4e4543ec96..240137846b24 100644
--- a/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -28,7 +28,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "postgis";
-  version = "3.4.2";
+  version = "3.4.3";
 
   outputs = [
     "out"
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz";
-    hash = "sha256-yMh0wAukqYSocDCva/lUSCFQIGCtRz1clvHU0INcWJI=";
+    hash = "sha256-+N7VBdrrj1dlnaK55Xf/ceGDqqCUcI0u7OLFbZM2H2I=";
   };
 
   buildInputs = [

From c9c7974117d15ba5e550cb1d3caf54f774f41065 Mon Sep 17 00:00:00 2001
From: davidsierradz <davidsierradz@gmail.com>
Date: Tue, 3 Sep 2024 18:51:42 -0500
Subject: [PATCH 30/49] tmux-fingers: 2.1.1 -> 2.2.2

---
 pkgs/misc/tmux-plugins/default.nix            | 25 +---------
 .../tmux-plugins/tmux-fingers/default.nix     | 46 +++++++++++++++++++
 pkgs/misc/tmux-plugins/tmux-fingers/fix.patch | 41 +++++++++++++++++
 .../misc/tmux-plugins/tmux-fingers/shards.nix | 12 +++++
 4 files changed, 101 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/misc/tmux-plugins/tmux-fingers/default.nix
 create mode 100644 pkgs/misc/tmux-plugins/tmux-fingers/fix.patch
 create mode 100644 pkgs/misc/tmux-plugins/tmux-fingers/shards.nix

diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index 7af81347e8e2..dacf6ba1ef6f 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -242,29 +242,8 @@ in rec {
     };
   };
 
-  fingers = mkTmuxPlugin rec {
-    pluginName = "tmux-fingers";
-    rtpFilePath = "load-config.tmux";
-    version = "2.1.1";
-    src = fetchFromGitHub {
-      owner = "Morantron";
-      repo = "tmux-fingers";
-      rev = "${version}";
-      sha256 = "sha256-1YMh6m8M6FKf8RPXsOfWCVC5CXSr/MynguwkG7O+oEY=";
-    };
-    nativeBuildInputs = [ pkgs.makeWrapper pkgs.crystal pkgs.shards ];
-    postInstall = ''
-      shards build --production
-      rm -rf $target/* $target/.*
-      cp -r bin $target/bin
-      echo "$target/bin/${pluginName} load-config" > $target/${rtpFilePath}
-      chmod +x $target/${rtpFilePath}
-
-      wrapProgram $target/${rtpFilePath} \
-        --prefix PATH : ${with pkgs; lib.makeBinPath (
-          [ gawk ] ++ lib.optionals stdenv.isDarwin [ reattach-to-user-namespace ]
-        )}
-    '';
+  fingers = pkgs.callPackage ./tmux-fingers {
+    inherit mkTmuxPlugin;
   };
 
   fpp = mkTmuxPlugin {
diff --git a/pkgs/misc/tmux-plugins/tmux-fingers/default.nix b/pkgs/misc/tmux-plugins/tmux-fingers/default.nix
new file mode 100644
index 000000000000..bb415d76935b
--- /dev/null
+++ b/pkgs/misc/tmux-plugins/tmux-fingers/default.nix
@@ -0,0 +1,46 @@
+{
+  mkTmuxPlugin,
+  substituteAll,
+  fetchFromGitHub,
+  crystal,
+}:
+let
+  fingers = crystal.buildCrystalPackage rec {
+    format = "shards";
+    version = "2.2.2";
+    pname = "fingers";
+    src = fetchFromGitHub {
+      owner = "Morantron";
+      repo = "tmux-fingers";
+      rev = "${version}";
+      sha256 = "sha256-m9QON7diHVEDnnv/alXCJOG+BnfrAKygScrubZZ605I=";
+    };
+
+    shardsFile = ./shards.nix;
+    crystalBinaries.tmux-fingers.src = "src/fingers.cr";
+
+    postInstall = ''
+      shopt -s dotglob extglob
+      rm -rv !("tmux-fingers.tmux"|"bin")
+      shopt -u dotglob extglob
+    '';
+
+    # TODO: Needs starting a TMUX session to run tests
+    # Unhandled exception: Missing ENV key: "TMUX" (KeyError)
+    doCheck = false;
+    doInstallCheck = false;
+  };
+in
+mkTmuxPlugin {
+  inherit (fingers) version src meta;
+
+  pluginName = fingers.src.repo;
+  rtpFilePath = "tmux-fingers.tmux";
+
+  patches = [
+    (substituteAll {
+      src = ./fix.patch;
+      tmuxFingersDir = "${fingers}/bin";
+    })
+  ];
+}
diff --git a/pkgs/misc/tmux-plugins/tmux-fingers/fix.patch b/pkgs/misc/tmux-plugins/tmux-fingers/fix.patch
new file mode 100644
index 000000000000..34014441ebf9
--- /dev/null
+++ b/pkgs/misc/tmux-plugins/tmux-fingers/fix.patch
@@ -0,0 +1,41 @@
+diff --git a/tmux-fingers.tmux b/tmux-fingers.tmux
+index f15b509..a14e312 100755
+--- a/tmux-fingers.tmux
++++ b/tmux-fingers.tmux
+@@ -1,35 +1,4 @@
+ #!/usr/bin/env bash
+ 
+-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+-
+-if command -v "tmux-fingers" &>/dev/null; then
+-  FINGERS_BINARY="tmux-fingers"
+-elif [[ -f "$CURRENT_DIR/bin/tmux-fingers" ]]; then
+-  FINGERS_BINARY="$CURRENT_DIR/bin/tmux-fingers"
+-fi
+-
+-if [[ -z "$FINGERS_BINARY" ]]; then
+-  tmux run-shell -b "bash $CURRENT_DIR/install-wizard.sh"
+-  exit 0
+-fi
+-
+-CURRENT_FINGERS_VERSION="$($FINGERS_BINARY version)"
+-
+-pushd $CURRENT_DIR &> /dev/null
+-CURRENT_GIT_VERSION=$(cat shard.yml | grep "^version" | cut -f2 -d':' | sed "s/ //g")
+-popd &> /dev/null
+-
+-SKIP_WIZARD=$(tmux show-option -gqv @fingers-skip-wizard)
+-SKIP_WIZARD=${SKIP_WIZARD:-0}
+-
+-if [ "$SKIP_WIZARD" = "0" ] && [ "$CURRENT_FINGERS_VERSION" != "$CURRENT_GIT_VERSION" ]; then
+-  tmux run-shell -b "FINGERS_UPDATE=1 bash $CURRENT_DIR/install-wizard.sh"
+-
+-  if [[ "$?" != "0" ]]; then
+-    echo "Something went wrong while updating tmux-fingers. Please try again."
+-    exit 1
+-  fi
+-fi
+-
+-tmux run "$FINGERS_BINARY load-config"
++tmux run "@tmuxFingersDir@/tmux-fingers load-config"
+ exit $?
diff --git a/pkgs/misc/tmux-plugins/tmux-fingers/shards.nix b/pkgs/misc/tmux-plugins/tmux-fingers/shards.nix
new file mode 100644
index 000000000000..9367ddf7b1a7
--- /dev/null
+++ b/pkgs/misc/tmux-plugins/tmux-fingers/shards.nix
@@ -0,0 +1,12 @@
+{
+  cling = {
+    url = "https://github.com/devnote-dev/cling.git";
+    rev = "v3.0.0";
+    sha256 = "0mj5xvpiif1vhg4qds938p9zb5a47qzl397ybz1l1jks0gg361wq";
+  };
+  xdg_base_directory = {
+    url = "https://github.com/tijn/xdg_base_directory.git";
+    rev = "60bf28dc060c221d5af52727927e92b840022eb0";
+    sha256 = "1sa8bw8mzsz0pbj3m8v0w1pnk1q86zjivr0jndfg77wa33ki34y0";
+  };
+}

From cce8434364c11d9d77d8b6033c8070bb1cc17b8c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Sep 2024 23:12:14 +0000
Subject: [PATCH 31/49] python312Packages.ucsmsdk: 0.9.19 -> 0.9.20

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

diff --git a/pkgs/development/python-modules/ucsmsdk/default.nix b/pkgs/development/python-modules/ucsmsdk/default.nix
index 232508310c07..a510f0f468aa 100644
--- a/pkgs/development/python-modules/ucsmsdk/default.nix
+++ b/pkgs/development/python-modules/ucsmsdk/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "ucsmsdk";
-  version = "0.9.19";
+  version = "0.9.20";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "CiscoUcs";
     repo = "ucsmsdk";
     rev = "refs/tags/v${version}";
-    hash = "sha256-PPxslqY8v6WbRiRXnR9jVSGAo8k89lHomXpqgSK0meo=";
+    hash = "sha256-X8lGpfVjIZIpNneOM/mE+9RvglW9FlYoGz7pFs7ellk=";
   };
 
   propagatedBuildInputs = [

From 2e5d14f50fbe16a3dd584e4493a021d1ae74bbce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Sep 2024 01:39:58 +0000
Subject: [PATCH 32/49] overskride: 0.5.7 -> 0.6.0

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

diff --git a/pkgs/by-name/ov/overskride/package.nix b/pkgs/by-name/ov/overskride/package.nix
index e57c281c665a..bade7387f410 100644
--- a/pkgs/by-name/ov/overskride/package.nix
+++ b/pkgs/by-name/ov/overskride/package.nix
@@ -4,7 +4,7 @@
 
 owner = "kaii-lb";
 name = "overskride";
-version = "0.5.7";
+version = "0.6.0";
 
 in rustPlatform.buildRustPackage {
 
@@ -15,10 +15,10 @@ in rustPlatform.buildRustPackage {
     inherit owner;
     repo = name;
     rev = "v${version}";
-    hash = "sha256-vuCpUTn/Re2wZIoCmKHwBRPdfpHDzNHi42iwvBFYjXo=";
+    hash = "sha256-TbakYKYbVe8wEFOrfj97m2bdAb1BJ7zoi/lyYLobw/k=";
   };
 
-  cargoHash = "sha256-hX3GHRiE/CbeT/zblQHzbxLPEc/grDddXgqoAe64zUM=";
+  cargoHash = "sha256-p2PmcLoHfeRUEG2v33vVyiKBkOjpNDbVteSmH5R3RmI=";
 
   nativeBuildInputs = [
     pkg-config

From 78d6f58d61143878d5b238e5d65c0c70ac7f82da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Sep 2024 02:13:17 +0000
Subject: [PATCH 33/49] python312Packages.faraday-agent-parameters-types: 1.7.0
 -> 1.7.1

---
 .../python-modules/faraday-agent-parameters-types/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix
index 4cd2944f6b99..a9ce3ef4a451 100644
--- a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix
+++ b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "faraday-agent-parameters-types";
-  version = "1.7.0";
+  version = "1.7.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "faraday_agent_parameters_types";
     inherit version;
-    hash = "sha256-xFrTOsoh/qCCnzJq97pHW2TogiWfnw4zL4Lul4jRaA0=";
+    hash = "sha256-ypr5/6mnATFswZPX4aeusH8PoYRa+yVL1gk+pdz7r0w=";
   };
 
   postPatch = ''

From 3b6147c39e3cc44af16606e22f6a97fa2f285357 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Sep 2024 02:17:35 +0000
Subject: [PATCH 34/49] python312Packages.mitogen: 0.3.9 -> 0.3.10

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

diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix
index 738c6cf57f32..1e159a90fd1a 100644
--- a/pkgs/development/python-modules/mitogen/default.nix
+++ b/pkgs/development/python-modules/mitogen/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "mitogen";
-  version = "0.3.9";
+  version = "0.3.10";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "mitogen-hq";
     repo = "mitogen";
     rev = "refs/tags/v${version}";
-    hash = "sha256-dfOufUvDsrBFvnz8/mp7iY9Tm52KoFFuQQnbq85qTGs=";
+    hash = "sha256-ndT5bAiUpjkgD2oeS0s/u69a4bBHI4zoXbudcWogTAU=";
   };
 
   build-system = [ setuptools ];

From c7ad6be1aea142d960b73a87aadad498f02bfa0e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Sep 2024 02:34:57 +0000
Subject: [PATCH 35/49] python312Packages.yalesmartalarmclient: 0.4.2 -> 0.4.3

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

diff --git a/pkgs/development/python-modules/yalesmartalarmclient/default.nix b/pkgs/development/python-modules/yalesmartalarmclient/default.nix
index 79fffcda613d..7846303b562f 100644
--- a/pkgs/development/python-modules/yalesmartalarmclient/default.nix
+++ b/pkgs/development/python-modules/yalesmartalarmclient/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "yalesmartalarmclient";
-  version = "0.4.2";
+  version = "0.4.3";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "domwillcode";
     repo = "yale-smart-alarm-client";
     rev = "refs/tags/v${version}";
-    hash = "sha256-/0Vydy7udmiaxtgxhSrwafTR37zHwsEll3VUF+hx25c=";
+    hash = "sha256-a0rzPEixJXLBfN+kJRPYiJiHY1BKxg/mM14RO3RiVdA=";
   };
 
   build-system = [ poetry-core ];

From e34095c332483daed597b10a8c11f46d8707f185 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Sep 2024 02:54:21 +0000
Subject: [PATCH 36/49] redpanda-client: 24.2.4 -> 24.2.5

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

diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix
index 8d282ab7876b..5202cce75b9e 100644
--- a/pkgs/servers/redpanda/default.nix
+++ b/pkgs/servers/redpanda/default.nix
@@ -6,12 +6,12 @@
 , stdenv
 }:
 let
-  version = "24.2.4";
+  version = "24.2.5";
   src = fetchFromGitHub {
     owner = "redpanda-data";
     repo = "redpanda";
     rev = "v${version}";
-    sha256 = "sha256-DSwD9oN5hrDjUL0Ey8ARvojr54abBXUNvj/06lLvURk=";
+    sha256 = "sha256-25ijVHEcj0AXLxC1rSbp3Xyv+SMQRRkRq+qgRJgSnAI=";
   };
 in
 buildGoModule rec {
@@ -19,7 +19,7 @@ buildGoModule rec {
   inherit doCheck src version;
   modRoot = "./src/go/rpk";
   runVend = false;
-  vendorHash = "sha256-8vwmxUi4oWmHzb2QkIS5sU1NgJmJSV1+2I48TDAo2a0=";
+  vendorHash = "sha256-JEbIC33J+uUzPN04EtO5XoC0MIkYRXKYNCsFsirJfhY=";
 
   ldflags = [
     ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"''

From 3ac00ab2f16cd714cab18261c95f900c30a4b40c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Sep 2024 03:07:22 +0000
Subject: [PATCH 37/49] weaver: 0.9.2 -> 0.10.0

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

diff --git a/pkgs/by-name/we/weaver/package.nix b/pkgs/by-name/we/weaver/package.nix
index d89c5483756a..22b5c9ef93a8 100644
--- a/pkgs/by-name/we/weaver/package.nix
+++ b/pkgs/by-name/we/weaver/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "weaver";
-  version = "0.9.2";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "open-telemetry";
     repo = "weaver";
     rev = "v${version}";
-    hash = "sha256-HKVUi/XJsvgj+UnhJRa2PkGlfJHNdz8M/re9vYMu1LM=";
+    hash = "sha256-hSoMt+4D1bpENBD9NmuVBLDUOJkau5Sk2OHS5RyDRYQ=";
   };
 
-  cargoHash = "sha256-p6NQm4Paq1nDMxmaf3BcZF3V7k6Ifw93BC0InKUjgBk=";
+  cargoHash = "sha256-4rHDulSsFvKly5M5bo1AtEAl280N/hxhznTngCxw36Y=";
 
   buildInputs = lib.optionals stdenv.isDarwin (
     with darwin.apple_sdk_11_0.frameworks; [ SystemConfiguration ]

From 745ca3a8291eb71ae8cf87f7cc534cf78dff940e Mon Sep 17 00:00:00 2001
From: Muhammad Falak R Wani <falakreyaz@gmail.com>
Date: Sat, 21 Sep 2024 09:11:51 +0530
Subject: [PATCH 38/49] zoxide: 0.9.5 -> 0.9.6

Diff: https://github.com/ajeetdsouza/zoxide/compare/refs/tags/v0.9.5...v0.9.6
Changelog: https://github.com/ajeetdsouza/zoxide/blob/v0.9.6/CHANGELOG.md
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
---
 pkgs/tools/misc/zoxide/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix
index b50d15983640..5b2d00f7538e 100644
--- a/pkgs/tools/misc/zoxide/default.nix
+++ b/pkgs/tools/misc/zoxide/default.nix
@@ -10,13 +10,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "zoxide";
-  version = "0.9.5";
+  version = "0.9.6";
 
   src = fetchFromGitHub {
     owner = "ajeetdsouza";
     repo = "zoxide";
     rev = "refs/tags/v${version}";
-    hash = "sha256-4Vb0C6k36VQwiruGj7lu6MjDEeTh84JSHw47YMbFb30=";
+    hash = "sha256-3XC5K4OlituoFMPN9yJkYi+tkH6M0KK5jVAGdr/GLd0=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
       --replace '"fzf"' '"${fzf}/bin/fzf"'
   '';
 
-  cargoHash = "sha256-G6Aqn+q48s8Qsoa1EMowtw5bnUnnYWhyGr4hNhVYNMo=";
+  cargoHash = "sha256-ZRsnoLysNzDIi9hDOqwAzbxcyFQgn2Wv3gRNAjV5HfE=";
 
   postInstall = ''
     installManPage man/man*/*

From 18337306f0c5d7a6b6975bfa334d0d3dfd1e4c30 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Sep 2024 05:46:03 +0000
Subject: [PATCH 39/49] vscode: 1.93.0 -> 1.93.1

---
 pkgs/applications/editors/vscode/vscode.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index eb8709957708..3a2528cde7fd 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -30,21 +30,21 @@ let
   archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "0glnqj8kr7m6dq5nbygjwlgim8cngrh3idc10zp05rg0n364906v";
-    x86_64-darwin = "18xy36jha1ixd8lb0dg045ld9qivyjlds90i2k6rh974mx8jl7rj";
-    aarch64-linux = "1hdjmfjpdycsj78dfsjyidpg8mx7s66b4sb7xih87vfqvzhfmyw2";
-    aarch64-darwin = "1xjqq5fz8blprxjnck8zbn933y7kgx1hnq3nc887kp7q0879p9kr";
-    armv7l-linux = "07rnkswy2lv8wad0iiaknrd329bj1hdadzcklgd34dmqpgr28lij";
+    x86_64-linux = "0475kwa3ym14l9ggaf2hg4lcrc0lpi9vchzj4sgj4c3606l9i1aa";
+    x86_64-darwin = "15sz42p7khzxpxii4zx14770kzyk4a3g1kwxjwvd46nxqjqciys4";
+    aarch64-linux = "14d5p764vx1ppi5f6b6v0wrn1wr3qqyfr6mpncjhnzr2pdss9fz0";
+    aarch64-darwin = "0kdh7a0nfpadhyn6cj89vw76hhbab4fg5wifbzdrjikwfg8jbd4b";
+    armv7l-linux = "1aqlpxyzjrf6qm0znyqbl7srn251f7ra5lj594b7906lxhirin3c";
   }.${system} or throwSystem;
 in
   callPackage ./generic.nix rec {
     # Please backport all compatible updates to the stable release.
     # This is important for the extension ecosystem.
-    version = "1.93.0";
+    version = "1.93.1";
     pname = "vscode" + lib.optionalString isInsiders "-insiders";
 
     # This is used for VS Code - Remote SSH test
-    rev = "4849ca9bdf9666755eb463db297b69e5385090e3";
+    rev = "38c31bc77e0dd6ae88a4e9cc93428cc27a56ba40";
 
     executableName = "code" + lib.optionalString isInsiders "-insiders";
     longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@@ -68,7 +68,7 @@ in
       src = fetchurl {
         name = "vscode-server-${rev}.tar.gz";
         url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-        sha256 = "00yjdgb48mclaamv8c9rz5d6p9pbqrik3y1pj60qqpqf29cj5p9s";
+        sha256 = "0cxpv9q681nk7gjcs1msn2rnj8i86hlrkb0x4ja1id42aj4xwrqy";
       };
     };
 

From cb7635612e5fe9b98eba671f85d4124d6d6feb16 Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Fri, 20 Sep 2024 17:15:00 +0200
Subject: [PATCH 40/49] nixos/yggdrasil: remove `with lib;`

---
 nixos/modules/services/networking/yggdrasil.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/networking/yggdrasil.nix b/nixos/modules/services/networking/yggdrasil.nix
index c1c952adac39..3953c81ef214 100644
--- a/nixos/modules/services/networking/yggdrasil.nix
+++ b/nixos/modules/services/networking/yggdrasil.nix
@@ -1,6 +1,8 @@
 { config, lib, pkgs, ... }:
-with lib;
+
 let
+  inherit (lib) mkIf mkOption;
+  inherit (lib.types) nullOr path bool listOf str;
   keysPath = "/var/lib/yggdrasil/keys.json";
 
   cfg = config.services.yggdrasil;
@@ -11,14 +13,14 @@ let
 in
 {
   imports = [
-    (mkRenamedOptionModule
+    (lib.mkRenamedOptionModule
       [ "services" "yggdrasil" "config" ]
       [ "services" "yggdrasil" "settings" ])
   ];
 
-  options = with types; {
+  options = {
     services.yggdrasil = {
-      enable = mkEnableOption "the yggdrasil system service";
+      enable = lib.mkEnableOption "the yggdrasil system service";
 
       settings = mkOption {
         type = format.type;
@@ -73,7 +75,7 @@ in
       };
 
       group = mkOption {
-        type = types.nullOr types.str;
+        type = nullOr str;
         default = null;
         example = "wheel";
         description = "Group to grant access to the Yggdrasil control socket. If `null`, only root can access the socket.";
@@ -108,9 +110,9 @@ in
         '';
       };
 
-      package = mkPackageOption pkgs "yggdrasil" { };
+      package = lib.mkPackageOption pkgs "yggdrasil" { };
 
-      persistentKeys = mkEnableOption ''
+      persistentKeys = lib.mkEnableOption ''
         persistent keys. If enabled then keys will be generated once and Yggdrasil
         will retain the same IPv6 address when the service is
         restarted. Keys are stored at ${keysPath}

From 991fd5f4620bc4499e1ccd937afc9b60a11009dd Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Fri, 20 Sep 2024 17:45:00 +0200
Subject: [PATCH 41/49] nixos/yggdrasil: add nagy as maintainer

---
 nixos/modules/services/networking/yggdrasil.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/yggdrasil.nix b/nixos/modules/services/networking/yggdrasil.nix
index 3953c81ef214..0fb51400d666 100644
--- a/nixos/modules/services/networking/yggdrasil.nix
+++ b/nixos/modules/services/networking/yggdrasil.nix
@@ -234,6 +234,6 @@ in
   );
   meta = {
     doc = ./yggdrasil.md;
-    maintainers = with lib.maintainers; [ gazally ehmry ];
+    maintainers = with lib.maintainers; [ gazally ehmry nagy ];
   };
 }

From 1dea6d4497b05743d3ae8a7014a22f66f525f6f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Sat, 21 Sep 2024 00:30:21 -0600
Subject: [PATCH 42/49] =?UTF-8?q?boringssl:=20unstable-2024-02-15=20?=
 =?UTF-8?q?=E2=86=92=20unstable-2024-09-20?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Unbreaks build after gcc 14 update

https://hydra.nixos.org/build/273318920
---
 pkgs/development/libraries/boringssl/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix
index 9bb0967bd5c6..44290b1a1dee 100644
--- a/pkgs/development/libraries/boringssl/default.nix
+++ b/pkgs/development/libraries/boringssl/default.nix
@@ -10,17 +10,17 @@
 # reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md
 buildGoModule {
   pname = "boringssl";
-  version = "unstable-2024-02-15";
+  version = "unstable-2024-09-20";
 
   src = fetchgit {
     url = "https://boringssl.googlesource.com/boringssl";
-    rev = "5a1a5fbdb865fa58f1da0fd8bf6426f801ea37ac";
-    hash = "sha256-nu+5TeWEAVLGhTE15kxmTWZxo0V2elNUy67gdaU3Y+I=";
+    rev = "718900aeb84c601523e71abbd18fd70c9e2ad884";
+    hash = "sha256-TdSObRECiGRQcgz6N2LhKvSi9yRYOZYJdK6MyfJX2Bo=";
   };
 
   nativeBuildInputs = [ cmake ninja perl ];
 
-  vendorHash = "sha256-074bgtoBRS3SOxLrwZbBdK1jFpdCvF6tRtU1CkrhoDY=";
+  vendorHash = "sha256-GlhLsPD+yp2LdqsIsfXNEaNKKlc76p0kBCyu4rlEmMg=";
   proxyVendor = true;
 
   # hack to get both go and cmake configure phase

From c9f8285f0566553fe9f4e6b829afd77d26ee7cb9 Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Sat, 21 Sep 2024 16:28:55 +0800
Subject: [PATCH 43/49] nixos/nautilus-open-any-terminal: only set
 NAUTILUS_4_EXTENSION_DIR in non GNOME environment

---
 .../programs/nautilus-open-any-terminal.nix   | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/programs/nautilus-open-any-terminal.nix b/nixos/modules/programs/nautilus-open-any-terminal.nix
index f878a9f26139..41f26e03d312 100644
--- a/nixos/modules/programs/nautilus-open-any-terminal.nix
+++ b/nixos/modules/programs/nautilus-open-any-terminal.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 let
   cfg = config.programs.nautilus-open-any-terminal;
@@ -23,20 +28,28 @@ in
       nautilus-open-any-terminal
     ];
 
-    environment.sessionVariables.NAUTILUS_4_EXTENSION_DIR = "${pkgs.nautilus-python}/lib/nautilus/extensions-4";
+    environment.sessionVariables = lib.mkIf (!config.services.xserver.desktopManager.gnome.enable) {
+      NAUTILUS_4_EXTENSION_DIR = "${pkgs.nautilus-python}/lib/nautilus/extensions-4";
+    };
+
     environment.pathsToLink = [
       "/share/nautilus-python/extensions"
     ];
 
     programs.dconf = lib.optionalAttrs (cfg.terminal != null) {
       enable = true;
-      profiles.user.databases = [{
-        settings."com/github/stunkymonkey/nautilus-open-any-terminal".terminal = cfg.terminal;
-        lockAll = true;
-      }];
+      profiles.user.databases = [
+        {
+          settings."com/github/stunkymonkey/nautilus-open-any-terminal".terminal = cfg.terminal;
+          lockAll = true;
+        }
+      ];
     };
   };
   meta = {
-    maintainers = with lib.maintainers; [ stunkymonkey linsui ];
+    maintainers = with lib.maintainers; [
+      stunkymonkey
+      linsui
+    ];
   };
 }

From ca3c9deb90fd83a44d013b92c34e78c2383b4a2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fausto=20N=C3=BA=C3=B1ez=20Alberro?=
 <fausto.nunez@mailbox.org>
Date: Sat, 21 Sep 2024 10:26:50 +0200
Subject: [PATCH 44/49] kdeApplications.koi: init at 0.3.1

[Koi](https://github.com/baduhai/Koi) is a scheduling theme switcher for
KDE that I have been using on Plasma 6 for the last few days. It has
been working great for me, and I was originally looking for it within
`nixpkgs`, but couldn't find it, so here it is.

This is the derivation I have been testing it with:
https://github.com/fnune/home.nix/commit/7edb3f60a8ee767268ac2a9915f8720d745802f0

I have also been running it from my own development fork of `nixpkgs`
using the same code I'm submitting here.
---
 pkgs/kde/default.nix                 |  1 +
 pkgs/kde/third-party/koi/default.nix | 55 ++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/kde/third-party/koi/default.nix

diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix
index 7d855dae05eb..ee011c3a7ae8 100644
--- a/pkgs/kde/default.nix
+++ b/pkgs/kde/default.nix
@@ -88,6 +88,7 @@ let
 
         applet-window-buttons6 = self.callPackage ./third-party/applet-window-buttons6 { };
         karousel = self.callPackage ./third-party/karousel { };
+        koi = self.callPackage ./third-party/koi { };
         krohnkite = self.callPackage ./third-party/krohnkite { };
         kzones = self.callPackage ./third-party/kzones { };
       }
diff --git a/pkgs/kde/third-party/koi/default.nix b/pkgs/kde/third-party/koi/default.nix
new file mode 100644
index 000000000000..dab4e10564d4
--- /dev/null
+++ b/pkgs/kde/third-party/koi/default.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  kconfig,
+  kcoreaddons,
+  kwidgetsaddons,
+  wrapQtAppsHook,
+}:
+stdenv.mkDerivation rec {
+  pname = "koi";
+  version = "0.3.1";
+
+  src = fetchFromGitHub {
+    owner = "baduhai";
+    repo = "Koi";
+    rev = version;
+    sha256 = "sha256-dhpuKIY/Xi62hzJlnVCIOF0k6uoQ3zH129fLq/r+Kmg";
+  };
+
+  # See https://github.com/baduhai/Koi/blob/master/development/Nix%20OS/dev.nix
+  sourceRoot = "source/src";
+  nativeBuildInputs = [
+    cmake
+    wrapQtAppsHook
+  ];
+  buildInputs = [
+    kconfig
+    kcoreaddons
+    kwidgetsaddons
+  ];
+
+  meta = with lib; {
+    description = "Scheduling LIGHT/DARK Theme Converter for the KDE Plasma Desktop";
+    longDescription = ''
+      Koi is a program designed to provide the KDE Plasma Desktop functionality to automatically switch between light and dark themes. Koi is under semi-active development, and while it is stable enough to use daily, expect bugs. Koi is designed to be used with Plasma, and while some features may function under different desktop environments, they are unlikely to work and untested.
+
+      Features:
+
+      - Toggle between light and dark presets based on time
+      - Change Plasma style
+      - Change Qt colour scheme
+      - Change Icon theme
+      - Change GTK theme
+      - Change wallpaper
+      - Hide application to system tray
+      - Toggle between LIGHT/DARK themes by clicking mouse wheel
+    '';
+    license = licenses.lgpl3;
+    platforms = platforms.linux;
+    homepage = "https://github.com/baduhai/Koi";
+    maintainers = [ ];
+  };
+}

From a4a742b6b6b65c570be2f723cbad0d467f5acc69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fausto=20N=C3=BA=C3=B1ez=20Alberro?=
 <fausto.nunez@mailbox.org>
Date: Sat, 21 Sep 2024 11:28:57 +0200
Subject: [PATCH 45/49] maintainers: add fnune

---
 maintainers/maintainer-list.nix      | 7 +++++++
 pkgs/kde/third-party/koi/default.nix | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6e02c9c8cec3..4ed9383d5e04 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7053,6 +7053,13 @@
     githubId = 5918766;
     name = "Franz Thoma";
   };
+  fnune = {
+    email = "fausto.nunez@mailbox.org";
+    github = "fnune";
+    githubId = 16181067;
+    name = "Fausto Núñez Alberro";
+    keys = [ { fingerprint = "668E 01D1 B129 3F42 0A0F  933A C880 6451 94A2 D562"; } ];
+  };
   foo-dogsquared = {
     email = "foodogsquared@foodogsquared.one";
     github = "foo-dogsquared";
diff --git a/pkgs/kde/third-party/koi/default.nix b/pkgs/kde/third-party/koi/default.nix
index dab4e10564d4..1c1d3c92172b 100644
--- a/pkgs/kde/third-party/koi/default.nix
+++ b/pkgs/kde/third-party/koi/default.nix
@@ -50,6 +50,6 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl3;
     platforms = platforms.linux;
     homepage = "https://github.com/baduhai/Koi";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ fnune ];
   };
 }

From f7ed0918af7fd24cb554891a4f8cb145acf018e3 Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Sat, 21 Sep 2024 11:30:00 +0200
Subject: [PATCH 46/49] emacsPackages.zig-mode: replace program

---
 .../editors/emacs/elisp-packages/melpa-packages.nix        | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
index a8285a4d790c..faf9aded966d 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@@ -539,6 +539,13 @@ let
             (attrs.nativeBuildInputs or [ ]) ++ [ pkgs.git ];
         });
 
+        zig-mode = super.zig-mode.overrideAttrs (attrs: {
+          postPatch = attrs.postPatch or "" + ''
+            substituteInPlace zig-mode.el \
+              --replace-fail 'zig-zig-bin "zig"' 'zig-zig-bin "${lib.getExe pkgs.zig}"'
+          '';
+        });
+
         zmq = super.zmq.overrideAttrs (old: {
           stripDebugList = [ "share" ];
           preBuild = ''

From 0bb32ac5ae6aab0cdf586700ef56b298c185c756 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Sep 2024 10:42:28 +0000
Subject: [PATCH 47/49] labwc-menu-generator: 0.1.0-unstable-2024-07-09 ->
 0.1.0-unstable-2024-09-19

---
 pkgs/by-name/la/labwc-menu-generator/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/la/labwc-menu-generator/package.nix b/pkgs/by-name/la/labwc-menu-generator/package.nix
index da51d9d73a7a..a7a4f781edd9 100644
--- a/pkgs/by-name/la/labwc-menu-generator/package.nix
+++ b/pkgs/by-name/la/labwc-menu-generator/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "labwc-menu-generator";
-  version = "0.1.0-unstable-2024-07-09";
+  version = "0.1.0-unstable-2024-09-19";
 
   src = fetchFromGitHub {
     owner = "labwc";
     repo = "labwc-menu-generator";
-    rev = "a2b3e8e46068d82e97168772e7c194d6b6e03e3d";
-    hash = "sha256-Y5gBaTgVu3OzZQwGDNLsmQkfS0txBm/vD0MG5av2Gv0=";
+    rev = "ebb8240bfd39ab2ffbe98d5cfe26f9c1b678822d";
+    hash = "sha256-4WGBrqY30wVXmnjZ5QPhfNfauvnxqrTE6DFuITfTI4M=";
   };
 
   nativeBuildInputs = [

From 25ce61d6f2196d33170f96bf7d3e54e31ce0337b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 29 Apr 2024 20:58:09 +0200
Subject: [PATCH 48/49] quartus-prime-lite: implement the SOURCE_DATE_EPOCH
 specification

For reproducible builds: https://reproducible-builds.org/specs/source-date-epoch

Some programs break with fixed/static clock (or just by the fact that
$LD_PRELOAD is set), so

* make this feature opt-in; activate by setting
  NIXPKGS_QUARTUS_REPRODUCIBLE_BUILD=1
* add a blocklist of programs that are known to misbehave, and
  completely exclude them from the SOURCE_DATE_EPOCH handling

In the future NIXPKGS_QUARTUS_REPRODUCIBLE_BUILD=1 might be the default,
but let's start gently, in case the blocklist is incomplete.
---
 .../editors/quartus-prime/default.nix         | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix
index b50d505e2dbb..8358bb7f160c 100644
--- a/pkgs/applications/editors/quartus-prime/default.nix
+++ b/pkgs/applications/editors/quartus-prime/default.nix
@@ -1,5 +1,5 @@
 { lib, buildFHSEnv, callPackage, makeDesktopItem, runtimeShell
-, runCommand, unstick, quartus-prime-lite
+, runCommand, unstick, quartus-prime-lite, libfaketime, pkgsi686Linux
 , withQuesta ? true
 , supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ]
 , unwrapped ? callPackage ./quartus.nix { inherit unstick supportedDevices withQuesta; }
@@ -85,15 +85,28 @@ in buildFHSEnv rec {
     progs_wrapped=()
     for prog in ''${progs_to_wrap[@]}; do
         relname="''${prog#"${unwrapped}/"}"
+        bname="$(basename "$relname")"
         wrapped="$out/$relname"
         progs_wrapped+=("$wrapped")
         mkdir -p "$(dirname "$wrapped")"
         echo "#!${runtimeShell}" >> "$wrapped"
+        NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK=1
         case "$relname" in
             questa_fse/*)
                 echo "export NIXPKGS_IS_QUESTA_WRAPPER=1" >> "$wrapped"
+                # Any use of LD_PRELOAD breaks Questa, so disable the
+                # SOURCE_DATE_EPOCH code path.
+                NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK=0
                 ;;
         esac
+        # SOURCE_DATE_EPOCH blocklist for programs that are known to hang/break
+        # with fixed/static clock.
+        case "$bname" in
+            jtagd|quartus_pgm|quartus)
+                NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK=0
+                ;;
+        esac
+        echo "export NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK=$NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK" >> "$wrapped"
         echo "exec $wrapper $prog \"\$@\"" >> "$wrapped"
     done
 
@@ -116,6 +129,17 @@ in buildFHSEnv rec {
     if [ "$NIXPKGS_IS_QUESTA_WRAPPER" != 1 ]; then
         export LD_PRELOAD=''${LD_PRELOAD:+$LD_PRELOAD:}/usr/lib/libudev.so.0
     fi
+
+    # Implement the SOURCE_DATE_EPOCH specification for reproducible builds
+    # (https://reproducible-builds.org/specs/source-date-epoch).
+    # Require opt-in with NIXPKGS_QUARTUS_REPRODUCIBLE_BUILD=1 for now, in case
+    # the blocklist is incomplete.
+    if [ -n "$SOURCE_DATE_EPOCH" ] && [ "$NIXPKGS_QUARTUS_REPRODUCIBLE_BUILD" = 1 ] && [ "$NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK" = 1 ]; then
+        export LD_LIBRARY_PATH="${lib.makeLibraryPath [ libfaketime pkgsi686Linux.libfaketime ]}''${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+        export LD_PRELOAD=libfaketime.so.1''${LD_PRELOAD:+:$LD_PRELOAD}
+        export FAKETIME_FMT="%s"
+        export FAKETIME="$SOURCE_DATE_EPOCH"
+    fi
   '' + extraProfile;
 
   # Run the wrappers directly, instead of going via bash.

From f305e717d38a278d533d3431efd71fcfdee1622d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 29 Apr 2024 21:16:25 +0200
Subject: [PATCH 49/49] quartus-prime-lite: run tests with
 NIXPKGS_QUARTUS_REPRODUCIBLE_BUILD=1

To prevent the reproducible build code path from regressing. Also adapt
the buildSof test to output the hash of the build artifact, so it's easy
to verify that the build is reproducible:

  $ NIXPKGS_ALLOW_UNFREE=1 nix-build -A quartus-prime-lite.tests.buildSof
  $ NIXPKGS_ALLOW_UNFREE=1 nix-build -A quartus-prime-lite.tests.buildSof --check
---
 .../applications/editors/quartus-prime/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix
index 8358bb7f160c..a5d39818639e 100644
--- a/pkgs/applications/editors/quartus-prime/default.nix
+++ b/pkgs/applications/editors/quartus-prime/default.nix
@@ -150,6 +150,7 @@ in buildFHSEnv rec {
     tests = {
       buildSof = runCommand "quartus-prime-lite-test-build-sof"
         { nativeBuildInputs = [ quartus-prime-lite ];
+          env.NIXPKGS_QUARTUS_REPRODUCIBLE_BUILD = "1";
         }
         ''
           cat >mydesign.vhd <<EOF
@@ -177,12 +178,15 @@ in buildFHSEnv rec {
               exit 1
           fi
 
-          touch "$out"
+          sha1sum mydesign.sof > "$out"
         '';
-      questaEncryptedModel = runCommand "quartus-prime-lite-test-questa-encrypted-model" {} ''
-        "${quartus-prime-lite}/bin/vlog" "${quartus-prime-lite.unwrapped}/questa_fse/intel/verilog/src/arriav_atoms_ncrypt.v"
-        touch "$out"
-      '';
+        questaEncryptedModel = runCommand "quartus-prime-lite-test-questa-encrypted-model"
+          { env.NIXPKGS_QUARTUS_REPRODUCIBLE_BUILD = "1";
+          }
+          ''
+            "${quartus-prime-lite}/bin/vlog" "${quartus-prime-lite.unwrapped}/questa_fse/intel/verilog/src/arriav_atoms_ncrypt.v"
+            touch "$out"
+          '';
     };
   };