From 14850de9f29b528ed59ccdfd8e0a7458d54c529a Mon Sep 17 00:00:00 2001
From: Kiran Rubin <xor@vavakado.xyz>
Date: Tue, 19 May 2026 14:42:19 +0300
Subject: [PATCH 01/41] maintainers: add vavakado

(cherry picked from commit a587521131a9f30f8a382720851bbf028ba91fb9)
---
 maintainers/maintainer-list.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index aa0f553c6a0b..d19ed9110811 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -28880,6 +28880,14 @@
     githubId = 110242808;
     name = "Vasilii Pustovoit";
   };
+  vavakado = {
+    email = "xor@vavakado.xyz";
+    github = "vavakado";
+    githubId = 80159210;
+    name = "Vladimir Rubin";
+    matrix = "@vavakado:imagisphe.re";
+    keys = [ { fingerprint = "A054 0374 CD37 2C71 FE6D  E0CF CAB7 4472 7F36 B524"; } ];
+  };
   vbgl = {
     email = "Vincent.Laporte@gmail.com";
     github = "vbgl";

From 2f3b87e5d0b2413a041e83acbf5e58aa1c05f770 Mon Sep 17 00:00:00 2001
From: Kiran Rubin <xor@vavakado.xyz>
Date: Tue, 19 May 2026 14:57:41 +0300
Subject: [PATCH 02/41] hinoirisetr: init at 1.6.3

(cherry picked from commit 33bb95dfa0a1764ab501245d963da8afdfde1889)
---
 pkgs/by-name/hi/hinoirisetr/package.nix | 60 +++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 pkgs/by-name/hi/hinoirisetr/package.nix

diff --git a/pkgs/by-name/hi/hinoirisetr/package.nix b/pkgs/by-name/hi/hinoirisetr/package.nix
new file mode 100644
index 000000000000..f81630e23e47
--- /dev/null
+++ b/pkgs/by-name/hi/hinoirisetr/package.nix
@@ -0,0 +1,60 @@
+{
+  fetchFromForgejo,
+  installShellFiles,
+  lib,
+  libnotify,
+  pandoc,
+  patchelf,
+  rustPlatform,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "hinoirisetr";
+  version = "1.6.3";
+
+  __structuredAttrs = true;
+
+  src = fetchFromForgejo {
+    domain = "git.vavakado.xyz";
+    owner = "me";
+    repo = "hinoirisetr";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-XgIeeVCnlntf2RopA6SMuFCgbqTlTEZv6V5ezjEHVKA=";
+  };
+
+  cargoHash = "sha256-lydS9TWb+Y1PPC7C3Mn6KNVX1fsooAcDKJeKMnXWZY0=";
+
+  nativeBuildInputs = [
+    installShellFiles
+    pandoc
+    patchelf
+  ];
+
+  buildInputs = [
+    libnotify
+  ];
+
+  postFixup = ''
+    patchelf --add-rpath "${lib.getLib libnotify}/lib" $out/bin/hinoirisetr
+  '';
+
+  postBuild = ''
+    pandoc manpages/hinoirisetr.1.md -s -t man -o hinoirisetr.1
+  '';
+
+  postInstall = ''
+    installManPage hinoirisetr.1
+  '';
+
+  meta = {
+    description = "a lightweight daemon that automatically adjusts your screen's color temperature and gamma";
+    homepage = "https://git.vavakado.xyz/me/hinoirisetr";
+    changelog = "https://git.vavakado.xyz/me/hinoirisetr/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      vavakado
+    ];
+    mainProgram = "hinoirisetr";
+    platforms = lib.platforms.linux;
+  };
+})

From f0daf061192a29eaea65b06a39d36214e5f0654d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Aug 2026 17:22:29 +0000
Subject: [PATCH 03/41] python3Packages.pyathena: 3.30.1 -> 3.35.4

(cherry picked from commit 7beed92dfd29e220854d7d03ef19ff45d00c43ab)
---
 pkgs/development/python-modules/pyathena/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix
