From 1220274c790df4df5d21ab47015e338b8833dbbc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Jul 2025 23:39:53 +0000
Subject: [PATCH 01/33] nbdkit: 1.42.1 -> 1.44.1

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

diff --git a/pkgs/by-name/nb/nbdkit/package.nix b/pkgs/by-name/nb/nbdkit/package.nix
index 5a2adb276b48..4e11dbcb8c0e 100644
--- a/pkgs/by-name/nb/nbdkit/package.nix
+++ b/pkgs/by-name/nb/nbdkit/package.nix
@@ -20,11 +20,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nbdkit";
-  version = "1.42.1";
+  version = "1.44.1";
 
   src = fetchurl {
     url = "https://download.libguestfs.org/nbdkit/${lib.versions.majorMinor finalAttrs.version}-stable/nbdkit-${finalAttrs.version}.tar.gz";
-    hash = "sha256-Azi8dD59OLKrl0xakd92QdPHVdNYUyJ3FbclJqCZ4KE=";
+    hash = "sha256-WQRLqBtYkPBmeK2I4aCt1P7r78fjVLsCOnUEjml1lmM=";
   };
 
   prePatch = ''

From 35cdd22d38858fd21b2783f2673bccb96e101ff2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 18 Jul 2025 00:32:04 +0000
Subject: [PATCH 02/33] sogo: 5.12.1 -> 5.12.3

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

diff --git a/pkgs/by-name/so/sogo/package.nix b/pkgs/by-name/so/sogo/package.nix
index 621c504aa56a..9db105884dc6 100644
--- a/pkgs/by-name/so/sogo/package.nix
+++ b/pkgs/by-name/so/sogo/package.nix
@@ -25,14 +25,14 @@
 
 clangStdenv.mkDerivation rec {
   pname = "sogo";
-  version = "5.12.1";
+  version = "5.12.3";
 
   # always update the sope package as well, when updating sogo
   src = fetchFromGitHub {
     owner = "Alinto";
     repo = "sogo";
     rev = "SOGo-${version}";
-    hash = "sha256-BBFo8h0YnE/qHbAwu+vHX+eu9f4WXMs1gQT2nAxiPgc=";
+    hash = "sha256-HTfe/ZiipqS6QdKQK0wf4Xl6xCTNw5fEdXfRFbBMWMY=";
   };
 
   nativeBuildInputs = [

From 51e4a6c7c38779e8aa613c9ef564f535177e6148 Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Sat, 28 Jun 2025 21:03:37 -0400
Subject: [PATCH 03/33] asahi-fwextract: init at 0.7.9

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

diff --git a/pkgs/by-name/as/asahi-fwextract/package.nix b/pkgs/by-name/as/asahi-fwextract/package.nix
new file mode 100644
index 000000000000..0db932bcaf0c
--- /dev/null
+++ b/pkgs/by-name/as/asahi-fwextract/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  python3,
+  fetchFromGitHub,
+  gzip,
+  gnutar,
+  lzfse,
+  nix-update-script,
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "asahi-fwextract";
+  version = "0.7.9";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "AsahiLinux";
+    repo = "asahi-installer";
+    tag = "v${version}";
+    hash = "sha256-vbhepoZ52k5tW2Gd7tfQTZ5CLqzhV7dUcVh6+AYwECk=";
+  };
+
+  postPatch = ''
+    substituteInPlace asahi_firmware/img4.py \
+      --replace-fail 'liblzfse.so' '${lzfse}/lib/liblzfse.so'
+    substituteInPlace asahi_firmware/update.py \
+      --replace-fail '"tar"' '"${gnutar}/bin/tar"' \
+      --replace-fail '"xf"' '"-x", "-I", "${gzip}/bin/gzip", "-f"'
+  '';
+
+  build-system = [ python3.pkgs.setuptools ];
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Asahi firmware extraction script";
+    homepage = "https://github.com/AsahiLinux/asahi-installer";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ normalcea ];
+    mainProgram = "asahi-fwextract";
+    platforms = [ "aarch64-linux" ];
+  };
+}

From 32ec35fbfa3613a38090b0514d10528f5377203d Mon Sep 17 00:00:00 2001
From: Douglas Mayle <douglas@mayle.org>
Date: Sat, 19 Jul 2025 18:02:04 -0400
Subject: [PATCH 04/33] whiserp-cpp: 1.75 -> 1.76 Fixes #409684

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

diff --git a/pkgs/by-name/wh/whisper-cpp/package.nix b/pkgs/by-name/wh/whisper-cpp/package.nix
index 55c0d357e5d8..7a1d5e5995a7 100644
--- a/pkgs/by-name/wh/whisper-cpp/package.nix
+++ b/pkgs/by-name/wh/whisper-cpp/package.nix
@@ -72,13 +72,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "whisper-cpp";
-  version = "1.7.5";
+  version = "1.7.6";
 
   src = fetchFromGitHub {
     owner = "ggml-org";
     repo = "whisper.cpp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tvCT0QRdmRGsjtQZcEZMgSe2/47tSkfdaPqS/2MuQTs=";
+    hash = "sha256-dppBhiCS4C3ELw/Ckx5W0KOMUvOHUiisdZvkS7gkxj4=";
   };
 
   # The upstream download script tries to download the models to the

From 8b88724884922048564cfd6e3fe01b99e248ab5d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 21 Jul 2025 10:21:35 +0000
Subject: [PATCH 05/33] dolt: 1.55.4 -> 1.57.0

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

diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix
index 93cb834ea71d..bd41d5bc198d 100644
--- a/pkgs/by-name/do/dolt/package.nix
+++ b/pkgs/by-name/do/dolt/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "dolt";
-  version = "1.55.4";
+  version = "1.57.0";
 
   src = fetchFromGitHub {
     owner = "dolthub";
     repo = "dolt";
     rev = "v${version}";
-    sha256 = "sha256-zIbyGpr26WL90PPoX0lW01XcrR0rBqWyK1odREnjQV0=";
+    sha256 = "sha256-9N5QPqwO9mzWuNwfRH+prYlq6dKD2NdcHbOE8WJ04r8=";
   };
 
   modRoot = "./go";
   subPackages = [ "cmd/dolt" ];