index 1df2db016dc4..376d435808f0 100644
--- a/pkgs/development/python-modules/pyathena/default.nix
+++ b/pkgs/development/python-modules/pyathena/default.nix
@@ -17,12 +17,12 @@
 
 buildPythonPackage rec {
   pname = "pyathena";
-  version = "3.30.1";
+  version = "3.35.4";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-AS2s9OUgXc5wW73HCogCWorq3BFLydLQrE/LEir6BFc=";
+    hash = "sha256-WDAHtWbRNGpNJIb6qw4ihY8ZQsRgZKtxuOfpMUbixT0=";
   };
 
   build-system = [

From c0b2a99aa0061950b533a081de8a902d0ee4d743 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Apr 2026 12:48:08 +0000
Subject: [PATCH 04/41] libcoap: 4.3.5a -> 4.3.5b

(cherry picked from commit 7aed0ebbc1fc47cb2459b4dab1ca5e84fba0f429)
---
 pkgs/by-name/li/libcoap/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libcoap/package.nix b/pkgs/by-name/li/libcoap/package.nix
index 42f6f9aa811e..f6bfbbcc92d3 100644
--- a/pkgs/by-name/li/libcoap/package.nix
+++ b/pkgs/by-name/li/libcoap/package.nix
@@ -15,13 +15,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "libcoap";
-  version = "4.3.5a";
+  version = "4.3.5b";
   src = fetchFromGitHub {
     repo = "libcoap";
     owner = "obgm";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-mLVGIG2JkWMlnZOlLxFTZVGM0nF6q2PKJoEo0s4Vq54=";
+    hash = "sha256-QPRyySqUu3ZYcuhoJ7g49di66ZhVqYJacDP3wJgDEtY=";
   };
   nativeBuildInputs = [
     automake

From b03c5ed3ad9b6d7ca532713fc7177d35f6d0b9a4 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Tue, 18 Aug 2026 22:39:39 +0200
Subject: [PATCH 05/41] rust_1_97: init

---
 pkgs/development/compilers/rust/1_97.nix  | 104 ++++++++++++++++++++++
 pkgs/development/compilers/rust/cargo.nix |   2 +-
 pkgs/top-level/all-packages.nix           |   2 +
 3 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/rust/1_97.nix

diff --git a/pkgs/development/compilers/rust/1_97.nix b/pkgs/development/compilers/rust/1_97.nix
new file mode 100644
index 000000000000..6e5d5f81c8d3
--- /dev/null
+++ b/pkgs/development/compilers/rust/1_97.nix
@@ -0,0 +1,104 @@
+# New rust versions should first go to staging.
+# Things to check after updating:
+# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin:
+#    i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github
+#    This testing can be also done by other volunteers as part of the pull
+#    request review, in case platforms cannot be covered.
+# 2. The LLVM version used for building should match with rust upstream.
+#    Check the version number in the src/llvm-project git submodule in:
+#    https://github.com/rust-lang/rust/blob/<version-tag>/.gitmodules
+
+# Note: The way this is structured is:
+# 1. Import default.nix, and apply arguments as needed for the file-defined function
+# 2. Implicitly, all arguments to this file are applied to the function that is imported.
+#    if you want to add an argument to default.nix's top-level function, but not the function
+#    it instantiates, add it to the `removeAttrs` call below.
+{
+  stdenv,
+  lib,
+  newScope,
+  callPackage,
+  pkgsBuildTarget,
+  pkgsBuildBuild,
+  pkgsBuildHost,
+  pkgsHostTarget,
+  pkgsTargetTarget,
+  makeRustPlatform,
+  wrapRustcWith,
+  llvmPackages,
+  llvm,
+  cargo-auditable,
+  wrapCCWith,
+  overrideCC,
+  fetchpatch,
+}@args:
+let
+  llvmSharedFor =
+    pkgSet:
+    pkgSet.llvmPackages.libllvm.override (
+      {
+        enableSharedLibraries = true;
+      }
+      // lib.optionalAttrs (stdenv.targetPlatform.useLLVM or false) {
+        # Force LLVM to compile using clang + LLVM libs when targeting pkgsLLVM
+        stdenv = pkgSet.stdenv.override {
+          allowedRequisites = null;
+          cc = pkgSet.pkgsBuildHost.llvmPackages.clangUseLLVM;
+        };
+      }
+    );
+in
+import ./default.nix
+  {
+    rustcVersion = "1.97.1";
+    rustcSha256 = "sha256-YiwrQpxTy/3A3TpR0DVU6RzWPr7BkSwfVwlkDN/vGp0=";
+
+    llvmSharedForBuild = llvmSharedFor pkgsBuildBuild;
+    llvmSharedForHost = llvmSharedFor pkgsBuildHost;
+    llvmSharedForTarget = llvmSharedFor pkgsBuildTarget;
+
+    inherit llvmPackages cargo-auditable;
+
+    # For use at runtime
+    llvmShared = llvmSharedFor pkgsHostTarget;
+
+    # Note: the version MUST be the same version that we are building. Upstream
+    # ensures that each released compiler can compile itself:
+    # https://github.com/NixOS/nixpkgs/pull/351028#issuecomment-2438244363
+    bootstrapVersion = "1.97.1";
+
+    # fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
+    bootstrapHashes = {
+      i686-unknown-linux-gnu = "914c2702deada0b9cf1d64bb3495d76e55cb3eba07d508472dde8b55a93e3759";
+      x86_64-unknown-linux-gnu = "b4cdbc7cc6b0ee0a2666b1872769fdb2ad8393b28b63952f6493b4b400e4832b";
+      x86_64-unknown-linux-musl = "40dbea28193cf2b488cf3e4a89274ccfb60efa50883f19917a382f84fd05bdc4";
+      arm-unknown-linux-gnueabihf = "ba62fe07ad85b507907705a14adc1e8bc258de5f6177ba41d77bbff9f469a4ce";
+      armv7-unknown-linux-gnueabihf = "e89c5e33aaddc6ef56857000c9117875c2997e9a1a500bd7b16277c9874b002f";
+      aarch64-unknown-linux-gnu = "2f2496c70bd336a66a4c8baf2d303ba161f3552f192444c3639ba903c7c1e2c5";
+      aarch64-unknown-linux-musl = "c5f45b5c6eb7f8fdb277c54c08402b7c931516740fbd4eccc26ba148f7cd5d57";
+      x86_64-apple-darwin = "5f4c84d2bcce7983468642855a45fc4978fba1324cfdd1ea0b182face3ab4ffa";
+      aarch64-apple-darwin = "cbd14c36f039f6f11f38148a6295d8234d18ddf20bea53031c86f119423a8b26";
+      powerpc64-unknown-linux-gnu = "2b507d5eb9b5c4c041b50e93e069db56d094f02e6df103dc74c016155141bfae";
+      powerpc64le-unknown-linux-gnu = "ff524eef5a59d801df09ccad5cdaf9ea1f0a07d75cbed2a7e9f013a9eb76a3c1";
+      powerpc64le-unknown-linux-musl = "15630f33fbea2dd9661f8482b6c612da271549aba40401444aaa53650e646b9b";
+      riscv64gc-unknown-linux-gnu = "59bec35d8febb2ab918fa41cffbaa5b07146a63bdc33f029ff756d70a3151ece";
+      s390x-unknown-linux-gnu = "808268af9e880d41b8cb32b242e38c9bd3ea7aba6409b02fbffa0fbc5370c538";
+      loongarch64-unknown-linux-gnu = "d5a925962854730ae7641420d8337af93988ea4ff47b503a856ec53776c87841";
+      loongarch64-unknown-linux-musl = "3fb653299d228e3e0726afb179b07dd10a51a2ecc3cdfcd740011b1d8420ca97";
+      x86_64-unknown-freebsd = "77866a4c449bcccb40e9d6712bf3eb899d29018ed8e841fd9d8d59370751f152";
+    };
+
+    selectRustPackage = pkgs: pkgs.rust_1_97;
+  }
+
+  (
+    removeAttrs args [
+      "llvmPackages"
+      "llvm"
+      "wrapCCWith"
+      "overrideCC"
+      "pkgsHostTarget"
+      "fetchpatch"
+      "cargo-auditable"
+    ]
+  )
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index 7c3d4eb2a5e0..e5d2ef896d05 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage.override
     pname = "cargo";
     inherit (rustc.unwrapped) version src;
 
-    patches = [
+    patches = lib.optionals (lib.versionOlder rustc.unwrapped.version "1.97.0") [
       (fetchpatch {
         name = "CVE-2026-5222.patch";
         url = "https://github.com/rust-lang/cargo/commit/c4d63a44234de22dc745231c416b80ed848d997f.patch";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47eb955a7d66..e2cf134776dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4326,6 +4326,7 @@ with pkgs;
   wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; };
 
   rust_1_95 = callPackage ../development/compilers/rust/1_95.nix { };
+  rust_1_97 = callPackage ../development/compilers/rust/1_97.nix { };
   rust = rust_1_95;
 
   mrustc = callPackage ../development/compilers/mrustc { };
@@ -4333,6 +4334,7 @@ with pkgs;
   mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { };
 
   rustPackages_1_95 = rust_1_95.packages.stable;
+  rustPackages_1_97 = rust_1_97.packages.stable;
   rustPackages = rustPackages_1_95;
 
   inherit (rustPackages)

From 41a70d60dcf9340da131df4bc8e64c9381d283e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jul 2026 06:44:39 +0000
Subject: [PATCH 06/41] mago: 1.29.0 -> 1.43.0

(cherry picked from commit d2b1e111a6b40aad2b732c16b9f0a3408ff41903)
---
 pkgs/by-name/ma/mago/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix
index e826b30803c0..53a523789322 100644
--- a/pkgs/by-name/ma/mago/package.nix
+++ b/pkgs/by-name/ma/mago/package.nix
@@ -1,7 +1,7 @@
 {
   stdenv,
   lib,
-  rustPlatform,
+  rustPackages_1_97,
   fetchFromGitHub,
   installShellFiles,
   pkg-config,
@@ -9,19 +9,19 @@
   versionCheckHook,
 }:
 
-rustPlatform.buildRustPackage (finalAttrs: {
+rustPackages_1_97.rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mago";
-  version = "1.29.0";
+  version = "1.43.0";
 
   src = fetchFromGitHub {
     owner = "carthage-software";
     repo = "mago";
     tag = finalAttrs.version;
-    hash = "sha256-e/LKOQ+GAtdDye/poJdbX/98gDWle3NWIZ2zHwkGkcQ=";
+    hash = "sha256-AWnPhylz41E6d1M7PxVpH4EbyYeO9T6jlWVlzBqiOhQ=";
     forceFetchGit = true; # Does not download all files otherwise
   };
 
-  cargoHash = "sha256-stjjP8VRHy5k9zMXWGikVNExXRFte0gVBEsbKmPY6U4=";
+  cargoHash = "sha256-f7HZTJ0ESx7QTKgBqd2FOH1nCeIzgODMM9Sb0tQpfdE=";
 
   env = {
     # Get openssl-sys to use pkg-config

From ca9116e585ad4cae9dfcfeea645c5a1e46bf3e50 Mon Sep 17 00:00:00 2001
From: Christopher Kaster <me@atomicptr.de>
Date: Mon, 27 Jul 2026 18:30:21 +0200
Subject: [PATCH 07/41] mago: 1.43.0 -> 1.45.0

(cherry picked from commit e620377e486b4f1750d336a4cfe47da3606d0cb6)
---
 pkgs/by-name/ma/mago/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix
index 53a523789322..efdc50fe15e1 100644
--- a/pkgs/by-name/ma/mago/package.nix
+++ b/pkgs/by-name/ma/mago/package.nix
@@ -11,17 +11,17 @@
 
 rustPackages_1_97.rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mago";
-  version = "1.43.0";
+  version = "1.45.0";
 
   src = fetchFromGitHub {
     owner = "carthage-software";
     repo = "mago";
     tag = finalAttrs.version;
-    hash = "sha256-AWnPhylz41E6d1M7PxVpH4EbyYeO9T6jlWVlzBqiOhQ=";
+    hash = "sha256-ue1jf2fdus6a6XHhNBL21cIaHtX46av2AQUBcRs0W44=";
     forceFetchGit = true; # Does not download all files otherwise
   };
 
-  cargoHash = "sha256-f7HZTJ0ESx7QTKgBqd2FOH1nCeIzgODMM9Sb0tQpfdE=";
+  cargoHash = "sha256-fViy3y1ipphSwh9NsFVR8hEUya/juQ1WCvqrzZpwsRU=";
 
   env = {
     # Get openssl-sys to use pkg-config
@@ -51,6 +51,7 @@ rustPackages_1_97.rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/carthage-software/mago";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
+      atomicptr
       hythera
       patka
     ];

From 227be0cd8ac89150855359c2c84c6baa7a51419a Mon Sep 17 00:00:00 2001
From: Christopher Kaster <me@atomicptr.de>
Date: Thu, 6 Aug 2026 09:55:12 +0200
Subject: [PATCH 08/41] mago: 1.45.0 -> 1.46.0

(cherry picked from commit 4badb6d03a1f417b435955fb3bed000509f75e98)
---
 pkgs/by-name/ma/mago/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix
index efdc50fe15e1..41f5b97f6a2d 100644
--- a/pkgs/by-name/ma/mago/package.nix
+++ b/pkgs/by-name/ma/mago/package.nix
@@ -11,17 +11,17 @@
 
 rustPackages_1_97.rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mago";
-  version = "1.45.0";
+  version = "1.46.0";
 
   src = fetchFromGitHub {
     owner = "carthage-software";
     repo = "mago";
     tag = finalAttrs.version;
-    hash = "sha256-ue1jf2fdus6a6XHhNBL21cIaHtX46av2AQUBcRs0W44=";
+    hash = "sha256-yFmTUsTiNLmgZRbASWp0fm3pjmJgfx82YPGmzx6JcZY=";
     forceFetchGit = true; # Does not download all files otherwise
   };
 
-  cargoHash = "sha256-fViy3y1ipphSwh9NsFVR8hEUya/juQ1WCvqrzZpwsRU=";
+  cargoHash = "sha256-91tt31lKeeH0+PrsVTMSP+jKjt/1XFNJStqVtt0q8n0=";
 
   env = {
     # Get openssl-sys to use pkg-config

From d1272ac4eeb3dc1a7cd3c40ab830b064040ae7d9 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Wed, 19 Aug 2026 15:24:46 +0200
Subject: [PATCH 09/41] redis: 8.8.1 -> 8.8.2

changelog: https://github.com/redis/redis/releases/tag/8.8.2

diff: https://github.com/redis/redis/compare/8.8.1...8.8.2
---
 pkgs/by-name/re/redis/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix
index abdc18697804..f35d09986f02 100644
--- a/pkgs/by-name/re/redis/package.nix
+++ b/pkgs/by-name/re/redis/package.nix
@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "redis";
-  version = "8.8.1";
+  version = "8.8.2";
 
   src = fetchFromGitHub {
     owner = "redis";
     repo = "redis";
     tag = finalAttrs.version;
-    hash = "sha256-VIzIv7NOmvuXygMXyWpYpnwKQ2rGguaGRd48/QjyYD8=";
+    hash = "sha256-BlCSRaeqmOQb5+c2HLZJWjMPqFBnS7mOI30ssRXAO6U=";
   };
 
   patches = lib.optional useSystemJemalloc (fetchpatch2 {

From 17aaad71fdb648ad26534db43f8639d72d5d1d8a Mon Sep 17 00:00:00 2001
From: Angel J <78835633+iamanaws@users.noreply.github.com>
Date: Thu, 20 Aug 2026 21:18:47 -0700
Subject: [PATCH 10/41] mongodb-compass: backport wrapGApp fix

(cherry picked from commit 1fbeed304854cd1d04928ff40a698fce3052fa08)
---
 pkgs/by-name/mo/mongodb-compass/package.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix
index 6bd63425dcad..7b6a2c8d0a22 100644
--- a/pkgs/by-name/mo/mongodb-compass/package.nix
+++ b/pkgs/by-name/mo/mongodb-compass/package.nix
@@ -121,13 +121,13 @@ in
 stdenv.mkDerivation (finalAttrs: {
   inherit pname version src;
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
-    dpkg
-    wrapGAppsHook3
-    patchelf
-  ];
-
-  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ unzip ];
+  nativeBuildInputs =
+    lib.optionals stdenv.hostPlatform.isLinux [
+      dpkg
+      wrapGAppsHook3
+      patchelf
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ unzip ];
 
   dontUnpack = stdenv.hostPlatform.isLinux;
   dontFixup = stdenv.hostPlatform.isDarwin;
@@ -158,7 +158,8 @@ stdenv.mkDerivation (finalAttrs: {
       patchelf --set-rpath ${rpath}:$out/lib/mongodb-compass "$file" || true
     done
 
-    wrapGAppsHook $out/bin/mongodb-compass
+    gappsWrapperArgsHook
+    wrapGApp "$out/bin/mongodb-compass"
   '';
 
   installPhase = ''

From d91bf85246f8b309bbf29f282fdc4f8d64887a95 Mon Sep 17 00:00:00 2001
From: Tomas Rivera <tomas.riveral@icloud.com>
Date: Fri, 5 Jun 2026 12:15:54 +0200
Subject: [PATCH 11/41] songrec: add tomasrivera as maintainer

(cherry picked from commit 32bc26bfeb783da6578b7516e759327f761e9b4a)
---
 pkgs/by-name/so/songrec/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/so/songrec/package.nix b/pkgs/by-name/so/songrec/package.nix
index 9de4c5154238..7f5cb9c1b525 100644
--- a/pkgs/by-name/so/songrec/package.nix
+++ b/pkgs/by-name/so/songrec/package.nix
@@ -57,7 +57,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/marin-m/SongRec";
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ tcbravo ];
+    maintainers = with lib.maintainers; [
+      tcbravo
+      tomasrivera
+    ];
     mainProgram = "songrec";
   };
 })

From 441000066a8d42f4fb7aaa99e6b1a97832843635 Mon Sep 17 00:00:00 2001
From: Tomas Rivera <tomas.riveral@icloud.com>
Date: Fri, 5 Jun 2026 12:16:51 +0200
Subject: [PATCH 12/41] songrec: add changelog

(cherry picked from commit 3a219f6445e74752c69afe2eb7189dc40e9f028e)
---
 pkgs/by-name/so/songrec/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/so/songrec/package.nix b/pkgs/by-name/so/songrec/package.nix
index 7f5cb9c1b525..42a4409893c9 100644
--- a/pkgs/by-name/so/songrec/package.nix
+++ b/pkgs/by-name/so/songrec/package.nix
@@ -55,6 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Open-source Shazam client for Linux, written in Rust";
     homepage = "https://github.com/marin-m/SongRec";
+    changelog = "https://github.com/marin-m/SongRec/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [

From 3f333249cbb7ed8e89914134b0e5cd77f52a9449 Mon Sep 17 00:00:00 2001
From: Tomas Rivera <tomas.riveral@icloud.com>
Date: Fri, 5 Jun 2026 12:17:43 +0200
Subject: [PATCH 13/41] songrec: add versionCheckHook

(cherry picked from commit b9497d93ecbb3fd89148c7f1f623b8c012927170)
---
 pkgs/by-name/so/songrec/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/so/songrec/package.nix b/pkgs/by-name/so/songrec/package.nix
index 42a4409893c9..58d96dcd3220 100644
--- a/pkgs/by-name/so/songrec/package.nix
+++ b/pkgs/by-name/so/songrec/package.nix
@@ -12,6 +12,7 @@
   ffmpeg,
   glib,
   libpulseaudio,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -52,6 +53,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mv packaging/rootfs/usr/share $out/share
   '';
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
   meta = {
     description = "Open-source Shazam client for Linux, written in Rust";
     homepage = "https://github.com/marin-m/SongRec";

From 1d8e0259b998d7d03dd38881502cd40d9e686dfd Mon Sep 17 00:00:00 2001
From: Tomas Rivera <tomas.riveral@icloud.com>
Date: Fri, 5 Jun 2026 12:18:33 +0200
Subject: [PATCH 14/41] songrec: add nix-update-script

(cherry picked from commit 08c00dc4e1883e8370bd727e43bb691d19bff1d7)
---
 pkgs/by-name/so/songrec/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/so/songrec/package.nix b/pkgs/by-name/so/songrec/package.nix
index 58d96dcd3220..98ff53d6dc14 100644
--- a/pkgs/by-name/so/songrec/package.nix
+++ b/pkgs/by-name/so/songrec/package.nix
@@ -13,6 +13,7 @@
   glib,
   libpulseaudio,
   versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -56,6 +57,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Open-source Shazam client for Linux, written in Rust";
     homepage = "https://github.com/marin-m/SongRec";

From 547a8605d30637ba52a30ffe6d9f052f861dd38f Mon Sep 17 00:00:00 2001
From: Tomas Rivera <tomas.riveral@icloud.com>
Date: Fri, 5 Jun 2026 12:19:30 +0200
Subject: [PATCH 15/41] songrec: change rev to tag

(cherry picked from commit 79ab0268148f63a9077ce85889ba1ef994725f2e)
---
 pkgs/by-name/so/songrec/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/so/songrec/package.nix b/pkgs/by-name/so/songrec/package.nix
index 98ff53d6dc14..c53227fb1077 100644
--- a/pkgs/by-name/so/songrec/package.nix
+++ b/pkgs/by-name/so/songrec/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   src = fetchFromGitHub {
     owner = "marin-m";
     repo = "songrec";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-lCwFMBQ6IimNtXYMfTnFOpwOO2qbwijOEZ+oMsQKAP0=";
   };
 

From 94354a006beb672687539e59e084cdb5c7792c7e Mon Sep 17 00:00:00 2001
From: Tomas Rivera <tomas.riveral@icloud.com>
Date: Fri, 5 Jun 2026 12:52:36 +0200
Subject: [PATCH 16/41] songrec: 0.6.7 -> 0.7.3

(cherry picked from commit 48675b5df37ff6ae53dd5ce6b7ad6e3bfe576223)
---
 pkgs/by-name/so/songrec/package.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/so/songrec/package.nix b/pkgs/by-name/so/songrec/package.nix
index c53227fb1077..a61ef8400419 100644
--- a/pkgs/by-name/so/songrec/package.nix
+++ b/pkgs/by-name/so/songrec/package.nix
@@ -14,24 +14,26 @@
   libpulseaudio,
   versionCheckHook,
   nix-update-script,
+  pipewire,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "songrec";
-  version = "0.6.7";
+  version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "marin-m";
     repo = "songrec";
     tag = finalAttrs.version;
-    hash = "sha256-lCwFMBQ6IimNtXYMfTnFOpwOO2qbwijOEZ+oMsQKAP0=";
+    hash = "sha256-6DT5KY6Y3CPTFLNG+EostAlMgZ35SLv8r9EXtRadC2U=";
   };
 
-  cargoHash = "sha256-BhDFGkvY6c8XbhJpFX1w8CSXK9IY/HiysNoooytFT9I=";
+  cargoHash = "sha256-9R7HwTwjeCBIxX2xHs++9Zl0SMRmHPHDD1OHNa4q+jI=";
 
   nativeBuildInputs = [
     pkg-config
     wrapGAppsHook4
+    rustPlatform.bindgenHook
   ];
 
   buildInputs = [
@@ -42,6 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     libadwaita
     libpulseaudio
     libsoup_3
+    pipewire
   ];
 
   preFixup = ''

From 3e7bd96f82f0203e11d40d43de988fc48ccc58c8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Aug 2026 05:30:03 +0000
Subject: [PATCH 17/41] python3Packages.hatch-gettext: 1.1.1 -> 1.1.2

(cherry picked from commit 692f9fbd60a5a1758ba4f686ccca5dfa431fb478)
---
 pkgs/development/python-modules/hatch-gettext/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hatch-gettext/default.nix b/pkgs/development/python-modules/hatch-gettext/default.nix
index 743cdbaf3f63..87db6fb6f1cb 100644
--- a/pkgs/development/python-modules/hatch-gettext/default.nix
+++ b/pkgs/development/python-modules/hatch-gettext/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "hatch-gettext";
-  version = "1.1.1";
+  version = "1.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "damonlynch";
     repo = "hatch-gettext";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hdYwDKRzv3iRoKUtPssOL2t4iPPsK+wlSydbMOeFyUs=";
+    hash = "sha256-EPyG9RYVdxEvgfHLb18zNCe5Wk6he+QAzxVCsNWu56k=";
   };
 
   build-system = [

From 7c5ee13ed1dd4aecf785bb97b5224851dad604e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Aug 2026 05:28:02 +0000
Subject: [PATCH 18/41] python3Packages.hatch-argparse-manpage: 1.0.1 -> 1.0.2

(cherry picked from commit bfdf25deef7ea6ce4cca533262334ac431cf412a)
---
 .../python-modules/hatch-argparse-manpage/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hatch-argparse-manpage/default.nix b/pkgs/development/python-modules/hatch-argparse-manpage/default.nix
index a0efb0bac9f6..74103f6a1bd8 100644
--- a/pkgs/development/python-modules/hatch-argparse-manpage/default.nix
+++ b/pkgs/development/python-modules/hatch-argparse-manpage/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "hatch-argparse-manpage";
-  version = "1.0.1";
+  version = "1.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "damonlynch";
     repo = "hatch-argparse-manpage";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wkMLbbOkIRO83byUTJRYAS7uTYc2weL/viH1fI8xYh0=";
+    hash = "sha256-+0X/+jWKcgwhXqli9AD208ITQUyvlqeXMbEr/bTYAM0=";
   };
 
   build-system = [

From 4ee786b0e08f6ed64237fae35c0c4acf4ca02c72 Mon Sep 17 00:00:00 2001
From: Christoph Otter <chipshort@tutanota.com>
Date: Thu, 20 Aug 2026 15:01:33 +0200
Subject: [PATCH 19/41] filebrowser-quantum: 1.4.0-stable -> 1.5.2-stable

https://github.com/gtsteffaniak/filebrowser/releases/tag/v1.5.2-stable

Assisted-by: opencode (deepseek-v4-flash-free)
(cherry picked from commit c5c3ebdb826f092392ff7b13aa8885fec2129843)
---
 pkgs/by-name/fi/filebrowser-quantum/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fi/filebrowser-quantum/package.nix b/pkgs/by-name/fi/filebrowser-quantum/package.nix
index a38354409ddd..21dd06b655e8 100644
--- a/pkgs/by-name/fi/filebrowser-quantum/package.nix
+++ b/pkgs/by-name/fi/filebrowser-quantum/package.nix
@@ -6,13 +6,13 @@
 }:
 
 let
-  version = "1.4.0-stable";
+  version = "1.5.2-stable";
 
   src = fetchFromGitHub {
     owner = "gtsteffaniak";
     repo = "filebrowser";
     tag = "v${version}";
-    hash = "sha256-Ojz1VTtlCFUTodQ66mr0ozLKsx3kUirm79HuFJu33yQ=";
+    hash = "sha256-1qG6IayTqL4x3CqJyvVSG8Fu4s6ywhWI9t1j9c+wTZM=";
   };
 
   frontend = buildNpmPackage {
@@ -20,7 +20,7 @@ let
     inherit version src;
 
     sourceRoot = "${src.name}/frontend";
-    npmDepsHash = "sha256-tisZA7v0WsynNxgbww48eERz9+om4w8MW4IMzQIyh+Y=";
+    npmDepsHash = "sha256-J1PddXU79T0GVcAgxYEW/vraqYxbTvASw8RmW8dDeOw=";
 
     buildPhase = ''
       runHook preBuild
@@ -47,7 +47,7 @@ buildGoModule {
 
   sourceRoot = "${src.name}/backend";
 
-  vendorHash = "sha256-WvilFCwTGXecsD/afUpLL6TrGzr/cgkQeltCKKDc4AI=";
+  vendorHash = "sha256-YAMh0WMe1zDCJq8BuPcekb1J8RvRoxOmsZarKI1ZWcs=";
 
   preBuild = ''
     mkdir -p http/embed

From df3286a0fbf9a833239381d126fce52beb22b5f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 5 Jun 2026 19:15:42 +0000
Subject: [PATCH 20/41] gogdl: 1.2.1 -> 1.2.2

(cherry picked from commit 559131a237dff681f0940fd087bfd774b5fba1e1)
---
 pkgs/by-name/go/gogdl/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/go/gogdl/package.nix b/pkgs/by-name/go/gogdl/package.nix
index 8d10143de43d..3c5df2a78ba0 100644
--- a/pkgs/by-name/go/gogdl/package.nix
+++ b/pkgs/by-name/go/gogdl/package.nix
@@ -6,7 +6,7 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "gogdl";
-  version = "1.2.1";
+  version = "1.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     repo = "heroic-gogdl";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-qYarDcwrVrTpLHQYdWQvXL5+V1wMyL06+n5t6LXKBHI=";
+    hash = "sha256-gXAlZa4rml8fH54jpOIXZN0/1iieLpZwpii5ICHQ2Sc=";
   };
 
   build-system = with python3Packages; [

From bfa746ba377ca2135308b82dd19894b215300290 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Sun, 9 Aug 2026 18:03:02 +0200
Subject: [PATCH 21/41] gogdl: 1.2.2 -> 1.3.0

Changelog:
https://github.com/Heroic-Games-Launcher/heroic-gogdl/releases/tag/v1.3.0
Diff:
https://github.com/Heroic-Games-Launcher/heroic-gogdl/compare/v1.2.2...v1.3.0

Co-authored-by: Keenan Weaver <keenanweaver@protonmail.com>
(cherry picked from commit b5fa4928ecbdcdd2d5f71f5654ddfcb7848ce72b)
---
 pkgs/by-name/go/gogdl/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/go/gogdl/package.nix b/pkgs/by-name/go/gogdl/package.nix
index 3c5df2a78ba0..7dbc0feb7370 100644
--- a/pkgs/by-name/go/gogdl/package.nix
+++ b/pkgs/by-name/go/gogdl/package.nix
@@ -6,7 +6,7 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "gogdl";
-  version = "1.2.2";
+  version = "1.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     repo = "heroic-gogdl";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-gXAlZa4rml8fH54jpOIXZN0/1iieLpZwpii5ICHQ2Sc=";
+    hash = "sha256-tTd41ufxPObXwLpA1F0HXNEROnJwHt4WpojsRnNLml0=";
   };
 
   build-system = with python3Packages; [

From 59b160ed6488b62154200b230126c84fb07acc3a Mon Sep 17 00:00:00 2001
From: sh0uv1 <mirantuten@yandex.com>
Date: Wed, 26 Aug 2026 09:52:54 +0000
Subject: [PATCH 22/41] feishin: bump electron to v43

(cherry picked from commit 4b374356a644aa37514417363e58f220af6dd8d2)
---
 pkgs/by-name/fe/feishin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix
index 0ecd436e621c..bee3c1cd6da7 100644
--- a/pkgs/by-name/fe/feishin/package.nix
+++ b/pkgs/by-name/fe/feishin/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   buildNpmPackage,
   fetchFromGitHub,
-  electron_41,
+  electron_43,
   mpv-unwrapped,
   fetchPnpmDeps,
   pnpmConfigHook,
@@ -27,7 +27,7 @@ let
     hash = "sha256-2UKJBUZNUpUUZIG1JFXok7YJdzqt+Ge0ykHUm8BeNcw=";
   };
 
-  electron = electron_41;
+  electron = electron_43;
 
   # Fix pnpm issue on darwin https://github.com/NixOS/nixpkgs/issues/525627
   pnpm = pnpm_11.override { nodejs-slim = nodejs-slim_latest; };

From 5d46a1a6fbf9369c232739cd1d7bdac9759daaa7 Mon Sep 17 00:00:00 2001
From: sh0uv1 <mirantuten@yandex.com>
Date: Wed, 26 Aug 2026 10:02:33 +0000
Subject: [PATCH 23/41] feishin: clean up

(cherry picked from commit 17bfb6b19606f4f9927217a250836bc95f9467ab)
---
 pkgs/by-name/fe/feishin/package.nix | 36 ++++++++++++++++-------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix
index bee3c1cd6da7..094111c60555 100644
--- a/pkgs/by-name/fe/feishin/package.nix
+++ b/pkgs/by-name/fe/feishin/package.nix
@@ -15,28 +15,25 @@
   makeDesktopItem,
   nix-update-script,
   webVersion ? false,
+  nixosTests,
 }:
 let
+  electron = electron_43;
+
+  # Fix pnpm issue on darwin https://github.com/NixOS/nixpkgs/issues/525627
+  pnpm = pnpm_11.override { nodejs-slim = nodejs-slim_latest; };
+in
+buildNpmPackage (finalAttrs: {
   pname = "feishin";
   version = "1.15.1";
 
   src = fetchFromGitHub {
     owner = "jeffvli";
     repo = "feishin";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-2UKJBUZNUpUUZIG1JFXok7YJdzqt+Ge0ykHUm8BeNcw=";
   };
 
-  electron = electron_43;
-
-  # Fix pnpm issue on darwin https://github.com/NixOS/nixpkgs/issues/525627
-  pnpm = pnpm_11.override { nodejs-slim = nodejs-slim_latest; };
-in
-buildNpmPackage {
-  inherit pname version;
-
-  inherit src;
-
   __structuredAttrs = true;
 
   npmConfigHook = pnpmConfigHook;
@@ -44,9 +41,9 @@ buildNpmPackage {
 
   npmDeps = null;
   pnpmDeps = fetchPnpmDeps {
-    inherit
+    inherit pnpm;
+    inherit (finalAttrs)
       pname
-      pnpm
       version
       src
       ;
@@ -145,12 +142,19 @@ buildNpmPackage {
     })
   ];
 
-  passthru.updateScript = nix-update-script { };
+  passthru = {
+    updateScript = nix-update-script { };
+
+    # add a tests
+    tests = {
+      inherit (nixosTests.feishin) caddy nginx;
+    };
+  };
 
   meta = {
     description = "Full-featured Jellyfin, Navidrome, and OpenSubsonic Compatible Music Player";
     homepage = "https://github.com/jeffvli/feishin";
-    changelog = "https://github.com/jeffvli/feishin/releases/tag/v${version}";
+    changelog = "https://github.com/jeffvli/feishin/releases/tag/v${finalAttrs.version}";
     sourceProvenance = with lib.sourceTypes; [ fromSource ];
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.unix;
@@ -161,4 +165,4 @@ buildNpmPackage {
     ];
   }
   // lib.optionalAttrs (!webVersion) { mainProgram = "feishin"; };
-}
+})

From 99673f2f71d61b871f349dcdd56fd75bcb4129d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 23 Aug 2026 05:46:39 +0000
Subject: [PATCH 24/41] python3Packages.tpm2-pytss: 3.0.0rc1 -> 3.0.0

(cherry picked from commit 189e2efabd5b24945999fd67c6e22bb0610cd086)
---
 pkgs/development/python-modules/tpm2-pytss/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix
index a389da6bef3d..80e85241175b 100644
--- a/pkgs/development/python-modules/tpm2-pytss/default.nix
+++ b/pkgs/development/python-modules/tpm2-pytss/default.nix
@@ -24,13 +24,13 @@ let
 in
 buildPythonPackage rec {
   pname = "tpm2-pytss";
-  version = "3.0.0rc1";
+  version = "3.0.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit version;
     pname = "tpm2_pytss";
-    hash = "sha256-9Wj7RKjcjCzPqlsA4PxgVGQBvqQKuANG2tMb/cI3ihE=";
+    hash = "sha256-wZPPGQi0gvk8SqRkEykg/jo31LnYAuJnl0/y3+N9RDM=";
   };
 
   patches = [

From e034c36ec65bfb909de06a1078897ba8623b8f8c Mon Sep 17 00:00:00 2001
From: Heinz Deinhart <heinz@nix.at>
Date: Sat, 29 Aug 2026 18:44:20 +0200
Subject: [PATCH 25/41] ddnet: 19.8.3 -> 20.0

https://ddnet.org/downloads/#20.0
https://github.com/ddnet/ddnet/compare/19.8.3...20.0
(cherry picked from commit f770abf715c938193a693bfe579a9d5a38cd25fc)
---
 pkgs/by-name/dd/ddnet/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/dd/ddnet/package.nix b/pkgs/by-name/dd/ddnet/package.nix
index d28885b64238..843c71ed2cc3 100644
--- a/pkgs/by-name/dd/ddnet/package.nix
+++ b/pkgs/by-name/dd/ddnet/package.nix
@@ -31,18 +31,18 @@
 
 stdenv.mkDerivation rec {
   pname = "ddnet";
-  version = "19.8.3";
+  version = "20.0";
 
   src = fetchFromGitHub {
     owner = "ddnet";
     repo = "ddnet";
     tag = version;
-    hash = "sha256-/SfUDliB6fdc/yf2yVXHiqYlH+cIIoxz3RkP8SxsgA4=";
+    hash = "sha256-xFz4F7Gh8H3qxe6axjDHg0lg9aDbmLjNpzRHqdJyXUs=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-VKGc4LQjt2FHbELLBKtV8rKpxjGBrzlA3m9BSdZ/6Z0=";
+    hash = "sha256-n+1SlgmjSe0ul/iuK3kjTGSvyYwdxwcRrCAnZyavZA8=";
   };
 
   nativeBuildInputs = [

From dc32d2bb6614ec9e391ac01f4a4267f52f7d5cbd Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 29 Aug 2026 11:46:42 -0300
Subject: [PATCH 26/41] microsoft-edge: 150.0.4078.105 -> 152.0.4191.53

(cherry picked from commit 1a1db40610c0d2e49c73cfc821c1c8a1a42c4c23)
---
 pkgs/by-name/mi/microsoft-edge/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 90b98eb5d7f9..db72cefe74a8 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -164,11 +164,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "150.0.4078.105";
+  version = "152.0.4191.53";
 
   src = fetchurl {
     url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
-    hash = "sha256-cRQZLix+jBKu7LYEsnMjVeklcWA1cp6/igr+aJXNwBs=";
+    hash = "sha256-szIkRfvmzh4Lz/hOu+Dt6jZeDq9Jix72E23aUt6m46c=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly

From 13b964ba2f04406fd46d84bba096b578c02493f9 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 29 Aug 2026 11:47:37 -0300
Subject: [PATCH 27/41] msedgedriver: 150.0.4078.105 -> 152.0.4191.53

(cherry picked from commit 262dd08b3ece2028a9f9392336be1f6967ed209d)
---
 pkgs/by-name/ms/msedgedriver/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ms/msedgedriver/package.nix b/pkgs/by-name/ms/msedgedriver/package.nix
index 534e18bb6b4b..36674db8a9c1 100644
--- a/pkgs/by-name/ms/msedgedriver/package.nix
+++ b/pkgs/by-name/ms/msedgedriver/package.nix
@@ -12,11 +12,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "msedgedriver";
-  version = "150.0.4078.105";
+  version = "152.0.4191.53";
 
   src = fetchzip {
     url = "https://msedgedriver.microsoft.com/${finalAttrs.version}/edgedriver_linux64.zip";
-    hash = "sha256-dFXj22lTP3lBN8gLooHFn6OzBWb7ha+dEHl/+jFjctI=";
+    hash = "sha256-3akRs0D76LAJ8Lgr3P7X+cDrMNXiEC+LWNH8lUdBM9k=";
     stripRoot = false;
   };
 

From 87b35844a5614f2fb16ac415724908be20f9b251 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 29 Aug 2026 12:08:05 -0300
Subject: [PATCH 28/41] microsoft-edge: fix graphics libs error

(cherry picked from commit d9348f9d1dfa1af59318c1c6e5fb2c7b96bca7e2)
---
 pkgs/by-name/mi/microsoft-edge/package.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index db72cefe74a8..b1e10843206c 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -247,9 +247,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \
       --add-flags ${lib.escapeShellArg commandLineArgs}
 
-    # Make sure that libGL and libvulkan are found by ANGLE libGLESv2.so
-    patchelf --set-rpath $rpath $out/share/microsoft/$appname/lib*GL*
-
     # Edge specific set liboneauth
     patchelf --set-rpath $rpath $out/share/microsoft/$appname/liboneauth.so
 

From 27a15b117c2ab1bdf808663e4c5ac6ce76cd307e Mon Sep 17 00:00:00 2001
From: Vegard Bieker Matthey <VegardMatthey@protonmail.com>
Date: Sat, 29 Aug 2026 04:47:17 +0200
Subject: [PATCH 29/41] calibre: 9.13.0 -> 9.14.0

(cherry picked from commit 0859cb88406e6648d5e6d11b591a726ca6f33d9f)
---
 pkgs/by-name/ca/calibre/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix
index 0a5a065e0ee3..2e1da91b8837 100644
--- a/pkgs/by-name/ca/calibre/package.nix
+++ b/pkgs/by-name/ca/calibre/package.nix
@@ -41,14 +41,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "calibre";
-  version = "9.13.0";
+  version = "9.14.0";
 
   __structuredAttrs = true;
   strictDeps = true;
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
-    hash = "sha256-ONfYjXq8vGLG/jV1SD+1STzpYtJhqXihpNtNWLxLN5M=";
+    hash = "sha256-0bwkAksJQkKcYn6cXQsl1R35wa8eHY3KPlcvA7GUxWE=";
   };
 
   patches =

From 54491482c65341888554baabf7f7f3679cc7e521 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 29 Aug 2026 20:11:10 +0000
Subject: [PATCH 30/41] gitea: 1.27.2 -> 1.27.3

(cherry picked from commit db58b0ea6013a8fd73acf640ae9419466a8b914d)
---
 pkgs/by-name/gi/gitea/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix
index 72a33ae59aff..28df315920b5 100644
--- a/pkgs/by-name/gi/gitea/package.nix
+++ b/pkgs/by-name/gi/gitea/package.nix
@@ -53,13 +53,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "gitea";
-  version = "1.27.2";
+  version = "1.27.3";
 
   src = fetchFromGitHub {
     owner = "go-gitea";
     repo = "gitea";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-376YyRYcZGya/k5zg2zL2iqtrE7r2Q/DMd3DbOnKyOA=";
+    hash = "sha256-91hF7VpMDHyBj1dBlsVC/b3IhNAnUwK/qhZb77GPEnc=";
   };
 
   proxyVendor = true;

From 68f65c3de1b31efd62280ec2c980df2e50e5c19d Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 27 Aug 2026 19:30:20 +0200
Subject: [PATCH 31/41] xearth: mark as `unfreeRedistributable`

Can only be used for non-commercial and not-for-profit purposes,
see https://xearth.org/copyright.html.

(cherry picked from commit afbadc1bd4143bf7dd56a68274a101ca1d5e1255)
---
 pkgs/by-name/xe/xearth/package.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/xe/xearth/package.nix b/pkgs/by-name/xe/xearth/package.nix
index 49d17d289cdb..4efc5a2f9f04 100644
--- a/pkgs/by-name/xe/xearth/package.nix
+++ b/pkgs/by-name/xe/xearth/package.nix
@@ -50,11 +50,9 @@ stdenv.mkDerivation (finalAttrs: {
       By default, xearth updates the displayed image every  five  minutes.
     '';
     maintainers = with lib.maintainers; [ mafo ];
-    license = {
-      fullName = "xearth license";
-      url = "https://xearth.org/copyright.html";
-      free = true;
-    };
+    # https://xearth.org/copyright.html
+    # > for non-commercial and not-for-profit purposes
+    license = lib.licenses.unfreeRedistributable;
     platforms = lib.platforms.unix;
   };
 })

From d9d613fef385dd7841992e64019d773b00a2d295 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Sun, 9 Aug 2026 18:18:14 +0200
Subject: [PATCH 32/41] heroic{,-unwrapped}: 2.22.0 -> 2.22.1

Changelog:
https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/releases/tag/v2.22.1
Diff:
https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/compare/v2.22.0...v2.22.1

pin electron version

Co-authored-by: Keenan Weaver <keenanweaver@protonmail.com>

(cherry picked from commit f0afd34d132c7ea396141ee0ee6493b5ae1a3d8e)
---
 .../he/heroic-unwrapped/fix-non-steam-shortcuts.patch    | 6 +++---
 pkgs/by-name/he/heroic-unwrapped/package.nix             | 9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/he/heroic-unwrapped/fix-non-steam-shortcuts.patch b/pkgs/by-name/he/heroic-unwrapped/fix-non-steam-shortcuts.patch
index 7b46473245f7..2c771441ca8a 100644
--- a/pkgs/by-name/he/heroic-unwrapped/fix-non-steam-shortcuts.patch
+++ b/pkgs/by-name/he/heroic-unwrapped/fix-non-steam-shortcuts.patch
@@ -1,11 +1,11 @@
 diff --git a/src/backend/shortcuts/nonesteamgame/nonesteamgame.ts b/src/backend/shortcuts/nonesteamgame/nonesteamgame.ts
-index ebef6aa4..c8bd853d 100644
+index 28c917ce..f3b09c55 100644
 --- a/src/backend/shortcuts/nonesteamgame/nonesteamgame.ts
 +++ b/src/backend/shortcuts/nonesteamgame/nonesteamgame.ts
-@@ -252,7 +252,7 @@ async function addNonSteamGame(props: {
+@@ -255,7 +255,7 @@ async function addNonSteamGame(game: Game): Promise<boolean> {
      // add new Entry
      const newEntry = {} as ShortcutEntry
-     newEntry.AppName = props.gameInfo.title
+     newEntry.AppName = gameInfo.title
 -    newEntry.Exe = `"${app.getPath('exe')}"`
 +    newEntry.Exe = `"heroic"`
      newEntry.StartDir = `"${process.cwd()}"`
diff --git a/pkgs/by-name/he/heroic-unwrapped/package.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix
index 8f0bdf3cbe88..cf05d80bc405 100644
--- a/pkgs/by-name/he/heroic-unwrapped/package.nix
+++ b/pkgs/by-name/he/heroic-unwrapped/package.nix
@@ -12,7 +12,7 @@
   makeWrapper,
   # Electron updates can break Heroic, so try to use same version as upstream.
   # If the used electron version is higher than upstream's then the node-abi package might need to be updated
-  electron,
+  electron_43,
   vulkan-helper,
   gogdl,
   nile,
@@ -22,6 +22,7 @@
 
 let
   pnpm = pnpm_10;
+  electron = electron_43;
 
   legendary = callPackage ./legendary.nix { };
   epic-integration = callPackage ./epic-integration.nix { };
@@ -29,13 +30,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "heroic-unwrapped";
-  version = "2.22.0";
+  version = "2.22.1";
 
   src = fetchFromGitHub {
     owner = "Heroic-Games-Launcher";
     repo = "HeroicGamesLauncher";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RDJDeL5exEzF2BhEWoiXWsTpV5hytrB6RDoXV0mTWTw=";
+    hash = "sha256-CpbCXmvfwXT16ZG/6fwPWSjBwK02ykJ/GuZk1VcW+tU=";
   };
 
   pnpmDeps = fetchPnpmDeps {
@@ -47,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
       ;
     inherit pnpm;
     fetcherVersion = 3;
-    hash = "sha256-lPHL6pA39hvEtq5WkcAXfcY3a0VPseQL/nI+oEjIZeE=";
+    hash = "sha256-NrglT9vtDMAYXmZ4G3vifvLXu1yS6xbp+cqE6B6vQFc=";
   };
 
   nativeBuildInputs = [

From 8be3c8cc3e739ac46d184f9c8b8576adb029a00d Mon Sep 17 00:00:00 2001
From: Giel van Schijndel <giel@mortis.eu>
Date: Mon, 29 Sep 2025 18:39:26 +0200
Subject: [PATCH 33/41] hash-slinger: fix $PATH to make 'openssl' discoverable
 for it

Without this it depends on the user injecting openssl in PATH when
attempting to use the 'tlsa --create --certificate $localFile' option.

(cherry picked from commit 812dcda57399d68da994b8c5f22e2e1bb7f4b2ef)
---
 pkgs/by-name/ha/hash-slinger/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ha/hash-slinger/package.nix b/pkgs/by-name/ha/hash-slinger/package.nix
index 2e3f6c89130b..2b4eb5406dec 100644
--- a/pkgs/by-name/ha/hash-slinger/package.nix
+++ b/pkgs/by-name/ha/hash-slinger/package.nix
@@ -5,6 +5,7 @@
   python3,
   unbound,
   libreswan,
+  openssl,
 }:
 
 stdenv.mkDerivation rec {
@@ -21,6 +22,7 @@ stdenv.mkDerivation rec {
   pythonPath = with python3.pkgs; [
     dnspython
     m2crypto
+    openssl
     python-gnupg
     pyunbound
   ];

From abbeb60bf02f622014e3d2f0781b4cc25724d832 Mon Sep 17 00:00:00 2001
From: ErmitaVulpe <tymon.wilczek@gmail.com>
Date: Mon, 9 Feb 2026 12:58:35 +0100
Subject: [PATCH 34/41] maintainers: add ErmitaVulpe

(cherry picked from commit f7d046889529b4631fe794c02c24599407c8477e)
---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 26bab6b80545..b4b140190e7e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8302,6 +8302,12 @@
     github = "eripa";
     githubId = 1429673;
   };
+  ErmitaVulpe = {
+    name = "Emily Wilczek";
+    email = "emily.wilczek@proton.me";
+    github = "ErmitaVulpe";
+    githubId = 34629570;
+  };
   ern775 = {
     email = "eren.demir2479090@gmail.com";
     github = "ern775";

From 19b6ff200354735d87b270a53235631a4fdd5a30 Mon Sep 17 00:00:00 2001
From: ErmitaVulpe <tymon.wilczek@gmail.com>
Date: Mon, 9 Feb 2026 16:59:58 +0100
Subject: [PATCH 35/41] surge-downloader: init at 0.12.1

(cherry picked from commit 02353e176cab9a64aa76d4192c83e77a7bed9e7a)
---
 pkgs/by-name/su/surge-downloader/package.nix | 63 ++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 pkgs/by-name/su/surge-downloader/package.nix

diff --git a/pkgs/by-name/su/surge-downloader/package.nix b/pkgs/by-name/su/surge-downloader/package.nix
new file mode 100644
index 000000000000..d67ee52f40d4
--- /dev/null
+++ b/pkgs/by-name/su/surge-downloader/package.nix
@@ -0,0 +1,63 @@
+{
+  buildGoModule,
+  fetchFromGitHub,
+  lib,
+  nix-update-script,
+  stdenv,
+  versionCheckHook,
+}:
+buildGoModule (finalAttrs: {
+  pname = "surge-downloader";
+  version = "0.12.1";
+
+  src = fetchFromGitHub {
+    owner = "SurgeDM";
+    repo = "Surge";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-cUJwt4gRdlQvMnrEvYG7JZe/2oz4cN9k35TEur13Sks=";
+  };
+
+  vendorHash = "sha256-Ei2i7dQ9s42Gg6f2iLABbTG7OQspjHoRnqIhkfcNvFo=";
+
+  subPackages = [ "." ];
+
+  ldflags = [
+    "-s"
+    "-X github.com/SurgeDM/Surge/cmd.Version=${finalAttrs.version}"
+  ];
+
+  postInstall =
+    if stdenv.hostPlatform.isDarwin then
+      ''
+        mv $out/bin/Surge $out/bin/surge.tmp
+        mv $out/bin/surge.tmp $out/bin/surge
+      ''
+    else
+      ''
+        mv $out/bin/Surge $out/bin/surge
+        ln -s $out/bin/surge $out/bin/Surge
+      '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  __structuredAttrs = true;
+
+  meta = {
+    description = "TUI download manager";
+    longDescription = ''
+      Surge is a blazing fast, open-source terminal (TUI) download manager built in Go.
+      Designed for power users who prefer a keyboard-driven workflow. It features a beautiful TUI,
+      as well as a background Headless Server and a CLI tool for automation.
+    '';
+    homepage = "https://github.com/SurgeDM/Surge";
+    changelog = "https://github.com/SurgeDM/Surge/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    mainProgram = "surge";
+    maintainers = with lib.maintainers; [ ErmitaVulpe ];
+  };
+})

From 9724c6b088be84de30427a8b501d2cfb3008a668 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Wed, 26 Aug 2026 16:29:08 +0200
Subject: [PATCH 36/41] nodejs_26: 26.7.0 -> 26.8.0

(cherry picked from commit bab241b677c78ada07cc54bd66895ed57c0e78fc)
---
 pkgs/development/web/nodejs/v26.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v26.nix b/pkgs/development/web/nodejs/v26.nix
index e7ba3bd59a44..c1d93df66a27 100644
--- a/pkgs/development/web/nodejs/v26.nix
+++ b/pkgs/development/web/nodejs/v26.nix
@@ -23,8 +23,8 @@ let
       [ ];
 in
 buildNodejs {
-  version = "26.7.0";
-  sha256 = "e6b182cbeeab032d1082ca4ac4fe15e3a57de691d3bde78ecf8a761fd56ee356";
+  version = "26.8.0";
+  sha256 = "2287613caa71f9ab8dff4cbec7da32f0fae3e8807a6876a77764acc16d4cca4c";
   patches =
     (lib.optional (!(stdenv.hostPlatform.emulatorAvailable buildPackages)) (fetchpatch2 {
       url = "https://raw.githubusercontent.com/buildroot/buildroot/2f0c31bffdb59fb224387e35134a6d5e09a81d57/package/nodejs/nodejs-src/0003-include-obj-name-in-shared-intermediate.patch";

From 12cc1775fcf55e18f99cfe04d570fca5d5c2f374 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Thu, 27 Aug 2026 00:11:55 +0200
Subject: [PATCH 37/41] nodejs_26: 26.8.0 -> 26.8.1

(cherry picked from commit 227b7ffc599fa44b587561f7e0691b56d2d43254)
---
 pkgs/development/web/nodejs/v26.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v26.nix b/pkgs/development/web/nodejs/v26.nix
index c1d93df66a27..182d4b35991e 100644
--- a/pkgs/development/web/nodejs/v26.nix
+++ b/pkgs/development/web/nodejs/v26.nix
@@ -23,8 +23,8 @@ let
       [ ];
 in
 buildNodejs {
-  version = "26.8.0";
-  sha256 = "2287613caa71f9ab8dff4cbec7da32f0fae3e8807a6876a77764acc16d4cca4c";
+  version = "26.8.1";
+  sha256 = "d1698832a1a10f050cdda044a3e3d6a748246811e2e7bc89ba9a8bd693dc45f2";
   patches =
     (lib.optional (!(stdenv.hostPlatform.emulatorAvailable buildPackages)) (fetchpatch2 {
       url = "https://raw.githubusercontent.com/buildroot/buildroot/2f0c31bffdb59fb224387e35134a6d5e09a81d57/package/nodejs/nodejs-src/0003-include-obj-name-in-shared-intermediate.patch";

From 6d4492a9be9a3b1ff9073c6813ef8dbc7c219fee Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 29 Aug 2026 13:42:58 +0200
Subject: [PATCH 38/41] php84: 8.4.24 -> 8.4.25

ChangeLog: https://www.php.net/ChangeLog-8.php#8.4.25
(cherry picked from commit ee28416b3ebdc704a119214542bf6383fc45901a)
---
 pkgs/development/interpreters/php/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index f18dfea5a2ca..e30d548bc606 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -77,8 +77,8 @@ in
     hash = "sha256-+cn00M12ksbj2jY81MpyqCakmuGPXtQwtvyue8KIHhg=";
   };
   php84 = mkPhp {
-    version = "8.4.24";
-    hash = "sha256-KGiQRHWIUQ3xEO3p6c4J8etPmFZjC0f9xA7OcOIDc88=";
+    version = "8.4.25";
+    hash = "sha256-lSzMF4Uma5WPSh3PxYDgjqu7efRCItHv8ZK82Y2R9uM=";
   };
   php85 = mkPhp {
     version = "8.5.10";

From 20b79e9727774d90caa4aec775e81614541dd786 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 29 Aug 2026 04:23:49 +0000
Subject: [PATCH 39/41] goupile: 3.12.6 -> 3.12.7

(cherry picked from commit cf206e86d26f1f1a5db3da2a3f3231895f80f4d9)
---
 pkgs/by-name/go/goupile/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/go/goupile/package.nix b/pkgs/by-name/go/goupile/package.nix
index d497c20148ea..702068cce047 100644
--- a/pkgs/by-name/go/goupile/package.nix
+++ b/pkgs/by-name/go/goupile/package.nix
@@ -27,14 +27,14 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
   pname = "goupile";
-  version = "3.12.6";
+  version = "3.12.7";
 
   # https://github.com/Koromix/rygel/tags
   src = fetchFromGitHub {
     owner = "Koromix";
     repo = "rygel";
     tag = "goupile/${finalAttrs.version}";
-    hash = "sha256-vwHcvvGWqdixMnE5FmhM2RtQl3OL0EIxoHjkDf8czj4=";
+    hash = "sha256-dGY8h55ugxdkMNIVcj2WgslfN7vcZD2VKoYWmOzBXIw=";
   };
 
   nativeBuildInputs = [

From 60d00347e4353cb765bce7fb52461e94eb53417e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 28 Aug 2026 23:59:49 +0000
Subject: [PATCH 40/41] rustywind: 0.27.0 -> 0.28.0

(cherry picked from commit 4525b87c9b881bf576e958ea935d52cd44081d3d)
---
 pkgs/by-name/ru/rustywind/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/rustywind/package.nix b/pkgs/by-name/ru/rustywind/package.nix
index 767162a54185..ae7b124c5a9d 100644
--- a/pkgs/by-name/ru/rustywind/package.nix
+++ b/pkgs/by-name/ru/rustywind/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rustywind";
-  version = "0.27.0";
+  version = "0.28.0";
 
   src = fetchFromGitHub {
     owner = "avencera";
     repo = "rustywind";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VlmJJ9movoMumCChINLikz1HJ+KjMvZiTiBhrSCEAdk=";
+    hash = "sha256-DHZF/ftJqeKvjgaYUY8KNOkq7MBguPi2yXyrb1V91M8=";
   };
 
-  cargoHash = "sha256-DAozCVsUBUp6TsbmtfZnU3G73OZE4qtDqtJzpv3fvp4=";
+  cargoHash = "sha256-A2bD4uXU4/9uMJjCHc83dfFVqjn/zgjZ31gDWiAhFVk=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From 008eb1906d1f4dd318ff60cc66c6b0e5647baac9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Jun 2026 14:38:39 +0000
Subject: [PATCH 41/41] songrec: 0.7.3 -> 0.7.4

(cherry picked from commit 1378cd4282f5f4dd0de29568835e0b826adcd28f)
---
 pkgs/by-name/so/songrec/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/so/songrec/package.nix b/pkgs/by-name/so/songrec/package.nix
index a61ef8400419..188449f9f589 100644
--- a/pkgs/by-name/so/songrec/package.nix
+++ b/pkgs/by-name/so/songrec/package.nix
@@ -19,16 +19,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "songrec";
-  version = "0.7.3";
+  version = "0.7.4";
 
   src = fetchFromGitHub {
     owner = "marin-m";
     repo = "songrec";
     tag = finalAttrs.version;
-    hash = "sha256-6DT5KY6Y3CPTFLNG+EostAlMgZ35SLv8r9EXtRadC2U=";
+    hash = "sha256-U7THM8fagZREkleH6DWiusP3KcAtu/OrAg9USdCGRec=";
   };
 
-  cargoHash = "sha256-9R7HwTwjeCBIxX2xHs++9Zl0SMRmHPHDD1OHNa4q+jI=";
+  cargoHash = "sha256-O0YjeZCOe+cXjxUAgMT1l621rid4pexMZ3MbLDGxQsM=";
 
   nativeBuildInputs = [
     pkg-config