-  vendorHash = "sha256-MxYOrK7Wo6tHHsGiFR9V+RosKycm1K2e4HdX0gBkm7A=";
+  vendorHash = "sha256-4lV2IAL/pBC3xyxa6uVslCJY+XwjKviZb9Gp7QyKZR0=";
   proxyVendor = true;
   doCheck = false;
 

From ac2d18244f65f3add6b8bf60bdd5ad6c7e409098 Mon Sep 17 00:00:00 2001
From: Florian Beeres <yuuki@protonmail.com>
Date: Mon, 21 Jul 2025 22:20:17 +0200
Subject: [PATCH 06/33] gcfflasher: 4.8.0 -> 4.10.0

The patch is now included in the source and is therefore no longer
needed. See: 1019d7ef2ab55a598ddd938db1b08169b05fc37
---
 pkgs/by-name/gc/gcfflasher/package.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/gc/gcfflasher/package.nix b/pkgs/by-name/gc/gcfflasher/package.nix
index 8aac346b5eae..f236a6624048 100644
--- a/pkgs/by-name/gc/gcfflasher/package.nix
+++ b/pkgs/by-name/gc/gcfflasher/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   pkg-config,
   libgpiod,
   cmake,
@@ -10,22 +9,15 @@
 
 stdenv.mkDerivation rec {
   pname = "gcfflasher";
-  version = "4.8.0";
+  version = "4.10.0";
 
   src = fetchFromGitHub {
     owner = "dresden-elektronik";
     repo = "gcfflasher";
     tag = "v${version}";
-    hash = "sha256-W1sL3RyauEYAC/Fj0JhNnk0k5DT6Q8qIEuZNke3xNAE=";
+    hash = "sha256-ayPo8FHxlH/xaoIwjbATSYLtGJUJkSj0oS16QoMxsbc=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/dresden-elektronik/gcfflasher/commit/c1019d7ef2ab55a598ddd938db1b08169b05fc37.patch";
-      hash = "sha256-Frd3Xerkv3QolGCOrTE4AqBPqPHTKjjhk+DzhHABTqo=";
-    })
-  ];
-
   nativeBuildInputs = [
     pkg-config
     cmake

From 716cca561350bedeb9db0cd491eb549be741b9bc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 23 Jul 2025 14:39:31 +0000
Subject: [PATCH 07/33] cameradar: 5.0.2 -> 5.0.4

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

diff --git a/pkgs/by-name/ca/cameradar/package.nix b/pkgs/by-name/ca/cameradar/package.nix
index aa44bf6eead4..1a7b2dc647a5 100644
--- a/pkgs/by-name/ca/cameradar/package.nix
+++ b/pkgs/by-name/ca/cameradar/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "cameradar";
-  version = "5.0.2";
+  version = "5.0.4";
 
   src = fetchFromGitHub {
     owner = "Ullaakut";
     repo = "cameradar";
     rev = "v${version}";
-    sha256 = "sha256-GOqmz/aiOLGMfs9rQBIEQSgBycPzhu8BohcAc2U+gBw=";
+    sha256 = "sha256-nfqgBUgcLjPLdn8hs1q0FLDBHbloeMKETDrv3a5SZq0=";
   };
 
   vendorHash = "sha256-AIi57DWMvAKl0PhuwHO/0cHoDKk5e0bJsqHYBka4NiU=";

From 91a1beec911855511f3ed8e999faf3d82a16450d Mon Sep 17 00:00:00 2001
From: Savyasachee Jha <genghizkhan91@hawkradius.com>
Date: Thu, 24 Jul 2025 17:24:36 +0200
Subject: [PATCH 08/33] nixosTests.firefly-iii: Added meta.platforms so that
 tests are skipped appropriately

---
 nixos/tests/firefly-iii.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/firefly-iii.nix b/nixos/tests/firefly-iii.nix
index 6c1ff99d9c91..41baf49f7735 100644
--- a/nixos/tests/firefly-iii.nix
+++ b/nixos/tests/firefly-iii.nix
@@ -6,7 +6,10 @@ let
 in
 {
   name = "firefly-iii";
-  meta.maintainers = [ lib.maintainers.savyajha ];
+  meta = {
+    maintainers = [ lib.maintainers.savyajha ];
+    platforms = lib.platforms.linux;
+  };
 
   nodes.fireflySqlite =
     { config, ... }:

From 4db3acaca6d1e87d6b3e9da14bde813a09ed4525 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Jul 2025 14:03:05 +0000
Subject: [PATCH 09/33] ghidra-extensions.findcrypt: 3.0.6 -> 3.1.0

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

diff --git a/pkgs/tools/security/ghidra/extensions/findcrypt/default.nix b/pkgs/tools/security/ghidra/extensions/findcrypt/default.nix
index 1e07f15ef4fa..4da372a027b7 100644
--- a/pkgs/tools/security/ghidra/extensions/findcrypt/default.nix
+++ b/pkgs/tools/security/ghidra/extensions/findcrypt/default.nix
@@ -5,13 +5,13 @@
 }:
 buildGhidraExtension (finalAttrs: {
   pname = "findcrypt";
-  version = "3.0.6";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "antoniovazquezblanco";
     repo = "GhidraFindcrypt";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-VWi1MP72Vl4XCrbTvRA6qYPk2QyvRyVb9N8QQ/Zml0A=";
+    hash = "sha256-hhcKve3Nw9L+/jHYaJmWtTxwyeH4ZMu0qOgCkpSMU6U=";
   };
 
   meta = {

From 2b34d9582b33016305cb4b2ef12fdc370c4ccf58 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Jul 2025 14:35:32 +0000
Subject: [PATCH 10/33] jitsi-meet-prosody: 1.0.8648 -> 1.0.8737

---
 pkgs/by-name/ji/jitsi-meet-prosody/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ji/jitsi-meet-prosody/package.nix b/pkgs/by-name/ji/jitsi-meet-prosody/package.nix
index 76deae00bb45..f1b8c4365c55 100644
--- a/pkgs/by-name/ji/jitsi-meet-prosody/package.nix
+++ b/pkgs/by-name/ji/jitsi-meet-prosody/package.nix
@@ -8,10 +8,10 @@
 
 stdenv.mkDerivation rec {
   pname = "jitsi-meet-prosody";
-  version = "1.0.8648";
+  version = "1.0.8737";
   src = fetchurl {
     url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb";
-    sha256 = "JqnLAAWEI57VR5DrQrz4XrIyHE1Z6P0AjtUaTNuWYLE=";
+    sha256 = "fZs1ng1mtxwXgJAQqxAlrNrqUQJc9fGlxJKwuTJLENc=";
   };
 
   nativeBuildInputs = [ dpkg ];

From d9931a5695d3a570b5fdf4279735fe13fb101baf Mon Sep 17 00:00:00 2001
From: Paul Meyer <katexochen0@gmail.com>
Date: Fri, 25 Jul 2025 18:10:12 +0200
Subject: [PATCH 11/33] cameradar: unbreak

Signed-off-by: Paul Meyer <katexochen0@gmail.com>
---
 pkgs/by-name/ca/cameradar/package.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/by-name/ca/cameradar/package.nix b/pkgs/by-name/ca/cameradar/package.nix
index 1a7b2dc647a5..8232308bd6a8 100644
--- a/pkgs/by-name/ca/cameradar/package.nix
+++ b/pkgs/by-name/ca/cameradar/package.nix
@@ -30,8 +30,6 @@ buildGoModule rec {
   subPackages = [
     "cmd/cameradar"
   ];
-  # At least one test is outdated
-  #doCheck = false;
 
   meta = {
     description = "RTSP stream access tool";
@@ -39,9 +37,5 @@ buildGoModule rec {
     changelog = "https://github.com/Ullaakut/cameradar/releases/tag/v${version}";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ fab ];
-    # Upstream issue, doesn't build with latest curl, see
-    # https://github.com/Ullaakut/cameradar/issues/320
-    # https://github.com/andelf/go-curl/issues/84
-    broken = true;
   };
 }

From 54e1c9fe000e98f0e3ca107b4d4b016029967763 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 25 Jul 2025 21:17:32 +0200
Subject: [PATCH 12/33] cameradar: refactor

---
 pkgs/by-name/ca/cameradar/package.nix | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/ca/cameradar/package.nix b/pkgs/by-name/ca/cameradar/package.nix
index 8232308bd6a8..ca5ec3f8a4c4 100644
--- a/pkgs/by-name/ca/cameradar/package.nix
+++ b/pkgs/by-name/ca/cameradar/package.nix
@@ -13,29 +13,23 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "Ullaakut";
     repo = "cameradar";
-    rev = "v${version}";
-    sha256 = "sha256-nfqgBUgcLjPLdn8hs1q0FLDBHbloeMKETDrv3a5SZq0=";
+    tag = "v${version}";
+    hash = "sha256-nfqgBUgcLjPLdn8hs1q0FLDBHbloeMKETDrv3a5SZq0=";
   };
 
   vendorHash = "sha256-AIi57DWMvAKl0PhuwHO/0cHoDKk5e0bJsqHYBka4NiU=";
 
-  nativeBuildInputs = [
-    pkg-config
-  ];
+  nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [
-    curl
-  ];
+  buildInputs = [ curl ];
 
-  subPackages = [
-    "cmd/cameradar"
-  ];
+  subPackages = [ "cmd/cameradar" ];
 
   meta = {
     description = "RTSP stream access tool";
     homepage = "https://github.com/Ullaakut/cameradar";
-    changelog = "https://github.com/Ullaakut/cameradar/releases/tag/v${version}";
-    license = with lib.licenses; [ mit ];
+    changelog = "https://github.com/Ullaakut/cameradar/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
 }

From fb51cc802dcdda33133146b6630492409e9b472d Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Fri, 25 Jul 2025 23:49:59 +0200
Subject: [PATCH 13/33] nixos/systemd: run0: enable setLoginUid, disable
 pamMount

This brings our `run0` in line with the upstream defaults:
https://github.com/systemd/systemd/blob/bcc73cafdbd9c3947c53e4cff3498f8a73e56d9d/src/run/systemd-run0.in

While working on `auditd`, i noticed differences in how `run0` behaves
in regard to `/proc/$pid/sessionid` and `/proc/$pid/loginuid`. Particularly,
both files were set to `4294967295`, the magic value denoting `unset`.

While the manual page says elevators such as sudo should not set the loginuid,
run0 is a bit of a special case: The unit spawned by it is not child of
the running user session, and as such there is no id to inherit.

`systemd` upstream uses `pam_loginuid`, and for consistency we should too.
Especially because it prevents a whole lot of pain when working with `auditd`.

As to pam mounts:
On nixos we enable those if they are globally enabled. Upstream does not.
Considering the password entered into polkit is usually not the user password
of the account which will own the unit, pam mount will fail for any partition
which requires a password. Thus it makes sense to also disable pam mounts
for our run0, it prevents unnecessary unexpected pain.
---
 nixos/modules/system/boot/systemd.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 2fa9eb16d82b..536174daa08d 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -838,7 +838,11 @@ in
     # error that we’re trying to avoid can’t possibly happen if polkit isn’t enabled. When polkit isn’t
     # enabled, run0 will fail before it even tries to run the command.
     security.pam.services = mkIf config.security.polkit.enable {
-      systemd-run0 = { };
+      systemd-run0 = {
+        # Upstream config: https://github.com/systemd/systemd/blob/main/src/run/systemd-run0.in
+        setLoginUid = true;
+        pamMount = false;
+      };
     };
   };
 

From 58b513042ff494dd3daf30d8d39cbde0d60fe9f0 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 25 Jul 2025 22:33:15 +0200
Subject: [PATCH 14/33] firfox: limit apple sdk patch to versions below 142

---
 pkgs/applications/networking/browsers/firefox/common.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 80c185d12f65..3c8dd8d416f3 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -316,7 +316,9 @@ buildStdenv.mkDerivation {
       # https://hg-edge.mozilla.org/mozilla-central/rev/aa8a29bd1fb9
       ./139-wayland-drag-animation.patch
     ]
-    ++ lib.optionals (lib.versionAtLeast version "139") [ ./139-relax-apple-sdk.patch ]
+    ++ lib.optionals (lib.versionAtLeast version "139" && lib.versionOlder version "142") [
+      ./139-relax-apple-sdk.patch
+    ]
     ++ lib.optionals (lib.versionOlder version "139") [
       # Fix for missing vector header on macOS
       # https://bugzilla.mozilla.org/show_bug.cgi?id=1959377

From 8f03c15a3b692932f94a97ced5f908da095915ee Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 25 Jul 2025 18:53:26 +0000
Subject: [PATCH 15/33] firefox-devedition-unwrapped: 141.0b9 -> 142.0b3

---
 .../browsers/firefox/packages/firefox-devedition.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
index c7e29fc1677f..e93b0cfff180 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
@@ -10,13 +10,13 @@
 buildMozillaMach rec {
   pname = "firefox-devedition";
   binaryName = pname;
-  version = "141.0b9";
+  version = "142.0b3";
   applicationName = "Firefox Developer Edition";
   requireSigning = false;
   branding = "browser/branding/aurora";
   src = fetchurl {
     url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "0acb95c53c35d086aa777a96563e5cdc2838b8fedceeba344a2d4f5c9b0cbd148e8d1313463c35cf98fb52048bebd1b7a3aefc63e0d3ac9ae66de69fa25fc2e8";
+    sha512 = "5752c77307e59ad188385bb7bbb440e01a256f437088e051d1bc74e0ccdbde4ddf68c97fdcf0401c03636293753c5e8f7132352aed5f5e9e537c96eaf8784f21";
   };
 
   # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

From d3d88996a67ed14e6956427e2cee31cd89579850 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 25 Jul 2025 18:54:16 +0000
Subject: [PATCH 16/33] firefox-beta-unwrapped: 141.0b9 -> 142.0b3

---
 .../networking/browsers/firefox/packages/firefox-beta.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
index 8dd14fbb7e1f..9b2c1ee89478 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
@@ -10,11 +10,11 @@
 buildMozillaMach rec {
   pname = "firefox-beta";
   binaryName = pname;
-  version = "141.0b9";
+  version = "142.0b3";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "b474898f3e5955c35fa8bef05ea27d68604aad5ec00e3417bfc586e8a6abd55b19d98515719997b179209a38a032cc96245c67acb2fd7df14d8a355b832c6b77";
+    sha512 = "707781fcc59798c0ecbf11532eac41f4f134f24b1d670234cf674e433525ca83fe4fff75874d1a16d2be2039959731e71a5aa56e727d2b46e5bc40f63277b188";
   };
 
   meta = {

From a370573342456896cfb393d89e2edb510a93fb5e Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Thu, 3 Jul 2025 23:04:15 -0700
Subject: [PATCH 17/33] maintainers: add yiyu

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index cf10b8a6e0f3..518dec12a8ff 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -27799,6 +27799,12 @@
     github = "YisuiDenghua";
     githubId = 102890144;
   };
+  yiyu = {
+    email = "yiyuzhou19@gmail.com";
+    name = "Yiyu Zhou";
+    github = "yzhou216";
+    githubId = 50000936;
+  };
   yl3dy = {
     email = "aleksandr.kiselyov@gmail.com";
     github = "yl3dy";

From 0e13c2d6f8ba160ec3715ccf8433512166f15c47 Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Thu, 3 Jul 2025 23:04:41 -0700
Subject: [PATCH 18/33] terminal-toys: init at 0.5.0

---
 pkgs/by-name/te/terminal-toys/package.nix | 28 +++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 pkgs/by-name/te/terminal-toys/package.nix

diff --git a/pkgs/by-name/te/terminal-toys/package.nix b/pkgs/by-name/te/terminal-toys/package.nix
new file mode 100644
index 000000000000..a005cfb18fe5
--- /dev/null
+++ b/pkgs/by-name/te/terminal-toys/package.nix
@@ -0,0 +1,28 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "terminal-toys";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "Seebass22";
+    repo = "terminal-toys";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-G4UfX1B4TM4w5KQreCXIZh91o0Tvezhz0ZxojyXRtX8=";
+  };
+
+  cargoHash = "sha256-hjWPWNwZxJkuoFuEUuf7SOSJ4CEtqwCOV5ZM7CGtvfY=";
+
+  meta = {
+    description = "Screensavers for your terminal";
+    homepage = "https://github.com/Seebass22/terminal-toys";
+    changelog = "https://github.com/Seebass22/terminal-toys/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ yiyu ];
+    mainProgram = "terminal-toys";
+  };
+})

From 2c24ef1fb0e9272861ede4874b30c991a07adb48 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Jul 2025 07:33:44 +0000
Subject: [PATCH 19/33] kuzu: 0.11.0 -> 0.11.1

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

diff --git a/pkgs/by-name/ku/kuzu/package.nix b/pkgs/by-name/ku/kuzu/package.nix
index e10520903525..a49c0b73884b 100644
--- a/pkgs/by-name/ku/kuzu/package.nix
+++ b/pkgs/by-name/ku/kuzu/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kuzu";
-  version = "0.11.0";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "kuzudb";
     repo = "kuzu";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pAMXszaWlUJOg343XUQ+eMUk+yBE9Ksia0gyss36sUI=";
+    hash = "sha256-rRnzAEQhmqO8w+dN0liLGoHympgU5Q/qbsrJqzKpuTw=";
   };
 
   outputs = [

From 6a342938a52f70aac193c6400f6bb9a316a8db06 Mon Sep 17 00:00:00 2001
From: Lein Matsumaru <applePrincess@applePrincess.io>
Date: Sat, 26 Jul 2025 08:54:54 +0000
Subject: [PATCH 20/33] python3Packages.pyscf: 2.9.0 -> 2.10.0

---
 .../pyscf/coerce-numpy-to-int.patch           | 19 -------------------
 .../python-modules/pyscf/default.nix          | 10 ++--------
 2 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pyscf/coerce-numpy-to-int.patch

diff --git a/pkgs/development/python-modules/pyscf/coerce-numpy-to-int.patch b/pkgs/development/python-modules/pyscf/coerce-numpy-to-int.patch
deleted file mode 100644
index 140e6d77b1f0..000000000000
--- a/pkgs/development/python-modules/pyscf/coerce-numpy-to-int.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 6df405512d33d432bb45553ddcffbc70edec51f6
-Author: Lein Matsumaru <applePrincess@applePrincess.io>
-Date:   Sun Jun 29 12:59:57 2025 +0000
-
-    Coerce int
-
-diff --git a/pyscf/ci/gcisd.py b/pyscf/ci/gcisd.py
-index d58e0364c..050f83962 100644
---- a/pyscf/ci/gcisd.py
-+++ b/pyscf/ci/gcisd.py
-@@ -197,7 +197,7 @@ def from_fcivec(ci0, nelec, orbspin, frozen=None):
-              numpy.count_nonzero(orbspin[:nelec] == 1))
-     ucisdvec = ucisd.from_fcivec(ci0, norb//2, nelec, frozen)
-     nocc = numpy.count_nonzero(~frozen_mask[:sum(nelec)])
--    return from_ucisdvec(ucisdvec, nocc, orbspin[~frozen_mask])
-+    return from_ucisdvec(ucisdvec, int(nocc), orbspin[~frozen_mask])
- 
- 
- def make_rdm1(myci, civec=None, nmo=None, nocc=None, ao_repr=False):
diff --git a/pkgs/development/python-modules/pyscf/default.nix b/pkgs/development/python-modules/pyscf/default.nix
index 5818570a0030..4454ebb72fda 100644
--- a/pkgs/development/python-modules/pyscf/default.nix
+++ b/pkgs/development/python-modules/pyscf/default.nix
@@ -24,22 +24,16 @@
 
 buildPythonPackage rec {
   pname = "pyscf";
-  version = "2.9.0";
+  version = "2.10.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "pyscf";
     repo = "pyscf";
     tag = "v${version}";
-    hash = "sha256-UTeZXlNuSWDOcBRVbUUWJ3mQnZZQr17aTw6rRA5DRNI=";
+    hash = "sha256-lFYSWCe5THlivpBB6nFBR2zfCIKJ0YJeuY2rCKoXUq8=";
   };
 
-  patches = [
-    # Converts numpy.int64 to int where necessary.
-    # Upstream issue: https://github.com/pyscf/pyscf/issues/2878
-    ./coerce-numpy-to-int.patch
-  ];
-
   # setup.py calls Cmake and passes the arguments in CMAKE_CONFIGURE_ARGS to cmake.
   build-system = [ cmake ];
   dontUseCmakeConfigure = true;

From c533809fdb7d4b8c215a96ddfbfd4ded5f3d7f93 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Jul 2025 09:45:19 +0000
Subject: [PATCH 21/33] firebase-tools: 14.11.0 -> 14.11.1

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

diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix
index e0db25ed6308..b7294634a720 100644
--- a/pkgs/by-name/fi/firebase-tools/package.nix
+++ b/pkgs/by-name/fi/firebase-tools/package.nix
@@ -10,16 +10,16 @@
 
 buildNpmPackage rec {
   pname = "firebase-tools";
-  version = "14.11.0";
+  version = "14.11.1";
 
   src = fetchFromGitHub {
     owner = "firebase";
     repo = "firebase-tools";
     tag = "v${version}";
-    hash = "sha256-yOwIasMJ0kUGUwj1HN2oPIgu/U0PYT+UmoH8LLUh9EQ=";
+    hash = "sha256-2igmTOGheCMlBo2fKbKOpc+IFhwLcYKJ7u5evKl0buY=";
   };
 
-  npmDepsHash = "sha256-eLhlk/9RmyJg9fpFmQ53IE6m2TN46N801n85yeEDG2M=";
+  npmDepsHash = "sha256-9ysvVXaJbV2axsZn/TEAdDBPwoM8baI5jnMO9dH6JqE=";
 
   postPatch = ''
     ln -s npm-shrinkwrap.json package-lock.json

From 8e59ce1e26f7a77ddc9a4535b8332eaac7345a23 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Sat, 26 Jul 2025 12:12:06 +0200
Subject: [PATCH 22/33] buildRustPackage: warn on explicit useFetchCargoVendor

---
 pkgs/build-support/rust/build-rust-package/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix
index 9c9b70684474..7efbc8a9ea36 100644
--- a/pkgs/build-support/rust/build-rust-package/default.nix
+++ b/pkgs/build-support/rust/build-rust-package/default.nix
@@ -72,7 +72,11 @@ lib.extendMkDerivation {
     }@args:
 
     assert lib.assertMsg useFetchCargoVendor
-      "buildRustPackage: `useFetchCargoVendor` is non‐optional and enabled by default as of 25.05";
+      "buildRustPackage: `useFetchCargoVendor` is non‐optional and enabled by default as of 25.05, remove it";
+
+    assert lib.warnIf (args ? useFetchCargoVendor)
+      "buildRustPackage: `useFetchCargoVendor` is non‐optional and enabled by default as of 25.05, remove it"
+      true;
 
     lib.optionalAttrs (stdenv.hostPlatform.isDarwin && buildType == "debug") {
       RUSTFLAGS = "-C split-debuginfo=packed " + (args.RUSTFLAGS or "");

From f7226276914392ab86d8b2e408f77b76626ca10f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Jul 2025 11:33:06 +0000
Subject: [PATCH 23/33] mdp: 1.0.17 -> 1.0.18

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

diff --git a/pkgs/by-name/md/mdp/package.nix b/pkgs/by-name/md/mdp/package.nix
index cc36c93783de..d0a96c8796b1 100644
--- a/pkgs/by-name/md/mdp/package.nix
+++ b/pkgs/by-name/md/mdp/package.nix
@@ -6,14 +6,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.17";
+  version = "1.0.18";
   pname = "mdp";
 
   src = fetchFromGitHub {
     owner = "visit1985";
     repo = "mdp";
     rev = version;
-    sha256 = "sha256-g9+bqMoUpcRL1pcNqaeMR3l5uHuiEpDZj/6YmyOSn7k=";
+    sha256 = "sha256-7ltqnvNzdr+sJiiiCQpp25dzhOrcUCOAgMTt1RIgVTw=";
   };
 
   makeFlags = [ "PREFIX=$(out)" ];

From 3431dc91df992f5b84cc4cfdf0dc5702a2c3107c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 26 Jul 2025 13:45:58 +0200
Subject: [PATCH 24/33] yosys: fetch patch to fix amaranth code compilation

Addresses
https://github.com/NixOS/nixpkgs/pull/397611#issuecomment-3121635236
---
 pkgs/by-name/yo/yosys/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/yo/yosys/package.nix b/pkgs/by-name/yo/yosys/package.nix
index 66107035aec5..de1b7f3f5227 100644
--- a/pkgs/by-name/yo/yosys/package.nix
+++ b/pkgs/by-name/yo/yosys/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
 
   # nativeBuildInputs
   bison,
@@ -134,6 +135,14 @@ stdenv.mkDerivation (finalAttrs: {
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
   patches = [
+    # Backport fix amaranth code compilation
+    # TODO remove when updating to 0.56
+    # https://github.com/YosysHQ/yosys/pull/5182
+    (fetchpatch2 {
+      name = "treat-zero-width-constant-as-zero.patch";
+      url = "https://github.com/YosysHQ/yosys/commit/478b6a2b3fbab0fd4097b841914cbe8bb9f67268.patch";
+      hash = "sha256-KeLoZfkXMk2KIPN9XBQdqWqohywQONlWUIvrGwgphKs=";
+    })
     ./plugin-search-dirs.patch
     ./fix-clang-build.patch
   ];

From b264aa2a8eddabec4b7bd84b26f1b96062af10f3 Mon Sep 17 00:00:00 2001
From: der-letzte <der-letzte@users.noreply.github.com>
Date: Sat, 26 Jul 2025 13:52:00 +0200
Subject: [PATCH 25/33] ubootRadxaZero3W: init

---
 pkgs/misc/uboot/default.nix     | 12 ++++++++++++
 pkgs/top-level/all-packages.nix |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index a4dbe56da39d..b07a6feecc77 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -664,6 +664,18 @@ in
     ];
   };
 
+  ubootRadxaZero3W = buildUBoot {
+    defconfig = "radxa-zero-3-rk3566_defconfig";
+    extraMeta.platforms = [ "aarch64-linux" ];
+    BL31 = "${armTrustedFirmwareRK3568}/bl31.elf";
+    ROCKCHIP_TPL = rkbin.TPL_RK3566;
+    filesToInstall = [
+      "idbloader.img"
+      "u-boot.itb"
+      "u-boot-rockchip.bin"
+    ];
+  };
+
   ubootRaspberryPi = buildUBoot {
     defconfig = "rpi_defconfig";
     extraMeta.platforms = [ "armv6l-linux" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bdbc642c239a..779e34e080d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11344,6 +11344,7 @@ with pkgs;
     ubootQemuX86
     ubootQemuX86_64
     ubootQuartz64B
+    ubootRadxaZero3W
     ubootRaspberryPi
     ubootRaspberryPi2
     ubootRaspberryPi3_32bit

From e3ef01640e90ff8247e5ebda96f9242128ffb208 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Jul 2025 12:02:00 +0000
Subject: [PATCH 26/33] parca-agent: 0.39.2 -> 0.39.3

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

diff --git a/pkgs/by-name/pa/parca-agent/package.nix b/pkgs/by-name/pa/parca-agent/package.nix
index 9c325b010aa0..1a6fd07e01e6 100644
--- a/pkgs/by-name/pa/parca-agent/package.nix
+++ b/pkgs/by-name/pa/parca-agent/package.nix
@@ -8,18 +8,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "parca-agent";
-  version = "0.39.2";
+  version = "0.39.3";
 
   src = fetchFromGitHub {
     owner = "parca-dev";
     repo = "parca-agent";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gg1xlvvIImqMxAGORdTEK7TQSTXrcJZLuinGoGmkS6E=";
+    hash = "sha256-dtDC0TlyYnoYpKiZ9gb9Dm75LA1r8040IUurnalkO4M=";
     fetchSubmodules = true;
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-h1VyXBsUTOToPnsQq1Z3YA5EDJwz+xdap1i6ntRjccM=";
+  vendorHash = "sha256-10cfmMbNvaX2VksX0WOOHQAMgqfOXbkLXeXAy3b3fhU=";
 
   buildInputs = [
     stdenv.cc.libc.static

From f7e486a6ca16b7f4fede9753b1b19ff6557e61f5 Mon Sep 17 00:00:00 2001
From: Victor Engmark <victor@engmark.name>
Date: Mon, 9 Jun 2025 22:22:37 +0200
Subject: [PATCH 27/33] libipuz: 0.4.5 -> 0.5.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Requires upgrading libipuz 0.4.5 → 0.5.2.

Also:

- fix libipuz license
- enable auto-update
- add myself as maintainer

Co-authored-by: Victor Engmark <victor@engmark.name>
---
 pkgs/by-name/li/libipuz/package.nix | 51 ++++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/li/libipuz/package.nix b/pkgs/by-name/li/libipuz/package.nix
index f1c62f408693..4648496425a4 100644
--- a/pkgs/by-name/li/libipuz/package.nix
+++ b/pkgs/by-name/li/libipuz/package.nix
@@ -1,31 +1,50 @@
 {
   lib,
   stdenv,
+  cargo,
   fetchFromGitLab,
+  gi-docgen,
+  glib,
+  gobject-introspection,
+  json-glib,
   meson,
   ninja,
+  nix-update-script,
   pkg-config,
-  glib,
-  json-glib,
+  rustPlatform,
 }:
-
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libipuz";
-  version = "0.4.5";
+  version = "0.5.2";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "jrb";
     repo = "libipuz";
-    rev = version;
-    hash = "sha256-psC2cFqSTlToCtCxwosXyJbmX/96AEI0xqzXtlc/HQE=";
+    rev = finalAttrs.version;
+    hash = "sha256-8bFMtqRD90SF9uT39Wkjf0eUef+0HgyrqY+DFA/xutI=";
+  };
+
+  cargoRoot = "libipuz/rust";
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs)
+      pname
+      src
+      version
+      cargoRoot
+      ;
+    hash = "sha256-Aw/caE5Z5JxoKLEr2Dr2wq6cyFleNNwtKM1yXM8ZWmU=";
   };
 
   nativeBuildInputs = [
+    cargo
+    gi-docgen
+    glib
+    gobject-introspection
     meson
     ninja
     pkg-config
-    glib
+    rustPlatform.cargoSetupHook
   ];
 
   buildInputs = [
@@ -33,12 +52,20 @@ stdenv.mkDerivation rec {
     json-glib
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Library for parsing .ipuz puzzle files";
     homepage = "https://gitlab.gnome.org/jrb/libipuz";
-    changelog = "https://gitlab.gnome.org/jrb/libipuz/-/blob/${version}/NEWS.md?ref_type=tags";
-    license = lib.licenses.lgpl21Plus;
-    maintainers = with lib.maintainers; [ aleksana ];
+    changelog = "https://gitlab.gnome.org/jrb/libipuz/-/blob/${finalAttrs.version}/NEWS.md?ref_type=tags";
+    license = with lib.licenses; [
+      lgpl21Plus
+      mit
+    ];
+    maintainers = with lib.maintainers; [
+      aleksana
+      l0b0
+    ];
     platforms = lib.platforms.unix;
   };
-}
+})

From 636a92342bdff6f21ef26cbdaaf4057c5b8a24d4 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Sat, 26 Jul 2025 20:33:50 +0800
Subject: [PATCH 28/33] crosswords: 0.3.12 -> 0.3.15

Co-authored-by: Victor Engmark <victor@engmark.name>
---
 pkgs/by-name/cr/crosswords/package.nix | 30 ++++++++++++++++----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/cr/crosswords/package.nix b/pkgs/by-name/cr/crosswords/package.nix
index e1d6b54bfc4e..f2aa015e19f6 100644
--- a/pkgs/by-name/cr/crosswords/package.nix
+++ b/pkgs/by-name/cr/crosswords/package.nix
@@ -1,52 +1,60 @@
 {
   lib,
   stdenv,
-  fetchFromGitLab,
-  meson,
-  ninja,
-  pkg-config,
-  wrapGAppsHook4,
   desktop-file-utils,
-  libadwaita,
+  fetchFromGitLab,
   isocodes,
   json-glib,
+  libadwaita,
   libipuz,
+  meson,
+  ninja,
+  nix-update-script,
+  pkg-config,
+  shared-mime-info,
+  wrapGAppsHook4,
 }:
 
 stdenv.mkDerivation rec {
   pname = "crosswords";
-  version = "0.3.12";
+  version = "0.3.15";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "jrb";
     repo = "crosswords";
     rev = version;
-    hash = "sha256-3RL2LJdIHmDAjXaxqsE0n5UQMsuBJWEMoyAEoSBemR0=";
+    hash = "sha256-KcHcTjPoQNA5TBXnKgudjBTV/0JbeVMJ09XVAL7SizI=";
   };
 
   nativeBuildInputs = [
+    desktop-file-utils
     meson
     ninja
     pkg-config
+    shared-mime-info
     wrapGAppsHook4
-    desktop-file-utils
   ];
 
   buildInputs = [
-    libadwaita
     isocodes
     json-glib
+    libadwaita
     libipuz
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Crossword player and editor for GNOME";
     homepage = "https://gitlab.gnome.org/jrb/crosswords";
     changelog = "https://gitlab.gnome.org/jrb/crosswords/-/blob/${version}/NEWS.md?ref_type=tags";
     license = lib.licenses.gpl3Plus;
     mainProgram = "crosswords";
-    maintainers = with lib.maintainers; [ aleksana ];
+    maintainers = with lib.maintainers; [
+      aleksana
+      l0b0
+    ];
     platforms = lib.platforms.unix;
   };
 }

From edf393346a8ca84c5de2b66058b3cc6da9436f66 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 25 Jul 2025 22:52:49 +0000
Subject: [PATCH 29/33] urn-timer: 0-unstable-2025-04-17 ->
 0-unstable-2025-07-21

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

diff --git a/pkgs/by-name/ur/urn-timer/package.nix b/pkgs/by-name/ur/urn-timer/package.nix
index 8222cac03c2b..d65f97df0dc5 100644
--- a/pkgs/by-name/ur/urn-timer/package.nix
+++ b/pkgs/by-name/ur/urn-timer/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation {
   pname = "urn-timer";
-  version = "0-unstable-2025-04-17";
+  version = "0-unstable-2025-07-21";
 
   src = fetchFromGitHub {
     owner = "paoloose";
     repo = "urn";
-    rev = "5eea3f9efb03758bfafcd029406797d34e4c875b";
-    hash = "sha256-rlUFZiA2fMa5QkKqKBRkiM8o2nioD0MPn6eJTJSJq3M=";
+    rev = "3e5d00cfb19c27e155e6bb03a11a70f1e89b0842";
+    hash = "sha256-FttQ9NffJQ8UjNaRUQ6kCDnDHp72q8eOmIhnoplwtYw=";
   };
 
   nativeBuildInputs = [

From 5948d9e51e6f34d5ecf75bbef8a16ce2acf86e17 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Jul 2025 15:13:56 +0000
Subject: [PATCH 30/33] vivaldi: 7.5.3735.54 -> 7.5.3735.56

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

diff --git a/pkgs/by-name/vi/vivaldi/package.nix b/pkgs/by-name/vi/vivaldi/package.nix
index 5c0b04eba27d..6d774e0541fe 100644
--- a/pkgs/by-name/vi/vivaldi/package.nix
+++ b/pkgs/by-name/vi/vivaldi/package.nix
@@ -66,7 +66,7 @@
 
 stdenv.mkDerivation rec {
   pname = "vivaldi";
-  version = "7.5.3735.54";
+  version = "7.5.3735.56";
 
   suffix =
     {
@@ -79,8 +79,8 @@ stdenv.mkDerivation rec {
     url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb";
     hash =
       {
-        aarch64-linux = "sha256-wgvqNeRrwPHmv4DNlo69mCJ+/cNOv2ZwvEnijTZke+s=";
-        x86_64-linux = "sha256-Wey4X3GUN1HnJsrEo0E/Zr7ozZiw8DyVYh2jQ67wFM0=";
+        aarch64-linux = "sha256-bHOmd5+YtSd8ZupIPOlPtTIJ5OrDcDMQSk6xq2Y811M=";
+        x86_64-linux = "sha256-yFaHtPTYAK/dOOTyWN8tDs7XJX93mg4OCt8dPd3ScJ8=";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };

From fedf95469d0f70d4ad7afc598134c14a5a97c84c Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 21 Jul 2025 18:45:57 +0200
Subject: [PATCH 31/33] bashunit: 0.19.1 -> 0.22.2

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

diff --git a/pkgs/by-name/ba/bashunit/package.nix b/pkgs/by-name/ba/bashunit/package.nix
index b601f9000c1d..f7bb37bf26de 100644
--- a/pkgs/by-name/ba/bashunit/package.nix
+++ b/pkgs/by-name/ba/bashunit/package.nix
@@ -12,13 +12,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "bashunit";
-  version = "0.19.1";
+  version = "0.22.2";
 
   src = fetchFromGitHub {
     owner = "TypedDevs";
     repo = "bashunit";
     tag = finalAttrs.version;
-    hash = "sha256-LoPtWf4Vo7hodWa0WJmqYDW7p7xJDrRZ5/qwUy/rB3U=";
+    hash = "sha256-neQ7/euCGn0u9ph4Z3vGsptayZ47cY0iG6FFRkwBFG0=";
     forceFetchGit = true; # needed to include the tests directory for the check phase
   };
 

From 6bc8b0e40945c885f36b868c0461336f226f584f Mon Sep 17 00:00:00 2001
From: Victor Engmark <victor@engmark.name>
Date: Sat, 26 Jul 2025 18:48:43 +0200
Subject: [PATCH 32/33] mcomix: Use Python 3.12

Works around <https://sourceforge.net/p/mcomix/bugs/150/>.

Closes #428631.
---
 pkgs/by-name/mc/mcomix/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/mc/mcomix/package.nix b/pkgs/by-name/mc/mcomix/package.nix
index 16ff2f73ff57..04537d5bea12 100644
--- a/pkgs/by-name/mc/mcomix/package.nix
+++ b/pkgs/by-name/mc/mcomix/package.nix
@@ -5,7 +5,7 @@
   gobject-introspection,
   gtk3,
   mcomix,
-  python3,
+  python312, # TODO: Revert to python3 when upgrading past 3.1.0
   testers,
   wrapGAppsHook3,
 
@@ -17,7 +17,7 @@
   unrarSupport ? false, # unfree software
 }:
 
-python3.pkgs.buildPythonApplication rec {
+python312.pkgs.buildPythonApplication rec {
   pname = "mcomix";
   version = "3.1.0";
   pyproject = true;
@@ -34,12 +34,12 @@ python3.pkgs.buildPythonApplication rec {
 
   nativeBuildInputs = [
     gobject-introspection
-    python3.pkgs.setuptools
+    python312.pkgs.setuptools
     wrapGAppsHook3
   ];
 
   propagatedBuildInputs =
-    with python3.pkgs;
+    with python312.pkgs;
     [
       pillow
       pycairo

From 4a5f5ed859150e5a381f3eec4b1c8fe554fc4454 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Jul 2025 17:44:29 +0000
Subject: [PATCH 33/33] windsurf: 1.11.0 -> 1.11.1

---
 pkgs/by-name/wi/windsurf/info.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json
index 2e61baac1c6e..2bd1e2f0c586 100644
--- a/pkgs/by-name/wi/windsurf/info.json
+++ b/pkgs/by-name/wi/windsurf/info.json
@@ -1,20 +1,20 @@
 {
   "aarch64-darwin": {
-    "version": "1.11.0",
+    "version": "1.11.1",
     "vscodeVersion": "1.99.3",
-    "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/7ebe3c84f46e15cc83584023b53a4988df13f475/Windsurf-darwin-arm64-1.11.0.zip",
-    "sha256": "eb0f139db3eb30b93e53afb37ec3d52c9881e39fc100287c25c66452dcefa0c8"
+    "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/dbfeb42156b0fd886be70f8e65a180a1ff0ac4f9/Windsurf-darwin-arm64-1.11.1.zip",
+    "sha256": "1462db0940e850a0ca5ff6980e3e062e20473b92a793fb16e34a4064b64f4b35"
   },
   "x86_64-darwin": {
-    "version": "1.11.0",
+    "version": "1.11.1",
     "vscodeVersion": "1.99.3",
-    "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/7ebe3c84f46e15cc83584023b53a4988df13f475/Windsurf-darwin-x64-1.11.0.zip",
-    "sha256": "f020a9e23115043070ac6e4a15614d58967b65c5dc6a09918869ed20e37cddf3"
+    "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/dbfeb42156b0fd886be70f8e65a180a1ff0ac4f9/Windsurf-darwin-x64-1.11.1.zip",
+    "sha256": "e365e4e5fe87de1f6d34698cb6bc1a4462d6f849b145b554cf63681fcf3dc839"
   },
   "x86_64-linux": {
-    "version": "1.11.0",
+    "version": "1.11.1",
     "vscodeVersion": "1.99.3",
-    "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/7ebe3c84f46e15cc83584023b53a4988df13f475/Windsurf-linux-x64-1.11.0.tar.gz",
-    "sha256": "ff1b9a168c0d60be0f6a97ee9d22d443d5bb3384df69182ea485b7403f4f9d02"
+    "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/dbfeb42156b0fd886be70f8e65a180a1ff0ac4f9/Windsurf-linux-x64-1.11.1.tar.gz",
+    "sha256": "617558e5ebf51940a92fcb7dbc6ba7f642021465ebb64ee60f374e80b61c7c25"
   }
 }