From 6183d4191bcdecb51d688b540bd568d81a5c4412 Mon Sep 17 00:00:00 2001
From: ja0nz <git@ja.nz>
Date: Wed, 18 Mar 2026 00:34:07 +0100
Subject: [PATCH 001/205] beszel-agent: add dataDir option

---
 nixos/modules/services/monitoring/beszel-agent.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/beszel-agent.nix b/nixos/modules/services/monitoring/beszel-agent.nix
index a7f3e425e441..e1ac8ffe25f6 100644
--- a/nixos/modules/services/monitoring/beszel-agent.nix
+++ b/nixos/modules/services/monitoring/beszel-agent.nix
@@ -16,6 +16,11 @@ in
   options.services.beszel.agent = {
     enable = lib.mkEnableOption "beszel agent";
     package = lib.mkPackageOption pkgs "beszel" { };
+    dataDir = lib.mkOption {
+      type = lib.types.path;
+      default = "/var/lib/beszel-agent";
+      description = "Data directory of beszel-agent.";
+    };
     openFirewall = (lib.mkEnableOption "") // {
       description = "Whether to open the firewall port (default 45876).";
     };
@@ -126,7 +131,7 @@ in
 
       environment = lib.mapAttrs (
         _: value: if lib.isBool value then (lib.boolToString value) else value
-      ) cfg.environment;
+      ) (cfg.environment // { DATA_DIR = cfg.dataDir; });
 
       path =
         cfg.extraPath
@@ -147,6 +152,7 @@ in
         '';
 
         EnvironmentFile = cfg.environmentFile;
+        StateDirectory = baseNameOf cfg.dataDir;
 
         # adds ability to monitor docker/podman containers
         SupplementaryGroups =

From 78c53d4fb8af8102fe2c15e2faded69e5d75f972 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= <git@viraptor.info>
Date: Sat, 28 Mar 2026 19:27:33 +1100
Subject: [PATCH 002/205] plzip: disable tests on darwin

---
 pkgs/by-name/pl/plzip/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/pl/plzip/package.nix b/pkgs/by-name/pl/plzip/package.nix
index 891952e63d87..13b620b3d99d 100644
--- a/pkgs/by-name/pl/plzip/package.nix
+++ b/pkgs/by-name/pl/plzip/package.nix
@@ -30,7 +30,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  doCheck = true;
+  # throws bogus out of memory errors in tests, but the binaries work
+  doCheck = !stdenv.hostPlatform.isDarwin;
 
   meta = {
     homepage = "https://www.nongnu.org/lzip/plzip.html";

From 0acc864e52937a890470eeb33447bf73b4746f31 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 12 Apr 2026 12:28:42 +0400
Subject: [PATCH 003/205] schemesh: fix build on darwin

---
 pkgs/by-name/sc/schemesh/package.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sc/schemesh/package.nix b/pkgs/by-name/sc/schemesh/package.nix
index 6d7b5f8344ba..22f234cc79d1 100644
--- a/pkgs/by-name/sc/schemesh/package.nix
+++ b/pkgs/by-name/sc/schemesh/package.nix
@@ -20,6 +20,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Tt3pxzti/Vv5JiP0kiplv6gOPiFU75tKoKyvpEPPztw=";
   };
 
+  postPatch = ''
+    # https://github.com/cosmos72/schemesh/commit/696ba7c24737cd436bb4d8bfa9ec1ea517681403
+    substituteInPlace c/dir.c --replace-fail PATH_MAX 1024
+  '';
+
+  preBuild = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # error initializing POSIX subsystem: dup2(0, tty_fd) failed with error Bad file descriptor
+    ulimit -n 128
+  '';
+
   buildInputs = [
     chez
     libuuid
@@ -30,12 +40,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   makeFlags = [ "prefix=$(out)" ];
 
+  # Chez Scheme .so files are fasl (compiled Scheme) not ELF/Mach-O;
+  # stripping them corrupts the fasl header, causing "incompatible fasl-object version"
+  dontStrip = true;
+
   meta = {
     description = "A Unix shell and Lisp REPL, fused together";
     homepage = "https://github.com/cosmos72/schemesh";
     license = lib.licenses.gpl2Plus;
     maintainers = [ lib.maintainers.sikmir ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
     mainProgram = "schemesh";
   };
 })

From 3771880fb682a805f022d1c350692ced5183759f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= <git@viraptor.info>
Date: Wed, 27 May 2026 23:47:15 +1000
Subject: [PATCH 004/205] quodlibet: broken on darwin

Even after adding the required pyobjc frameworks, it crashes on:

```
0   CoreFoundation                	       0x184e7d1b4 __exceptionPreprocess + 164
1   libobjc.A.dylib               	       0x18490691c objc_exception_throw + 88
2   CoreFoundation                	       0x184e7d0b0 +[NSException exceptionWithName:reason:userInfo:] + 0
3   AppKit                        	       0x18920c8d4 __33+[NSAppearance _initializeCoreUI]_block_invoke + 88
4   libdispatch.dylib             	       0x184bb04b0 _dispatch_client_callout + 16
5   libdispatch.dylib             	       0x184b99630 _dispatch_once_callout + 32
6   AppKit                        	       0x18922b704 +[NSAppearance _aquaAppearance] + 60
7   AppKit                        	       0x18920c03c +[NSAppearance appearanceNamed:] + 32
8   AppKit                        	       0x18920b620 -[NSSystemAppearanceProxy init] + 124
9   AppKit                        	       0x18920b594 __38+[NSSystemAppearanceProxy systemProxy]_block_invoke + 24
10  libdispatch.dylib             	       0x184bb04b0 _dispatch_client_callout + 16
11  libdispatch.dylib             	       0x184b99630 _dispatch_once_callout + 32
12  AppKit                        	       0x18920b570 +[NSSystemAppearanceProxy systemProxy] + 60
13  AppKit                        	       0x18920b500 -[NSApplication(NSApplicationAppearance_Internal) _registerForAppearanceNotifications] + 32
14  AppKit                        	       0x189209298 -[NSApplication init] + 972
15  AppKit                        	       0x189208d00 +[NSApplication sharedApplication] + 128
16  libgdk-3.0.dylib              	       0x10b6e43e8 _gdk_quartz_display_open + 208
```
---
 pkgs/applications/audio/quodlibet/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index 26e6716018fe..74ec1c8bbf5d 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
   tag ? "",
 
@@ -196,5 +197,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     homepage = "https://quodlibet.readthedocs.io/en/latest";
     license = lib.licenses.gpl2Plus;
     maintainers = [ ];
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })

From 6ea49afa8faba218c4d08c326ed8b7a1d30d76df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?=
 =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?=
 =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= <regime_skylark.0y@icloud.com>
Date: Tue, 2 Jun 2026 13:56:34 -0400
Subject: [PATCH 005/205] system-syzygy: improve meta

---
 pkgs/by-name/sy/system-syzygy/package.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sy/system-syzygy/package.nix b/pkgs/by-name/sy/system-syzygy/package.nix
index 714532f17ee1..100ce2a6fe64 100644
--- a/pkgs/by-name/sy/system-syzygy/package.nix
+++ b/pkgs/by-name/sy/system-syzygy/package.nix
@@ -43,9 +43,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     broken = stdenv.hostPlatform.isDarwin;
-    description = "Story and a puzzle game, where you solve a variety of puzzle";
+    description = "Narrative meta-puzzle game in the style of The Fool's Errand";
+    longDescription = ''
+      System Syzygy is a story and a puzzle game, in the style of Cliff
+      Johnson's The Fool's Errand and 3 in Three, and of Andrew Plotkin's
+      System's Twilight.  By the end of the game, all the different puzzles and
+      pieces of the story come together into a single meta-puzzle.
+    '';
     mainProgram = "syzygy";
     homepage = "https://mdsteele.games/syzygy";
+    changelog = "https://github.com/mdsteele/syzygy/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3Plus;
     maintainers = [ lib.maintainers.marius851000 ];
   };

From 5d5c0074b8883b6441559b9f8e175855a8a1b504 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?=
 =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?=
 =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= <regime_skylark.0y@icloud.com>
Date: Tue, 2 Jun 2026 13:56:55 -0400
Subject: [PATCH 006/205] system-syzygy: improve desktop integration

---
 pkgs/by-name/sy/system-syzygy/package.nix | 45 +++++++++++++++++------
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/sy/system-syzygy/package.nix b/pkgs/by-name/sy/system-syzygy/package.nix
index 100ce2a6fe64..ad1705c8d5fc 100644
--- a/pkgs/by-name/sy/system-syzygy/package.nix
+++ b/pkgs/by-name/sy/system-syzygy/package.nix
@@ -5,18 +5,10 @@
   fetchFromGitHub,
   SDL2,
   makeWrapper,
+  copyDesktopItems,
   makeDesktopItem,
 }:
 
-let
-  desktopFile = makeDesktopItem {
-    name = "system-syzygy";
-    exec = "@out@/bin/syzygy";
-    comment = "A puzzle game";
-    desktopName = "System Syzygy";
-    categories = [ "Game" ];
-  };
-in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "system-syzygy";
   version = "1.0.2";
@@ -28,17 +20,46 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-wxe9+r3tWRXiznvjvxsmTgUC7YVKgbt+I3Q8A/WtcN0=";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
+  # nixpkgs SDL2 uses pkg-config, not the macOS SDL2 framework.
+  postPatch = ''
+    substituteInPlace Cargo.toml \
+      --replace-fail \
+        'features = ["unsafe_textures", "use_mac_framework"]' \
+        'features = ["unsafe_textures"]'
+  '';
+
+  nativeBuildInputs = [
+    makeWrapper
+    copyDesktopItems
+  ];
   buildInputs = [ SDL2 ];
 
   cargoHash = "sha256-H/iG6vsmtpBGYBBqNQG5EpyZaUtfXfVaHv4fkxwqrD0=";
 
+  desktopItems = [
+    (makeDesktopItem {
+      name = "system-syzygy";
+      exec = "syzygy";
+      icon = "syzygy";
+      comment = "A narrative meta-puzzle game";
+      desktopName = "System Syzygy";
+      categories = [ "Game" ];
+    })
+  ];
+
   postInstall = ''
+    hicolor="$out/share/icons/hicolor"
     mkdir -p $out/share/syzygy/
     cp -r ${finalAttrs.src}/data/* $out/share/syzygy/
     wrapProgram $out/bin/syzygy --set SYZYGY_DATA_DIR $out/share/syzygy
-    mkdir -p $out/share/applications
-    substituteAll ${desktopFile}/share/applications/system-syzygy.desktop $out/share/applications/system-syzygy.desktop
+
+    for res in 128x128 32x32 512x512; do
+      install -Dm644 data/icon/$res.png \
+        "$hicolor/$res/apps/syzygy.png"
+    done
+
+    install -Dm644 data/icon/512x512@2x.png \
+      "$hicolor/512x512@2/apps/syzygy.png"
   '';
 
   meta = {

From 7c4c40fb1603b04cdbfb6ca9476b33bf8b97ac4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?=
 =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?=
 =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= <regime_skylark.0y@icloud.com>
Date: Tue, 2 Jun 2026 13:57:08 -0400
Subject: [PATCH 007/205] system-syzygy: switch to makeBinaryWrapper

---
 pkgs/by-name/sy/system-syzygy/package.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sy/system-syzygy/package.nix b/pkgs/by-name/sy/system-syzygy/package.nix
index ad1705c8d5fc..7dd4cbb40267 100644
--- a/pkgs/by-name/sy/system-syzygy/package.nix
+++ b/pkgs/by-name/sy/system-syzygy/package.nix
@@ -4,11 +4,14 @@
   rustPlatform,
   fetchFromGitHub,
   SDL2,
-  makeWrapper,
+  makeBinaryWrapper,
   copyDesktopItems,
   makeDesktopItem,
 }:
 
+let
+  dataDirFlag = "--set SYZYGY_DATA_DIR $out/share/syzygy";
+in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "system-syzygy";
   version = "1.0.2";
@@ -29,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   nativeBuildInputs = [
-    makeWrapper
+    makeBinaryWrapper
     copyDesktopItems
   ];
   buildInputs = [ SDL2 ];
@@ -51,7 +54,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hicolor="$out/share/icons/hicolor"
     mkdir -p $out/share/syzygy/
     cp -r ${finalAttrs.src}/data/* $out/share/syzygy/
-    wrapProgram $out/bin/syzygy --set SYZYGY_DATA_DIR $out/share/syzygy
 
     for res in 128x128 32x32 512x512; do
       install -Dm644 data/icon/$res.png \
@@ -60,6 +62,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
     install -Dm644 data/icon/512x512@2x.png \
       "$hicolor/512x512@2/apps/syzygy.png"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    wrapProgram $out/bin/syzygy ${dataDirFlag}
   '';
 
   meta = {

From 86811838616e0c34ec2b212dee5079b9a2b2665f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?=
 =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?=
 =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= <regime_skylark.0y@icloud.com>
Date: Tue, 2 Jun 2026 13:57:28 -0400
Subject: [PATCH 008/205] system-syzygy: add macOS support

---
 pkgs/by-name/sy/system-syzygy/package.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sy/system-syzygy/package.nix b/pkgs/by-name/sy/system-syzygy/package.nix
index 7dd4cbb40267..3d2d93a8099b 100644
--- a/pkgs/by-name/sy/system-syzygy/package.nix
+++ b/pkgs/by-name/sy/system-syzygy/package.nix
@@ -7,6 +7,7 @@
   makeBinaryWrapper,
   copyDesktopItems,
   makeDesktopItem,
+  desktopToDarwinBundle,
 }:
 
 let
@@ -34,6 +35,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeBuildInputs = [
     makeBinaryWrapper
     copyDesktopItems
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    desktopToDarwinBundle
   ];
   buildInputs = [ SDL2 ];
 
@@ -67,8 +71,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
     wrapProgram $out/bin/syzygy ${dataDirFlag}
   '';
 
+  postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    app="$out/Applications/System Syzygy.app/Contents"
+    install -m755 "$out/bin/syzygy" "$app/MacOS/System Syzygy"
+
+    makeBinaryWrapper "$app/MacOS/System Syzygy" "$out/bin/syzygy" \
+      ${dataDirFlag}
+
+    ln -s "$out/share/syzygy" "$app/Resources/data"
+  '';
+
   meta = {
-    broken = stdenv.hostPlatform.isDarwin;
     description = "Narrative meta-puzzle game in the style of The Fool's Errand";
     longDescription = ''
       System Syzygy is a story and a puzzle game, in the style of Cliff
@@ -81,5 +94,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/mdsteele/syzygy/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3Plus;
     maintainers = [ lib.maintainers.marius851000 ];
+    platforms = lib.platforms.unix;
   };
 })

From feee1a40bb83bf9e675b2d59fbac1949bd02a0d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?=
 =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?=
 =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= <regime_skylark.0y@icloud.com>
Date: Tue, 2 Jun 2026 13:58:02 -0400
Subject: [PATCH 009/205] system-syzygy: added philocalyst to maintainers

---
 pkgs/by-name/sy/system-syzygy/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sy/system-syzygy/package.nix b/pkgs/by-name/sy/system-syzygy/package.nix
index 3d2d93a8099b..4af7647f6239 100644
--- a/pkgs/by-name/sy/system-syzygy/package.nix
+++ b/pkgs/by-name/sy/system-syzygy/package.nix
@@ -93,7 +93,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://mdsteele.games/syzygy";
     changelog = "https://github.com/mdsteele/syzygy/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3Plus;
-    maintainers = [ lib.maintainers.marius851000 ];
+    maintainers = with lib.maintainers; [
+      marius851000
+      philocalyst
+    ];
     platforms = lib.platforms.unix;
   };
 })

From cc0801814478f5881251543c27bb56b359c66a0a Mon Sep 17 00:00:00 2001
From: Edil Medeiros <jose.edil@gmail.com>
Date: Thu, 4 Jun 2026 13:31:58 -0300
Subject: [PATCH 010/205] libjson-rpc-cpp: add support for darwin

The libjson-rpc-cpp is linux-specific because of elf patching required
to build on modern systems. This patch makes those patches conditional
so that the package can be used in darwin as well.

Also, this changes some build flags to make the library emit less noise
for consumers.
---
 pkgs/by-name/li/libjson-rpc-cpp/package.nix | 53 +++++++++++++--------
 1 file changed, 33 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/li/libjson-rpc-cpp/package.nix b/pkgs/by-name/li/libjson-rpc-cpp/package.nix
index 004e35dc39de..298f39af181e 100644
--- a/pkgs/by-name/li/libjson-rpc-cpp/package.nix
+++ b/pkgs/by-name/li/libjson-rpc-cpp/package.nix
@@ -11,6 +11,7 @@
   hiredis,
   jsoncpp,
   libmicrohttpd,
+  patchelf,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -30,6 +31,9 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     cmake
     doxygen
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    patchelf
   ];
 
   buildInputs = [
@@ -70,32 +74,41 @@ stdenv.mkDerivation (finalAttrs: {
   configurePhase = ''
     runHook preConfigure
     cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd)/Install \
-             -DCMAKE_BUILD_TYPE=Release
+             -DCMAKE_INSTALL_LIBDIR=lib \
+             -DCMAKE_BUILD_TYPE=Release \
+             -DWITH_COVERAGE=OFF \
+             ${lib.optionalString stdenv.hostPlatform.isDarwin "-DCMAKE_INSTALL_NAME_DIR=$out/lib -DCMAKE_INSTALL_RPATH=$out/lib"}
     runHook postConfigure
   '';
 
-  preInstall = ''
-    function fixRunPath {
-      p=$(patchelf --print-rpath $1)
-      q="$p:${
-        lib.makeLibraryPath [
-          jsoncpp
-          argtable
-          libmicrohttpd
-          curl
-        ]
-      }:$out/lib"
-      patchelf --set-rpath $q $1
-    }
-
-    mkdir -p $out
-  '';
+  preInstall =
+    lib.optionalString stdenv.hostPlatform.isLinux ''
+      function fixRunPath {
+        p=$(patchelf --print-rpath $1)
+        q="$p:${
+          lib.makeLibraryPath [
+            jsoncpp
+            argtable
+            libmicrohttpd
+            curl
+          ]
+        }:$out/lib"
+        patchelf --set-rpath $q $1
+      }
+    ''
+    + ''
+      mkdir -p $out
+    '';
 
   postInstall = ''
-    sed -i -re "s#-([LI]).*/Build/Install(.*)#-\1$out\2#g" Install/lib64/pkgconfig/*.pc
-    for f in Install/lib64/*.so* $(find Install/bin -executable -type f); do
+    sed -i -re "s#-([LI]).*/Build/Install(.*)#-\1$out\2#g" Install/lib*/pkgconfig/*.pc
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
+    for f in Install/lib*/*.so* $(find Install/bin -executable -type f); do
       fixRunPath $f
     done
+  ''
+  + ''
     cp -r Install/* $out
   '';
 
@@ -110,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "jsonrpcstub";
     homepage = "https://github.com/cinemast/libjson-rpc-cpp";
     license = lib.licenses.mit;
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     maintainers = with lib.maintainers; [ robertrichter ];
   };

From 8a46bb94958bd7bab2255b431bf930a284d68102 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sun, 15 Feb 2026 14:22:00 -0600
Subject: [PATCH 011/205] csmith: modernize package derivations, fix broken
 download link

---
 pkgs/by-name/cs/csmith/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/cs/csmith/package.nix b/pkgs/by-name/cs/csmith/package.nix
index 2e682f6d21e9..354b35dbf97a 100644
--- a/pkgs/by-name/cs/csmith/package.nix
+++ b/pkgs/by-name/cs/csmith/package.nix
@@ -9,7 +9,7 @@
   perlPackages,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "csmith";
   version = "2.3.0-unstable-2026-03-01";
 
@@ -40,13 +40,13 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     substituteInPlace $out/bin/compiler_test.pl \
-      --replace '$CSMITH_HOME/runtime' $out/include/${pname}-${version} \
-      --replace ' ''${CSMITH_HOME}/runtime' " $out/include/${pname}-${version}" \
-      --replace '$CSMITH_HOME/src/csmith' $out/bin/csmith
+      --replace-fail '$CSMITH_HOME/runtime' $out/include/csmith-${finalAttrs.version} \
+      --replace-fail ' ''${CSMITH_HOME}/runtime' " $out/include/csmith-${finalAttrs.version}" \
+      --replace-fail '$CSMITH_HOME/src/csmith' $out/bin/csmith
 
     substituteInPlace $out/bin/launchn.pl \
-      --replace '../compiler_test.pl' $out/bin/compiler_test.pl \
-      --replace '../$CONFIG_FILE' '$CONFIG_FILE'
+      --replace-fail '../compiler_test.pl' $out/bin/compiler_test.pl \
+      --replace-fail '../$CONFIG_FILE' '$CONFIG_FILE'
 
     wrapProgram $out/bin/launchn.pl \
       --prefix PERL5LIB : "$PERL5LIB"
@@ -72,4 +72,4 @@ stdenv.mkDerivation rec {
     maintainers = [ ];
     platforms = lib.platforms.all;
   };
-}
+})

From f3c5497125d813fd732965d132859a63955b73c8 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Tue, 9 Jun 2026 16:51:46 +0300
Subject: [PATCH 012/205] duperemove: `__structuredAttrs`, `strictDeps`,
 `enableParallelBuilding`

---
 pkgs/by-name/du/duperemove/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/du/duperemove/package.nix b/pkgs/by-name/du/duperemove/package.nix
index 0fce7eb7f88a..b725a45d925e 100644
--- a/pkgs/by-name/du/duperemove/package.nix
+++ b/pkgs/by-name/du/duperemove/package.nix
@@ -30,6 +30,10 @@ stdenv.mkDerivation (finalAttrs: {
       "lscpu" "${lib.getBin util-linux}/bin/lscpu"
   '';
 
+  __structuredAttrs = true;
+  strictDeps = true;
+  enableParallelBuilding = true;
+
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     libbsd

From 2a2aba9a404d8413c29d9206043dc2764eb2d3cb Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Tue, 9 Jun 2026 16:50:33 +0300
Subject: [PATCH 013/205] duperemove: use `versionCheckHook`

---
 pkgs/by-name/du/duperemove/package.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/du/duperemove/package.nix b/pkgs/by-name/du/duperemove/package.nix
index b725a45d925e..948dd531bd1a 100644
--- a/pkgs/by-name/du/duperemove/package.nix
+++ b/pkgs/by-name/du/duperemove/package.nix
@@ -10,8 +10,7 @@
   linuxHeaders ? stdenv.cc.libc.linuxHeaders,
   sqlite,
   util-linux,
-  testers,
-  duperemove,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -50,11 +49,10 @@ stdenv.mkDerivation (finalAttrs: {
     "VERSION=v${finalAttrs.version}"
   ];
 
-  passthru.tests.version = testers.testVersion {
-    package = duperemove;
-    command = "duperemove --version";
-    version = "v${finalAttrs.version}";
-  };
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
 
   meta = {
     description = "Simple tool for finding duplicated extents and submitting them for deduplication";

From 389ccd66cc6831a6171b1abb8961c078f55fa7d9 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Tue, 9 Jun 2026 16:55:08 +0300
Subject: [PATCH 014/205] duperemove: use `tag` instead of `rev`

---
 pkgs/by-name/du/duperemove/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/du/duperemove/package.nix b/pkgs/by-name/du/duperemove/package.nix
index 948dd531bd1a..cc6f6e6429a6 100644
--- a/pkgs/by-name/du/duperemove/package.nix
+++ b/pkgs/by-name/du/duperemove/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "markfasheh";
     repo = "duperemove";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-Y3HIqq61bLfZi4XR2RtSyuCPmcWrTxeWvqpTh+3hUjc=";
   };
 

From 49e9bd6b7c1bc8067f8cc6fadd93044ec501223d Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Tue, 9 Jun 2026 16:55:08 +0300
Subject: [PATCH 015/205] duperemove: `updateScript`

---
 pkgs/by-name/du/duperemove/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/du/duperemove/package.nix b/pkgs/by-name/du/duperemove/package.nix
index cc6f6e6429a6..09829ecc9f63 100644
--- a/pkgs/by-name/du/duperemove/package.nix
+++ b/pkgs/by-name/du/duperemove/package.nix
@@ -11,6 +11,7 @@
   sqlite,
   util-linux,
   versionCheckHook,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -54,6 +55,10 @@ stdenv.mkDerivation (finalAttrs: {
     versionCheckHook
   ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Simple tool for finding duplicated extents and submitting them for deduplication";
     homepage = "https://github.com/markfasheh/duperemove";

From 048399bfe2ed18d01aeecb8495bf31bf72ffb67c Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Tue, 9 Jun 2026 16:55:08 +0300
Subject: [PATCH 016/205] duperemove: split `man` output

---
 pkgs/by-name/du/duperemove/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/du/duperemove/package.nix b/pkgs/by-name/du/duperemove/package.nix
index 09829ecc9f63..829d63ff657a 100644
--- a/pkgs/by-name/du/duperemove/package.nix
+++ b/pkgs/by-name/du/duperemove/package.nix
@@ -25,6 +25,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Y3HIqq61bLfZi4XR2RtSyuCPmcWrTxeWvqpTh+3hUjc=";
   };
 
+  outputs = [
+    "out"
+    "man"
+  ];
+
   postPatch = ''
     substituteInPlace util.c --replace \
       "lscpu" "${lib.getBin util-linux}/bin/lscpu"

From e8a08745f8ea5e9e7bd8bb19902519b794dae058 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Tue, 9 Jun 2026 16:55:08 +0300
Subject: [PATCH 017/205] duperemove: add changelog

---
 pkgs/by-name/du/duperemove/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/du/duperemove/package.nix b/pkgs/by-name/du/duperemove/package.nix
index 829d63ff657a..43eab6538b76 100644
--- a/pkgs/by-name/du/duperemove/package.nix
+++ b/pkgs/by-name/du/duperemove/package.nix
@@ -67,6 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Simple tool for finding duplicated extents and submitting them for deduplication";
     homepage = "https://github.com/markfasheh/duperemove";
+    changelog = "https://github.com/markfasheh/duperemove/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [
       thoughtpolice

From f1faebd1106087ffcdb495430b66255aac50ece0 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Tue, 9 Jun 2026 16:55:08 +0300
Subject: [PATCH 018/205] duperemove: a few finishing touches

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

diff --git a/pkgs/by-name/du/duperemove/package.nix b/pkgs/by-name/du/duperemove/package.nix
index 43eab6538b76..ff9b2b7623c6 100644
--- a/pkgs/by-name/du/duperemove/package.nix
+++ b/pkgs/by-name/du/duperemove/package.nix
@@ -31,8 +31,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   postPatch = ''
-    substituteInPlace util.c --replace \
-      "lscpu" "${lib.getBin util-linux}/bin/lscpu"
+    substituteInPlace util.c --replace-fail \
+      "lscpu" "${lib.getExe' util-linux "lscpu"}"
   '';
 
   __structuredAttrs = true;

From cecaac10c40927b1d89990ccc5337d2010ed858e Mon Sep 17 00:00:00 2001
From: roblabla <unfiltered@roblab.la>
Date: Wed, 15 Jul 2026 01:28:41 +0200
Subject: [PATCH 019/205] slint-viewer: Build with the the gettext feature

---
 pkgs/by-name/sl/slint-viewer/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/sl/slint-viewer/package.nix b/pkgs/by-name/sl/slint-viewer/package.nix
index 5e05bae0562c..7fffbf2d9d32 100644
--- a/pkgs/by-name/sl/slint-viewer/package.nix
+++ b/pkgs/by-name/sl/slint-viewer/package.nix
@@ -36,6 +36,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     libGL
   ];
 
+  buildFeatures = [ "gettext" ];
+
   nativeBuildInputs = [
     autoPatchelfHook
     pkg-config

From a1e1eb219478d5b2db6e2ea3abcc2821eab47086 Mon Sep 17 00:00:00 2001
From: roblabla <unfiltered@roblab.la>
Date: Wed, 15 Jul 2026 01:29:07 +0200
Subject: [PATCH 020/205] slint-viewer: Fix macos build

---
 pkgs/by-name/sl/slint-viewer/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sl/slint-viewer/package.nix b/pkgs/by-name/sl/slint-viewer/package.nix
index 7fffbf2d9d32..13ac5c6e8265 100644
--- a/pkgs/by-name/sl/slint-viewer/package.nix
+++ b/pkgs/by-name/sl/slint-viewer/package.nix
@@ -39,10 +39,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildFeatures = [ "gettext" ];
 
   nativeBuildInputs = [
-    autoPatchelfHook
     pkg-config
     qt6.wrapQtAppsHook
-  ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ];
 
   # stolen from the surfer package
   runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [

From c831bccf07ddd69811f610fefe24288712b0d0f9 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sat, 18 Jul 2026 10:51:31 -0500
Subject: [PATCH 021/205] mozart2: move top-level definitions to derivation

---
 pkgs/development/compilers/mozart/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix               | 5 +----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/mozart/default.nix b/pkgs/development/compilers/mozart/default.nix
index 1421301668a3..b3040351e35e 100644
--- a/pkgs/development/compilers/mozart/default.nix
+++ b/pkgs/development/compilers/mozart/default.nix
@@ -8,8 +8,8 @@
   boost183,
   llvmPackages,
   gmp,
-  emacs,
-  jre_headless,
+  emacs-nox,
+  jre8_headless,
   tcl,
   tk,
 }:
@@ -25,6 +25,8 @@ let
     url = "https://github.com/layus/mozart2/releases/download/v2.0.0-beta.1/bootcompiler.jar";
     sha256 = "1hgh1a8hgzgr6781as4c4rc52m2wbazdlw3646s57c719g5xphjz";
   };
+  emacs = emacs-nox;
+  jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
 in
 stdenv.mkDerivation {
   inherit pname version;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ee3452607a6a..9f789eac0467 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3992,10 +3992,7 @@ with pkgs;
 
   mono6 = callPackage ../development/compilers/mono/6.nix { };
 
-  mozart2 = callPackage ../development/compilers/mozart {
-    emacs = emacs-nox;
-    jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
-  };
+  mozart2 = callPackage ../development/compilers/mozart { };
 
   mozart2-binary = callPackage ../development/compilers/mozart/binary.nix { };
 

From ef86319729ca0b3064132d28399c1776c511cb7c Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sun, 19 Jul 2026 08:56:41 -0500
Subject: [PATCH 022/205] mozart2: modernize derivation, fix hashes, enable
 structured attrs

- Switch mkDerivation to `finalAttrs` form
- Replace deprecated `sha256` with `hash`
- Update bootcompiler and source hashes
- Add `strictDeps` and `__structuredAttrs`
- Move `jre8_headless` to nativeBuildInputs
- Clean up pname/version usage in URL
---
 pkgs/development/compilers/mozart/default.nix | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/mozart/default.nix b/pkgs/development/compilers/mozart/default.nix
index b3040351e35e..fdb960cbec92 100644
--- a/pkgs/development/compilers/mozart/default.nix
+++ b/pkgs/development/compilers/mozart/default.nix
@@ -16,26 +16,27 @@
 
 let
   stdenv = llvmPackages.stdenv;
-  pname = "mozart2";
-  version = "2.0.1";
 
   # This is a workaround to avoid using sbt.
   # I guess it is acceptable to fetch the bootstrapping compiler in binary form.
   bootcompiler = fetchurl {
     url = "https://github.com/layus/mozart2/releases/download/v2.0.0-beta.1/bootcompiler.jar";
-    sha256 = "1hgh1a8hgzgr6781as4c4rc52m2wbazdlw3646s57c719g5xphjz";
+    hash = "sha256-X8Lby0vhsFO0IWZw2r5aXFRRWCaMaBXQMfn9B5EK8ME=";
   };
   emacs = emacs-nox;
-  jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
 in
-stdenv.mkDerivation {
-  inherit pname version;
+stdenv.mkDerivation (finalAttrs: {
+  pname = "mozart2";
+  version = "2.0.1";
 
   src = fetchurl {
-    url = "https://github.com/mozart/mozart2/releases/download/v${version}/${pname}-${version}-Source.zip";
-    sha256 = "1mad9z5yzzix87cdb05lmif3960vngh180s2mb66cj5gwh5h9dll";
+    url = "https://github.com/mozart/mozart2/releases/download/v${finalAttrs.version}/mozart2-${finalAttrs.version}-Source.zip";
+    hash = "sha256-lLYEC+SvSGbMqkIDFOCzG5g0XKy0gNXYQT3+78tPTdU=";
   };
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   patches = [
     ./patch-limits.diff
     (fetchpatch {
@@ -53,6 +54,7 @@ stdenv.mkDerivation {
     cmake
     makeWrapper
     unzip
+    jre8_headless
   ];
 
   cmakeFlags = [
@@ -72,7 +74,6 @@ stdenv.mkDerivation {
     boost183
     gmp
     emacs
-    jre_headless
     tcl
     tk
   ];
@@ -101,4 +102,4 @@ stdenv.mkDerivation {
     broken = stdenv.hostPlatform.isDarwin;
   };
 
-}
+})

From 90f333012824303baad8ec059cd49dafda4130f2 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sun, 19 Jul 2026 09:34:35 -0500
Subject: [PATCH 023/205] mozart-binary: modernize derivation, switch to
 finalAttrs, update hash
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Replace let‑bound version/binaries with finalAttrs‑scoped values
- Move fetchurl hash to `hash` attribute
- Add `strictDeps` and `__structuredAttrs`
- Keep platform dispatch logic but relocate it inside finalAttrs
- Preserve existing buildCommand logic and emacs PATH wrapping
- No functional changes beyond hash update and structured‑attrs migration

Assisted-by: Gemini 3.1 Pro
---
 pkgs/development/compilers/mozart/binary.nix | 125 ++++++++++---------
 1 file changed, 64 insertions(+), 61 deletions(-)

diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix
index 382cb2fa6cfd..fea17f6feb44 100644
--- a/pkgs/development/compilers/mozart/binary.nix
+++ b/pkgs/development/compilers/mozart/binary.nix
@@ -10,80 +10,83 @@
   emacs,
 }:
 
-let
-  version = "2.0.0";
-
-  binaries = {
-    x86_64-linux = fetchurl {
-      url = "mirror://sourceforge/project/mozart-oz/v${version}-alpha.0/mozart2-${version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz";
-      sha256 = "0rsfrjimjxqbwprpzzlmydl3z3aiwg5qkb052jixdxjyad7gyh5z";
+stdenv.mkDerivation (
+  finalAttrs:
+  let
+    binaries = {
+      x86_64-linux = fetchurl {
+        url = "mirror://sourceforge/project/mozart-oz/v${finalAttrs.version}-alpha.0/mozart2-${finalAttrs.version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz";
+        hash = "sha256-v0D/TlNe9tajFAWsicvjUY0/aPOV/n/z5Qt3WaPMTmc=";
+      };
     };
-  };
-in
+  in
+  {
+    pname = "mozart-binary";
+    version = "2.0.0";
 
-stdenv.mkDerivation {
-  pname = "mozart-binary";
-  inherit version;
+    preferLocalBuild = true;
 
-  preferLocalBuild = true;
+    src =
+      binaries.${stdenv.hostPlatform.system}
+        or (throw "unsupported system: ${stdenv.hostPlatform.system}");
 
-  src =
-    binaries.${stdenv.hostPlatform.system}
-      or (throw "unsupported system: ${stdenv.hostPlatform.system}");
+    strictDeps = true;
+    __structuredAttrs = true;
 
-  libPath = lib.makeLibraryPath [
-    stdenv.cc.cc
-    boost
-    gmp
-    tcl-8_5
-    tk-8_5
-  ];
+    libPath = lib.makeLibraryPath [
+      stdenv.cc.cc
+      boost
+      gmp
+      tcl-8_5
+      tk-8_5
+    ];
 
-  env.TK_LIBRARY = "${tk-8_5}/lib/tk8.5";
+    env.TK_LIBRARY = "${tk-8_5}/lib/tk8.5";
 
-  nativeBuildInputs = [ makeWrapper ];
+    nativeBuildInputs = [ makeWrapper ];
 
-  buildCommand = ''
-    mkdir $out
-    tar xvf $src -C $out --strip-components=1
+    buildCommand = ''
+      mkdir $out
+      tar xvf $src -C $out --strip-components=1
 
-    for exe in $out/bin/{ozemulator,ozwish} ; do
-      patchelf --set-interpreter $(< $NIX_CC/nix-support/dynamic-linker) \
-               --set-rpath $libPath \
-               $exe
-    done
+      for exe in $out/bin/{ozemulator,ozwish} ; do
+        patchelf --set-interpreter $(< $NIX_CC/nix-support/dynamic-linker) \
+                 --set-rpath $libPath \
+                 $exe
+      done
 
-    wrapProgram $out/bin/ozwish \
-      --set OZHOME $out \
-      --set TK_LIBRARY $TK_LIBRARY
+      wrapProgram $out/bin/ozwish \
+        --set OZHOME $out \
+        --set TK_LIBRARY $TK_LIBRARY
 
-    wrapProgram $out/bin/ozemulator --set OZHOME $out
+      wrapProgram $out/bin/ozemulator --set OZHOME $out
 
-    ${lib.optionalString (emacs != null) ''
-      wrapProgram $out/bin/oz --suffix PATH ":" ${lib.makeBinPath [ emacs ]}
-    ''}
+      ${lib.optionalString (emacs != null) ''
+        wrapProgram $out/bin/oz --suffix PATH ":" ${lib.makeBinPath [ emacs ]}
+      ''}
 
-    sed -i $out/share/applications/oz.desktop \
-        -e "s,Exec=oz %u,Exec=$out/bin/oz %u,"
+      sed -i $out/share/applications/oz.desktop \
+          -e "s,Exec=oz %u,Exec=$out/bin/oz %u,"
 
-    gzip -9n $out/share/mozart/elisp"/"*.elc
+      gzip -9n $out/share/mozart/elisp"/"*.elc
 
-    patchShebangs $out
-  '';
-
-  meta = {
-    homepage = "https://www.mozart-oz.org/";
-    description = "Multiplatform implementation of the Oz programming language";
-    longDescription = ''
-      The Mozart Programming System combines ongoing research in
-      programming language design and implementation, constraint logic
-      programming, distributed computing, and human-computer
-      interfaces. Mozart implements the Oz language and provides both
-      expressive power and advanced functionality.
+      patchShebangs $out
     '';
-    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
-    license = lib.licenses.mit;
-    platforms = lib.attrNames binaries;
-    hydraPlatforms = [ ];
-  };
-}
+
+    meta = {
+      homepage = "https://www.mozart-oz.org/";
+      description = "Multiplatform implementation of the Oz programming language";
+      longDescription = ''
+        The Mozart Programming System combines ongoing research in
+        programming language design and implementation, constraint logic
+        programming, distributed computing, and human-computer
+        interfaces. Mozart implements the Oz language and provides both
+        expressive power and advanced functionality.
+      '';
+      sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      license = lib.licenses.mit;
+      platforms = lib.attrNames binaries;
+      hydraPlatforms = [ ];
+    };
+  }
+)

From b9a2920c0e7b3c9d23bd37419163b7da8e00df95 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sun, 19 Jul 2026 10:23:09 -0500
Subject: [PATCH 024/205] mozart2{,-binary}: migrate to pkgs/by-name

- Move mozart2 to pkgs/by-name/mo/mozart2/package.nix
- Move mozart-binary to pkgs/by-name/mo/mozart-binary/package.nix
- Relocate patch-limits.diff alongside mozart2
- Remove mozart2 and mozart2-binary from all-packages.nix
- No functional changes; structural migration only
---
 .../binary.nix => by-name/mo/mozart-binary/package.nix}       | 0
 .../mozart/default.nix => by-name/mo/mozart2/package.nix}     | 0
 .../compilers/mozart => by-name/mo/mozart2}/patch-limits.diff | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 4 files changed, 4 deletions(-)
 rename pkgs/{development/compilers/mozart/binary.nix => by-name/mo/mozart-binary/package.nix} (100%)
 rename pkgs/{development/compilers/mozart/default.nix => by-name/mo/mozart2/package.nix} (100%)
 rename pkgs/{development/compilers/mozart => by-name/mo/mozart2}/patch-limits.diff (100%)

diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/by-name/mo/mozart-binary/package.nix
similarity index 100%
rename from pkgs/development/compilers/mozart/binary.nix
rename to pkgs/by-name/mo/mozart-binary/package.nix
diff --git a/pkgs/development/compilers/mozart/default.nix b/pkgs/by-name/mo/mozart2/package.nix
similarity index 100%
rename from pkgs/development/compilers/mozart/default.nix
rename to pkgs/by-name/mo/mozart2/package.nix
diff --git a/pkgs/development/compilers/mozart/patch-limits.diff b/pkgs/by-name/mo/mozart2/patch-limits.diff
similarity index 100%
rename from pkgs/development/compilers/mozart/patch-limits.diff
rename to pkgs/by-name/mo/mozart2/patch-limits.diff
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f789eac0467..b83698a3e793 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3992,10 +3992,6 @@ with pkgs;
 
   mono6 = callPackage ../development/compilers/mono/6.nix { };
 
-  mozart2 = callPackage ../development/compilers/mozart { };
-
-  mozart2-binary = callPackage ../development/compilers/mozart/binary.nix { };
-
   buildNimPackage = callPackage ../build-support/build-nim-package.nix { };
   buildNimSbom = callPackage ../build-support/build-nim-sbom.nix { };
   nimOverrides = callPackage ./nim-overrides.nix { };

From 2a7cabbb43921c2c0c885c69ef073c32de3179f4 Mon Sep 17 00:00:00 2001
From: Edoardo Signorini <mail@edoars.me>
Date: Tue, 21 Jul 2026 20:41:12 +0200
Subject: [PATCH 025/205] maintainers: add edoars

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 13ae59e1992f..59ae79b1abfa 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7884,6 +7884,12 @@
     github = "edlimerkaj";
     githubId = 71988351;
   };
+  edoars = {
+    name = "Edoardo Signorini";
+    email = "mail@edoars.me";
+    github = "edoars";
+    githubId = 44139791;
+  };
   edrex = {
     email = "ericdrex@gmail.com";
     github = "edrex";

From 1065b9527b9c1fce400764a845d6d859abbaa8d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 21 Jul 2026 18:20:11 +0200
Subject: [PATCH 026/205] python314Packages.ctranslate2: explicitly set
 library_dirs through build system env

In high core/load environments ctranslate2 could fail to link like:

...
running build_ext
building 'ctranslate2._ext' extension
creating build/temp.linux-x86_64-cpython-314/cpp
g++ -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -fPIC -I/nix/store/ijyd6j5zv846q20zh9q5dk5dk9smn5h0-python3.14-pybind11-3.0.4/lib/python3.14/site-packages/pybind11/include -I/nix/store/jxyrvv4gbpnp3ap5iy7wxwl1sg4x2x88-python3-3.14.6/include/python3.14 -c cpp/encoder.cc -o build/temp.linux-x86_64-cpython-314/cpp/encoder.o -std=c++17 -fvisibility=hidden -fPIC
g++ -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -fPIC -I/nix/store/ijyd6j5zv846q20zh9q5dk5dk9smn5h0-python3.14-pybind11-3.0.4/lib/python3.14/site-packages/pybind11/include -I/nix/store/jxyrvv4gbpnp3ap5iy7wxwl1sg4x2x88-python3-3.14.6/include/python3.14 -c cpp/logging.cc -o build/temp.linux-x86_64-cpython-314/cpp/logging.o -std=c++17 -fvisibility=hidden -fPIC
g++ -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -fPIC -I/nix/store/ijyd6j5zv846q20zh9q5dk5dk9smn5h0-python3.14-pybind11-3.0.4/lib/python3.14/site-packages/pybind11/include -I/nix/store/jxyrvv4gbpnp3ap5iy7wxwl1sg4x2x88-python3-3.14.6/include/python3.14 -c cpp/translation_result.cc -o build/temp.linux-x86_64-cpython-314/cpp/translation_result.o -std=c++17 -fvisibility=hidden -fPIC
g++ -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -fPIC -I/nix/store/ijyd6j5zv846q20zh9q5dk5dk9smn5h0-python3.14-pybind11-3.0.4/lib/python3.14/site-packages/pybind11/include -I/nix/store/jxyrvv4gbpnp3ap5iy7wxwl1sg4x2x88-python3-3.14.6/include/python3.14 -c cpp/wav2vec2.cc -o build/temp.linux-x86_64-cpython-314/cpp/wav2vec2.o -std=c++17 -fvisibility=hidden -fPIC
g++ -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -fPIC -I/nix/store/ijyd6j5zv846q20zh9q5dk5dk9smn5h0-python3.14-pybind11-3.0.4/lib/python3.14/site-packages/pybind11/include -I/nix/store/jxyrvv4gbpnp3ap5iy7wxwl1sg4x2x88-python3-3.14.6/include/python3.14 -c cpp/execution_stats.cc -o build/temp.linux-x86_64-cpython-314/cpp/execution_stats.o -std=c++17 -fvisibility=hidden -fPIC
g++ -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -fPIC -I/nix/store/ijyd6j5zv846q20zh9q5dk5dk9smn5h0-python3.14-pybind11-3.0.4/lib/python3.14/site-packages/pybind11/include -I/nix/store/jxyrvv4gbpnp3ap5iy7wxwl1sg4x2x88-python3-3.14.6/include/python3.14 -c cpp/mpi.cc -o build/temp.linux-x86_64-cpython-314/cpp/mpi.o -std=c++17 -fvisibility=hidden -fPIC
g++ -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -fPIC -I/nix/store/ijyd6j5zv846q20zh9q5dk5dk9smn5h0-python3.14-pybind11-3.0.4/lib/python3.14/site-packages/pybind11/include -I/nix/store/jxyrvv4gbpnp3ap5iy7wxwl1sg4x2x88-python3-3.14.6/include/python3.14 -c cpp/generator.cc -o build/temp.linux-x86_64-cpython-314/cpp/generator.o -std=c++17 -fvisibility=hidden -fPIC
g++ -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -fPIC -I/nix/store/ijyd6j5zv846q20zh9q5dk5dk9smn5h0-python3.14-pybind11-3.0.4/lib/python3.14/site-packages/pybind11/include -I/nix/store/jxyrvv4gbpnp3ap5iy7wxwl1sg4x2x88-python3-3.14.6/include/python3.14 -c cpp/module.cc -o build/temp.linux-x86_64-cpython-314/cpp/module.o -std=c++17 -fvisibility=hidden -fPIC
g++ -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -fPIC -I/nix/store/ijyd6j5zv846q20zh9q5dk5dk9smn5h0-python3.14-pybind11-3.0.4/lib/python3.14/site-packages/pybind11/include -I/nix/store/jxyrvv4gbpnp3ap5iy7wxwl1sg4x2x88-python3-3.14.6/include/python3.14 -c cpp/translator.cc -o build/temp.linux-x86_64-cpython-314/cpp/translator.o -std=c++17 -fvisibility=hidden -fPIC
g++ -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -fPIC -I/nix/store/ijyd6j5zv846q20zh9q5dk5dk9smn5h0-python3.14-pybind11-3.0.4/lib/python3.14/site-packages/pybind11/include -I/nix/store/jxyrvv4gbpnp3ap5iy7wxwl1sg4x2x88-python3-3.14.6/include/python3.14 -c cpp/whisper.cc -o build/temp.linux-x86_64-cpython-314/cpp/whisper.o -std=c++17 -fvisibility=hidden -fPIC
g++ -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -fPIC -I/nix/store/ijyd6j5zv846q20zh9q5dk5dk9smn5h0-python3.14-pybind11-3.0.4/lib/python3.14/site-packages/pybind11/include -I/nix/store/jxyrvv4gbpnp3ap5iy7wxwl1sg4x2x88-python3-3.14.6/include/python3.14 -c cpp/generation_result.cc -o build/temp.linux-x86_64-cpython-314/cpp/generation_result.o -std=c++17 -fvisibility=hidden -fPIC
g++ -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -fPIC -I/nix/store/ijyd6j5zv846q20zh9q5dk5dk9smn5h0-python3.14-pybind11-3.0.4/lib/python3.14/site-packages/pybind11/include -I/nix/store/jxyrvv4gbpnp3ap5iy7wxwl1sg4x2x88-python3-3.14.6/include/python3.14 -c cpp/storage_view.cc -o build/temp.linux-x86_64-cpython-314/cpp/storage_view.o -std=c++17 -fvisibility=hidden -fPIC
g++ -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -fPIC -I/nix/store/ijyd6j5zv846q20zh9q5dk5dk9smn5h0-python3.14-pybind11-3.0.4/lib/python3.14/site-packages/pybind11/include -I/nix/store/jxyrvv4gbpnp3ap5iy7wxwl1sg4x2x88-python3-3.14.6/include/python3.14 -c cpp/wav2vec2bert.cc -o build/temp.linux-x86_64-cpython-314/cpp/wav2vec2bert.o -std=c++17 -fvisibility=hidden -fPIC
g++ -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -fPIC -I/nix/store/ijyd6j5zv846q20zh9q5dk5dk9smn5h0-python3.14-pybind11-3.0.4/lib/python3.14/site-packages/pybind11/include -I/nix/store/jxyrvv4gbpnp3ap5iy7wxwl1sg4x2x88-python3-3.14.6/include/python3.14 -c cpp/scoring_result.cc -o build/temp.linux-x86_64-cpython-314/cpp/scoring_result.o -std=c++17 -fvisibility=hidden -fPIC
g++ -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -shared -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-bzip2-1.0.8/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-libffi-3.5.2/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-util-linux-minimal-2.42.2-lib/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-ncurses-6.6/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-xz-5.8.3/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-zlib-1.3.2/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-openssl-3.6.3/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-sqlite-3.53.1/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-mpdecimal-4.0.1/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-expat-2.8.2/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-zstd-1.5.7/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-bluez-headers-5.86/lib -L/nix/store/bzzvmj6wh8a7mqvq9i54fmvpsdxz4zqj-tzdata-2026b/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-gdbm-1.26-lib/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-readline-8.3p3/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-bzip2-1.0.8/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-libffi-3.5.2/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-util-linux-minimal-2.42.2-lib/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-ncurses-6.6/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-xz-5.8.3/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-zlib-1.3.2/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-openssl-3.6.3/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-sqlite-3.53.1/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-mpdecimal-4.0.1/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-expat-2.8.2/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-zstd-1.5.7/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-bluez-headers-5.86/lib -L/nix/store/bzzvmj6wh8a7mqvq9i54fmvpsdxz4zqj-tzdata-2026b/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-gdbm-1.26-lib/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-readline-8.3p3/lib build/temp.linux-x86_64-cpython-314/cpp/encoder.o build/temp.linux-x86_64-cpython-314/cpp/execution_stats.o build/temp.linux-x86_64-cpython-314/cpp/generation_result.o build/temp.linux-x86_64-cpython-314/cpp/generator.o build/temp.linux-x86_64-cpython-314/cpp/logging.o build/temp.linux-x86_64-cpython-314/cpp/module.o build/temp.linux-x86_64-cpython-314/cpp/mpi.o build/temp.linux-x86_64-cpython-314/cpp/scoring_result.o build/temp.linux-x86_64-cpython-314/cpp/storage_view.o build/temp.linux-x86_64-cpython-314/cpp/translation_result.o build/temp.linux-x86_64-cpython-314/cpp/translator.o build/temp.linux-x86_64-cpython-314/cpp/wav2vec2.o build/temp.linux-x86_64-cpython-314/cpp/wav2vec2bert.o build/temp.linux-x86_64-cpython-314/cpp/whisper.o -L/nix/store/jxyrvv4gbpnp3ap5iy7wxwl1sg4x2x88-python3-3.14.6/lib -lctranslate2 -o build/lib.linux-x86_64-cpython-314/ctranslate2/_ext.cpython-314-x86_64-linux-gnu.so -Wl,-rpath,/usr/local/lib64:/usr/local/lib
/nix/store/ddk8rvjihg4vhh1k6x9rc65y1zb1kx34-binutils-2.46/bin/ld.bfd: cannot find -lctranslate2: No such file or directory
collect2: error: ld returned 1 exit status
error: command '/nix/store/vdaz6sk455r8sbpi7wzaf9vlz5i9yyvx-gcc-wrapper-15.2.0/bin/g++' failed with exit code 1
ERROR Backend subprocess exited when trying to invoke build_wheel
...

This can be avoided by setting library_dirs explicitly through an env in
the upstream build system https://github.com/OpenNMT/CTranslate2/blob/v4.8.1/python/setup.py#L31-L42
and with that the lib directory is given explicitly and the linker can
always find it:

python3.14-ctranslate2> g++ -fno-strict-overflow -Wsign-compare -DNDEBUG -g -O3 -Wall -shared -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-bzip2-1.0.8/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-libffi-3.5.2/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-util-linux-minimal-2.42.2-lib/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-ncurses-6.6/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-xz-5.8.3/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-zlib-1.3.2/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-openssl-3.6.3/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-sqlite-3.53.1/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-mpdecimal-4.0.1/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-expat-2.8.2/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-zstd-1.5.7/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-bluez-headers-5.86/lib -L/nix/store/bzzvmj6wh8a7mqvq9i54fmvpsdxz4zqj-tzdata-2026b/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-gdbm-1.26-lib/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-readline-8.3p3/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-bzip2-1.0.8/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-libffi-3.5.2/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-util-linux-minimal-2.42.2-lib/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-ncurses-6.6/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-xz-5.8.3/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-zlib-1.3.2/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-openssl-3.6.3/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-sqlite-3.53.1/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-mpdecimal-4.0.1/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-expat-2.8.2/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-zstd-1.5.7/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-bluez-headers-5.86/lib -L/nix/store/bzzvmj6wh8a7mqvq9i54fmvpsdxz4zqj-tzdata-2026b/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-gdbm-1.26-lib/lib -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-readline-8.3p3/lib build/temp.linux-x86_64-cpython-314/cpp/encoder.o build/temp.linux-x86_64-cpython-314/cpp/execution_stats.o build/temp.linux-x86_64-cpython-314/cpp/generation_result.o build/temp.linux-x86_64-cpython-314/cpp/generator.o build/temp.linux-x86_64-cpython-314/cpp/logging.o build/temp.linux-x86_64-cpython-314/cpp/module.o build/temp.linux-x86_64-cpython-314/cpp/mpi.o build/temp.linux-x86_64-cpython-314/cpp/scoring_result.o build/temp.linux-x86_64-cpython-314/cpp/storage_view.o build/temp.linux-x86_64-cpython-314/cpp/translation_result.o build/temp.linux-x86_64-cpython-314/cpp/translator.o build/temp.linux-x86_64-cpython-314/cpp/wav2vec2.o build/temp.linux-x86_64-cpython-314/cpp/wav2vec2bert.o build/temp.linux-x86_64-cpython-314/cpp/whisper.o -L/nix/store/xiqxnqx0w0aaq35mh3x4pjh2mv9w0xg3-ctranslate2-4.8.1/lib -L/nix/store/jxyrvv4gbpnp3ap5iy7wxwl1sg4x2x88-python3-3.14.6/lib -lctranslate2 -o build/lib.linux-x86_64-cpython-314/ctranslate2/_ext.cpython-314-x86_64-linux-gnu.so -Wl,-rpath,/usr/local/lib64:/usr/local/lib
---
 pkgs/development/python-modules/ctranslate2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ctranslate2/default.nix b/pkgs/development/python-modules/ctranslate2/default.nix
index 5c84d2b1ca1c..11eb19cf4f26 100644
--- a/pkgs/development/python-modules/ctranslate2/default.nix
+++ b/pkgs/development/python-modules/ctranslate2/default.nix
@@ -37,13 +37,13 @@ buildPythonPackage rec {
     setuptools
   ];
 
-  buildInputs = [ ctranslate2-cpp ];
-
   dependencies = [
     numpy
     pyyaml
   ];
 
+  env.CTRANSLATE2_ROOT = "${ctranslate2-cpp}";
+
   cmakeFlags = [ "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" ];
 
   pythonImportsCheck = [

From eb2d35ae0269c3023f99d8735ca51965fe354ac8 Mon Sep 17 00:00:00 2001
From: Edoardo Signorini <mail@edoars.me>
Date: Tue, 21 Jul 2026 20:42:37 +0200
Subject: [PATCH 027/205] practrand: init at 0.96

---
 pkgs/by-name/pr/practrand/package.nix | 75 +++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 pkgs/by-name/pr/practrand/package.nix

diff --git a/pkgs/by-name/pr/practrand/package.nix b/pkgs/by-name/pr/practrand/package.nix
new file mode 100644
index 000000000000..02eada0eacc3
--- /dev/null
+++ b/pkgs/by-name/pr/practrand/package.nix
@@ -0,0 +1,75 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  unzip,
+  nix-update-script,
+  programPrefix ? "PractRand-",
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "practrand";
+  version = "0.96";
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://sourceforge/pracrand/PractRand_${finalAttrs.version}.zip";
+    hash = "sha256-5Mr3/amLLFl7vaO1dnU89aD2BHqrg3yCvjcKt5imcuE=";
+  };
+
+  nativeBuildInputs = [ unzip ];
+
+  env.NIX_CFLAGS_COMPILE = "-O3";
+
+  buildPhase = ''
+    runHook preBuild
+
+    $CXX -Iinclude -pthread -c src/*.cpp src/RNGs/*.cpp src/RNGs/other/*.cpp
+    $AR rcs libPractRand.a ./*.o
+
+    for tool in RNG_test RNG_benchmark RNG_output; do
+      $CXX -Iinclude -Itools -pthread -o "$tool" "tools/$tool.cpp" libPractRand.a
+    done
+
+    runHook postBuild
+  '';
+
+  doCheck = true;
+
+  checkPhase = ''
+    runHook preCheck
+
+    ./RNG_test --self_test
+
+    runHook postCheck
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    for tool in RNG_test RNG_benchmark RNG_output; do
+      install -Dm755 "$tool" "$out/bin/${programPrefix}$tool"
+    done
+    install -Dm644 libPractRand.a -t "$dev/lib"
+    mkdir -p "$dev/include" "$out/share/doc/practrand"
+    cp -r include/. "$dev/include/"
+    cp -r doc/. "$out/share/doc/practrand/"
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Suite of statistical tests and pseudo-random number generators";
+    homepage = "https://sourceforge.net/projects/pracrand/";
+    license = lib.licenses.cc0;
+    maintainers = with lib.maintainers; [ edoars ];
+    platforms = lib.intersectLists lib.platforms.unix lib.platforms.x86;
+  };
+})

From 2a9fb549d9c1e8f41b886c0c94a6c07e7d2c39da Mon Sep 17 00:00:00 2001
From: eztakesin <qwquq@proton.me>
Date: Fri, 24 Jul 2026 09:44:42 +0700
Subject: [PATCH 028/205] easylpac: create .app bundle on darwin

The darwin build installed only bin/ + share/, so the app never showed
up in Spotlight/Launchpad and could only be launched from a terminal.
Add desktopToDarwinBundle, which turns the existing desktop item and
hicolor icons into Applications/EasyLPAC.app; the bundle executable is
the wrapGAppsHook3-wrapped launcher, so lpac stays on PATH and the GTK
environment survives a Finder launch.

Assisted-by: Claude Code (Claude Fable 5)
---
 pkgs/by-name/ea/easylpac/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/ea/easylpac/package.nix b/pkgs/by-name/ea/easylpac/package.nix
index 3157980dad45..6daf5336d351 100644
--- a/pkgs/by-name/ea/easylpac/package.nix
+++ b/pkgs/by-name/ea/easylpac/package.nix
@@ -1,11 +1,13 @@
 {
   lib,
+  stdenv,
   buildGoModule,
   fetchFromGitHub,
   pkg-config,
   wrapGAppsHook3,
   makeDesktopItem,
   copyDesktopItems,
+  desktopToDarwinBundle,
   gtk3,
   libglvnd,
   libxxf86vm,
@@ -35,6 +37,11 @@ buildGoModule rec {
     copyDesktopItems
     pkg-config
     wrapGAppsHook3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Generate Applications/EasyLPAC.app from the desktop item, so the
+    # app shows up in Spotlight/Launchpad instead of being CLI-only.
+    desktopToDarwinBundle
   ];
 
   buildInputs = [

From 05ca2c64e63d9ed0c55adf5ceb0b5362f9f1968f Mon Sep 17 00:00:00 2001
From: Noah Snelson <noah.snelson@protonmail.com>
Date: Wed, 22 Jul 2026 20:50:22 -0700
Subject: [PATCH 029/205] am2rlauncer: upgrade to webkitgtk_4_1

This commit also removes the patch to upgrade the dotnet version to 8,
as the dotnet version has now been upgraded upstream.
---
 pkgs/by-name/am/am2rlauncher/deps.json        | 88 ++++++++++++++-----
 .../am/am2rlauncher/dotnet-8-upgrade.patch    | 52 -----------
 pkgs/by-name/am/am2rlauncher/package.nix      | 13 ++-
 3 files changed, 69 insertions(+), 84 deletions(-)
 delete mode 100644 pkgs/by-name/am/am2rlauncher/dotnet-8-upgrade.patch

diff --git a/pkgs/by-name/am/am2rlauncher/deps.json b/pkgs/by-name/am/am2rlauncher/deps.json
index af9c725d3fc7..4745af70d122 100644
--- a/pkgs/by-name/am/am2rlauncher/deps.json
+++ b/pkgs/by-name/am/am2rlauncher/deps.json
@@ -1,53 +1,53 @@
 [
   {
     "pname": "AtkSharp",
-    "version": "3.24.24.34",
-    "hash": "sha256-GrOzO4YDMKJNHAnqLF+c44iGYlvazGTOuRLUnuLbwco="
+    "version": "3.24.24.95",
+    "hash": "sha256-NgdWbXToBHhEVbvPrFcwXeit5iaqbBmNPQiC0jPKlnQ="
   },
   {
     "pname": "CairoSharp",
-    "version": "3.24.24.34",
-    "hash": "sha256-/80xbYSPU8+6twoXRjES8PtV7dKB6fQoe6EqBmawzV8="
+    "version": "3.24.24.95",
+    "hash": "sha256-ycdgmQyQ1uSshI/9uMaqn5OBxRF8RADf4Tn/TptE2BU="
   },
   {
     "pname": "Eto.Forms",
-    "version": "2.7.1",
-    "hash": "sha256-OdGDlkKST1qlO4p/jIrX6qVfyywK7wqiY97+Yqtt68M="
+    "version": "2.11.0",
+    "hash": "sha256-VxNpNQEiO73A6IKvOk5AAr10PXNP7HZiunXGz3ze43A="
   },
   {
     "pname": "Eto.Platform.Gtk",
-    "version": "2.7.1",
-    "hash": "sha256-2msf/Dxo+rxVmJBl57ofWd9cON4YDH8eLl4icXRBPyY="
+    "version": "2.11.0",
+    "hash": "sha256-9ST2LKb2h2mbsszeul1Cwl8H0ijlGQJ+C9OtZ8JwFIM="
   },
   {
     "pname": "GdkSharp",
-    "version": "3.24.24.34",
-    "hash": "sha256-pQOp2jft19vVN+gSjD0tHfNGucss7ruy1xyys6IHHWQ="
+    "version": "3.24.24.95",
+    "hash": "sha256-NYjADgZG9TUQDIZiSSXDAxj5PyX/B7oKRo9f8Oyb4vI="
   },
   {
     "pname": "GioSharp",
-    "version": "3.24.24.34",
-    "hash": "sha256-/fZBfaKXlrdBuNh1/h0s1++5Ek4OnznXvzJx0uTbHQo="
+    "version": "3.24.24.95",
+    "hash": "sha256-5THx4af5PghPnQxXdnsC+wtVcoslh+0636WkB1FaPYg="
   },
   {
     "pname": "GLibSharp",
-    "version": "3.24.24.34",
-    "hash": "sha256-eAYUYNHF37nIJnk7aRffzBj8b/rluqXERYy358YAd08="
+    "version": "3.24.24.95",
+    "hash": "sha256-1pDRkKoUI9fLJBcTA2DBlpVccJl2GyAdL+VKjsFbttA="
   },
   {
     "pname": "GtkSharp",
-    "version": "3.24.24.34",
-    "hash": "sha256-i0XZfzUt9GNaZD1uXNd8x+pb1mPJqYrxQd15XOuHSAA="
+    "version": "3.24.24.95",
+    "hash": "sha256-sBvk5Ecf2i6c2fYVjMBVoXz0I6IlucOWeE2czZH9QHg="
   },
   {
     "pname": "LibGit2Sharp",
-    "version": "0.27.0",
-    "hash": "sha256-/4Vr5pXvq1J+5kb4jvd7JkFQ5aiUF1InOViSe53KDFk="
+    "version": "0.31.0",
+    "hash": "sha256-AvvsA3dsDbcGNjpxWXO5F1iw8bhrctaWQ0MD2oJSyJA="
   },
   {
     "pname": "LibGit2Sharp.NativeBinaries",
-    "version": "2.0.319",
-    "hash": "sha256-jvbiwXrsqzzqnMiUQa3oqGshXeDT1miIKFug4NG1pnY="
+    "version": "2.0.323",
+    "hash": "sha256-0qFqyNC0u05UF+DJ/LNvng5Sur1ryci+wIEGhVU/7rE="
   },
   {
     "pname": "log4net",
@@ -56,8 +56,8 @@
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
-    "version": "2.0.0",
-    "hash": "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="
+    "version": "1.1.0",
+    "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
@@ -74,10 +74,25 @@
     "version": "6.0.0",
     "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="
   },
+  {
+    "pname": "NETStandard.Library",
+    "version": "2.0.3",
+    "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="
+  },
   {
     "pname": "PangoSharp",
-    "version": "3.24.24.34",
-    "hash": "sha256-/KdH3SA/11bkwPe/AXRph4v4a2cjbUjDvo4+OhkJEOQ="
+    "version": "3.24.24.95",
+    "hash": "sha256-YhltIz1jisJqR2ZxvbYy0ybi4oGw6qR2SkjF/2aWiBQ="
+  },
+  {
+    "pname": "System.Buffers",
+    "version": "4.4.0",
+    "hash": "sha256-KTxAhYawFG2V5VX1jw3pzx3IrQXRgn1TsvgjPgxAbqA="
+  },
+  {
+    "pname": "System.Buffers",
+    "version": "4.5.1",
+    "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="
   },
   {
     "pname": "System.ComponentModel.Annotations",
@@ -99,6 +114,31 @@
     "version": "6.0.0",
     "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="
   },
+  {
+    "pname": "System.Memory",
+    "version": "4.5.0",
+    "hash": "sha256-YOz1pCR4RpP1ywYoJsgXnVlzsWtC2uYKQJTg0NnFXtE="
+  },
+  {
+    "pname": "System.Memory",
+    "version": "4.5.4",
+    "hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="
+  },
+  {
+    "pname": "System.Numerics.Vectors",
+    "version": "4.4.0",
+    "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="
+  },
+  {
+    "pname": "System.Runtime.CompilerServices.Unsafe",
+    "version": "4.5.0",
+    "hash": "sha256-g9jIdQtXSAhY+ezQtYNgHEUoQR3HzznHs3JMzD9bip4="
+  },
+  {
+    "pname": "System.Runtime.CompilerServices.Unsafe",
+    "version": "4.5.3",
+    "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="
+  },
   {
     "pname": "System.Security.AccessControl",
     "version": "4.5.0",
diff --git a/pkgs/by-name/am/am2rlauncher/dotnet-8-upgrade.patch b/pkgs/by-name/am/am2rlauncher/dotnet-8-upgrade.patch
deleted file mode 100644
index aa57704e697a..000000000000
--- a/pkgs/by-name/am/am2rlauncher/dotnet-8-upgrade.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj b/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj
-index e5e6191..ab9f228 100644
---- a/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj
-+++ b/AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj
-@@ -2,7 +2,7 @@
- 	
-   <PropertyGroup>
-     <OutputType>WinExe</OutputType>
--    <TargetFramework>net6.0</TargetFramework>
-+    <TargetFramework>net8.0</TargetFramework>
-     <ApplicationIcon>icon64.ico</ApplicationIcon>
-     <RollForward>LatestMajor</RollForward>
-     <LangVersion>latest</LangVersion>
-diff --git a/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj b/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj
-index 2af5688..a91bb25 100644
---- a/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj
-+++ b/AM2RLauncher/AM2RLauncher.Mac/AM2RLauncher.Mac.csproj
-@@ -2,7 +2,7 @@
- 	
-   <PropertyGroup>
-     <OutputType>Exe</OutputType>
--    <TargetFramework>net6.0-macos</TargetFramework>
-+    <TargetFramework>net8.0-macos</TargetFramework>
-     <RuntimeIdentifiers>osx-x64;osx-arm64</RuntimeIdentifiers>
-     <SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
-     <RollForward>LatestMajor</RollForward>
-diff --git a/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj b/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj
-index be49446..34a842f 100644
---- a/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj
-+++ b/AM2RLauncher/AM2RLauncher/AM2RLauncher.csproj
-@@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
- 	
-   <PropertyGroup>
--    <TargetFramework>netstandard2.0</TargetFramework>
-+    <TargetFramework>net8.0</TargetFramework>
- 	<LangVersion>latest</LangVersion>
-     <ApplicationIcon>Resources\LauncherIcon.ico</ApplicationIcon>
-     <Authors>Lojemiru, Miepee</Authors>
-diff --git a/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj b/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj
-index 673ab7a..da3a019 100644
---- a/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj
-+++ b/AM2RLauncher/AM2RLauncherLib/AM2RLauncherLib.csproj
-@@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
- 
-   <PropertyGroup>
--    <TargetFramework>netstandard2.0</TargetFramework>
-+    <TargetFramework>net8.0</TargetFramework>
-     <LangVersion>default</LangVersion>
-     <Configurations>Debug;Release</Configurations>
-     <Platforms>AnyCPU</Platforms>
diff --git a/pkgs/by-name/am/am2rlauncher/package.nix b/pkgs/by-name/am/am2rlauncher/package.nix
index 313f2ea1fb07..8c18518046d8 100644
--- a/pkgs/by-name/am/am2rlauncher/package.nix
+++ b/pkgs/by-name/am/am2rlauncher/package.nix
@@ -5,7 +5,7 @@
   glibc,
   gtk3,
   libappindicator,
-  # webkitgtk_4_0,
+  webkitgtk_4_1,
   e2fsprogs,
   libnotify,
   libgit2,
@@ -48,13 +48,13 @@ let
 in
 buildDotnetModule {
   pname = "am2rlauncher";
-  version = "2.3.0-unstable-2023-11-08";
+  version = "2.3.0-unstable-2026-07-22";
 
   src = fetchFromGitHub {
     owner = "AM2R-Community-Developers";
     repo = "AM2RLauncher";
-    rev = "5d8b7d9b3de68e6215c10b9fd223b7f1d5e40dea";
-    hash = "sha256-/nHqo8jh3sOUngbpqdfiQjUWO/8Uzpc5jtW7Ep4q6Wg=";
+    rev = "f9bd0a3e0b661648b0ce1b0531dc174d9ebcf7d9";
+    hash = "sha256-bXUBw8XN3iR3UL1vvTsBqnnnJGxMIxFCg1tVVyAxRPw=";
   };
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0;
@@ -67,7 +67,7 @@ buildDotnetModule {
     glibc
     gtk3
     libappindicator
-    # webkitgtk_4_0
+    webkitgtk_4_1
     e2fsprogs
     libnotify
     libgit2
@@ -84,7 +84,6 @@ buildDotnetModule {
 
   patches = [
     ./am2r-run-binary.patch
-    ./dotnet-8-upgrade.patch
   ];
 
   dotnetFlags = [
@@ -116,8 +115,6 @@ buildDotnetModule {
   '';
 
   meta = {
-    # webkitgtk_4_0 was removed
-    broken = true;
     homepage = "https://github.com/AM2R-Community-Developers/AM2RLauncher";
     description = "Front-end for dealing with AM2R updates and mods";
     longDescription = ''

From 3bd3b595b4ea2ec187626f06fb76b96b87de64ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ondrej=20Mosn=C3=A1=C4=8Dek?= <omosnacek@gmail.com>
Date: Sun, 26 Jul 2026 21:24:23 +0200
Subject: [PATCH 030/205] maintainers: add WOnder93

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c82bed9ae9a0..4e768a71b1af 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -30604,6 +30604,13 @@
     githubId = 1595132;
     name = "Kranium Gikos Mendoza";
   };
+  WOnder93 = {
+    email = "omosnacek@gmail.com";
+    github = "WOnder93";
+    githubId = 3041388;
+    matrix = "@omos:fedora.im";
+    name = "Ondrej Mosnáček";
+  };
   workflow = {
     email = "4farlion@gmail.com";
     github = "workflow";

From 434a2eb953579e095bf4dd2ff9f78e4d18547828 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Mon, 27 Jul 2026 16:13:04 -0700
Subject: [PATCH 031/205] =?UTF-8?q?electron-fiddle:=200.37.2=20=E2=86=92?=
 =?UTF-8?q?=200.40.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 .../el/electron-fiddle/bump-yauzl.patch       | 90 ++++++++++---------
 .../el/electron-fiddle/missing-hashes.json    | 56 ++++++++++++
 pkgs/by-name/el/electron-fiddle/package.nix   | 40 ++++++---
 .../yarn-metadata-version.patch               | 13 +++
 4 files changed, 143 insertions(+), 56 deletions(-)
 create mode 100644 pkgs/by-name/el/electron-fiddle/missing-hashes.json
 create mode 100644 pkgs/by-name/el/electron-fiddle/yarn-metadata-version.patch

diff --git a/pkgs/by-name/el/electron-fiddle/bump-yauzl.patch b/pkgs/by-name/el/electron-fiddle/bump-yauzl.patch
index d1bdf7b757c2..97c8207b0fa3 100644
--- a/pkgs/by-name/el/electron-fiddle/bump-yauzl.patch
+++ b/pkgs/by-name/el/electron-fiddle/bump-yauzl.patch
@@ -1,61 +1,65 @@
 diff --git a/package.json b/package.json
-index 7e49e7a..ab5c306 100644
+index f69931cc..3963bbb6 100644
 --- a/package.json
 +++ b/package.json
-@@ -166,6 +166,7 @@
+@@ -156,6 +156,7 @@
      ]
    },
    "resolutions": {
 +    "yauzl": "^3.3.1",
-     "@electron-forge/maker-base": "7.8.1",
-     "@electron-forge/shared-types": "7.8.1"
-   }
+     "@electron-forge/maker-base": "8.0.0-alpha.9",
+     "@electron-forge/shared-types": "8.0.0-alpha.9",
+     "electron-windows-msix@npm:^2.0.4": "patch:electron-windows-msix@npm%3A2.0.4#~/.yarn/patches/electron-windows-msix-npm-2.0.4-954aec946e.patch"
 diff --git a/yarn.lock b/yarn.lock
-index a4d91bb..8ae6ff9 100644
+index 365f8b4d..b805b8af 100644
 --- a/yarn.lock
 +++ b/yarn.lock
-@@ -3653,11 +3653,6 @@ browserslist@^4.21.10:
-     node-releases "^2.0.18"
-     update-browserslist-db "^1.1.0"
+@@ -4146,13 +4146,6 @@ __metadata:
+   languageName: node
+   linkType: hard
  
--buffer-crc32@~0.2.3:
--  version "0.2.13"
--  resolved "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"
--  integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
+-"buffer-crc32@npm:~0.2.3":
+-  version: 0.2.13
+-  resolution: "buffer-crc32@npm:0.2.13"
+-  checksum: 10c0/cb0a8ddf5cf4f766466db63279e47761eb825693eeba6a5a95ee4ec8cb8f81ede70aa7f9d8aeec083e781d47154290eb5d4d26b3f7a465ec57fb9e7d59c47150
+-  languageName: node
+-  linkType: hard
 -
- buffer-from@^1.0.0:
-   version "1.1.2"
-   resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"
-@@ -5746,13 +5741,6 @@ faye-websocket@^0.11.3:
-   dependencies:
-     websocket-driver ">=0.5.1"
+ "buffer-from@npm:^1.0.0":
+   version: 1.1.2
+   resolution: "buffer-from@npm:1.1.2"
+@@ -6442,15 +6435,6 @@ __metadata:
+   languageName: node
+   linkType: hard
  
--fd-slicer@~1.1.0:
--  version "1.1.0"
--  resolved "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz"
--  integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==
+-"fd-slicer@npm:~1.1.0":
+-  version: 1.1.0
+-  resolution: "fd-slicer@npm:1.1.0"
 -  dependencies:
--    pend "~1.2.0"
+-    pend: "npm:~1.2.0"
+-  checksum: 10c0/304dd70270298e3ffe3bcc05e6f7ade2511acc278bc52d025f8918b48b6aa3b77f10361bddfadfe2a28163f7af7adbdce96f4d22c31b2f648ba2901f0c5fc20e
+-  languageName: node
+-  linkType: hard
 -
- fdir@^6.4.4, fdir@^6.4.6:
-   version "6.4.6"
-   resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.6.tgz#2b268c0232697063111bbf3f64810a2a741ba281"
-@@ -12352,13 +12340,12 @@ yargs@^17.0.1:
-     y18n "^5.0.5"
-     yargs-parser "^21.1.1"
+ "fdir@npm:^6.5.0":
+   version: 6.5.0
+   resolution: "fdir@npm:6.5.0"
+@@ -13869,13 +13853,12 @@ __metadata:
+   languageName: node
+   linkType: hard
  
--yauzl@^2.10.0:
--  version "2.10.0"
--  resolved "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz"
--  integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==
-+yauzl@^2.10.0, yauzl@^3.3.1:
-+  version "3.4.0"
-+  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-3.4.0.tgz#88b2a21455f37ca7dccf2eeb33bacb4392322719"
-+  integrity sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==
+-"yauzl@npm:^2.10.0":
+-  version: 2.10.0
+-  resolution: "yauzl@npm:2.10.0"
++"yauzl@npm:^3.3.1":
++  version: 3.4.0
++  resolution: "yauzl@npm:3.4.0"
    dependencies:
--    buffer-crc32 "~0.2.3"
--    fd-slicer "~1.1.0"
-+    pend "~1.2.0"
+-    buffer-crc32: "npm:~0.2.3"
+-    fd-slicer: "npm:~1.1.0"
+-  checksum: 10c0/f265002af7541b9ec3589a27f5fb8f11cf348b53cc15e2751272e3c062cd73f3e715bc72d43257de71bbaecae446c3f1b14af7559e8ab0261625375541816422
++    pend: "npm:~1.2.0"
++  checksum: 10c0/17a98c42c0065e8af429eb8a61f7a0e4562181ed54080366b838f34f741b6829f167f804787c86b7646bb042707f35871739f053de0548285e405a2eae4da025
+   languageName: node
+   linkType: hard
  
- yocto-queue@^0.1.0:
-   version "0.1.0"
diff --git a/pkgs/by-name/el/electron-fiddle/missing-hashes.json b/pkgs/by-name/el/electron-fiddle/missing-hashes.json
new file mode 100644
index 000000000000..1239fbc5f71c
--- /dev/null
+++ b/pkgs/by-name/el/electron-fiddle/missing-hashes.json
@@ -0,0 +1,56 @@
+{
+  "@esbuild/aix-ppc64@npm:0.25.8": "37fc14b17214c1f6bf41175029b62a43664a6a5a5b802614fe1d837bbf7abf5eaf2f6b735b6a446ebcfabb632e038c8ad9cccd87a259c45a1846689f8527874a",
+  "@esbuild/android-arm64@npm:0.25.8": "e367e989238292ccee72013511dde1aef2d2160d8d5d669a12272f693cf9a0970fac9d7835178b3c46ed6936a0c4b29d21d58ed11851a3697bf98b4320be4b74",
+  "@esbuild/android-arm@npm:0.25.8": "cbfa2c802d8931e5f4d06582f20573cb34774ab713b4712c37eb15bfab6f90b693878b661de2a3bb9c81eecf45b37e0ddf2e9c79ef4ff932bbc37da588c40183",
+  "@esbuild/android-x64@npm:0.25.8": "1d4b900dd2f43790415745d20ae6cadb53e9412911578aaf43462277169c22800eca1f49a9f8ce9c37236e1691279494f91967d28310720707911910ec765013",
+  "@esbuild/darwin-arm64@npm:0.25.8": "a8a50e303056e668e99370a88d1744de4a83e62e2f3f7fcf2ff611142346505229568b0ec5edda93ec96e33e842a585880a312790553202750f123d9636fa97d",
+  "@esbuild/darwin-x64@npm:0.25.8": "9806fe9d54f3228a01f535e7c51aea26bd1bab3c5d64d5f77f4606de44f361f049222776d32bfd262d45991b7aecca645ed576ea338edbf4f8044b22b3e331ad",
+  "@esbuild/freebsd-arm64@npm:0.25.8": "8e6cbdd45819390ecdb62a70a4f119a9269a90895f3e1237788b36a512248a756233ef59f55f9033658af372a196f0edc3567f078f1387e150238d2bd51f733b",
+  "@esbuild/freebsd-x64@npm:0.25.8": "3f920c686037f825859a2fe82104085f4b254b77821cc71a71db512ef0679dd01481c136c3f7057ba7250daff2458aa3ffd101cc28cb5fff2d55270ba5930ec8",
+  "@esbuild/linux-arm64@npm:0.25.8": "234edc9f815cdc74d21c6a90a3542c941deeaf3a24b408c74a4651616bd270383ba5a15eaef837ab347a374032c7028fc29e4f1da0becb33f0b8dd8f744934d7",
+  "@esbuild/linux-arm@npm:0.25.8": "dc6dc225ae278cb3383e11d9829d22f301e1b79f2ed4efde1a01896ae67e45efde98caa61f10cb425a809e9b61e9a4651b60d2b6a3e9ad6174519e8ce74bc02a",
+  "@esbuild/linux-ia32@npm:0.25.8": "1c780012035552e27adea34d11f959a3ddd4a4d576cddd03d320b1db18110e777c1adca2c6d10affd587a4454900d3ffcad9371956855e56739babdc2e4edcd3",
+  "@esbuild/linux-loong64@npm:0.25.8": "d3d39691d301d144c7d61f52163a2fe64caaf928f4117d906707dc1456f3d88d1a7a3b16fb988ccfc0b0bc203f4bcd56665a9c7405dc380b3165a26ab195b9ec",
+  "@esbuild/linux-mips64el@npm:0.25.8": "437e51b2be977cf7774114e04c141e3c0f1ceb7f12b961b7b3ac7f99c4e203afdd74c41e072ecdc4bab3cde4f14feedd78653727d1b2013ed3611bd89117ee8c",
+  "@esbuild/linux-ppc64@npm:0.25.8": "29d2e344b1c8b767518d25b23eb9e98d85deae1f2def2e01c1939536ac7d1fc9e92749a8d29b29277b3340d3613e4b0f96213c6aa2de7e06885a19d3d269870a",
+  "@esbuild/linux-riscv64@npm:0.25.8": "82b2ef7fd5a00b465da97bd797246269d7460ed710c0533517a1f8ad8e32527f405509b2ce27e29f8f3df1affa04e45cf5d1a71205f69dab5c1a27118cf10fb8",
+  "@esbuild/linux-s390x@npm:0.25.8": "74168a6e8927d12c883dba56006f5277f8888c7b1b5e4d132a3c235b8629c3015b4715968ba128a79ff55c9f08a23df84fe44047e8cda4366b9699c5c45f27a4",
+  "@esbuild/linux-x64@npm:0.25.8": "d531002ac2ead0bdb293ec1a4eceea687d37815e298196af2471107cdd4c1f76ef7d12417052b51852b80f66111abfb5ad8375c58b97da92306b975e9a8f0649",
+  "@esbuild/netbsd-arm64@npm:0.25.8": "55626924ae946a6225707062648aabb79c70d61e7e094b067338ea1adf72493b502e99e59440fe0d3abfe20eb36c33f78115815d63e72fa99f5e90146c2ee5d9",
+  "@esbuild/netbsd-x64@npm:0.25.8": "d03122aaa3e9a8bda686bc4120820805b5d9701099458a2c928ee1a292fabcc47df0cb178c8c428edb78a058e75cf7c0d80fa25b71fb91db43d73fe6e4062c41",
+  "@esbuild/openbsd-arm64@npm:0.25.8": "113ed8722788986b5b703c791bb9c954e80a861b92f453c66c79318d71cc6eac509c1dc79d20671b4af92165eee05a28eb7b3122537d8701447d30f58c428942",
+  "@esbuild/openbsd-x64@npm:0.25.8": "dfa68d80d68ae825de85aeccc118724ced6b232dcf25da6d862ba03abda2f55e75483dccbf8cb3a7338e7882a05e5425fcf5a902b7dced72c9f1a9c2650912bd",
+  "@esbuild/openharmony-arm64@npm:0.25.8": "8dab5710d93ad4a78a34a0016f6ea0bf2e16489845f9895ecaf354c1c3db209bed8f05a31309b95c358bfeaea53829605f4e315e9a53dae4d9fdb58e31ca4688",
+  "@esbuild/sunos-x64@npm:0.25.8": "ccc940bd687d1f6d320d2538ac594b7fe5e291e194380a8b392dd2348d738cf8d322f9f62bcea82b3809f98796a0a004cd02ba9c4d563e5e336665e1ec8e1e1d",
+  "@esbuild/win32-arm64@npm:0.25.8": "b0a9a86548d4a62e68b12a89e21aaadda3d6d3e96541a2714b74df370cc344e1a2d91604998a26951da28c2f932bd2ee033adc9346bb232622c3ac419107136a",
+  "@esbuild/win32-ia32@npm:0.25.8": "5880e933c8fb8dc1de1225128c171ea64f4b27fe52fc11ed9cfe6b0ca8ae091c2703d4cb629f08c06731810c46f48cf881516d0d54b3ac408dec34586ea84d27",
+  "@esbuild/win32-x64@npm:0.25.8": "9e98fe0e7eef7a0e774ab761c59d520ea1c997a7a6e4c7f9cbc967471a4a7ffb14bc27c60d2aa10796c4e945c3da2613fcc297054566fe3f5191e1250691d622",
+  "@rolldown/binding-android-arm64@npm:1.0.0-rc.12": "1fe38430414fef2eb817ad10c50744c757e74b105850f9bec12016312c3b9ce0a03c14eb65c04f79ec06795005d52bf97d3a6ca62446184f5ca0c41300256d15",
+  "@rolldown/binding-darwin-arm64@npm:1.0.0-rc.12": "39aa446385e9b0b3d4843478f440c452cabe4f826407986f085d0f6a73467d0e6642f3718facd4ea3c4f7687890ba0a9568e97b9f0ec816fbf5a271f2fdd56e0",
+  "@rolldown/binding-darwin-x64@npm:1.0.0-rc.12": "3cb24f9a29f0ddbfa9c7734f22786ee436129b0cea963b7b9a8e09e5ad3a37516591deacf5c952d01a582de6ba1a069e39b3d056c455986c89448ba57dc99c05",
+  "@rolldown/binding-freebsd-x64@npm:1.0.0-rc.12": "02033ccde0b7383adbe16d0df36dd74e20b3973bcd1c791822246c9314c2cbd52d2b0d37704de591e237d1db6a92108fb12c5d07afce07d9598b024576a66754",
+  "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-rc.12": "4d5daa86125e95ec7c1da4804d1aa259715fff3f966e0f15aabbe8488fb46e6c69e2289119f4dd8ba5bcd1b1c94fcd2f2c5a1f59477253cea020ebdcc2c7c652",
+  "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-rc.12": "87311abc5e88ebb12b1f17fd840b72d3dfad98d4a36d3c9215e75b0e4cc20d378372efb3c40a79176067764857b3def4eaafeae13b385a10866d383ca69b9168",
+  "@rolldown/binding-linux-arm64-musl@npm:1.0.0-rc.12": "e9fa1956b2f2afce1479a6e1a850dca09ffecffbb4f7f90680dfaef2503fdc0fcea2a13e0cce9303b72125f225d798ef7c5d1fc6d36466a36dece61cddb98848",
+  "@rolldown/binding-linux-ppc64-gnu@npm:1.0.0-rc.12": "e4c86e1145f0605c708c0facf1cb717ac7410010812c1bcb50cd55481a3ea4802fc610b9ef2ff9f65f05c5baed788bd7c0d015702b9b9056d62efdb209d6cd47",
+  "@rolldown/binding-linux-s390x-gnu@npm:1.0.0-rc.12": "52bb2a9c287fb59c394ed2194d47222fadb72f0516683f7d1ad19eb73e73c1e3a3917d0598e483c5bf2c7cc942eb010e8ebf091515369c90f45dcb4a375563c7",
+  "@rolldown/binding-linux-x64-gnu@npm:1.0.0-rc.12": "f1f604d49ad2d47a0f8d00152c045756016e422a5f93d8548e2a2388d1af43b597ae22a349ba30d94413352999a2526a5865ed65fe1045743759f5e4f6293cf2",
+  "@rolldown/binding-linux-x64-musl@npm:1.0.0-rc.12": "1db5ea4ae644892004e7bc00b3dd0515c8bbe196f0abe71ecbd5862c9bf72d2658f2c40ca6f637764c795ad3cc182d449b7239da1057837aa5a874b923cb7f51",
+  "@rolldown/binding-openharmony-arm64@npm:1.0.0-rc.12": "e2145fb3bfd2ab8ac1ecba1b70284b47a4bdb12559d6efb3146180a6e5b6827c78b613c5d23bf0afff2692b37a2019d0ae39d6554969508478d9e840520e3fc8",
+  "@rolldown/binding-wasm32-wasi@npm:1.0.0-rc.12": "3fec2099b45f6982dd5655ab5b45416413951d22f4cfd726e7ed3cb1a37ca499fc322b5b7b8b5258de49591cc1d1f6344a707f5541dc748591e2dbb38c200389",
+  "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-rc.12": "de6e85e0826c1daed00b6020fbf8a61fe8842e48a56eee6b64bc33be514d084d2f3969428e871b7f66db60529ac601c6b0a37ac86c36e34af6454d70f95f98cd",
+  "@rolldown/binding-win32-x64-msvc@npm:1.0.0-rc.12": "7db443359da15f8b7947e585ff9a388e0a66e318d12ba96d435f0a436c6fe92c67620672c1c15b82645ab5bd1da9a1c20957a99a3d8bf5c122fdad03dfc0d117",
+  "electron-installer-debian@npm:3.2.0": "9ffb1fe15cf291ab23cd6ef51e20b30ebe003c58f745bc5373a3c0800f793f0cfccebfc01eec1cd6658672522a7dcb9733441cdcf9657624606333a5738538a1",
+  "electron-installer-redhat@npm:3.3.0": "82b49fc9447b658e8ee718d008b7785335608e110bde8d8e1c9baa69ff6d6ca0c7913e03fc58aee12ded7e5705f5787d08c7c993e14c0d7d0fb12909c632188c",
+  "lightningcss-android-arm64@npm:1.32.0": "1cb326ad39dcb02cf9f45025c167b6900e3a04b08f5149d3c5ee26054b00d08db3736fb69183a6c3ed1cb32dddd148608c784b6631b4777623f7dd0c032c392d",
+  "lightningcss-darwin-arm64@npm:1.32.0": "da954d0c215d0e95f15a92c8717f871017586e1332b98fd40e96196571d2fd3d51a727dc530768afee9f6a04da210510740574dd0c8dbf2ecced79e5996f1a06",
+  "lightningcss-darwin-x64@npm:1.32.0": "b1d298c9173f839e8447d1917ed8bc5ab098ed0fc4e4b419d36ac5afe8b27bf21cb47d00a35c3d2edadcac598086e9b4f26c992a809d79f9681d6865a230d79e",
+  "lightningcss-freebsd-x64@npm:1.32.0": "0eb59f6acf2fcdc944c921b0ac2a16ee803452b9438f573ad6bc41be00040b791ed698698ed5c06f98ef43a6fed0a54987ba3a88da204de9978db2fca96a4a65",
+  "lightningcss-linux-arm-gnueabihf@npm:1.32.0": "7d1ea43986d2370a90cefc920dac3e041e0d19445cc4fdaf244644b57b6937588d7c3a464c31440617231f55a6dad79744cf707912e05f3b46a1694abb5b4e00",
+  "lightningcss-linux-arm64-gnu@npm:1.32.0": "f01ede75f41480a164d18338fa46d9fccdb4a821717174ce848ff8b2aa4badba4f1d331deb3ebec3ee2f0eb95bfa2e35f54877f371427b04e6f36a4783aa1414",
+  "lightningcss-linux-arm64-musl@npm:1.32.0": "38d373f99768f1c5ab6a9c87e1c0ec45eccdb3fe4d216dd5cd06629648c4b0689570ad4e89285d490662cde1790cd36e6b3d176c14e5e31f6869c604aa2df820",
+  "lightningcss-linux-x64-gnu@npm:1.32.0": "0a1433d46a4a010f87b615c3fa43725a456bae259858a2c927899cbf93074f0ae40f49901bf6af6daa30a4d169c86f594f6341fd775bf7b59293b8d7947b81c5",
+  "lightningcss-linux-x64-musl@npm:1.32.0": "a6f48ccc30a73d30563c7b61856d1fd6a8812ce62b1bee797f227e06612df70aab4ccd1908552952f77ca7ff2a51019f62d14ae5310ca67311635eeec55d3a9e",
+  "lightningcss-win32-arm64-msvc@npm:1.32.0": "a919be7fb298c1102bccf18b6f83d54946adfac70ab2ac9c95e4ae38ded76d8f530215b0bcda4d38df4ffc40a70abe3afd91d01d35fd122e7d119ed0e46972d0",
+  "lightningcss-win32-x64-msvc@npm:1.32.0": "5b8d3431aadbdc40a0a7eae32f2415e4f28b547af1a1cd5b35a35d67f772a89492c7fa03e9fc88ce804b14f5f88e412e49fff40d1b0aad67177de815c434207e"
+}
diff --git a/pkgs/by-name/el/electron-fiddle/package.nix b/pkgs/by-name/el/electron-fiddle/package.nix
index fc8d78f0f6e8..6d1761f3ed3c 100644
--- a/pkgs/by-name/el/electron-fiddle/package.nix
+++ b/pkgs/by-name/el/electron-fiddle/package.nix
@@ -9,20 +9,20 @@
   nodejs,
   stdenvNoCC,
   util-linux,
-  yarnBuildHook,
-  yarnConfigHook,
+  yarn-berry_4,
   zip,
 }:
 
 let
   pname = "electron-fiddle";
-  version = "0.37.2";
+  version = "0.40.1";
+  yarn-berry = yarn-berry_4;
 
   src = fetchFromGitHub {
     owner = "electron";
     repo = "fiddle";
     tag = "v${version}";
-    hash = "sha256-e9PLgkqWBNLBw7uuNpPluOQ6+aGLYQLyTzcLa+LMOzs=";
+    hash = "sha256-nmmj1PvW9LOoEdwwWRRXe9q9J8z6Fp45Tt038BjWD+k=";
   };
 
   patches = [
@@ -31,27 +31,39 @@ let
 
     # zip extraction fails on newer nodejs versions without this fix
     ./bump-yauzl.patch
+
+    # https://github.com/nixos/nixpkgs/issues/542343
+    ./yarn-metadata-version.patch
   ];
 
+  missingHashes = ./missing-hashes.json;
+
   unwrapped = stdenvNoCC.mkDerivation {
     pname = "${pname}-unwrapped";
-    inherit version src patches;
+    inherit
+      version
+      src
+      patches
+      missingHashes
+      ;
 
-    offlineCache = fetchYarnDeps {
-      inherit src patches;
-      hash = "sha256-5yUsjXQ3OHwEGFgMTUJAXAuTdAl4zkb8zxTs5OT6sw4=";
+    offlineCache = yarn-berry.fetchYarnBerryDeps {
+      inherit src patches missingHashes;
+      hash = "sha256-xxguRiyZDGdVt3eYh+KUI/odLZZ/LeScRBfexMxAOVI=";
     };
 
     nativeBuildInputs = [
       git
       nodejs
       util-linux
-      yarnBuildHook
-      yarnConfigHook
+      yarn-berry
+      yarn-berry.yarnBerryConfigHook
       zip
     ];
 
-    preBuild = ''
+    buildPhase = ''
+      runHook preBuild
+
       # electron files need to be writable on Darwin
       cp -r ${electron.dist} electron-dist
       chmod -R u+w electron-dist
@@ -65,13 +77,15 @@ let
       # force @electron/packager to use our electron instead of downloading it, even if it is a different version
       substituteInPlace node_modules/@electron/packager/dist/packager.js \
         --replace-fail 'await this.getElectronZipPath(downloadOpts)' '"electron.zip"'
+
+      node --run package
+
+      runHook postBuild
     '';
 
     # electron-forge's console output is squeezed into one narrow column if unset
     env.CI = "1";
 
-    yarnBuildScript = "package";
-
     installPhase = ''
       runHook preInstall
 
diff --git a/pkgs/by-name/el/electron-fiddle/yarn-metadata-version.patch b/pkgs/by-name/el/electron-fiddle/yarn-metadata-version.patch
new file mode 100644
index 000000000000..780b7265824a
--- /dev/null
+++ b/pkgs/by-name/el/electron-fiddle/yarn-metadata-version.patch
@@ -0,0 +1,13 @@
+diff --git a/yarn.lock b/yarn.lock
+index 365f8b4d..ffa89a3d 100644
+--- a/yarn.lock
++++ b/yarn.lock
+@@ -2,7 +2,7 @@
+ # Manual changes might be lost - proceed with caution!
+ 
+ __metadata:
+-  version: 8
++  version: 9
+   cacheKey: 10c0
+ 
+ "@aashutoshrathi/word-wrap@npm:^1.2.3":

From d011df12cb7888c0aed1b6ef54ab9b6101684fc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ondrej=20Mosn=C3=A1=C4=8Dek?= <omosnacek@gmail.com>
Date: Sun, 26 Jul 2026 21:12:07 +0200
Subject: [PATCH 032/205] python3Packages.udsoncan: init at 1.26.1

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

diff --git a/pkgs/development/python-modules/udsoncan/default.nix b/pkgs/development/python-modules/udsoncan/default.nix
new file mode 100644
index 000000000000..0dd4699d080e
--- /dev/null
+++ b/pkgs/development/python-modules/udsoncan/default.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "udsoncan";
+  version = "1.26.1";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "pylessard";
+    repo = "python-udsoncan";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-zprGzcSPfDcP9RKtWmXhQTYT8eR2NQFyfKggRBaIfUU=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "udsoncan"
+  ];
+
+  meta = {
+    description = "Python implementation of UDS (ISO-14229) standard";
+    homepage = "https://github.com/pylessard/python-udsoncan";
+    changelog = "https://github.com/pylessard/python-udsoncan/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ WOnder93 ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 774843645a69..19e9127e7a8d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21413,6 +21413,8 @@ self: super: with self; {
 
   udatetime = callPackage ../development/python-modules/udatetime { };
 
+  udsoncan = callPackage ../development/python-modules/udsoncan { };
+
   udtools = callPackage ../development/python-modules/udtools { };
 
   ueagle = callPackage ../development/python-modules/ueagle { };

From d80cceda10ddf95f1daedf97cf9e55b78b07c828 Mon Sep 17 00:00:00 2001
From: KangaZero <samuelyongw@gmail.com>
Date: Mon, 27 Jul 2026 14:12:20 +0900
Subject: [PATCH 033/205] asmc-linux: 2.36.25 -> 2.39.07

Also refactor to the finalAttrs pattern, switched out rev for tag, add                                        meta.changelog, and add versionCheckHook to guard against version drift.

Changelog: https://github.com/nidud/asmc/blob/v2.39/source/asmc/history.txt
---
 pkgs/by-name/as/asmc-linux/package.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/as/asmc-linux/package.nix b/pkgs/by-name/as/asmc-linux/package.nix
index 0b8073e9cee5..05877430e0d3 100644
--- a/pkgs/by-name/as/asmc-linux/package.nix
+++ b/pkgs/by-name/as/asmc-linux/package.nix
@@ -2,15 +2,16 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  versionCheckHook,
 }:
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "asmc-linux";
-  version = "2.36.25";
+  version = "2.39.07";
   src = fetchFromGitHub {
     owner = "nidud";
     repo = "asmc_linux";
-    rev = "4ee70bde4439bdd9c772d08527dba6d50f2e5a88";
-    hash = "sha256-/yJC1OQGRgy9T/U2VB0MohSsD1ImLnHYM/8Y8fIWhVE=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-JtJsyaw4UqMf9epMLGH+iQA0FYYlE9k2NG1aPOu6pec=";
   };
 
   enableParallelBuilding = true;
@@ -23,12 +24,16 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   meta = {
     description = "MASM-compatible assembler";
     homepage = "https://github.com/nidud/asmc_linux";
+    changelog = "https://github.com/nidud/asmc/blob/v${lib.versions.majorMinor finalAttrs.version}/source/asmc/history.txt";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ ccicnce113424 ];
     platforms = with lib.systems.inspect; patternLogicalAnd patterns.isx86_64 patterns.isLinux;
     mainProgram = "asmc";
   };
-}
+})

From af9356139c44013f96c8ab5e262f7a257d5530ef Mon Sep 17 00:00:00 2001
From: ntsk <ntsk@ntsk.jp>
Date: Thu, 7 May 2026 00:46:32 +0900
Subject: [PATCH 034/205] tree-sitter-grammars.tree-sitter-vcl: init at 0.3.1

---
 maintainers/maintainer-list.nix                      |  6 ++++++
 .../tr/tree-sitter/grammars/grammar-sources.nix      | 12 ++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2a041719c32e..b1ea1384fcd5 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -20867,6 +20867,12 @@
     githubId = 1839979;
     name = "Niklas Thörne";
   };
+  ntsk = {
+    email = "ntsk@ntsk.jp";
+    github = "ntsk";
+    githubId = 5681281;
+    name = "ntsk";
+  };
   nudelsalat = {
     email = "nudelsalat@clouz.de";
     name = "Fabian Dreßler";
diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index a80cde29fbb1..391e02ff56f6 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -2955,6 +2955,18 @@
     };
   };
 
+  vcl = rec {
+    version = "0.3.1";
+    url = "github:ntsk/tree-sitter-vcl?ref=v${version}";
+    hash = "sha256-aqEKHAb/ILoVAG2h/VuAn83HRZamrEgcjIGPatcQCfI=";
+    meta = {
+      license = lib.licenses.mit;
+      maintainers = with lib.maintainers; [
+        ntsk
+      ];
+    };
+  };
+
   vento = {
     version = "0-unstable-2026-02-23";
     url = "github:ventojs/tree-sitter-vento";

From 4806a61f18b2b8fc77aa762654cd9e993847580b Mon Sep 17 00:00:00 2001
From: ntsk <ntsk@ntsk.jp>
Date: Sun, 2 Aug 2026 22:31:01 +0900
Subject: [PATCH 035/205] tree-sitter-grammars.tree-sitter-vcl: 0.3.1 -> 0.4.0

---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index 391e02ff56f6..0a5ede948cce 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -2956,9 +2956,9 @@
   };
 
   vcl = rec {
-    version = "0.3.1";
+    version = "0.4.0";
     url = "github:ntsk/tree-sitter-vcl?ref=v${version}";
-    hash = "sha256-aqEKHAb/ILoVAG2h/VuAn83HRZamrEgcjIGPatcQCfI=";
+    hash = "sha256-qV+Ww5pzUHxmv9R6zIJDcLZnHLHL6xi3EZoRlhzgISQ=";
     meta = {
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [

From 0873cf0dae3ac59b8efc64063203aae544127031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= <tomas.riveral@icloud.com>
Date: Sun, 2 Aug 2026 16:06:56 +0200
Subject: [PATCH 036/205] eternal-terminal: add tomasrivera as maintainer

---
 pkgs/by-name/et/eternal-terminal/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/et/eternal-terminal/package.nix b/pkgs/by-name/et/eternal-terminal/package.nix
index 9068f6dc7d01..399483fe5e6e 100644
--- a/pkgs/by-name/et/eternal-terminal/package.nix
+++ b/pkgs/by-name/et/eternal-terminal/package.nix
@@ -58,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       jshort
+      tomasrivera
     ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };

From 5e94baef8424718ed4addccae07629a83b4bd382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= <tomas.riveral@icloud.com>
Date: Sun, 2 Aug 2026 16:09:50 +0200
Subject: [PATCH 037/205] eternal-terminal: add versionCheckHook

---
 pkgs/by-name/et/eternal-terminal/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/et/eternal-terminal/package.nix b/pkgs/by-name/et/eternal-terminal/package.nix
index 399483fe5e6e..c88cdba172b7 100644
--- a/pkgs/by-name/et/eternal-terminal/package.nix
+++ b/pkgs/by-name/et/eternal-terminal/package.nix
@@ -9,6 +9,7 @@
   protobuf,
   zlib,
   catch2,
+  versionCheckHook
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -50,6 +51,9 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   doCheck = true;
+  doInstallCheck = true;
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
 
   meta = {
     description = "Remote shell that automatically reconnects without interrupting the session";

From ac361885db47dbaeb2af346f7a8b6b0d1663bcf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= <tomas.riveral@icloud.com>
Date: Sun, 2 Aug 2026 16:11:37 +0200
Subject: [PATCH 038/205] eternal-terminal: add mainProgram

---
 pkgs/by-name/et/eternal-terminal/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/et/eternal-terminal/package.nix b/pkgs/by-name/et/eternal-terminal/package.nix
index c88cdba172b7..18f1c5f3120a 100644
--- a/pkgs/by-name/et/eternal-terminal/package.nix
+++ b/pkgs/by-name/et/eternal-terminal/package.nix
@@ -64,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
       jshort
       tomasrivera
     ];
+    mainProgram = "et";
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 })

From 6fc95f3f7350f11551201d634f5afee6b3600cf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= <tomas.riveral@icloud.com>
Date: Sun, 2 Aug 2026 16:19:15 +0200
Subject: [PATCH 039/205] eternal-terminal: add nix-update-script

---
 pkgs/by-name/et/eternal-terminal/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/et/eternal-terminal/package.nix b/pkgs/by-name/et/eternal-terminal/package.nix
index 18f1c5f3120a..088e092afc3f 100644
--- a/pkgs/by-name/et/eternal-terminal/package.nix
+++ b/pkgs/by-name/et/eternal-terminal/package.nix
@@ -9,7 +9,8 @@
   protobuf,
   zlib,
   catch2,
-  versionCheckHook
+  versionCheckHook,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -55,6 +56,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Remote shell that automatically reconnects without interrupting the session";
     homepage = "https://eternalterminal.dev/";

From b447e90939dab503ebcec8cb81d7e6693b4ca079 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= <tomas.riveral@icloud.com>
Date: Sun, 2 Aug 2026 16:25:41 +0200
Subject: [PATCH 040/205] eternal-terminal: 6.2.11 -> 7.0.0

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

diff --git a/pkgs/by-name/et/eternal-terminal/package.nix b/pkgs/by-name/et/eternal-terminal/package.nix
index 088e092afc3f..a850d7607316 100644
--- a/pkgs/by-name/et/eternal-terminal/package.nix
+++ b/pkgs/by-name/et/eternal-terminal/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "eternal-terminal";
-  version = "6.2.11";
+  version = "7.0.0";
 
   src = fetchFromGitHub {
     owner = "MisterTea";
     repo = "EternalTerminal";
     tag = "et-v${finalAttrs.version}";
-    hash = "sha256-d3mCZQO12NUQjGIOX1FWTLUq+adMTNb9QYCSU3ibZMY=";
+    hash = "sha256-uZnjtSubTljFlbIZEznfEmNRaUWsuZotRapn0wexkow=";
   };
 
   nativeBuildInputs = [

From f4343cb2bfdce4f80b99a80952f874f4b5ed34ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= <tomas.riveral@icloud.com>
Date: Sun, 2 Aug 2026 17:36:37 +0200
Subject: [PATCH 041/205] eternal-terminal: checkPhase use ctest without
 et-test.LargeInputNoDeadlock

Assisted-by: OpenAI ChatGPT GPT-5.5-mini
https://chatgpt.com/share/6a6f64a2-9c14-83eb-964f-83f11335613e
---
 pkgs/by-name/et/eternal-terminal/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/et/eternal-terminal/package.nix b/pkgs/by-name/et/eternal-terminal/package.nix
index a850d7607316..399a1d539608 100644
--- a/pkgs/by-name/et/eternal-terminal/package.nix
+++ b/pkgs/by-name/et/eternal-terminal/package.nix
@@ -55,6 +55,9 @@ stdenv.mkDerivation (finalAttrs: {
   doInstallCheck = true;
 
   nativeInstallCheckInputs = [ versionCheckHook ];
+  checkPhase = ''
+    ctest --output-on-failure -E 'et-test\.LargeInputNoDeadlock'
+  '';
 
   passthru.updateScript = nix-update-script { };
 

From a52049b1ee49509eb75262a1d5d9d9f3b8491d61 Mon Sep 17 00:00:00 2001
From: James Alseth <james@jalseth.me>
Date: Sun, 2 Aug 2026 09:56:57 -0700
Subject: [PATCH 042/205] nordic: Revert removal and remove GTK2

This mostly reverts commit 6b579784d561fdc643e91c644687b95602eb4bb4, but
removes GTK2 dependencies to not conflict with the removal of
`gtk-engine-murrine` from nixpkgs.
---
 pkgs/by-name/no/nordic/package.nix | 163 +++++++++++++++++++++++++++++
 pkgs/top-level/aliases.nix         |   1 -
 2 files changed, 163 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/no/nordic/package.nix

diff --git a/pkgs/by-name/no/nordic/package.nix b/pkgs/by-name/no/nordic/package.nix
new file mode 100644
index 000000000000..2b18bca95da5
--- /dev/null
+++ b/pkgs/by-name/no/nordic/package.nix
@@ -0,0 +1,163 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  jdupes,
+  kdePackages,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "nordic";
+  version = "2.2.0-unstable-2025-05-05";
+
+  srcs = [
+    (fetchFromGitHub {
+      owner = "EliverLara";
+      repo = "nordic";
+      rev = "d9b5c42cebf9a165bcce7b6b8a019f5cfd5b789c";
+      hash = "sha256-OkXjwaoXyWfTgNkeU+ab+uv+U/5OaJ8oTt/G8YLz84o=";
+      name = "Nordic";
+    })
+
+    (fetchFromGitHub {
+      owner = "EliverLara";
+      repo = "nordic";
+      rev = "361f0d1d23177a1154d415f793ce52a2c09629d4";
+      hash = "sha256-0IBuCMbHxTL3YtIK35g9xiBEs1DZgA4MwMAVPIw3Omk=";
+      name = "Nordic-standard-buttons";
+    })
+
+    (fetchFromGitHub {
+      owner = "EliverLara";
+      repo = "nordic";
+      rev = "bf05d41c7c7cd03e391854739bcc843fc6053ced";
+      hash = "sha256-AjVvciUrm/X3U6Pmo52ZrucLRJdsRFPeEMRwSKyjwi4=";
+      name = "Nordic-darker";
+    })
+
+    (fetchFromGitHub {
+      owner = "EliverLara";
+      repo = "nordic";
+      rev = "98cdf88d77fa7f0535ff660148e0ccbabe47a579";
+      hash = "sha256-70l5+renDhniZroPoMrCHsPgT6Pg3cr5w86LjkaWchg=";
+      name = "Nordic-darker-standard-buttons";
+    })
+
+    (fetchFromGitHub {
+      owner = "EliverLara";
+      repo = "nordic";
+      rev = "f1e43cf9ba83602f73f71407a8a4ba768122b7f4";
+      hash = "sha256-yLE/M9PXfQv2JD+HTsBHFiFaKuY8vOkZiOlQLLON+HM=";
+      name = "Nordic-bluish-accent";
+    })
+
+    (fetchFromGitHub {
+      owner = "EliverLara";
+      repo = "nordic";
+      rev = "52a37ebce50f948129507e4804240d9e7788a7a2";
+      hash = "sha256-zwnCaS08vceHjFHn9ET2509Zat7a1gHEG1RDR+xrbhc=";
+      name = "Nordic-bluish-accent-standard-buttons";
+    })
+
+    (fetchFromGitHub {
+      owner = "EliverLara";
+      repo = "nordic-polar";
+      rev = "24dc0325c4a38508039f5fee9a5391c1d9d8d5d5";
+      hash = "sha256-Y3PFuIc7UPbRg9NZie4buKCUiMXzl5idg7LSrj/lsos=";
+      name = "Nordic-Polar";
+    })
+
+    (fetchFromGitHub {
+      owner = "EliverLara";
+      repo = "nordic-polar";
+      rev = "fe0d657613a1e6330fa8c41378c324af93a42c3a";
+      hash = "sha256-fusSDXawWttXWQfGloRkpkHWvfLPuljm1l0BpAKvNSg=";
+      name = "Nordic-Polar-standard-buttons";
+    })
+  ];
+
+  sourceRoot = ".";
+
+  outputs = [
+    "out"
+    "sddm"
+  ];
+
+  nativeBuildInputs = [ jdupes ];
+
+  dontWrapQtApps = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    # install theme files
+    mkdir -p $out/share/themes
+    cp -a Nordic* $out/share/themes
+
+    # remove uneeded files
+    rm -r $out/share/themes/*/.gitignore
+    rm -r $out/share/themes/*/Art
+    rm -r $out/share/themes/*/FUNDING.yml
+    rm -r $out/share/themes/*/LICENSE
+    rm -r $out/share/themes/*/README.md
+    rm -r $out/share/themes/*/{package.json,package-lock.json,Gulpfile.js}
+    rm -r $out/share/themes/*/src
+    rm -r $out/share/themes/*/cinnamon/*.scss
+    rm -r $out/share/themes/*/gnome-shell/{earlier-versions,extensions,*.scss}
+    rm -r $out/share/themes/*/gtk-2.0
+    rm -r $out/share/themes/*/gtk-3.0/{apps,widgets,*.scss}
+    rm -r $out/share/themes/*/gtk-4.0/{apps,widgets,*.scss}
+    rm -r $out/share/themes/*/xfwm4/{assets,render_assets.fish}
+
+    # move wallpapers to appropriate directory
+    mkdir -p $out/share/wallpapers/Nordic
+    mv -v $out/share/themes/Nordic/extras/wallpapers/* $out/share/wallpapers/Nordic/
+    rmdir $out/share/themes/Nordic/extras{/wallpapers,}
+
+    # move kde related contents to appropriate directories
+    mkdir -p $out/share/{aurorae/themes,color-schemes,Kvantum,plasma,icons}
+    mv -v $out/share/themes/Nordic/kde/aurorae/* $out/share/aurorae/themes/
+    mv -v $out/share/themes/Nordic/kde/colorschemes/* $out/share/color-schemes/
+    mv -v $out/share/themes/Nordic/kde/konsole $out/share/
+    mv -v $out/share/themes/Nordic/kde/kvantum/* $out/share/Kvantum/
+    cp -vr $out/share/themes/Nordic/kde/plasma/look-and-feel $out/share/plasma/look-and-feel/
+    mv -v $out/share/themes/Nordic/kde/plasma/look-and-feel $out/share/plasma/desktoptheme/
+    mv -v $out/share/themes/Nordic/kde/folders/* $out/share/icons/
+    mv -v $out/share/themes/Nordic/kde/cursors/*-cursors $out/share/icons/
+
+    rm -rf $out/share/plasma/look-and-feel/*/contents/{logout,osd,components}
+    rm -rf $out/share/plasma/desktoptheme/*/contents/{defaults,splash,previews}
+    rm -rf $out/share/Kvantum/*.tar.xz
+
+    mkdir -p $sddm/share/sddm/themes
+    mv -v $out/share/themes/Nordic/kde/sddm/* $sddm/share/sddm/themes/
+
+    rm -rf $out/share/themes/Nordic/kde
+
+    # Replace duplicate files with symbolic links to the first file in
+    # each set of duplicates, reducing the installed size in about 53%
+    jdupes --quiet --link-soft --recurse $out/share
+
+    # FIXME: https://github.com/EliverLara/Nordic/issues/331
+    echo "Removing broken symlinks ..."
+    find $out -xtype l -print -delete
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    mkdir -p $sddm/nix-support
+
+    # avoid .dev outputs propagation
+    printWords ${kdePackages.breeze-icons.out} ${kdePackages.libplasma.out} ${kdePackages.plasma-workspace.out} \
+      >> $sddm/nix-support/propagated-build-inputs
+  '';
+
+  meta = {
+    description = "Gtk and KDE themes using the Nord color pallete";
+    homepage = "https://github.com/EliverLara/Nordic";
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 08d69741489e..0025c2a82db3 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1759,7 +1759,6 @@ mapAliases {
   nodePackages_latest = throw "nodePackages has been removed. Many packages are now available at the top level (e.g. `pkgs.package-name`). Check on https://search.nixos.org to see if the package is still available."; # Added 2026-03-03
   nofi = throw "'nofi' has been removed due to being archived upstream."; # Added 2026-01-16
   nomacs-qt6 = nomacs; # Added 2025-08-30
-  nordic = throw "'nordic' has been removed because it depended on 'gtk-engine-murrine', which was removed because it was unmaintained upstream and depended on GTK 2."; # Added 2026-07-22
   norouter = throw "norouter has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-29
   notary = throw "'notary' has been removed due to being archived upstream. Consider using 'notation' instead."; # Added 2025-11-13
   notepadqq = throw "'notepadqq' has been removed due to upstream stopping maintenance in 2023."; # Added 2026-02-10

From 641ee1bde06d9ac1d1f4324ffbabf81ae3dc20b7 Mon Sep 17 00:00:00 2001
From: bitsyndicate <contact@bitsyndicate.de>
Date: Mon, 3 Aug 2026 23:01:43 +0200
Subject: [PATCH 043/205] nixos/zsh: add package option

Add an option to the `programs.zsh` module to allow providing a custom
zsh package.
---
 nixos/modules/programs/zsh/zsh.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index 879b802a5db6..10313bd5731a 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -58,6 +58,8 @@ in
         type = lib.types.bool;
       };
 
+      package = lib.mkPackageOption pkgs "zsh" { };
+
       shellAliases = lib.mkOption {
         default = { };
         description = ''
@@ -195,7 +197,7 @@ in
           . ${config.system.build.setEnvironment}
       fi
 
-      HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help"
+      HELPDIR="${cfg.package}/share/zsh/$ZSH_VERSION/help"
 
       # Tell zsh how to find installed completions.
       for p in ''${(z)NIX_PROFILES}; do
@@ -307,7 +309,7 @@ in
     environment.etc.zinputrc.text = builtins.readFile ./zinputrc;
 
     environment.systemPackages = [
-      pkgs.zsh
+      cfg.package
     ]
     ++ lib.optional cfg.enableCompletion pkgs.nix-zsh-completions;
 
@@ -317,7 +319,7 @@ in
 
     environment.shells = [
       "/run/current-system/sw/bin/zsh"
-      "${pkgs.zsh}/bin/zsh"
+      "${cfg.package}/bin/zsh"
     ];
 
   };

From 855c95817188cf9cc4ba4d916399c192c8788df9 Mon Sep 17 00:00:00 2001
From: eymeric <hatchchien@protonmail.com>
Date: Wed, 5 Aug 2026 16:06:11 +0700
Subject: [PATCH 044/205] mautrix-meta: add mautrix-instagram binary build

---
 pkgs/by-name/ma/mautrix-meta/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ma/mautrix-meta/package.nix b/pkgs/by-name/ma/mautrix-meta/package.nix
index 81703b68f81f..3ca0d7d53454 100644
--- a/pkgs/by-name/ma/mautrix-meta/package.nix
+++ b/pkgs/by-name/ma/mautrix-meta/package.nix
@@ -18,7 +18,10 @@ buildGoModule rec {
   version = "26.07";
   tag = "v0.2607.0";
 
-  subPackages = [ "cmd/mautrix-meta" ];
+  subPackages = [
+    "cmd/mautrix-meta"
+    "cmd/mautrix-instagram"
+  ];
 
   src = fetchFromGitHub {
     owner = "mautrix";

From 0ca90c55e00641b0d95eee609df8de48c87dd80e Mon Sep 17 00:00:00 2001
From: eymeric <hatchchien@protonmail.com>
Date: Wed, 5 Aug 2026 16:06:35 +0700
Subject: [PATCH 045/205] nixos/mautrix-meta: automatically select the right
 binary based on mode instagram or others

---
 nixos/modules/services/matrix/mautrix-meta.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/matrix/mautrix-meta.nix b/nixos/modules/services/matrix/mautrix-meta.nix
index a0576c79edb3..1645ef3cdc8a 100644
--- a/nixos/modules/services/matrix/mautrix-meta.nix
+++ b/nixos/modules/services/matrix/mautrix-meta.nix
@@ -18,6 +18,7 @@ let
   settingsFileUnsubstituted = cfg: settingsFormat.generate "mautrix-meta-config.yaml" cfg.settings;
 
   metaName = name: "mautrix-meta-${name}";
+  packageName = network: if network == "instagram" then "mautrix-instagram" else "mautrix-meta";
 
   enabledInstances = lib.filterAttrs (
     name: config: config.enable
@@ -471,7 +472,7 @@ in
               cp '${settingsFile cfg}' '${settingsFile cfg}.tmp'
 
               echo "Generating registration file"
-              mautrix-meta \
+              ${lib.getExe' upperCfg.package (packageName cfg.settings.network.mode)} \
                 --generate-registration \
                 --config='${settingsFile cfg}.tmp' \
                 --registration='${cfg.registrationFile}'
@@ -568,7 +569,7 @@ in
               EnvironmentFile = cfg.environmentFile;
 
               ExecStart = lib.escapeShellArgs [
-                (lib.getExe upperCfg.package)
+                (lib.getExe' upperCfg.package (packageName cfg.settings.network.mode))
                 "--config=${settingsFile cfg}"
               ];
             };

From 10be65e30c06ba5f93aea196ee55370a99a0b304 Mon Sep 17 00:00:00 2001
From: AstroSnail <astrosnail@protonmail.com>
Date: Wed, 5 Aug 2026 16:39:14 +0000
Subject: [PATCH 046/205] nixos/transmission: wait for network-online.target

Transmission seems to have trouble opening Local Peer Discovery
listeners when it starts before the network is fully up.

Delaying it until after network-online.target seems to fix it, and this
appears to be the same solution found in the service file from upstream.

Fixes #549497.
---
 nixos/modules/services/torrent/transmission.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index 75dbe6886b5f..2ef6fd97563a 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -383,7 +383,8 @@ in
 
     systemd.services.transmission = {
       description = "Transmission BitTorrent Service";
-      after = [ "network.target" ] ++ optional apparmor.enable "apparmor.service";
+      wants = [ "network-online.target" ];
+      after = [ "network-online.target" ] ++ optional apparmor.enable "apparmor.service";
       requires = optional apparmor.enable "apparmor.service";
       wantedBy = [ "multi-user.target" ];
 

From 5c8d21794502f12cceeead8c4767a0589656edd3 Mon Sep 17 00:00:00 2001
From: ivy forever <ivy@ivy.rs>
Date: Wed, 5 Aug 2026 10:35:29 +0100
Subject: [PATCH 047/205] keymapp: fix aarch64-linux meta.platforms (upstream
 only ships an x86_64 Linux build)

Assisted-by: Claude Code (claude-sonnet-5)
---
 pkgs/by-name/ke/keymapp/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ke/keymapp/package.nix b/pkgs/by-name/ke/keymapp/package.nix
index ca95ba677ca6..ac20c1f6b7c7 100644
--- a/pkgs/by-name/ke/keymapp/package.nix
+++ b/pkgs/by-name/ke/keymapp/package.nix
@@ -16,16 +16,15 @@ let
   pname = "keymapp";
   version = "1.3.7";
 
-  sources = rec {
+  sources = {
     aarch64-darwin = {
       url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.dmg";
       hash = "sha256-H6xRau7pWuSF5Aa6lblwi/Lg5KxC+HM3rtUMjX+hEE8=";
     };
-    aarch64-linux = {
+    x86_64-linux = {
       url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.tar.gz";
       hash = "sha256-qHvHCDzWRhuhDg2kuU8kmikQDXElQtVEmPAelHz4aPo=";
     };
-    x86_64-linux = aarch64-linux;
   };
   src = fetchurl {
     inherit (sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}")) url hash;
@@ -39,7 +38,7 @@ let
       jankaifer
       shawn8901
     ];
-    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin;
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     license = lib.licenses.unfree;
   };

From 4ca575f954ece1b831e41ef1908fcaac2d86d678 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Aug 2026 13:04:58 +0000
Subject: [PATCH 048/205] intel-gmmlib: 22.10.0 -> 22.10.1

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

diff --git a/pkgs/by-name/in/intel-gmmlib/package.nix b/pkgs/by-name/in/intel-gmmlib/package.nix
index 0fe1f6a0d62d..4b8e05d6cad9 100644
--- a/pkgs/by-name/in/intel-gmmlib/package.nix
+++ b/pkgs/by-name/in/intel-gmmlib/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "intel-gmmlib";
-  version = "22.10.0";
+  version = "22.10.1";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "gmmlib";
     tag = "intel-gmmlib-${finalAttrs.version}";
-    hash = "sha256-1JF9zb5aqvUkiPVyDxrmhEC90NwRi/AGQEamEub3gS4=";
+    hash = "sha256-BxFyCL3ny5pdhfnfjurSltgtoNEZ9gnWMKt6oW1i+gI=";
   };
 
   nativeBuildInputs = [ cmake ];

From 1a91a7b5ec605ff726d5b0064410dc3f41402624 Mon Sep 17 00:00:00 2001
From: Santhosh Raju <santhosh.raju@gmail.com>
Date: Fri, 15 May 2026 08:43:10 +0200
Subject: [PATCH 049/205] annot: init at 0.19.0

---
 pkgs/by-name/an/annot/package.nix | 129 ++++++++++++++++++++++++++++++
 1 file changed, 129 insertions(+)
 create mode 100644 pkgs/by-name/an/annot/package.nix

diff --git a/pkgs/by-name/an/annot/package.nix b/pkgs/by-name/an/annot/package.nix
new file mode 100644
index 000000000000..c18deeffdb8a
--- /dev/null
+++ b/pkgs/by-name/an/annot/package.nix
@@ -0,0 +1,129 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+
+  jq,
+  moreutils,
+  pnpm_10,
+  fetchPnpmDeps,
+  pnpmConfigHook,
+  nodejs,
+  cargo-tauri,
+  pkg-config,
+  wrapGAppsHook3,
+  makeBinaryWrapper,
+  git,
+  jujutsu,
+
+  libsoup_3,
+  openssl,
+  webkitgtk_4_1,
+
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "annot";
+  version = "0.19.0";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  src = fetchFromGitHub {
+    owner = "denolehov";
+    repo = "annot";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-T9CG5S0H90xYNP5QcbuINNEIEGLVCqR7HRX4XYNrgM4=";
+  };
+
+  pnpmDeps = fetchPnpmDeps {
+    inherit (finalAttrs) pname version src;
+    pnpm = pnpm_10;
+    fetcherVersion = 3;
+    hash = "sha256-OHsq/So4YhonxSnT4fByZnlPnpYvjcf0UuHHgBGVIf8=";
+  };
+
+  postPatch = ''
+    jq '.bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json
+  '';
+
+  cargoRoot = "src-tauri";
+  buildAndTestSubdir = finalAttrs.cargoRoot;
+
+  cargoHash = "sha256-F38w6rLm4VQ72p5DE/d92+vzy9ovX6P03r4Y+hGh7yc=";
+
+  nativeBuildInputs = [
+    jq
+    moreutils
+    pnpmConfigHook
+    pnpm_10
+    nodejs
+    cargo-tauri.hook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    pkg-config
+    wrapGAppsHook3
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    makeBinaryWrapper
+  ];
+
+  nativeCheckInputs = [
+    git
+    jujutsu
+  ];
+
+  buildInputs =
+    lib.optionals stdenv.hostPlatform.isLinux [
+      libsoup_3
+      openssl
+      webkitgtk_4_1
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      openssl
+    ];
+
+  # pnpmConfigHook runs with --ignore-scripts, so the postinstall that copies
+  # Excalidraw fonts from node_modules into static/ must be run manually.
+  preBuild = ''
+    node scripts/copy-excalidraw-fonts.js
+  '';
+
+  # Disable automatic wrapper to handle it manually per platform
+  dontWrapGApps = stdenv.hostPlatform.isLinux;
+
+  postFixup =
+    lib.optionalString stdenv.hostPlatform.isLinux ''
+      wrapGApp "$out/bin/annot"
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      makeWrapper "$out/Applications/annot.app/Contents/MacOS/annot" "$out/bin/annot"
+    '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Human-in-the-loop annotation tool for AI workflows";
+    longDescription = ''
+      annot is an annotation tool for human-in-the-loop AI workflows. AI
+      agents work fast, but vague feedback is a lossy channel. When an agent
+      drafts a plan, proposes a refactor, or generates code, annot provides a
+      moment of structured review: it opens a native window, you annotate
+      specific lines with located, typed comments, then it closes and returns
+      structured output to the agent.
+
+      annot can be used as a standalone CLI (open a file, annotate, get
+      output) or as an MCP server, allowing AI agents to block on human
+      review mid-workflow. It supports reviewing files, diffs, and
+      agent-generated content, with optional exit modes so the human can
+      signal approval, rejection, or custom next steps.
+    '';
+    homepage = "https://github.com/denolehov/annot";
+    license = lib.licenses.agpl3Only;
+    mainProgram = "annot";
+    maintainers = with lib.maintainers; [ fraggerfox ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+  };
+})

From 448f44262374f25d87c6397844c07bfa2122bd83 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 6 Jun 2026 05:30:16 +0000
Subject: [PATCH 050/205] python3Packages.command-runner: 1.7.5 -> 1.7.6

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

diff --git a/pkgs/development/python-modules/command-runner/default.nix b/pkgs/development/python-modules/command-runner/default.nix
index af42fd3f0bbb..bae93487e7cb 100644
--- a/pkgs/development/python-modules/command-runner/default.nix
+++ b/pkgs/development/python-modules/command-runner/default.nix
@@ -3,22 +3,22 @@
   buildPythonPackage,
   fetchFromGitHub,
   psutil,
-  setuptools,
+  setuptools_80,
 }:
 
 buildPythonPackage rec {
   pname = "command-runner";
-  version = "1.7.5";
+  version = "1.7.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "netinvent";
     repo = "command_runner";
     tag = "v${version}";
-    hash = "sha256-jGYIz+c6wt137b8kG1QVVAvBAaJQAzNnZyKVeKHIk5c=";
+    hash = "sha256-/xfpvEU3yWWXz+xsntht9NY3kUenc7S1Sw8hRZbM/fQ=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ setuptools_80 ];
 
   dependencies = [ psutil ];
 

From 5837a3b4647cb07555e650d11ac518a564c4f7f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 6 Aug 2026 21:07:24 +0200
Subject: [PATCH 051/205] librenms: 26.6.1 -> 26.7.0

Diff: https://github.com/librenms/librenms/compare/26.6.1...26.7.0
---
 pkgs/by-name/li/librenms/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/librenms/package.nix b/pkgs/by-name/li/librenms/package.nix
index e99be2d3f16f..3356cdcf2169 100644
--- a/pkgs/by-name/li/librenms/package.nix
+++ b/pkgs/by-name/li/librenms/package.nix
@@ -24,16 +24,16 @@ let
 in
 phpPackage.buildComposerProject2 rec {
   pname = "librenms";
-  version = "26.6.1";
+  version = "26.7.0";
 
   src = fetchFromGitHub {
     owner = "librenms";
     repo = "librenms";
     tag = version;
-    hash = "sha256-RuKUdOopU8NDhsvYH1TIOdKzx5WMF9lfygZ7Ox8VM0E=";
+    hash = "sha256-BH5ucY+xd5K325mKdzw4vHu4f3v/R3iCsqlG/YZboWM=";
   };
 
-  vendorHash = "sha256-evJriHdnKSVD9sDZj0xWyLmUPD/LgM8X8p8U5NwXwqk=";
+  vendorHash = "sha256-vzEBZDe3tpLgl7f0kJniwv56r1MsJSSkPxeYW1zM0pI=";
 
   php = phpPackage;
 

From b67eafae4e9d10383bd7329549f944402c8beeb2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Aug 2026 00:29:28 +0000
Subject: [PATCH 052/205] shiru: 6.7.1 -> 6.8.0

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

diff --git a/pkgs/by-name/sh/shiru/package.nix b/pkgs/by-name/sh/shiru/package.nix
index 45315765b5c7..4c786b5fa336 100644
--- a/pkgs/by-name/sh/shiru/package.nix
+++ b/pkgs/by-name/sh/shiru/package.nix
@@ -19,13 +19,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "shiru";
-  version = "6.7.1";
+  version = "6.8.0";
 
   src = fetchFromGitHub {
     owner = "RockinChaos";
     repo = "shiru";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hlxwpTQp8ZD1dGeo2eKeE7MPZSi/qV74Q+5NEox5UkY=";
+    hash = "sha256-9bSFTjoQSslye0kML8co0QKTLaN9KOMo8W3QEMxOeqE=";
   };
 
   patches = [
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
       cd electron
     '';
     fetcherVersion = 3;
-    hash = "sha256-dBoVmqSnJG0KsvLuZQVoZWX4m1BEqLYumofbNHgPgz0=";
+    hash = "sha256-4WlYGN5MicJZ9b/XObLjttznLh24DEbQwLS/rW4mrsI=";
   };
 
   buildPhase = ''

From a6a86e4929a19fdf6d8b449607b2b446f740edae Mon Sep 17 00:00:00 2001
From: eymeric <hatchchien@protonmail.com>
Date: Fri, 7 Aug 2026 08:26:25 +0700
Subject: [PATCH 053/205] nixos/mautrix-meta: update settings description
 example generation method

---
 nixos/modules/services/matrix/mautrix-meta.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/matrix/mautrix-meta.nix b/nixos/modules/services/matrix/mautrix-meta.nix
index 1645ef3cdc8a..9fbd58b18d2a 100644
--- a/nixos/modules/services/matrix/mautrix-meta.nix
+++ b/nixos/modules/services/matrix/mautrix-meta.nix
@@ -201,8 +201,10 @@ in
                   '';
                   description = ''
                     {file}`config.yaml` configuration as a Nix attribute set.
-                    Configuration options should match those described in
-                    [example-config.yaml](https://github.com/mautrix/meta/blob/main/example-config.yaml).
+                    Configuration options should match those described in the example configuration.
+                    Get an example configuration by executing one of those commands
+                      - `mautrix-meta -c example.yaml --generate-example-config`
+                      - `mautrix-instagram -c example.yaml --generate-example-config`
 
                     Secret tokens should be specified using {option}`environmentFile`
                     instead

From 61c0c7acdb6a43eaa0d8bd77429f38a768e7a5b4 Mon Sep 17 00:00:00 2001
From: eymeric <hatchchien@protonmail.com>
Date: Thu, 6 Aug 2026 09:45:27 +0700
Subject: [PATCH 054/205] nixos/tests/matrix/mautrix-meta: fix tests for newer
 mautrix versions

Co-authored-by: Gemini CLI
---
 nixos/tests/matrix/mautrix-meta-postgres.nix | 35 ++++++++-----
 nixos/tests/matrix/mautrix-meta-sqlite.nix   | 54 +++++++++++++-------
 2 files changed, 58 insertions(+), 31 deletions(-)

diff --git a/nixos/tests/matrix/mautrix-meta-postgres.nix b/nixos/tests/matrix/mautrix-meta-postgres.nix
index b1ecf5da3cdd..bf28b889ecec 100644
--- a/nixos/tests/matrix/mautrix-meta-postgres.nix
+++ b/nixos/tests/matrix/mautrix-meta-postgres.nix
@@ -90,12 +90,21 @@ in
               as_token = "$AS_TOKEN";
               hs_token = "$HS_TOKEN";
 
-              database = {
-                type = "postgres";
-                uri = "postgres:///mautrix-meta-instagram?host=/var/run/postgresql";
+              bot = {
+                username = botUserName;
+                avatar = "";
               };
+            };
 
-              bot.username = botUserName;
+            database = {
+              type = "postgres";
+              uri = "postgres:///mautrix-meta-instagram?host=/var/run/postgresql";
+            };
+
+            encryption = {
+              allow = false;
+              default = false;
+              require = false;
             };
 
             bridge.permissions."@${userName}:server" = "user";
@@ -127,13 +136,14 @@ in
               import functools
               import asyncio
 
-              from nio import AsyncClient, RoomMessageNotice, RoomCreateResponse, RoomInviteResponse
+              from nio import AsyncClient, RoomMessageText, RoomCreateResponse, RoomInviteResponse
 
 
-              async def message_callback(matrix: AsyncClient, msg: str, _r, e):
+              async def message_callback(matrix: AsyncClient, expected_msg: str, expected_sender: str, _r, e):
                   print("Received matrix text message: ", e)
-                  assert msg in e.body
-                  exit(0)  # Success!
+                  if getattr(e, "sender", "") == expected_sender and expected_msg in getattr(e, "body", ""):
+                      print("Success!")
+                      exit(0)  # Success!
 
 
               async def run(homeserver: str):
@@ -151,9 +161,9 @@ in
                   assert isinstance(response, RoomInviteResponse)
 
                   callback = functools.partial(
-                      message_callback, matrix, "Hello, I'm an Instagram bridge bot."
+                      message_callback, matrix, "Hello, I'm a Instagram bridge bot.", "@${botUserName}:${homeserverDomain}"
                   )
-                  matrix.add_event_callback(callback, RoomMessageNotice)
+                  matrix.add_event_callback(callback, RoomMessageText)
 
                   print("Waiting for matrix message...")
                   await matrix.sync_forever(timeout=30000)
@@ -171,11 +181,10 @@ in
     def extract_token(data):
         stdout = data[1]
         stdout = stdout.strip()
-        line = stdout.split('\n')[-1]
-        return line.split(':')[-1].strip("\" '\n")
+        return stdout.split(':')[-1].strip("\" '\n")
 
     def get_token_from(token, file):
-        data = server.execute(f"cat {file} | grep {token}")
+        data = server.execute(f"grep -E '^\\s*{token}:' {file}")
         return extract_token(data)
 
     def get_as_token_from(file):
diff --git a/nixos/tests/matrix/mautrix-meta-sqlite.nix b/nixos/tests/matrix/mautrix-meta-sqlite.nix
index d4692dec718e..085910eeb19b 100644
--- a/nixos/tests/matrix/mautrix-meta-sqlite.nix
+++ b/nixos/tests/matrix/mautrix-meta-sqlite.nix
@@ -4,7 +4,7 @@ let
   homeserverUrl = "http://server:8008";
   username = "alice";
   instagramBotUsername = "instagrambot";
-  facebookBotUsername = "facebookbot";
+  metaBotUsername = "metabot";
 in
 {
   name = "mautrix-meta-sqlite";
@@ -60,7 +60,16 @@ in
             appservice = {
               port = 8009;
 
-              bot.username = facebookBotUsername;
+              bot = {
+                username = metaBotUsername;
+                avatar = "";
+              };
+            };
+
+            encryption = {
+              allow = false;
+              default = false;
+              require = false;
             };
 
             bridge.permissions."@${username}:server" = "user";
@@ -79,7 +88,16 @@ in
             appservice = {
               port = 8010;
 
-              bot.username = instagramBotUsername;
+              bot = {
+                username = instagramBotUsername;
+                avatar = "";
+              };
+            };
+
+            encryption = {
+              allow = false;
+              default = false;
+              require = false;
             };
 
             bridge.permissions."@${username}:server" = "user";
@@ -136,16 +154,17 @@ in
               import functools
               import asyncio
 
-              from nio import AsyncClient, RoomMessageNotice, RoomCreateResponse, RoomInviteResponse
+              from nio import AsyncClient, RoomMessageText, RoomCreateResponse, RoomInviteResponse
 
 
-              async def message_callback(matrix: AsyncClient, msg: str, _r, e):
+              async def message_callback(matrix: AsyncClient, expected_msg: str, expected_sender: str, _r, e):
                   print("Received matrix text message: ", e)
-                  assert msg in e.body
-                  exit(0)  # Success!
+                  if getattr(e, "sender", "") == expected_sender and expected_msg in getattr(e, "body", ""):
+                      print("Success!")
+                      exit(0)  # Success!
 
 
-              async def run(username: str, bot_username: str, homeserver: str):
+              async def run(username: str, bot_username: str, homeserver: str, expected_msg: str):
                   matrix = AsyncClient(homeserver, f"@{username}:${homeserverDomain}")
 
                   response = await matrix.login("foobar")
@@ -161,16 +180,16 @@ in
                   assert isinstance(response, RoomInviteResponse)
 
                   callback = functools.partial(
-                      message_callback, matrix, "Hello, I'm an Instagram bridge bot."
+                      message_callback, matrix, expected_msg, f"@{bot_username}:${homeserverDomain}"
                   )
-                  matrix.add_event_callback(callback, RoomMessageNotice)
+                  matrix.add_event_callback(callback, RoomMessageText)
 
                   print("Waiting for matrix message...")
                   await matrix.sync_forever(timeout=30000)
 
 
               if __name__ == "__main__":
-                  asyncio.run(run(sys.argv[1], sys.argv[2], sys.argv[3]))
+                  asyncio.run(run(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4]))
             ''
           )
         ];
@@ -181,11 +200,10 @@ in
     def extract_token(data):
         stdout = data[1]
         stdout = stdout.strip()
-        line = stdout.split('\n')[-1]
-        return line.split(':')[-1].strip("\" '\n")
+        return stdout.split(':')[-1].strip("\" '\n")
 
     def get_token_from(token, file):
-        data = server.execute(f"cat {file} | grep {token}")
+        data = server.execute(f"grep -E '^\\s*{token}:' {file}")
         return extract_token(data)
 
     def get_as_token_from(file):
@@ -216,8 +234,8 @@ in
         client.succeed("register_user ${username} ${homeserverUrl} >&2")
 
     with subtest("ensure messages can be exchanged"):
-        client.succeed("do_test ${username} ${facebookBotUsername} ${homeserverUrl} >&2")
-        client.succeed("do_test ${username} ${instagramBotUsername} ${homeserverUrl} >&2")
+        client.succeed("do_test ${username} ${metaBotUsername} ${homeserverUrl} \"Hello, I'm a Facebook Messenger bridge bot.\" >&2")
+        client.succeed("do_test ${username} ${instagramBotUsername} ${homeserverUrl} \"Hello, I'm a Instagram bridge bot.\" >&2")
 
     with subtest("ensure as_token and hs_token stays same after restart"):
         generated_as_token_facebook = get_as_token_from(config_yaml)
@@ -252,7 +270,7 @@ in
         assert generated_hs_token_facebook == new_hs_token_facebook, f"hs_token should stay the same after restart inside the registration file (is: {new_hs_token_facebook}, was: {generated_hs_token_facebook})"
 
     with subtest("ensure messages can be exchanged after restart"):
-        client.succeed("do_test ${username} ${instagramBotUsername} ${homeserverUrl} >&2")
-        client.succeed("do_test ${username} ${facebookBotUsername} ${homeserverUrl} >&2")
+        client.succeed("do_test ${username} ${instagramBotUsername} ${homeserverUrl} \"Hello, I'm a Instagram bridge bot.\" >&2")
+        client.succeed("do_test ${username} ${metaBotUsername} ${homeserverUrl} \"Hello, I'm a Facebook Messenger bridge bot.\" >&2")
   '';
 }

From d4a4825a39aeed38231288c89feacfab1faab33c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Aug 2026 12:42:16 +0000
Subject: [PATCH 055/205] kstars: 3.8.3 -> 3.8.4.1

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

diff --git a/pkgs/by-name/ks/kstars/package.nix b/pkgs/by-name/ks/kstars/package.nix
index b4ab87c637b7..a06243901bb5 100644
--- a/pkgs/by-name/ks/kstars/package.nix
+++ b/pkgs/by-name/ks/kstars/package.nix
@@ -24,11 +24,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kstars";
-  version = "3.8.3";
+  version = "3.8.4.1";
 
   src = fetchurl {
     url = "mirror://kde/stable/kstars/${finalAttrs.version}/kstars-${finalAttrs.version}.tar.xz";
-    hash = "sha256-xez++JWHcQIx5Mk+TUeBrhcnbQNE4tqX31T9bthqGdU=";
+    hash = "sha256-5YymHJ15Y4ku+a740LgviLfp6b56NbE37hqi2CAw6r0=";
   };
 
   nativeBuildInputs = with kdePackages; [

From 5906cd4bb06d10bdb6b8cb65a51c89db97bfcb0a Mon Sep 17 00:00:00 2001
From: xoconoch <github@cordovault.com>
Date: Thu, 16 Jul 2026 16:10:13 -0600
Subject: [PATCH 056/205] buildOpenSCADPackage: init

Co-authored-by: Yueh-Shun Li <shamrocklee@posteo.net>
---
 .../build-openscad-package/default.nix        | 71 ++++++++++++++++
 pkgs/build-support/openscad/tests/default.nix | 81 +++++++++++++++++++
 pkgs/by-name/op/openscad/package.nix          | 30 ++++---
 pkgs/by-name/op/openscad/wrapper.nix          | 37 +++++++++
 pkgs/test/default.nix                         |  2 +
 pkgs/top-level/all-packages.nix               |  2 +
 pkgs/top-level/openscad-packages.nix          | 16 ++++
 7 files changed, 228 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/build-support/build-openscad-package/default.nix
 create mode 100644 pkgs/build-support/openscad/tests/default.nix
 create mode 100644 pkgs/by-name/op/openscad/wrapper.nix
 create mode 100644 pkgs/top-level/openscad-packages.nix

diff --git a/pkgs/build-support/build-openscad-package/default.nix b/pkgs/build-support/build-openscad-package/default.nix
new file mode 100644
index 000000000000..11bebe1bfb09
--- /dev/null
+++ b/pkgs/build-support/build-openscad-package/default.nix
@@ -0,0 +1,71 @@
+{
+  lib,
+  stdenvNoCC,
+  buildPackages,
+}:
+
+lib.extendMkDerivation {
+  constructDrv = stdenvNoCC.mkDerivation;
+  extendDrvArgs =
+    finalAttrs:
+    {
+      pname,
+      version,
+      libName ? pname,
+      installTargets ? [ "." ],
+
+      ...
+    }@args:
+
+    {
+      inherit
+        pname
+        version
+        libName
+        installTargets
+        ;
+
+      __structuredAttrs = true;
+      name = "openscad-package-${finalAttrs.pname}-${finalAttrs.version}";
+
+      strictDeps = true;
+
+      # Use the interactive Bash shell (with readline support) for the compgen shell built-in.
+      realBuilder = lib.getExe buildPackages.bash;
+
+      installPhase =
+        args.installPhase or ''
+          runHook preInstall
+
+          installDir="$out/share/openscad/libraries/$libName"
+          mkdir -p "$installDir"
+
+          for _target in "''${installTargets[@]}"; do
+            _targetDirName="$(dirname "$_target")"
+            _targetBaseName="$(basename "$_target")"
+            # Support globs using Bash's compgen built-in.
+            (
+              if [[ "$_targetDirName" != "." ]]; then
+                if ! cd "$_targetDirName"; then
+                  echo "ERROR: $name: Fails to switch to the dirname of $_target -- $_targetDirName" >&2
+                  exit 1
+                fi
+              fi
+              if [[ "$_targetBaseName" == "." ]]; then
+                echo "$_targetBaseName"
+              else
+                if ! compgen -G "$_targetBaseName"; then
+                  echo "ERROR: $name: Glob $_target does not match any files or directories." >&2
+                  exit 1
+                fi
+              fi
+            # Keep the number of input files per batch under Bash's command length limitation.
+            ) | while read -r _line; do
+              printf "%s/%s\0" "$_targetDirName" "$_line"
+            done | xargs -0 cp -r -t "$installDir"
+          done
+
+          runHook postInstall
+        '';
+    };
+}
diff --git a/pkgs/build-support/openscad/tests/default.nix b/pkgs/build-support/openscad/tests/default.nix
new file mode 100644
index 000000000000..598eada95b77
--- /dev/null
+++ b/pkgs/build-support/openscad/tests/default.nix
@@ -0,0 +1,81 @@
+{
+  lib,
+  stdenv,
+  runCommand,
+  openscad,
+  openscadPackages,
+}:
+
+let
+  # We may add more libraries as they get added
+  dummySrc = runCommand "mock-chaotic-repo" { } ''
+    mkdir -p $out/modules \
+             $out/unwanted-clutter \
+             $out/utils \
+             $out/"folder with spaces" \
+             $out/empty-dir \
+             $out/glob-char-\* \
+             $out/dot-files
+
+    echo "module main_core() { sphere(10); }" > $out/core.scad
+    echo "module main_utils() { cube(5); }" > $out/utils.scad
+    echo "module nested_mod() { cylinder(10); }" > $out/modules/shapes.scad
+    echo "module math_helpers() { cube(2); }" > $out/utils/math.scad
+
+    echo "module spaced() { sphere(1); }" > $out/"my file.scad"
+
+    echo "module weird() { echo(\"weird\"); }" > $out/glob-char-\*/actual.scad
+
+    echo "secret config" > $out/modules/.hidden-config
+
+    echo "print('broken script')" > $out/unwanted-clutter/dont_copy_me.py
+    echo "unwanted markdown" > $out/README.md
+  '';
+
+  openscadPackagesOverridden = openscadPackages.overrideScope (
+    openscadFinal: openscadPrev: {
+      dummylib = openscadFinal.buildOpenSCADPackage {
+        pname = "dummylib";
+        version = "1.0.0";
+        libName = "dummylib";
+        src = dummySrc;
+        installTargets = [
+          "core.scad"
+          "modules"
+          "my file.scad"
+          "glob-char-*"
+          "utils/*.scad"
+        ];
+      };
+    }
+  );
+
+  wrappedOpenscad = openscad.override {
+    openscadPackages = openscadPackagesOverridden;
+  };
+in
+lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
+  withPackages-glob-test =
+    runCommand "openscad-withPackages-glob-test"
+      {
+        nativeBuildInputs = [
+          (wrappedOpenscad.withPackages (ps: [ ps.dummylib ]))
+        ];
+      }
+      ''
+        openscad -o test.3mf - <<EOF
+        use <dummylib/core.scad>
+        use <dummylib/modules/shapes.scad>
+        use <dummylib/my file.scad>
+        use <dummylib/glob-char-*/actual.scad>
+        use <dummylib/math.scad>
+
+        main_core();
+        nested_mod();
+        spaced();
+        weird();
+        math_helpers();
+        EOF
+        touch $out
+      '';
+}
diff --git a/pkgs/by-name/op/openscad/package.nix b/pkgs/by-name/op/openscad/package.nix
index 7cf1da9371b2..e7f21c4c9df1 100644
--- a/pkgs/by-name/op/openscad/package.nix
+++ b/pkgs/by-name/op/openscad/package.nix
@@ -30,9 +30,11 @@
   wayland-protocols,
   wrapGAppsHook3,
   cairo,
+  callPackage,
   openscad,
   runCommand,
   versionCheckHook,
+  openscadPackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -209,16 +211,22 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "openscad";
   };
 
-  passthru.tests = {
-    lib3mf_support =
-      runCommand "${finalAttrs.pname}-lib3mf-support-test"
-        {
-          nativeBuildInputs = [ finalAttrs.finalPackage ];
-        }
-        ''
-          echo "cube([1, 1, 1]);" | openscad -o cube.3mf -
-          echo "import(\"cube.3mf\");" | openscad -o cube-import.3mf -
-          mv cube-import.3mf $out
-        '';
+  passthru = {
+    tests = lib.optionalAttrs (!stdenv.hostPlatform.isDarwin) {
+      lib3mf_support =
+        runCommand "${finalAttrs.pname}-lib3mf-support-test"
+          {
+            nativeBuildInputs = [ finalAttrs.finalPackage ];
+          }
+          ''
+            echo "cube([1, 1, 1]);" | openscad -o cube.3mf -
+            echo "import(\"cube.3mf\");" | openscad -o cube-import.3mf -
+            mv cube-import.3mf $out
+          '';
+    };
+    withPackages = callPackage ./wrapper.nix {
+      openscad = finalAttrs.finalPackage;
+      inherit openscadPackages;
+    };
   };
 })
diff --git a/pkgs/by-name/op/openscad/wrapper.nix b/pkgs/by-name/op/openscad/wrapper.nix
new file mode 100644
index 000000000000..e97890697573
--- /dev/null
+++ b/pkgs/by-name/op/openscad/wrapper.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  makeWrapper,
+  symlinkJoin,
+  buildEnv,
+  openscad,
+  openscadPackages,
+}:
+
+f:
+
+assert lib.assertMsg (lib.isFunction f)
+  "openscad.withPackages: Expected `f` to be callable (e.g., 'ps: [ ps.bosl2 ]'), but received a ${lib.typeOf f}.";
+
+let
+  selectedPackages = f openscadPackages;
+in
+
+symlinkJoin {
+  name = "${openscad.pname}-with-packages-${openscad.version}";
+  paths = [ openscad ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postBuild = ''
+    rm $out/bin/openscad
+
+    # Add the OPENSCADPATH environment variable
+    makeWrapper ${openscad}/bin/openscad $out/bin/openscad \
+      --set OPENSCADPATH ${lib.makeSearchPath "share/openscad/libraries" selectedPackages}
+  '';
+
+  passthru = {
+    unwrapped = openscad;
+    withPackages = openscad.withPackages;
+  };
+}
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index 63e8e2b32aae..76933b4b7e3a 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -271,4 +271,6 @@ in
   );
 
   home-assistant-components = recurseIntoAttrs pkgs.home-assistant.tests.components;
+
+  openscad = recurseIntoAttrs (callPackage ../build-support/openscad/tests { });
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89e8ab34a9ae..8822a4c52eb9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2670,6 +2670,8 @@ with pkgs;
     openrgb-plugin-hardwaresync
   ];
 
+  openscadPackages = lib.recurseIntoAttrs (callPackage ../top-level/openscad-packages.nix { });
+
   opensshPackages = dontRecurseIntoAttrs (callPackage ../tools/networking/openssh { });
 
   openssh = opensshPackages.openssh.override {
diff --git a/pkgs/top-level/openscad-packages.nix b/pkgs/top-level/openscad-packages.nix
new file mode 100644
index 000000000000..41192ee82791
--- /dev/null
+++ b/pkgs/top-level/openscad-packages.nix
@@ -0,0 +1,16 @@
+{
+  lib,
+  newScope,
+  openscad,
+}:
+
+let
+  openscadOrig = openscad;
+in
+lib.makeScope newScope (
+  self:
+  lib.recurseIntoAttrs {
+    buildOpenSCADPackage = self.callPackage ../build-support/build-openscad-package { };
+    openscad = openscadOrig.override { openscadPackages = self; };
+  }
+)

From cd4bbd2fbf5d28399ef4cf9e26810978f95c9537 Mon Sep 17 00:00:00 2001
From: xoconoch <github@cordovault.com>
Date: Thu, 16 Jul 2026 16:14:55 -0600
Subject: [PATCH 057/205] maintainers: add xoconoch to maintainers list

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3b5e3f4959cf..b48bcef14deb 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -30360,6 +30360,12 @@
     githubId = 3028542;
     name = "Guillermo NWDD";
   };
+  xoconoch = {
+    email = "github@cordovault.com";
+    github = "xoconoch";
+    githubId = 93692082;
+    name = "Xoconoch";
+  };
   xokdvium = {
     email = "sergei@zimmerman.foo";
     github = "xokdvium";

From 576a3ba1e86ffb9f3e5d614488d02c38332ce965 Mon Sep 17 00:00:00 2001
From: xoconoch <github@cordovault.com>
Date: Thu, 16 Jul 2026 16:15:32 -0600
Subject: [PATCH 058/205] openscad: add xoconoch as a maintainer

---
 pkgs/by-name/op/openscad/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/op/openscad/package.nix b/pkgs/by-name/op/openscad/package.nix
index e7f21c4c9df1..9b3381b4b645 100644
--- a/pkgs/by-name/op/openscad/package.nix
+++ b/pkgs/by-name/op/openscad/package.nix
@@ -207,6 +207,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       bjornfor
       raskin
+      xoconoch
     ];
     mainProgram = "openscad";
   };

From ececfec451f5a9a7dc8e590dd6c003a025e70e37 Mon Sep 17 00:00:00 2001
From: whispers <whispersofthedawn@duck.com>
Date: Fri, 7 Aug 2026 16:17:07 -0400
Subject: [PATCH 059/205] sparsehash: fix build with c++20 / gcc 16
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

c++20 removed several members of std::allocator, causing sparsehash to
fail to build. a long-open (2021…) pr switches these to alternatives, so
we fetch that pr and include it. this is relevant for gcc 16, which
switches to c++20 as the default standard version.

fedora has done the same thing:
https://src.fedoraproject.org/rpms/sparsehash/blob/rawhide/f/165.patch
---
 .../sp/sparsehash/c++-20-std-allocator.patch  | 306 ++++++++++++++++++
 pkgs/by-name/sp/sparsehash/package.nix        |   5 +
 2 files changed, 311 insertions(+)
 create mode 100644 pkgs/by-name/sp/sparsehash/c++-20-std-allocator.patch

diff --git a/pkgs/by-name/sp/sparsehash/c++-20-std-allocator.patch b/pkgs/by-name/sp/sparsehash/c++-20-std-allocator.patch
new file mode 100644
index 000000000000..0afb25be6ca9
--- /dev/null
+++ b/pkgs/by-name/sp/sparsehash/c++-20-std-allocator.patch
@@ -0,0 +1,306 @@
+From 6940fcaba9766735e48064b930690d67fc2f84ea Mon Sep 17 00:00:00 2001
+From: sugak <sugak@fb.com>
+Date: Mon, 29 Nov 2021 18:01:19 -0800
+Subject: [PATCH] fix build with -std=c++20
+
+---
+ src/sparsehash/internal/densehashtable.h  | 46 ++++++++++++---------
+ src/sparsehash/internal/sparsehashtable.h | 50 +++++++++++++----------
+ src/sparsehash/sparsetable                | 37 +++++++++--------
+ 3 files changed, 74 insertions(+), 59 deletions(-)
+
+diff --git a/src/sparsehash/internal/densehashtable.h b/src/sparsehash/internal/densehashtable.h
+index cdf4ff6..79cecab 100644
+--- a/src/sparsehash/internal/densehashtable.h
++++ b/src/sparsehash/internal/densehashtable.h
+@@ -149,7 +149,8 @@ struct dense_hashtable_const_iterator;
+ template <class V, class K, class HF, class ExK, class SetK, class EqK, class A>
+ struct dense_hashtable_iterator {
+  private:
+-  typedef typename A::template rebind<V>::other value_alloc_type;
++  typedef typename std::allocator_traits<A>::template rebind_alloc<V> value_alloc_type;
++  typedef std::allocator_traits<value_alloc_type> value_alloc_traits;
+ 
+  public:
+   typedef dense_hashtable_iterator<V,K,HF,ExK,SetK,EqK,A>       iterator;
+@@ -157,10 +158,10 @@ struct dense_hashtable_iterator {
+ 
+   typedef std::forward_iterator_tag iterator_category;  // very little defined!
+   typedef V value_type;
+-  typedef typename value_alloc_type::difference_type difference_type;
+-  typedef typename value_alloc_type::size_type size_type;
+-  typedef typename value_alloc_type::reference reference;
+-  typedef typename value_alloc_type::pointer pointer;
++  typedef typename value_alloc_traits::difference_type difference_type;
++  typedef typename value_alloc_traits::size_type size_type;
++  typedef value_type& reference;
++  typedef typename value_alloc_traits::pointer pointer;
+ 
+   // "Real" constructor and default constructor
+   dense_hashtable_iterator(const dense_hashtable<V,K,HF,ExK,SetK,EqK,A> *h,
+@@ -202,7 +203,8 @@ struct dense_hashtable_iterator {
+ template <class V, class K, class HF, class ExK, class SetK, class EqK, class A>
+ struct dense_hashtable_const_iterator {
+  private:
+-  typedef typename A::template rebind<V>::other value_alloc_type;
++  typedef typename std::allocator_traits<A>::template rebind_alloc<V> value_alloc_type;
++  typedef std::allocator_traits<value_alloc_type> value_alloc_traits;
+ 
+  public:
+   typedef dense_hashtable_iterator<V,K,HF,ExK,SetK,EqK,A>       iterator;
+@@ -210,10 +212,10 @@ struct dense_hashtable_const_iterator {
+ 
+   typedef std::forward_iterator_tag iterator_category;  // very little defined!
+   typedef V value_type;
+-  typedef typename value_alloc_type::difference_type difference_type;
+-  typedef typename value_alloc_type::size_type size_type;
+-  typedef typename value_alloc_type::const_reference reference;
+-  typedef typename value_alloc_type::const_pointer pointer;
++  typedef typename value_alloc_traits::difference_type difference_type;
++  typedef typename value_alloc_traits::size_type size_type;
++  typedef const value_type& reference;
++  typedef typename value_alloc_traits::const_pointer pointer;
+ 
+   // "Real" constructor and default constructor
+   dense_hashtable_const_iterator(
+@@ -259,7 +261,8 @@ template <class Value, class Key, class HashFcn,
+           class ExtractKey, class SetKey, class EqualKey, class Alloc>
+ class dense_hashtable {
+  private:
+-  typedef typename Alloc::template rebind<Value>::other value_alloc_type;
++  typedef typename std::allocator_traits<Alloc>::template rebind_alloc<Value> value_alloc_type;
++  typedef std::allocator_traits<value_alloc_type> value_alloc_traits;
+ 
+  public:
+   typedef Key key_type;
+@@ -268,12 +271,12 @@ class dense_hashtable {
+   typedef EqualKey key_equal;
+   typedef Alloc allocator_type;
+ 
+-  typedef typename value_alloc_type::size_type size_type;
+-  typedef typename value_alloc_type::difference_type difference_type;
+-  typedef typename value_alloc_type::reference reference;
+-  typedef typename value_alloc_type::const_reference const_reference;
+-  typedef typename value_alloc_type::pointer pointer;
+-  typedef typename value_alloc_type::const_pointer const_pointer;
++  typedef typename value_alloc_traits::size_type size_type;
++  typedef typename value_alloc_traits::difference_type difference_type;
++  typedef value_type& reference;
++  typedef const value_type& const_reference;
++  typedef typename value_alloc_traits::pointer pointer;
++  typedef typename value_alloc_traits::const_pointer const_pointer;
+   typedef dense_hashtable_iterator<Value, Key, HashFcn,
+                                    ExtractKey, SetKey, EqualKey, Alloc>
+   iterator;
+@@ -518,7 +521,9 @@ class dense_hashtable {
+   // FUNCTIONS CONCERNING SIZE
+  public:
+   size_type size() const      { return num_elements - num_deleted; }
+-  size_type max_size() const  { return val_info.max_size(); }
++  size_type max_size() const  {
++      return std::allocator_traits<ValInfo>::max_size(val_info);
++  }
+   bool empty() const          { return size() == 0; }
+   size_type bucket_count() const      { return num_buckets; }
+   size_type max_bucket_count() const  { return max_size(); }
+@@ -1170,8 +1175,9 @@ class dense_hashtable {
+   template <class A>
+   class alloc_impl : public A {
+    public:
+-    typedef typename A::pointer pointer;
+-    typedef typename A::size_type size_type;
++    typedef std::allocator_traits<A> alloc_traits;
++    typedef typename alloc_traits::pointer pointer;
++    typedef typename alloc_traits::size_type size_type;
+ 
+     // Convert a normal allocator to one that has realloc_or_die()
+     alloc_impl(const A& a) : A(a) { }
+diff --git a/src/sparsehash/internal/sparsehashtable.h b/src/sparsehash/internal/sparsehashtable.h
+index f54ea51..1c71d6d 100644
+--- a/src/sparsehash/internal/sparsehashtable.h
++++ b/src/sparsehash/internal/sparsehashtable.h
+@@ -160,7 +160,8 @@ struct sparse_hashtable_const_iterator;
+ template <class V, class K, class HF, class ExK, class SetK, class EqK, class A>
+ struct sparse_hashtable_iterator {
+  private:
+-  typedef typename A::template rebind<V>::other value_alloc_type;
++  typedef typename std::allocator_traits<A>::template rebind_alloc<V> value_alloc_type;
++  typedef std::allocator_traits<value_alloc_type> value_alloc_traits;
+ 
+  public:
+   typedef sparse_hashtable_iterator<V,K,HF,ExK,SetK,EqK,A>       iterator;
+@@ -170,10 +171,10 @@ struct sparse_hashtable_iterator {
+ 
+   typedef std::forward_iterator_tag iterator_category;  // very little defined!
+   typedef V value_type;
+-  typedef typename value_alloc_type::difference_type difference_type;
+-  typedef typename value_alloc_type::size_type size_type;
+-  typedef typename value_alloc_type::reference reference;
+-  typedef typename value_alloc_type::pointer pointer;
++  typedef typename value_alloc_traits::difference_type difference_type;
++  typedef typename value_alloc_traits::size_type size_type;
++  typedef value_type& reference;
++  typedef typename value_alloc_traits::pointer pointer;
+ 
+   // "Real" constructor and default constructor
+   sparse_hashtable_iterator(const sparse_hashtable<V,K,HF,ExK,SetK,EqK,A> *h,
+@@ -212,7 +213,9 @@ struct sparse_hashtable_iterator {
+ template <class V, class K, class HF, class ExK, class SetK, class EqK, class A>
+ struct sparse_hashtable_const_iterator {
+  private:
+-  typedef typename A::template rebind<V>::other value_alloc_type;
++  typedef typename std::allocator_traits<A>::template rebind_alloc<V> value_alloc_type;
++  typedef typename std::allocator_traits<value_alloc_type> value_alloc_traits;
++
+ 
+  public:
+   typedef sparse_hashtable_iterator<V,K,HF,ExK,SetK,EqK,A>       iterator;
+@@ -222,10 +225,10 @@ struct sparse_hashtable_const_iterator {
+ 
+   typedef std::forward_iterator_tag iterator_category;  // very little defined!
+   typedef V value_type;
+-  typedef typename value_alloc_type::difference_type difference_type;
+-  typedef typename value_alloc_type::size_type size_type;
+-  typedef typename value_alloc_type::const_reference reference;
+-  typedef typename value_alloc_type::const_pointer pointer;
++  typedef typename value_alloc_traits::difference_type difference_type;
++  typedef typename value_alloc_traits::size_type size_type;
++  typedef const value_type& reference;
++  typedef typename value_alloc_traits::const_pointer pointer;
+ 
+   // "Real" constructor and default constructor
+   sparse_hashtable_const_iterator(const sparse_hashtable<V,K,HF,ExK,SetK,EqK,A> *h,
+@@ -267,7 +270,9 @@ struct sparse_hashtable_const_iterator {
+ template <class V, class K, class HF, class ExK, class SetK, class EqK, class A>
+ struct sparse_hashtable_destructive_iterator {
+  private:
+-  typedef typename A::template rebind<V>::other value_alloc_type;
++  typedef typename std::allocator_traits<A>::template rebind_alloc<V> value_alloc_type;
++  typedef std::allocator_traits<value_alloc_type> value_alloc_traits;
++
+ 
+  public:
+   typedef sparse_hashtable_destructive_iterator<V,K,HF,ExK,SetK,EqK,A> iterator;
+@@ -276,10 +281,10 @@ struct sparse_hashtable_destructive_iterator {
+ 
+   typedef std::forward_iterator_tag iterator_category;  // very little defined!
+   typedef V value_type;
+-  typedef typename value_alloc_type::difference_type difference_type;
+-  typedef typename value_alloc_type::size_type size_type;
+-  typedef typename value_alloc_type::reference reference;
+-  typedef typename value_alloc_type::pointer pointer;
++  typedef typename value_alloc_traits::difference_type difference_type;
++  typedef typename value_alloc_traits::size_type size_type;
++  typedef value_type& reference;
++  typedef typename value_alloc_traits::pointer pointer;
+ 
+   // "Real" constructor and default constructor
+   sparse_hashtable_destructive_iterator(const
+@@ -320,7 +325,8 @@ template <class Value, class Key, class HashFcn,
+           class ExtractKey, class SetKey, class EqualKey, class Alloc>
+ class sparse_hashtable {
+  private:
+-  typedef typename Alloc::template rebind<Value>::other value_alloc_type;
++  typedef typename std::allocator_traits<Alloc>::template rebind_alloc<Value> value_alloc_type;
++  typedef std::allocator_traits<value_alloc_type> value_alloc_traits;
+ 
+  public:
+   typedef Key key_type;
+@@ -329,12 +335,12 @@ class sparse_hashtable {
+   typedef EqualKey key_equal;
+   typedef Alloc allocator_type;
+ 
+-  typedef typename value_alloc_type::size_type size_type;
+-  typedef typename value_alloc_type::difference_type difference_type;
+-  typedef typename value_alloc_type::reference reference;
+-  typedef typename value_alloc_type::const_reference const_reference;
+-  typedef typename value_alloc_type::pointer pointer;
+-  typedef typename value_alloc_type::const_pointer const_pointer;
++  typedef typename value_alloc_traits::size_type size_type;
++  typedef typename value_alloc_traits::difference_type difference_type;
++  typedef value_type& reference;
++  typedef const value_type& const_reference;
++  typedef typename value_alloc_traits::pointer pointer;
++  typedef typename value_alloc_traits::const_pointer const_pointer;
+   typedef sparse_hashtable_iterator<Value, Key, HashFcn, ExtractKey,
+                                     SetKey, EqualKey, Alloc>
+   iterator;
+diff --git a/src/sparsehash/sparsetable b/src/sparsehash/sparsetable
+index 6259ebd..60c71dc 100644
+--- a/src/sparsehash/sparsetable
++++ b/src/sparsehash/sparsetable
+@@ -802,16 +802,17 @@ class destructive_two_d_iterator {
+ template <class T, u_int16_t GROUP_SIZE, class Alloc>
+ class sparsegroup {
+  private:
+-  typedef typename Alloc::template rebind<T>::other value_alloc_type;
++  typedef typename std::allocator_traits<Alloc>::template rebind_alloc<T> value_alloc_type;
++  typedef std::allocator_traits<value_alloc_type> value_alloc_traits;
+ 
+  public:
+   // Basic types
+   typedef T value_type;
+   typedef Alloc allocator_type;
+-  typedef typename value_alloc_type::reference reference;
+-  typedef typename value_alloc_type::const_reference const_reference;
+-  typedef typename value_alloc_type::pointer pointer;
+-  typedef typename value_alloc_type::const_pointer const_pointer;
++  typedef value_type& reference;
++  typedef const value_type& const_reference;
++  typedef typename value_alloc_traits::pointer pointer;
++  typedef typename value_alloc_traits::const_pointer const_pointer;
+ 
+   typedef table_iterator<sparsegroup<T, GROUP_SIZE, Alloc> > iterator;
+   typedef const_table_iterator<sparsegroup<T, GROUP_SIZE, Alloc> >
+@@ -1289,8 +1290,9 @@ class sparsegroup {
+   template <class A>
+   class alloc_impl : public A {
+    public:
+-    typedef typename A::pointer pointer;
+-    typedef typename A::size_type size_type;
++    typedef std::allocator_traits<A> alloc_traits;
++    typedef typename alloc_traits::pointer pointer;
++    typedef typename alloc_traits::size_type size_type;
+ 
+     // Convert a normal allocator to one that has realloc_or_die()
+     alloc_impl(const A& a) : A(a) { }
+@@ -1362,20 +1364,21 @@ template <class T, u_int16_t GROUP_SIZE = DEFAULT_SPARSEGROUP_SIZE,
+           class Alloc = libc_allocator_with_realloc<T> >
+ class sparsetable {
+  private:
+-  typedef typename Alloc::template rebind<T>::other value_alloc_type;
+-  typedef typename Alloc::template rebind<
+-      sparsegroup<T, GROUP_SIZE, value_alloc_type> >::other vector_alloc;
++  typedef typename std::allocator_traits<Alloc>::template rebind_alloc<T> value_alloc_type;
++  typedef std::allocator_traits<value_alloc_type> value_alloc_traits;
++  typedef typename std::allocator_traits<Alloc>::template rebind_alloc<
++      sparsegroup<T, GROUP_SIZE, value_alloc_type> > vector_alloc;
+ 
+  public:
+   // Basic types
+   typedef T value_type;                        // stolen from stl_vector.h
+   typedef Alloc allocator_type;
+-  typedef typename value_alloc_type::size_type size_type;
+-  typedef typename value_alloc_type::difference_type difference_type;
+-  typedef typename value_alloc_type::reference reference;
+-  typedef typename value_alloc_type::const_reference const_reference;
+-  typedef typename value_alloc_type::pointer pointer;
+-  typedef typename value_alloc_type::const_pointer const_pointer;
++  typedef typename value_alloc_traits::size_type size_type;
++  typedef typename value_alloc_traits::difference_type difference_type;
++  typedef value_type& reference;
++  typedef const value_type& const_reference;
++  typedef typename value_alloc_traits::pointer pointer;
++  typedef typename value_alloc_traits::const_pointer const_pointer;
+   typedef table_iterator<sparsetable<T, GROUP_SIZE, Alloc> > iterator;
+   typedef const_table_iterator<sparsetable<T, GROUP_SIZE, Alloc> >
+       const_iterator;
+@@ -1446,7 +1449,7 @@ class sparsetable {
+     return destructive_iterator(groups.begin(), groups.end(), groups.end());
+   }
+ 
+-  typedef sparsegroup<value_type, GROUP_SIZE, allocator_type> group_type;
++  typedef sparsegroup<value_type, GROUP_SIZE, value_alloc_type> group_type;
+   typedef std::vector<group_type, vector_alloc > group_vector_type;
+ 
+   typedef typename group_vector_type::reference GroupsReference;
diff --git a/pkgs/by-name/sp/sparsehash/package.nix b/pkgs/by-name/sp/sparsehash/package.nix
index 002ba03fc1a4..5be59bdf8f8c 100644
--- a/pkgs/by-name/sp/sparsehash/package.nix
+++ b/pkgs/by-name/sp/sparsehash/package.nix
@@ -15,6 +15,11 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "1pf1cjvcjdmb9cd6gcazz64x0cd2ndpwh6ql2hqpypjv725xwxy7";
   };
 
+  # C++20 (default with GCC 16) removed many members of std::allocator. This
+  # replaces use of these deprecated methods with alternatives where necessary.
+  # https://github.com/sparsehash/sparsehash/pull/165
+  patches = [ ./c++-20-std-allocator.patch ];
+
   meta = {
     homepage = "https://github.com/sparsehash/sparsehash";
     description = "Extremely memory-efficient hash_map implementation";

From b94be3ca8330256d9424a034afe01114d81194c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Aug 2026 22:13:50 +0000
Subject: [PATCH 060/205] goeland: 0.26.0 -> 0.27.0

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

diff --git a/pkgs/by-name/go/goeland/package.nix b/pkgs/by-name/go/goeland/package.nix
index 9788a3810bec..89d59b179f16 100644
--- a/pkgs/by-name/go/goeland/package.nix
+++ b/pkgs/by-name/go/goeland/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "goeland";
-  version = "0.26.0";
+  version = "0.27.0";
 
   src = fetchFromGitHub {
     owner = "slurdge";
     repo = "goeland";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-8vhcAzpgYDPHRuvBzeboGO09n+UCSCxNaJuooPnLBjo=";
+    sha256 = "sha256-oELciX2ESLoMydx1E3Oo4U1wf/GN+dMRpvpBBVCxRK0=";
   };
 
-  vendorHash = "sha256-GOoeyh0ddtYiigavgjMNy8z6suTFtS9oswO9PAdagGE=";
+  vendorHash = "sha256-aITCLQoLIJEwlsZBQ9DuTqbnJYm8EGqNIX2dykq2QlU=";
 
   ldflags = [
     "-s"

From 48f9a1592dabc1fa49fb013ce639de1181f02cd5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Aug 2026 22:50:42 +0000
Subject: [PATCH 061/205] ejson: 1.5.4 -> 1.5.5

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

diff --git a/pkgs/by-name/ej/ejson/package.nix b/pkgs/by-name/ej/ejson/package.nix
index 9de87e840cb7..c8c94d72a917 100644
--- a/pkgs/by-name/ej/ejson/package.nix
+++ b/pkgs/by-name/ej/ejson/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "ejson";
-  version = "1.5.4";
+  version = "1.5.5";
 
   src = fetchFromGitHub {
     owner = "Shopify";
     repo = "ejson";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-s/VeBajNZI0XNs1PwWMpHAF0Wrh1/ZQUvUZBnUCoPBM=";
+    sha256 = "sha256-t0IjL+gB1bfHwS1eoMy/yKgayswECxpXyK8xq6iGMCg=";
   };
 
-  vendorHash = "sha256-JeZkiiqNmDsuQSA6hCboasApRlTmw/+fgTAp5WbgdDg=";
+  vendorHash = "sha256-vT9A4d+e+iOie5TNbu5EyPi5OZJ/m8Not3tCQc7Xwn8=";
 
   ldflags = [
     "-s"

From e9a41b53b4b23ba4ffc7c271a45676acb2ef8c73 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Aug 2026 23:43:14 +0000
Subject: [PATCH 062/205] jx: 3.17.61 -> 3.17.76

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

diff --git a/pkgs/by-name/jx/jx/package.nix b/pkgs/by-name/jx/jx/package.nix
index 683621d50caa..1a458e039070 100644
--- a/pkgs/by-name/jx/jx/package.nix
+++ b/pkgs/by-name/jx/jx/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "jx";
-  version = "3.17.61";
+  version = "3.17.76";
 
   src = fetchFromGitHub {
     owner = "jenkins-x";
     repo = "jx";
     rev = "v${version}";
-    sha256 = "sha256-4iDzS4ONDbCzXun2cB+t2c276VmKzIyB6OdeXEb3E6M=";
+    sha256 = "sha256-ejm/U2EX9iU07k9mqzd9jOeo3hESx44mXWO7mvhNqqM=";
   };
 
   vendorHash = "sha256-Rupnzj1kw0den6O0RZ5Fg5pZWRsfLuor3ntAiQjfIn8=";

From 4fdf32abb5f31b3ec60304d149bbddf95d482e2c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Aug 2026 00:19:03 +0000
Subject: [PATCH 063/205] mcat-unwrapped: 0.6.3 -> 0.6.4

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

diff --git a/pkgs/by-name/mc/mcat-unwrapped/package.nix b/pkgs/by-name/mc/mcat-unwrapped/package.nix
index 44c56b28c377..e27dc2e0c407 100644
--- a/pkgs/by-name/mc/mcat-unwrapped/package.nix
+++ b/pkgs/by-name/mc/mcat-unwrapped/package.nix
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mcat-unwrapped";
-  version = "0.6.3";
+  version = "0.6.4";
 
   src = fetchFromGitHub {
     owner = "Skardyy";
     repo = "mcat";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oaDJYskWG+zWUFLCaEDOr3oHVw2XPVRhUIBFISaptis=";
+    hash = "sha256-DeBQyOf0JjocsnbVp49Ue/M0VAE+97mfHHGEnL7cRjU=";
   };
 
-  cargoHash = "sha256-I/QA1FXFZIsz4W40bri47LtT9Uk4NoKe1aoV4QYHtAQ=";
+  cargoHash = "sha256-EQCtxI+K8CqMt2+SkX4yQiLmOrNpQsqIsff12OcbAuU=";
 
   nativeBuildInputs = [
     installShellFiles

From ba4911d8386d8f3a35af08e01e00305a5615ac19 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Aug 2026 00:47:00 +0000
Subject: [PATCH 064/205] nextdns: 1.47.3 -> 1.48.0

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

diff --git a/pkgs/by-name/ne/nextdns/package.nix b/pkgs/by-name/ne/nextdns/package.nix
index 958b2b9f4065..afd63ae25c86 100644
--- a/pkgs/by-name/ne/nextdns/package.nix
+++ b/pkgs/by-name/ne/nextdns/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "nextdns";
-  version = "1.47.3";
+  version = "1.48.0";
 
   src = fetchFromGitHub {
     owner = "nextdns";
     repo = "nextdns";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-oTxa/iZ13WSrHOxlmKL55veXhGq1m1Md9RZESdwsKJ0=";
+    sha256 = "sha256-iTo96BabjPJLe2E4iThDLJJ4VZ/XjUgKB6vqWA/VyWw=";
   };
 
-  vendorHash = "sha256-Q6gh9E6FzvQn+Lyv3Tr3uLAO/r8zlF8im6xAG2YnuoU=";
+  vendorHash = "sha256-K4KbV4Tg30bCMksVMV3xx2sseAB2ery6u+K1V2c0mxQ=";
 
   ldflags = [
     "-s"

From 57ed2c384c634590506473454935063d36fc482e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Aug 2026 03:12:09 +0000
Subject: [PATCH 065/205] google-java-format: 1.36.0 -> 1.36.1

---
 pkgs/by-name/go/google-java-format/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/go/google-java-format/package.nix b/pkgs/by-name/go/google-java-format/package.nix
index 8d276be81072..9048dec4153d 100644
--- a/pkgs/by-name/go/google-java-format/package.nix
+++ b/pkgs/by-name/go/google-java-format/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "google-java-format";
-  version = "1.36.0";
+  version = "1.36.1";
   __structuredAttrs = true;
 
   src = fetchurl {
-    sha256 = "sha256-I2lt4F3SDYXBRJyN6fJBkDB5lQj1NWVw6Xn3+W5Z2NY=";
+    sha256 = "sha256-JbQA8AMInSPMUyDNrxoWyr7hm4qjQ00P8CGz2fQhVLQ=";
     url = "https://github.com/google/google-java-format/releases/download/v${finalAttrs.version}/google-java-format-${finalAttrs.version}-all-deps.jar";
   };
 

From 56b12b55253d60d207c9af2f5b57d6fcc8c3cd29 Mon Sep 17 00:00:00 2001
From: Holiu618 <165534185+Holiu618@users.noreply.github.com>
Date: Sat, 8 Aug 2026 11:53:45 +0800
Subject: [PATCH 066/205] layerx: 1.6.0 -> 1.6.1

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

diff --git a/pkgs/by-name/la/layerx/package.nix b/pkgs/by-name/la/layerx/package.nix
index f840cc5085a2..41116246a0ac 100644
--- a/pkgs/by-name/la/layerx/package.nix
+++ b/pkgs/by-name/la/layerx/package.nix
@@ -10,14 +10,14 @@
 
 buildGoModule (finalAttrs: {
   pname = "layerx";
-  version = "1.6.0";
+  version = "1.6.1";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "deveshctl";
     repo = "layerx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6D/c2RDfvoVXikQ1TLq1dl6MJdxD0562tl6LgFOrSds=";
+    hash = "sha256-7GBJzcW/2SXx8Id+ke+ktLDFRv0nWgqLA/UrOl0Bn5k=";
   };
 
   vendorHash = "sha256-7wbyz6fKB3HMFhKJVIWrOIczLfqF4yInyszdh2Ky8WU=";

From 5fc8baf23e6103b9415c4f024e702f6948c2b447 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Aug 2026 03:57:52 +0000
Subject: [PATCH 067/205] buildkit: 0.32.0 -> 0.32.2

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

diff --git a/pkgs/by-name/bu/buildkit/package.nix b/pkgs/by-name/bu/buildkit/package.nix
index bf3141e23d92..cc190e9ea238 100644
--- a/pkgs/by-name/bu/buildkit/package.nix
+++ b/pkgs/by-name/bu/buildkit/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "buildkit";
-  version = "0.32.0";
+  version = "0.32.2";
 
   src = fetchFromGitHub {
     owner = "moby";
     repo = "buildkit";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Kw3tTHpdB6hQmE9pfT3pBxzOxN6Lfv8uM/rLGPJrbI4=";
+    hash = "sha256-sRSFypb/CZiCISMumVTor9XI4KOCvBhY6UaNUk2Y4t8=";
   };
 
   vendorHash = null;

From 1e4d44f5c4738f8ee91702a8cd4bfc95c62632f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Aug 2026 06:00:39 +0000
Subject: [PATCH 068/205] cockpit-machines: 354 -> 355

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

diff --git a/pkgs/by-name/co/cockpit-machines/package.nix b/pkgs/by-name/co/cockpit-machines/package.nix
index 96f4fb87e736..31d67375d394 100644
--- a/pkgs/by-name/co/cockpit-machines/package.nix
+++ b/pkgs/by-name/co/cockpit-machines/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cockpit-machines";
-  version = "354";
+  version = "355";
 
   src = fetchFromGitHub {
     owner = "cockpit-project";
     repo = "cockpit-machines";
     tag = finalAttrs.version;
-    hash = "sha256-r5gvs6/clRDV0VZKU1r6fjJSwHLuf9Pnhi0c60/9qkE=";
+    hash = "sha256-9NRpo9j0EDTWvJAPuAhr3H6Gigt7MdwYbdXZeGqHVGo=";
 
     fetchSubmodules = true;
     postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json";

From 3675245e7b4aa8ce54cc1780847ca535a13779ef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Aug 2026 06:01:07 +0000
Subject: [PATCH 069/205] cockpit-files: 42 -> 43

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

diff --git a/pkgs/by-name/co/cockpit-files/package.nix b/pkgs/by-name/co/cockpit-files/package.nix
index e2d15ae8d224..5a19c924b0ca 100644
--- a/pkgs/by-name/co/cockpit-files/package.nix
+++ b/pkgs/by-name/co/cockpit-files/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cockpit-files";
-  version = "42";
+  version = "43";
 
   src = fetchFromGitHub {
     owner = "cockpit-project";
     repo = "cockpit-files";
     tag = finalAttrs.version;
-    hash = "sha256-NfI6y60O5ctsPbwPcXgkwxpNYuZkF/2YXZOIcRZUc5c=";
+    hash = "sha256-ex15Bs8hFlNnksTEQC3rxhpiKDpK6bY3r3o5wX9ad44=";
 
     fetchSubmodules = true;
     postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json";

From f12022a2f49dcb3aa440ecc54af48c27de15747a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Aug 2026 06:01:45 +0000
Subject: [PATCH 070/205] cockpit-podman: 128 -> 129

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

diff --git a/pkgs/by-name/co/cockpit-podman/package.nix b/pkgs/by-name/co/cockpit-podman/package.nix
index f2419ca2f855..423f4abf3f77 100644
--- a/pkgs/by-name/co/cockpit-podman/package.nix
+++ b/pkgs/by-name/co/cockpit-podman/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cockpit-podman";
-  version = "128";
+  version = "129";
 
   src = fetchFromGitHub {
     owner = "cockpit-project";
     repo = "cockpit-podman";
     tag = finalAttrs.version;
-    hash = "sha256-GlnIZGV5nk7o28EUs4H/IdZkgtHG0a9uwCTCS4rCP6c=";
+    hash = "sha256-NFEVwDrDgFQphSh7k56wjGsWJslkerJEQ6FFm5xJsfA=";
 
     fetchSubmodules = true;
     postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json";

From 67903994a871771f075addaaf4d1abaedea82e14 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Aug 2026 06:05:21 +0000
Subject: [PATCH 071/205] perplexity-mcp: 0-unstable-2026-07-27 ->
 0-unstable-2026-07-30

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

diff --git a/pkgs/by-name/pe/perplexity-mcp/package.nix b/pkgs/by-name/pe/perplexity-mcp/package.nix
index 5fd624a98a8f..a4dfc6b12adc 100644
--- a/pkgs/by-name/pe/perplexity-mcp/package.nix
+++ b/pkgs/by-name/pe/perplexity-mcp/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "perplexity-mcp";
-  version = "0-unstable-2026-07-27";
+  version = "0-unstable-2026-07-30";
 
   src = fetchFromGitHub {
     owner = "perplexityai";
     repo = "modelcontextprotocol";
-    rev = "9f7dd0b1951c7421f930d1af8ff10e92473de0f9";
-    hash = "sha256-B3cv427UwR8il/604tW8tnzQ35V1sHF3h/Cn6cWjJY0=";
+    rev = "df5e29a5a17c694b5de144c7a3ac56d3377bc079";
+    hash = "sha256-U+nrAYQdENZ9Aw6H7/rU0cXXUj0+35Srj8wwgM7AcnE=";
   };
 
   npmDepsHash = "sha256-GHdBn7PA7+eV3+3sUX18f2dawK79X/o68IqzBv6SB0I=";

From 62558f6e99f4f82f6767430e4fe1827c4cb8363e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Aug 2026 08:28:38 +0000
Subject: [PATCH 072/205] todoist-cli: 3.0.6 -> 3.1.5

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

diff --git a/pkgs/by-name/to/todoist-cli/package.nix b/pkgs/by-name/to/todoist-cli/package.nix
index 9360f863982e..693c4ea1c20b 100644
--- a/pkgs/by-name/to/todoist-cli/package.nix
+++ b/pkgs/by-name/to/todoist-cli/package.nix
@@ -7,16 +7,16 @@
 }:
 buildNpmPackage rec {
   pname = "todoist-cli";
-  version = "3.0.6";
+  version = "3.1.5";
 
   src = fetchFromGitHub {
     owner = "Doist";
     repo = "todoist-cli";
     rev = "v${version}";
-    sha256 = "sha256-gt9/RSmVvgvWjBIKElt1A/Z7vbr9ACxgAvgtcnQ8V6A=";
+    sha256 = "sha256-tCrcR5g26xUlx7Nd6PUooIiZnBRUcrP2GD4aiPRWlp0=";
   };
 
-  npmDepsHash = "sha256-BjN7fvUbycqgFb3LVvOmQFWXlj7hcBC98k8tGWxGvE8=";
+  npmDepsHash = "sha256-osvdOfZtYhtl8DcfaKFjk2mxYq4STanvbmIy4ZHCbSE=";
 
   doCheck = true;
 

From 19242dab2df406ce7c935c5dff680a067b862bf2 Mon Sep 17 00:00:00 2001
From: vomba <hani.harzallah@elastisys.com>
Date: Sat, 8 Aug 2026 10:59:20 +0200
Subject: [PATCH 073/205] helmfile: 1.7.2 -> 1.7.3

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

diff --git a/pkgs/by-name/he/helmfile/package.nix b/pkgs/by-name/he/helmfile/package.nix
index 4684f886c89e..4136f425a9b1 100644
--- a/pkgs/by-name/he/helmfile/package.nix
+++ b/pkgs/by-name/he/helmfile/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "helmfile";
-  version = "1.7.2";
+  version = "1.7.3";
 
   src = fetchFromGitHub {
     owner = "helmfile";
     repo = "helmfile";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-B9peVIqI2DveyWzVo+oXtsW8WLq7COk/2RrUjf2XX0w=";
+    hash = "sha256-St7MTDWoc/Ue5meAMe6Krbi4Csp2Kz5KqfUuFmjanbE=";
   };
 
-  vendorHash = "sha256-LBp+UASFNctJ0iclgNk3OlIumifG5jV6sllExwCvp1g=";
+  vendorHash = "sha256-ngIAwWMicW4nqBqd0CIlOI3ocHfJPHbwnkIT0ADZzHk=";
 
   proxyVendor = true; # darwin/linux hash mismatch
 

From 66a47717f4ef77c02e6b927c767c6b960f93362f Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sat, 8 Aug 2026 13:04:34 +0400
Subject: [PATCH 074/205] =?UTF-8?q?agate:=203.3.23=20=E2=86=92=203.3.24?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/ag/agate/package.nix b/pkgs/by-name/ag/agate/package.nix
index c7a9d3a57407..0b5642cfdba7 100644
--- a/pkgs/by-name/ag/agate/package.nix
+++ b/pkgs/by-name/ag/agate/package.nix
@@ -14,7 +14,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "agate";
-  version = "3.3.23";
+  version = "3.3.24";
 
   __darwinAllowLocalNetworking = true;
 
@@ -22,10 +22,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "mbrubeck";
     repo = "agate";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6xF1iCAW4tCSoVU0rBSSfREIqPdOPF8Z1+ScMyEX4SQ=";
+    hash = "sha256-/BCX2vozZDpSINE6+s/k8GIwr7mt5Ai+vBIfdIq7clk=";
   };
 
-  cargoHash = "sha256-K6BUKaVULb/x3b9UQ/wJPI/kjBIOUdLnB63FyMJEXDE=";
+  cargoHash = "sha256-bumh4w8C4qZbvZwTpdwIDYmMvdFs0MCk2VnPxDepFk8=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];

From 82c7b007c8efb2f221cc837f3da4ab75f61c700b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Aug 2026 09:29:32 +0000
Subject: [PATCH 075/205] docker-credential-gcr: 2.1.32 -> 2.2.1

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

diff --git a/pkgs/by-name/do/docker-credential-gcr/package.nix b/pkgs/by-name/do/docker-credential-gcr/package.nix
index 1ffefcb4d3d1..58ecdce650eb 100644
--- a/pkgs/by-name/do/docker-credential-gcr/package.nix
+++ b/pkgs/by-name/do/docker-credential-gcr/package.nix
@@ -9,20 +9,20 @@
 
 buildGoModule (finalAttrs: {
   pname = "docker-credential-gcr";
-  version = "2.1.32";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "docker-credential-gcr";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xOiLrN8NLKzm7VDDzeq8gbAD6+WXYqcDaSoTpvOOvbw=";
+    hash = "sha256-6jvNF0L3vXyumfiNSLRwRqZeui8rgnO4h/rTmY7qVDA=";
   };
 
   postPatch = ''
     rm -rf ./test
   '';
 
-  vendorHash = "sha256-P8Mhk6jj7TlbP+rcqpYsWy8CIGJMetYAuKylXRBNKIc=";
+  vendorHash = "sha256-gghmzq1eBMh+d5m5Ez6t3jxAc58NbLHr9F8vcYdOYSk=";
 
   env.CGO_ENABLED = 0;
 

From 9303b49ee37c78ea200c3fab628e80719d649a0b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Aug 2026 12:49:18 +0000
Subject: [PATCH 076/205] 
 vscode-extensions.divyanshuagrawal.competitive-programming-helper:
 2026.7.1784984280 -> 2026.8.1785865132

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index be0e4ba63a75..908c222ca326 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1375,8 +1375,8 @@ let
         mktplcRef = {
           name = "competitive-programming-helper";
           publisher = "DivyanshuAgrawal";
-          version = "2026.7.1784984280";
-          hash = "sha256-0re8raTXTv61JUr0WeIOmSWIy5NsgmqKpkJo5nt8z+w=";
+          version = "2026.8.1785865132";
+          hash = "sha256-/JVuIOoTgeENtbvYFri1/RtiZ6PCabOrwC1mzHoaML4=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/DivyanshuAgrawal.competitive-programming-helper/changelog";

From 22f464e0e0f0b05a348ff60135a37c662ee2e801 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Aug 2026 13:28:47 +0000
Subject: [PATCH 077/205] python3Packages.jellyfin-apiclient-python: 1.17.0 ->
 1.18.0

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

diff --git a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
index 37ba7a87f7d1..f2b4adb35c44 100644
--- a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
+++ b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "jellyfin-apiclient-python";
-  version = "1.17.0";
+  version = "1.18.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin-apiclient-python";
     tag = "v${version}";
-    hash = "sha256-dSofOLzW/7YCUVjIBQxEPUu+TjNbjPzBlZ3I+yQ6Rw8=";
+    hash = "sha256-5xiKtV/nRvrRXHjLizY7vOV9bamk1elQmPt55QtA8xc=";
   };
 
   build-system = [ setuptools ];

From 5caaa569703a1e257e0cb4a7316a0d96aa0601a9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Aug 2026 13:52:18 +0000
Subject: [PATCH 078/205] python3Packages.tenant-schemas-celery: 4.0.3 -> 5.0.0

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

diff --git a/pkgs/development/python-modules/tenant-schemas-celery/default.nix b/pkgs/development/python-modules/tenant-schemas-celery/default.nix
index 6616ac04623a..e0ad542165ea 100644
--- a/pkgs/development/python-modules/tenant-schemas-celery/default.nix
+++ b/pkgs/development/python-modules/tenant-schemas-celery/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "tenant-schemas-celery";
-  version = "4.0.3";
+  version = "5.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "maciej-gol";
     repo = "tenant-schemas-celery";
     tag = version;
-    hash = "sha256-HLZQHwGCYYxU6LYvPoVhGeN8t5wqGVaXU44/qazf2aM=";
+    hash = "sha256-pwulEC7kZpM2f1s0ILi+S7KbxWJjg0O7AQ12/XPCzTQ=";
   };
 
   build-system = [ setuptools ];

From 632c05cddc5e6ccfc69bae6526d89a50238bab6b Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 8 Aug 2026 10:34:26 -0400
Subject: [PATCH 079/205] .github/actions/checkout: bump actions/github-script
 from 8 to 9

---
 .github/actions/checkout/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/checkout/action.yml b/.github/actions/checkout/action.yml
index 83995b1cb31c..91cca324fcd4 100644
--- a/.github/actions/checkout/action.yml
+++ b/.github/actions/checkout/action.yml
@@ -13,7 +13,7 @@ inputs:
 runs:
   using: composite
   steps:
-    - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+    - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
       env:
         MERGED_SHA: ${{ inputs.merged-as-untrusted-at }}
         TARGET_SHA: ${{ inputs.target-as-trusted-at }}

From 18551c1de26cf9b7192df3a0125faf2cdc65047f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Aug 2026 14:42:36 +0000
Subject: [PATCH 080/205] svtplay-dl: 4.191 -> 4.193

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

diff --git a/pkgs/by-name/sv/svtplay-dl/package.nix b/pkgs/by-name/sv/svtplay-dl/package.nix
index 844a6d6901dc..30a2e2f8aaba 100644
--- a/pkgs/by-name/sv/svtplay-dl/package.nix
+++ b/pkgs/by-name/sv/svtplay-dl/package.nix
@@ -22,7 +22,7 @@ let
     requests-mock
     ;
 
-  version = "4.191";
+  version = "4.193";
 
 in
 
@@ -35,7 +35,7 @@ buildPythonApplication {
     owner = "spaam";
     repo = "svtplay-dl";
     tag = version;
-    hash = "sha256-BOgCJeEUUTt1BoyalBbzgmTS2EaAgFpzhKtWvjBC+VI=";
+    hash = "sha256-AR7AITB3Mnfg1hMCe1TDQ7F3NwRDo9hMysPxV6O1m5A=";
   };
 
   build-system = [ setuptools ];

From 98198caa879ed8b3732d90c1eb0ebb73df3b6edc Mon Sep 17 00:00:00 2001
From: r0chd <oskarrochowiak@gmail.com>
Date: Sat, 8 Aug 2026 17:51:45 +0200
Subject: [PATCH 081/205] sessiond: 0.1.1 -> 0.2.0

---
 pkgs/by-name/se/sessiond/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/se/sessiond/package.nix b/pkgs/by-name/se/sessiond/package.nix
index 255c9bec1245..35bcd725d670 100644
--- a/pkgs/by-name/se/sessiond/package.nix
+++ b/pkgs/by-name/se/sessiond/package.nix
@@ -11,14 +11,14 @@
 rustPlatform.buildRustPackage (finalAttrs: {
   __structuredAttrs = true;
   pname = "sessiond";
-  version = "0.1.1";
+  version = "0.2.0";
 
-  cargoHash = "sha256-i5F9WJD6hMjgiAM43iR4+ZQKZmwtKhEY8uZ0KleNqE8=";
+  cargoHash = "sha256-QM5eDBSBahobqsJKFAG9eR/FvYrpVuQ3L1CXmhlIBFY=";
 
   src = fetchgit {
     url = "https://tangled.org/did:plc:vj3bxta3i3cp26nn46yideoh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8NFNFuolp0zqtBmEeI5ZP4aAmzdUMHNYwvm7esOoS8A=";
+    hash = "sha256-kygJ/Hw/5tBjGCxsRLrti3L1Zcpm8y5gLpGPGsqV0VI=";
   };
 
   nativeBuildInputs = [
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   meta = {
-    description = "Session and seat management daemon";
+    description = "Session management daemon";
     homepage = "https://tangled.org/r0chd.pl/sessiond";
     license = lib.licenses.gpl3Only;
     maintainers = builtins.attrValues { inherit (lib.maintainers) r0chd; };

From 852fe5006c30a116d0f6171171f4248fb4616756 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 8 Aug 2026 18:19:49 +0200
Subject: [PATCH 082/205] python3Packages.django-scim2: 0.20.0 -> 0.21.0, fix
 build

Also applies patches for Python 3.14 compat.
---
 .../python-modules/django-scim2/default.nix   | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-scim2/default.nix b/pkgs/development/python-modules/django-scim2/default.nix
index 28a2313cf548..505c38ec6d6e 100644
--- a/pkgs/development/python-modules/django-scim2/default.nix
+++ b/pkgs/development/python-modules/django-scim2/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
 
   # build-system
   poetry-core,
@@ -18,16 +19,35 @@
 
 buildPythonPackage rec {
   pname = "django-scim2";
-  version = "0.20.0";
+  version = "0.21.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "15five";
     repo = "django-scim2";
     tag = version;
-    hash = "sha256-OsfC6Jc/oQl6nzy3Nr3vkY+XicRxUoV62hK8MHa3LJ8=";
+    hash = "sha256-8zPUlvVHVowzPU+sfQGoOrJ+Vdm8zVKI5V+wTJnIBZ0=";
   };
 
+  patches = [
+    # These two patches update dependencies & the min. python version.
+    # They're applied such that the third can be applied trivially.
+    (fetchpatch {
+      url = "https://github.com/15five/django-scim2/commit/df3bd25d477928ceecdd02410babf9b59e67c595.patch";
+      hash = "sha256-BkBBbxImCKfSBDY7hTmKX6z/+l7H2MRmIJ4VHKxFtnM=";
+    })
+    (fetchpatch {
+      url = "https://github.com/15five/django-scim2/commit/be4e67f158b50fd216d723024d975d8b15f4031a.patch";
+      hash = "sha256-IE8yg7qdv5UWla5T1erAM3KK7TAb3qYBqjNJdV4+8C0=";
+    })
+    # Python 3.14 compat
+    # Includes support for newer Django.
+    (fetchpatch {
+      url = "https://github.com/15five/django-scim2/commit/131ec58a94c66f2f1b205a96e9405c76828de7db.patch";
+      hash = "sha256-KafF2I6CFCVz96NVHBoGmJLB6ejdLJaWBx2F0EoEwrI=";
+    })
+  ];
+
   build-system = [ poetry-core ];
 
   dependencies = [

From f3a28b010fd7029ee01ee4a598051ad75a6687d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Aug 2026 17:09:07 +0000
Subject: [PATCH 083/205] prow: 0-unstable-2026-07-14 -> 0-unstable-2026-08-08

---
 pkgs/by-name/pr/prow/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pr/prow/package.nix b/pkgs/by-name/pr/prow/package.nix
index 37dedda8d1f3..560b0949c634 100644
--- a/pkgs/by-name/pr/prow/package.nix
+++ b/pkgs/by-name/pr/prow/package.nix
@@ -8,18 +8,18 @@
 
 buildGoModule rec {
   pname = "prow";
-  version = "0-unstable-2026-07-14";
-  rev = "0633879af8026d056e1a5dbe1e29f5a98f6acec3";
+  version = "0-unstable-2026-08-08";
+  rev = "d06078952878afaf40df8696be3199ecc85e4837";
 
   src = fetchFromGitHub {
     inherit rev;
 
     owner = "kubernetes-sigs";
     repo = "prow";
-    hash = "sha256-tpIxZSqftGgA501zh4MyjTrBUvLOaLjkBO8nK/IDwhU=";
+    hash = "sha256-9RKtVIOrx08ZZWPZDH6sB7/KeLIr2kcpuBxZcBdCgSg=";
   };
 
-  vendorHash = "sha256-iLJ2atYyHNMvflyuETpPnuhKD293k25vfZQU68Y7oN8=";
+  vendorHash = "sha256-T0j9jkxussq1JzsiRjvBSrho+pmn+8KlsImI2hZWlyM=";
 
   # doCheck = false;
 

From 6e0624b6816547ff08d5caa81031a05f459c238d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 8 Aug 2026 20:27:47 +0200
Subject: [PATCH 084/205] python3Packages.comfy-aimdo: 0.4.11 -> 0.4.13

Diff: https://github.com/Comfy-Org/comfy-aimdo/compare/v0.4.11...v0.4.13
---
 pkgs/development/python-modules/comfy-aimdo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/comfy-aimdo/default.nix b/pkgs/development/python-modules/comfy-aimdo/default.nix
index bb5077603b8e..04a39749594e 100644
--- a/pkgs/development/python-modules/comfy-aimdo/default.nix
+++ b/pkgs/development/python-modules/comfy-aimdo/default.nix
@@ -21,14 +21,14 @@ let
 in
 buildPythonPackage (finalAttrs: {
   pname = "comfy-aimdo";
-  version = "0.4.11";
+  version = "0.4.13";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Comfy-Org";
     repo = "comfy-aimdo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-i/1/j+VKikPrgltmaaDGGp2KOAUY5VzjowZJZDQAbow=";
+    hash = "sha256-cIgvOC4Ocv3JiAdVMUGjX4cv+bGFkaiw65PRi0ys2ig=";
   };
 
   postPatch = ''

From 3fc15548985a2d985801f35d40e0f743adad4b4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 8 Aug 2026 20:27:37 +0200
Subject: [PATCH 085/205] python3Packages.comfy-kitchen: 0.2.26 -> 0.2.28

Diff: https://github.com/Comfy-Org/comfy-kitchen/compare/v0.2.26...v0.2.28
---
 pkgs/development/python-modules/comfy-kitchen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/comfy-kitchen/default.nix b/pkgs/development/python-modules/comfy-kitchen/default.nix
index 421f1a454cbd..8a817ee5ae28 100644
--- a/pkgs/development/python-modules/comfy-kitchen/default.nix
+++ b/pkgs/development/python-modules/comfy-kitchen/default.nix
@@ -17,14 +17,14 @@ let
 in
 buildPythonPackage (finalAttrs: {
   pname = "comfy-kitchen";
-  version = "0.2.26";
+  version = "0.2.28";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Comfy-Org";
     repo = "comfy-kitchen";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-T/govRMiwiANbVXRizY4W3jz4iN8NuLyM0nVA990Lwg=";
+    hash = "sha256-jtCW0mO78CuOWpM2TnlnEfDuti3BRXvT1VVDiDKSpeU=";
   };
 
   buildInputs = lib.optionals cudaSupport (

From ff5f140afdb16a66c67c3455b5c3427726bde2f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 8 Aug 2026 20:24:58 +0200
Subject: [PATCH 086/205] python3Packages.comfyui-frontend-package: 1.47.12 ->
 1.48.7

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

diff --git a/pkgs/development/python-modules/comfyui-frontend-package/default.nix b/pkgs/development/python-modules/comfyui-frontend-package/default.nix
index e588fca82b53..8ee9096c1586 100644
--- a/pkgs/development/python-modules/comfyui-frontend-package/default.nix
+++ b/pkgs/development/python-modules/comfyui-frontend-package/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "comfyui-frontend-package";
-  version = "1.47.12";
+  version = "1.48.7";
   pyproject = true;
 
   src = fetchPypi {
     pname = "comfyui_frontend_package";
     inherit (finalAttrs) version;
-    hash = "sha256-exS4vZBbwZ3KlYTv6OVljZTJKjSg3td2x7ZAj/aAUXk=";
+    hash = "sha256-7E7N5pXX4bbdIFJ88Nc9Iub1P1y+Czv7nZjamaa8NDg=";
   };
 
   build-system = [ setuptools ];

From 883644bf90e0fb065a93f9db568709478a9f8ad2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 8 Aug 2026 20:25:14 +0200
Subject: [PATCH 087/205] python3Packages.comfyui-workflow-templates: 0.11.31
 -> 0.11.37

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

diff --git a/pkgs/development/python-modules/comfyui-workflow-templates/default.nix b/pkgs/development/python-modules/comfyui-workflow-templates/default.nix
index ac59c05c67c2..5d9ed5417ceb 100644
--- a/pkgs/development/python-modules/comfyui-workflow-templates/default.nix
+++ b/pkgs/development/python-modules/comfyui-workflow-templates/default.nix
@@ -15,13 +15,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "comfyui-workflow-templates";
-  version = "0.11.31";
+  version = "0.11.37";
   pyproject = true;
 
   src = fetchPypi {
     pname = "comfyui_workflow_templates";
     inherit (finalAttrs) version;
-    hash = "sha256-tE2d5AgU39CW3PGYYW6k8a8YJU+MK837a0ms0gBOaS8=";
+    hash = "sha256-si/bxl5NXk0kSs91EhIwmLhlnWxW+3l4ZvisDI0YSbo=";
   };
 
   build-system = [ setuptools ];

From 73c1d65f4acd3bdc00698785ca573c32cd9086d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 8 Aug 2026 20:26:08 +0200
Subject: [PATCH 088/205] python3Packages.comfyui-workflow-templates-core:
 0.3.295 -> 0.3.302

---
 .../comfyui-workflow-templates-core/default.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/comfyui-workflow-templates-core/default.nix b/pkgs/development/python-modules/comfyui-workflow-templates-core/default.nix
index 9f809bea5a2b..c9b630a293d0 100644
--- a/pkgs/development/python-modules/comfyui-workflow-templates-core/default.nix
+++ b/pkgs/development/python-modules/comfyui-workflow-templates-core/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "comfyui-workflow-templates-core";
-  version = "0.3.295";
+  version = "0.3.302";
   pyproject = true;
 
   src = fetchPypi {
     pname = "comfyui_workflow_templates_core";
     inherit (finalAttrs) version;
-    hash = "sha256-Udr0hfQ41AkE+OXAt/YLJZ3QSQiHWNqjPqaZo0WFIrA=";
+    hash = "sha256-nZVZto1DBFT1S6t/21IJMxbZsIMcRoxmrhD0mBqQbu4=";
   };
 
   build-system = [ setuptools ];

From 5b1029ed17ea7f88b49169cd4a04b09ab411d265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 8 Aug 2026 20:26:17 +0200
Subject: [PATCH 089/205] python3Packages.comfyui-workflow-templates-json:
 0.1.30 -> 0.1.37

---
 .../comfyui-workflow-templates-json/default.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/comfyui-workflow-templates-json/default.nix b/pkgs/development/python-modules/comfyui-workflow-templates-json/default.nix
index 75f8b27c6483..e3e3da9f265b 100644
--- a/pkgs/development/python-modules/comfyui-workflow-templates-json/default.nix
+++ b/pkgs/development/python-modules/comfyui-workflow-templates-json/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "comfyui-workflow-templates-json";
-  version = "0.1.30";
+  version = "0.1.37";
   pyproject = true;
 
   src = fetchPypi {
     pname = "comfyui_workflow_templates_json";
     inherit (finalAttrs) version;
-    hash = "sha256-uAjVUvVLCR+2ySpZJn+NITtky0mxl90uul2UuusMJL0=";
+    hash = "sha256-Iod2Kh8he/cSBt7l/xf+rxPpbabARESFn1Zxmgjr5Ps=";
   };
 
   build-system = [ setuptools ];

From 453303cc0056c9cd4832ad84aeb19445553c9b03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 8 Aug 2026 20:26:31 +0200
Subject: [PATCH 090/205] 
 python3Packages.comfyui-workflow-templates-media-assets-01: 0.1.19 -> 0.1.24

---
 .../comfyui-workflow-templates-media-assets-01/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/comfyui-workflow-templates-media-assets-01/default.nix b/pkgs/development/python-modules/comfyui-workflow-templates-media-assets-01/default.nix
index c7415129210e..7d637886c3d8 100644
--- a/pkgs/development/python-modules/comfyui-workflow-templates-media-assets-01/default.nix
+++ b/pkgs/development/python-modules/comfyui-workflow-templates-media-assets-01/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "comfyui-workflow-templates-media-assets-01";
-  version = "0.1.19";
+  version = "0.1.24";
   pyproject = true;
 
   src = fetchPypi {
     pname = "comfyui_workflow_templates_media_assets_01";
     inherit (finalAttrs) version;
-    hash = "sha256-N+hWCIJID1r8lnS0hydmEygNTniXObfaZa2AyW7vBP0=";
+    hash = "sha256-IXMRhxUuY3ISb55TC02J65I6pk+IcpuDf2hLO1E+lso=";
   };
 
   build-system = [ setuptools ];

From 371a9edc5a2d15cf6ffdf5d81b784255c594cfdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 8 Aug 2026 20:30:04 +0200
Subject: [PATCH 091/205] comfyui: 0.30.2 -> 0.31.1

Diff: https://github.com/Comfy-Org/ComfyUI/compare/v0.30.2...v0.31.1

Changelog: https://github.com/Comfy-Org/ComfyUI/releases/tag/v0.31.1
---
 pkgs/by-name/co/comfyui/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/comfyui/package.nix b/pkgs/by-name/co/comfyui/package.nix
index 93e6cdad3d50..f540d6a23797 100644
--- a/pkgs/by-name/co/comfyui/package.nix
+++ b/pkgs/by-name/co/comfyui/package.nix
@@ -74,7 +74,7 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "comfyui";
-  version = "0.30.2";
+  version = "0.31.1";
 
   strictDeps = true;
   __structuredAttrs = true;
@@ -83,7 +83,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     owner = "Comfy-Org";
     repo = "ComfyUI";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fLtgJpK8hEuYcfu1vKGDJtszPfED4mmyKHZYrrq/uiA=";
+    hash = "sha256-zo5XPU10liF5SvVQ4WpRDmx0QfuZ0CNh6EjCa60/9hc=";
   };
 
   nativeBuildInputs = [ makeBinaryWrapper ];

From 6b2329f99456e6a3411dc84d64f8cdb8b8e7d4b6 Mon Sep 17 00:00:00 2001
From: BatteredBunny <ayes2022@protonmail.com>
Date: Fri, 7 Aug 2026 00:12:17 +0300
Subject: [PATCH 092/205] python3Packages.exllamav3: 1.3.0 -> 1.4.1

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

diff --git a/pkgs/development/python-modules/exllamav3/default.nix b/pkgs/development/python-modules/exllamav3/default.nix
index 86cd146e35ee..ef5f8030ce4f 100644
--- a/pkgs/development/python-modules/exllamav3/default.nix
+++ b/pkgs/development/python-modules/exllamav3/default.nix
@@ -8,8 +8,7 @@
   setuptools,
 
   flash-linear-attention,
-  formatron,
-  kbnf,
+  llguidance,
   marisa-trie,
   ninja,
   numpy,
@@ -27,14 +26,14 @@ let
 in
 buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
   pname = "exllamav3";
-  version = "1.3.0";
+  version = "1.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "turboderp-org";
     repo = "exllamav3";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pWdh5fiGZEkdSLXvI5DAEdj6XmBFquzew57L1YIsEg8=";
+    hash = "sha256-6TzJbLGcp3rmlpIRiz26bYVbW2ZORrsJF3257Iv2QZc=";
   };
 
   pythonRelaxDeps = [
@@ -59,8 +58,7 @@ buildPythonPackage.override { inherit (torch) stdenv; } (finalAttrs: {
 
   dependencies = [
     flash-linear-attention
-    formatron
-    kbnf
+    llguidance
     marisa-trie
     numpy
     pillow

From 7457048625d53d344dd743e04d22dcaa609091d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Aug 2026 20:13:19 +0000
Subject: [PATCH 093/205] flake-checker: 0.2.13 -> 0.2.14

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

diff --git a/pkgs/by-name/fl/flake-checker/package.nix b/pkgs/by-name/fl/flake-checker/package.nix
index c7617b718e06..0ad83033f848 100644
--- a/pkgs/by-name/fl/flake-checker/package.nix
+++ b/pkgs/by-name/fl/flake-checker/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "flake-checker";
-  version = "0.2.13";
+  version = "0.2.14";
 
   src = fetchFromGitHub {
     owner = "DeterminateSystems";
     repo = "flake-checker";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-QE/Druzo/EDiuh7Vb+kipPgUxkIRPLsHFMSpSRMFIVw=";
+    hash = "sha256-MUbF2mOrcoODe26j0OaXHLk73yFhB+0/d2yPaeBEi6M=";
   };
 
-  cargoHash = "sha256-kKEHYKXtccXRsa1cON0oMHOWagi3mVdnf3pEgkoNn/k=";
+  cargoHash = "sha256-toC9qMq06Grh6NJZZUb7cbQdNeI7lwqDqbJO85a3zwk=";
 
   meta = {
     description = "Health checks for your Nix flakes";

From 1a16ce8a7be81c6a63ab678617d29efc1bbb9b52 Mon Sep 17 00:00:00 2001
From: BatteredBunny <ayes2022@protonmail.com>
Date: Fri, 7 Aug 2026 00:29:57 +0300
Subject: [PATCH 094/205] tabbyapi: 0-unstable-2026-07-31 ->
 0-unstable-2026-08-08

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

diff --git a/pkgs/by-name/ta/tabbyapi/package.nix b/pkgs/by-name/ta/tabbyapi/package.nix
index e6eed91c61ff..74680320bd80 100644
--- a/pkgs/by-name/ta/tabbyapi/package.nix
+++ b/pkgs/by-name/ta/tabbyapi/package.nix
@@ -7,14 +7,14 @@
 }:
 python3Packages.buildPythonApplication {
   pname = "tabbyapi";
-  version = "0-unstable-2026-07-31";
+  version = "0-unstable-2026-08-08";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "theroyallab";
     repo = "tabbyAPI";
-    rev = "29680f496b57e3ed1a496c580677d2d67ac729b8";
-    hash = "sha256-eB8Q4iVlNCrgHHWutuhxzD+bQfC5Yx3z2rSCCSFsrL4=";
+    rev = "3d2848d03184344664b9a8ed7685033e87744742";
+    hash = "sha256-gmvr8d0vGlkFcSbjSvECGiYWM69Y2c8ZWqL59+s34Yw=";
   };
 
   build-system = with python3Packages; [
@@ -44,8 +44,7 @@ python3Packages.buildPythonApplication {
       sse-starlette
       packaging
       tokenizers
-      formatron
-      kbnf
+      numpy
       aiofiles
       aiohttp
       async-lru

From dc64a4d270c7940263843ffacab85ded5983f443 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Aug 2026 20:49:55 +0000
Subject: [PATCH 095/205] cudaPackages.cutlass: 4.6.1 -> 4.6.2

---
 pkgs/development/cuda-modules/packages/cutlass.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/cuda-modules/packages/cutlass.nix b/pkgs/development/cuda-modules/packages/cutlass.nix
index c2d68d097872..1cda0d339fd0 100644
--- a/pkgs/development/cuda-modules/packages/cutlass.nix
+++ b/pkgs/development/cuda-modules/packages/cutlass.nix
@@ -46,13 +46,13 @@ backendStdenv.mkDerivation (finalAttrs: {
   # NOTE: Depends on the CUDA package set, so use cudaNamePrefix.
   name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
   pname = "cutlass";
-  version = "4.6.1";
+  version = "4.6.2";
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "cutlass";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Eru8FdTUwuc4xXD9Pu8r0nRP9eK2MTIHHs9eNEiKQ0g=";
+    hash = "sha256-pXRmZ/60ENcLKxnvnMhTumetWV4e9nGNwJmT8EE0RQ8=";
   };
 
   # TODO: As a header-only library, we should make sure we have an `include` directory or similar which is not a

From d3dbec298f2601b495e8a979b04c2882ed2e3117 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Aug 2026 23:09:36 +0000
Subject: [PATCH 096/205] python3Packages.rstcheck: 6.2.5 -> 6.3.0

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

diff --git a/pkgs/development/python-modules/rstcheck/default.nix b/pkgs/development/python-modules/rstcheck/default.nix
index 5e9a9d03b83f..be4d5f435377 100644
--- a/pkgs/development/python-modules/rstcheck/default.nix
+++ b/pkgs/development/python-modules/rstcheck/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "rstcheck";
-  version = "6.2.5";
+  version = "6.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rstcheck";
     repo = "rstcheck";
     tag = "v${version}";
-    hash = "sha256-ajevEHCsPvr5e4K8I5AfxFZ+Vo1quaGUKFIEB9Wlobc=";
+    hash = "sha256-EjTJ4QukFGfiWCzwv3p8xOi6mib7+8gQCpVb4GGEqh4=";
   };
 
   build-system = [

From 6cb4b9e5d4ceadca92c963c561fb98c4e3eadac5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Aug 2026 23:26:01 +0000
Subject: [PATCH 097/205] melonds: 1.1-unstable-2026-07-29 ->
 1.1-unstable-2026-07-31

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

diff --git a/pkgs/by-name/me/melonds/package.nix b/pkgs/by-name/me/melonds/package.nix
index 07369ae4d77a..41be52040377 100644
--- a/pkgs/by-name/me/melonds/package.nix
+++ b/pkgs/by-name/me/melonds/package.nix
@@ -29,13 +29,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "melonds";
-  version = "1.1-unstable-2026-07-29";
+  version = "1.1-unstable-2026-07-31";
 
   src = fetchFromGitHub {
     owner = "melonDS-emu";
     repo = "melonDS";
-    rev = "b3dd9880768a5d36c8daf87229b0bc915b51c1ff";
-    hash = "sha256-wnfi43f2nUR4xh3BtlY8oKBsS8aFQ1xE7ZNp5cdkvb4=";
+    rev = "d3cd6164deb1f217d4b262d18af3ef9b97e536c8";
+    hash = "sha256-3epbcg/0Oq3Hndg/5VYKepPruUMHxEkL6LwIcdGm24g=";
   };
 
   nativeBuildInputs = [

From ed56ae7a54ebaa7069486d5872ed81881dd9e321 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Aug 2026 23:36:04 +0000
Subject: [PATCH 098/205] libretro.genesis-plus-gx: 0-unstable-2026-07-27 ->
 0-unstable-2026-08-07

---
 .../emulators/libretro/cores/genesis-plus-gx.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
index ff8a51e8043b..2e750cdd3a69 100644
--- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
+++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "genesis-plus-gx";
-  version = "0-unstable-2026-07-27";
+  version = "0-unstable-2026-08-07";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "Genesis-Plus-GX";
-    rev = "f687c49dc4b825101f26a483b222620686616b78";
-    hash = "sha256-CztdCuoNIGzpntWmdFmWaTv4TGbo3PdRiH57UMp785M=";
+    rev = "84fcf2ec8e6b8d901c2fec55c884f285f93a1679";
+    hash = "sha256-FQmDiCaxgWwDpUXT8NpiV/xtLdiRHizCVJpqs9PhpvM=";
   };
 
   meta = {

From 28f9d3e13a13f182814bdd9769c2703d95a617f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Aug 2026 01:02:50 +0000
Subject: [PATCH 099/205] python3Packages.pysmb: 1.2.14 -> 1.2.15

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

diff --git a/pkgs/development/python-modules/pysmb/default.nix b/pkgs/development/python-modules/pysmb/default.nix
index 1d074a81b6fd..77a0c2219d4e 100644
--- a/pkgs/development/python-modules/pysmb/default.nix
+++ b/pkgs/development/python-modules/pysmb/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pysmb";
-  version = "1.2.14";
+  version = "1.2.15";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "miketeo";
     repo = "pysmb";
     tag = "pysmb-${version}";
-    hash = "sha256-TwQ9gkhZ9nMyr30qJ9QVX3PPUtSPcxxBzKZr7Z7d9l8=";
+    hash = "sha256-Unc5CfLOyaoy25x7vhe3wqO2+bocvCbu3yrDwX3K06U=";
   };
 
   build-system = [ setuptools ];

From 86e8d22d12057ed509db95f36baeeffec39e9b8c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Aug 2026 03:45:57 +0000
Subject: [PATCH 100/205] grafanaPlugins.grafana-googlesheets-datasource: 2.5.1
 -> 2.6.1

---
 .../plugins/grafana-googlesheets-datasource/default.nix   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix
index 42fd24fb0f3b..e5651dcf4c9f 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix
@@ -2,11 +2,11 @@
 
 grafanaPlugin {
   pname = "grafana-googlesheets-datasource";
-  version = "2.5.1";
+  version = "2.6.1";
   zipHash = {
-    x86_64-linux = "sha256-Y6UvMLw+bAg0HTKsc2FdpY+S4Zf7gpgIVdZDFgr+mog=";
-    aarch64-linux = "sha256-feBfv07DrKdeJbeD0gnYoOhg1LG636cghVu1x8n9rCQ=";
-    aarch64-darwin = "sha256-0iv1oUj6bLw7kUOwkW69rs+4NIetp+uEgJ7YULkKYLE=";
+    x86_64-linux = "sha256-6Q/ZAwyUcpB491PyDIYz25clgMepzxGegTL1+i1oadY=";
+    aarch64-linux = "sha256-/xpkAB51nJbX/8LWu8uN2elybuxysaNIHsLt0NErtbE=";
+    aarch64-darwin = "sha256-EST0OcVMhQFYB5oRXmCUXVBLn34x9KcDceZrJFElVHY=";
   };
   meta = {
     description = "Integrate JSON data into Grafana";

From 789577132c520cbe4603ef24f07b65bada64de9c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Aug 2026 03:54:01 +0000
Subject: [PATCH 101/205] ananicy-rules-cachyos: 0-unstable-2026-07-29 ->
 0-unstable-2026-08-05

---
 pkgs/by-name/an/ananicy-rules-cachyos/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
index 35f057e1cf8d..32f215a987b0 100644
--- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
+++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "ananicy-rules-cachyos";
-  version = "0-unstable-2026-07-29";
+  version = "0-unstable-2026-08-05";
 
   src = fetchFromGitHub {
     owner = "CachyOS";
     repo = "ananicy-rules";
-    rev = "411f29641e4dd96da6a5c8a2ae09c0d708249364";
-    hash = "sha256-mmSyiNysVGV/fh1GopKozeE793S+3ikZD+PhMzQjyiA=";
+    rev = "489dd6c929d17e4f6a374746ebfce9fa7bd5a3d1";
+    hash = "sha256-FVN689V2b6lNu15Nx7TJsn+DqukhFZDL8ebtplFdYNs=";
   };
 
   dontConfigure = true;

From 8ab2addaa0c3540e783284652c25eb5d39eb40e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Aug 2026 03:57:02 +0000
Subject: [PATCH 102/205] python3Packages.qbittorrent-api: 2026.7.0 -> 2026.8.0

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

diff --git a/pkgs/development/python-modules/qbittorrent-api/default.nix b/pkgs/development/python-modules/qbittorrent-api/default.nix
index cbe22f5ad541..f3d8335e6890 100644
--- a/pkgs/development/python-modules/qbittorrent-api/default.nix
+++ b/pkgs/development/python-modules/qbittorrent-api/default.nix
@@ -15,13 +15,13 @@
 
 buildPythonPackage rec {
   pname = "qbittorrent-api";
-  version = "2026.7.0";
+  version = "2026.8.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "qbittorrent_api";
     inherit version;
-    hash = "sha256-nwpuM+5NuikNFV3jrVnBkd4C5NljnUJL8C7EoA7PMgU=";
+    hash = "sha256-QSepwdXHrZzU6N4W+D2u6i6LLtli+Z8oTSOPknR5ORo=";
   };
 
   build-system = [

From 302cf184b3e5c13decb422453f4d6ff623ce2fcd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Aug 2026 07:28:09 +0000
Subject: [PATCH 103/205] bichon: 1.6.2 -> 2.0.0

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

diff --git a/pkgs/by-name/bi/bichon/package.nix b/pkgs/by-name/bi/bichon/package.nix
index 48ac631c8013..73b79d9dee3d 100644
--- a/pkgs/by-name/bi/bichon/package.nix
+++ b/pkgs/by-name/bi/bichon/package.nix
@@ -13,17 +13,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "bichon";
-  version = "1.6.2";
+  version = "2.0.0";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "rustmailer";
     repo = "bichon";
     tag = finalAttrs.version;
-    hash = "sha256-a8BAO93eI2eiFwmvMqUsgL1KZ11X3qg/r/Iw6ckMSTs=";
+    hash = "sha256-WL3FC0ohdB6iB+D7xyVAeaZVGd/vyoraEI7W9ypRcIE=";
   };
 
-  cargoHash = "sha256-GC/2bswme76bAFRCsBHFi3lWnYx5x5H58emCmkiyKfE=";
+  cargoHash = "sha256-7MA+J30sE4H/UVT3HqJnpYsqefsHCQ88Dsq3240smZY=";
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;

From e054ae3509e3e50aeb3e99ddb658fdae1283a24e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Aug 2026 08:02:45 +0000
Subject: [PATCH 104/205] python3Packages.tomlrt: 2.2.0 -> 2.2.1

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

diff --git a/pkgs/development/python-modules/tomlrt/default.nix b/pkgs/development/python-modules/tomlrt/default.nix
index 9f2d1ff03cca..3a660e3373c9 100644
--- a/pkgs/development/python-modules/tomlrt/default.nix
+++ b/pkgs/development/python-modules/tomlrt/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "tomlrt";
-  version = "2.2.0";
+  version = "2.2.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-5lKT84Rl6pz8kKZveOFHuxBqi9veF3N76abxtzicXuo=";
+    hash = "sha256-CWKHINwKrTP64H3HChRJyjrBW7cU0TS2ouY9++tPVcE=";
   };
 
   build-system = [ hatchling ];

From 282a60e576bc1f11d8c50d300444218c58a81064 Mon Sep 17 00:00:00 2001
From: Andrew Zah <zah@andrewzah.com>
Date: Thu, 2 Jul 2026 15:22:08 +0900
Subject: [PATCH 105/205] codex-relay: init at 0.5.6

---
 pkgs/by-name/co/codex-relay/package.nix | 39 +++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 pkgs/by-name/co/codex-relay/package.nix

diff --git a/pkgs/by-name/co/codex-relay/package.nix b/pkgs/by-name/co/codex-relay/package.nix
new file mode 100644
index 000000000000..157c2816e0ba
--- /dev/null
+++ b/pkgs/by-name/co/codex-relay/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "codex-relay";
+  version = "0.5.6";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "MetaFARS";
+    repo = "codex-relay";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-JjrtQev2lujweV3dNiPC5ZV+LTPHX4BjWASfrI4/zy8=";
+  };
+
+  cargoHash = "sha256-Ihdm2GhUhxlZw61w01Nakod4ZIAdHeBv2rCCrMQrC7I=";
+
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = with lib; {
+    description = "Responses API ↔  Chat Completions translation bridge for Codex CLI";
+    longDescription = ''
+      A lightweight Rust proxy that translates the OpenAI Responses API
+      (used by Codex CLI) into the Chat Completions API, letting Codex work
+      with any OpenAI-compatible provider —  DeepSeek, Kimi, Qwen, Mistral,
+      Groq, xAI, OpenRouter, and more.
+    '';
+    homepage = "https://github.com/MetaFARS/codex-relay";
+    changelog = "https://github.com/MetaFARS/codex-relay/releases/tag/v${finalAttrs.version}";
+    license = licenses.mit;
+    mainProgram = "codex-relay";
+    maintainers = [ maintainers.andrewzah ];
+  };
+})

From aa4bc79330ae55b4c33106bf776f6ae316bfb32b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Aug 2026 11:45:45 +0000
Subject: [PATCH 106/205] runpodctl: 2.8.0 -> 2.9.0

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

diff --git a/pkgs/by-name/ru/runpodctl/package.nix b/pkgs/by-name/ru/runpodctl/package.nix
index 361826fc36bc..ded5563fc7bb 100644
--- a/pkgs/by-name/ru/runpodctl/package.nix
+++ b/pkgs/by-name/ru/runpodctl/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "runpodctl";
-  version = "2.8.0";
+  version = "2.9.0";
 
   src = fetchFromGitHub {
     owner = "runpod";
     repo = "runpodctl";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ZbqpeXQQA6ulcKn70BqHtYmdUQLsZuSnFd/GqrtWb5w=";
+    hash = "sha256-0QMDJ7xdVfm3kPYgJcNgyyInSY8UWbbzQI0bT69x1us=";
   };
 
   vendorHash = "sha256-aCrN521urP1FioTmbcR1BNKg+OCith1mabyayuC9FtI=";

From 66339bab41f4110e87d165847f988c12ef05c70b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Aug 2026 11:51:47 +0000
Subject: [PATCH 107/205] libretro.gambatte: 0-unstable-2026-07-17 ->
 0-unstable-2026-07-31

---
 pkgs/applications/emulators/libretro/cores/gambatte.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/gambatte.nix b/pkgs/applications/emulators/libretro/cores/gambatte.nix
index 2229f2efc0fe..b549d8939e3a 100644
--- a/pkgs/applications/emulators/libretro/cores/gambatte.nix
+++ b/pkgs/applications/emulators/libretro/cores/gambatte.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "gambatte";
-  version = "0-unstable-2026-07-17";
+  version = "0-unstable-2026-07-31";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "gambatte-libretro";
-    rev = "9b3b5e3cc18ec92f460d37dd551eaf90c55bfcea";
-    hash = "sha256-IBQmVcWx839rRV8uLUou4fdwxgZqVbMWyqRVa3Dq0rc=";
+    rev = "96174369b3c30d9fc57c926fa3379c273dc6a9a5";
+    hash = "sha256-DEXyycFfQMK3RksP+4YxBIPYqmCFH4fM39MKxw6VOBU=";
   };
 
   meta = {

From d0a758bc2f7857e401728fc419038793bf161557 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Aug 2026 11:53:25 +0000
Subject: [PATCH 108/205] python3Packages.materialyoucolor: 3.0.3 -> 3.0.4

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

diff --git a/pkgs/development/python-modules/materialyoucolor/default.nix b/pkgs/development/python-modules/materialyoucolor/default.nix
index 4a3e317fa1eb..222a04bc67e9 100644
--- a/pkgs/development/python-modules/materialyoucolor/default.nix
+++ b/pkgs/development/python-modules/materialyoucolor/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "materialyoucolor";
-  version = "3.0.3";
+  version = "3.0.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "T-Dynamos";
     repo = "materialyoucolor-python";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wD6Vh0Ao+zq8FmUXcBaJYGcdw+hCk8lZ2FvODhwJBCE=";
+    hash = "sha256-F4Tl9MBf41K5y1wmuCcDIqGU/vuspRGuiX/47CBl6FQ=";
   };
 
   build-system = [

From 83851807a0a0541d528d4b2a20112f4271018735 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Aug 2026 11:55:31 +0000
Subject: [PATCH 109/205] grafanaPlugins.grafana-metricsdrilldown-app: 2.3.0 ->
 2.4.0

---
 .../grafana/plugins/grafana-metricsdrilldown-app/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
index e893f07c1d65..4939e70072ea 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "grafana-metricsdrilldown-app";
-  version = "2.3.0";
-  zipHash = "sha256-Ii4XYEtxbvkYSE3TlYcs0S3ZCRXH9s/Trn+tSggQWTM=";
+  version = "2.4.0";
+  zipHash = "sha256-OeDvm8tJSu/Tv80PKqqmc7932omgKXO50wTy04QPyUQ=";
   meta = {
     description = "Queryless experience for browsing Prometheus-compatible metrics. Quickly find related metrics without writing PromQL queries";
     license = lib.licenses.agpl3Only;

From 39db043a74a9dd9b40d13c51429cd7d4ebc1e2bb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Aug 2026 12:22:12 +0000
Subject: [PATCH 110/205] vscode-extensions.tuttieee.emacs-mcx: 0.111.1 ->
 0.111.3

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index be0e4ba63a75..300874b2d19e 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4852,8 +4852,8 @@ let
         mktplcRef = {
           name = "emacs-mcx";
           publisher = "tuttieee";
-          version = "0.111.1";
-          hash = "sha256-+0wIC/7xbun2Wf8wePU6NSR9UMNd0RvLz6UdAM3X5Y4=";
+          version = "0.111.3";
+          hash = "sha256-yMiEvC7zCVnBSSo+HvK9m7RbD6Bmv7zwKabOtlsEXjE=";
         };
         meta = {
           changelog = "https://github.com/whitphx/vscode-emacs-mcx/blob/main/CHANGELOG.md";

From c200bc429be01a519b1f0143c5c0a209f24dcd8a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Aug 2026 12:56:33 +0000
Subject: [PATCH 111/205] syncpack: 15.3.2 -> 15.3.3

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

diff --git a/pkgs/by-name/sy/syncpack/package.nix b/pkgs/by-name/sy/syncpack/package.nix
index 94e7c34c20c4..ae7cc5546de4 100644
--- a/pkgs/by-name/sy/syncpack/package.nix
+++ b/pkgs/by-name/sy/syncpack/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "syncpack";
-  version = "15.3.2";
+  version = "15.3.3";
 
   src = fetchFromGitHub {
     owner = "JamieMason";
     repo = "syncpack";
     tag = finalAttrs.version;
-    hash = "sha256-hpTVubKPuRtVxjaWetpFaK71UJXMAfOvWCZ4SqgOi0Y=";
+    hash = "sha256-njA6NMIoY38Ej/ymZIVcCVVkM+tPFrDmXWXrDXlYUdw=";
   };
 
-  cargoHash = "sha256-sjHyifhKU7FxwxrrAPuMwcUEw0lDGV83mOxXzLZul88=";
+  cargoHash = "sha256-phBgKoFHyqXRwf+aTuy/cwiBr1rKuERFrXuWJQKl7+4=";
 
   __structuredAttrs = true;
 

From bdd977b75880c6526e7e6a3c9b079baac816b9ab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Aug 2026 13:07:33 +0000
Subject: [PATCH 112/205] cel-go: 0.30.0 -> 0.31.0

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

diff --git a/pkgs/by-name/ce/cel-go/package.nix b/pkgs/by-name/ce/cel-go/package.nix
index 021fa5bd71bb..d749a04589fc 100644
--- a/pkgs/by-name/ce/cel-go/package.nix
+++ b/pkgs/by-name/ce/cel-go/package.nix
@@ -26,18 +26,18 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "cel-go";
-  version = "0.30.0";
+  version = "0.31.0";
 
   src = fetchFromGitHub {
     owner = "cel-expr";
     repo = "cel-go";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-D07O4eLNvOLecIRDylUC5Rrc8EfworHwEPIzTZV82IU=";
+    hash = "sha256-d2qteEY7aRKvzD+uF7uNibUv5dECaL61NogbZfd3cAQ=";
   };
 
   modRoot = "repl";
 
-  vendorHash = "sha256-AR1XxMJZEtfFgq/H/N07d/qpnI7K1/IHZCHqvqIfeC8=";
+  vendorHash = "sha256-SetkDfzfR/zqkNirGeGlczvV5h/CM9GiAPP2pKq6QDU=";
 
   subPackages = [
     "main"

From 8cf692c9ffe00a6729dafe2af4080bfa828e18bd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Aug 2026 14:11:52 +0000
Subject: [PATCH 113/205] fotowall: 1.1.2 -> 1.1.3

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

diff --git a/pkgs/by-name/fo/fotowall/package.nix b/pkgs/by-name/fo/fotowall/package.nix
index 92fde5f9fdba..80667be6dca3 100644
--- a/pkgs/by-name/fo/fotowall/package.nix
+++ b/pkgs/by-name/fo/fotowall/package.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   pname = "fotowall";
-  version = "1.1.2";
+  version = "1.1.3";
   strictDeps = true;
   __structuredAttrs = true;
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     owner = "fotowall";
     repo = "fotowall";
     rev = "v${version}";
-    hash = "sha256-icZUT17vgpI65Vyx7/TuTP4ISDkb7mrXwuyVzDHcoNE=";
+    hash = "sha256-u3EV8UzfESbhaIDLYimYnjDXiP0j04VKoqqO/NglFLA=";
   };
 
   nativeBuildInputs = [

From 2efb4f73f15b1e0fb33a0dcbafe0e8cfcffff17b Mon Sep 17 00:00:00 2001
From: Fiona Behrens <me@kloenk.dev>
Date: Tue, 12 Aug 2025 20:38:05 +0200
Subject: [PATCH 114/205] wlink: fix build on darwin

Add darwin.DarwinTools and remove udev for builds on darwin
---
 pkgs/by-name/wl/wlink/package.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/wl/wlink/package.nix b/pkgs/by-name/wl/wlink/package.nix
index 1012eaeea8fd..2174adafb86a 100644
--- a/pkgs/by-name/wl/wlink/package.nix
+++ b/pkgs/by-name/wl/wlink/package.nix
@@ -8,6 +8,7 @@
   udev,
   nix-update-script,
   versionCheckHook,
+  darwin,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -21,12 +22,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-GKtoGmK2Y3qmwAhlSk42iqvPd2qFXhcu4GBDGnVBxVo=";
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ];
 
   buildInputs = [
     libusb1
-    udev
-  ];
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ udev ];
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
@@ -43,8 +47,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
       mit # or
       asl20
     ];
-    platforms = with lib.platforms; linux ++ darwin ++ windows;
-    broken = !stdenv.hostPlatform.isLinux;
+    platforms = with lib.platforms; linux ++ lib.platforms.darwin ++ windows;
+    broken = stdenv.hostPlatform.isWindows;
     maintainers = with lib.maintainers; [ jwillikers ];
     mainProgram = "wlink";
   };

From 26cf717e22ba0f4373afa70be226f87faa998e43 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Aug 2026 14:35:31 +0000
Subject: [PATCH 115/205] python3Packages.kafka-python: 3.0.9 -> 3.0.10

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

diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix
index d6657816a573..3f79526206be 100644
--- a/pkgs/development/python-modules/kafka-python/default.nix
+++ b/pkgs/development/python-modules/kafka-python/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "kafka-python";
-  version = "3.0.9";
+  version = "3.0.10";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -31,7 +31,7 @@ buildPythonPackage (finalAttrs: {
     owner = "dpkp";
     repo = "kafka-python";
     tag = finalAttrs.version;
-    hash = "sha256-Dvi5zWArY3QkQYUhM4XU//2HiSZ1Ks4bJFJ6a9xIEPQ=";
+    hash = "sha256-BTUFwTpzNtgMisbU3bXXCVF/DhTmYzqQuxFTp7g/b7Y=";
   };
 
   build-system = [ setuptools ];

From 03d922c964668ac3e2e21b06646af640c48635ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Aug 2026 18:41:58 +0000
Subject: [PATCH 116/205] tree-sitter-grammars.tree-sitter-sshclientconfig:
 2026.7.30 -> 2026.8.6

---
 pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
index 5f0872632971..a27c2c2d4679 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
+++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix
@@ -2556,9 +2556,9 @@
   };
 
   sshclientconfig = rec {
-    version = "2026.7.30";
+    version = "2026.8.6";
     url = "github:metio/tree-sitter-ssh-client-config?ref=${version}";
-    hash = "sha256-pZcEtZ9PBpydW4iVLPmnYCgLyEsi/UqRs7Szc6oEwio=";
+    hash = "sha256-2po80xskxqmgwA32WIj9yE2BtjALUFcKCcwjcYx6jMg=";
     meta = {
       license = lib.licenses.cc0;
       maintainers = with lib.maintainers; [

From 168129433670d523ca30d6ddda36c3fd8cbfadbb Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Wed, 3 Jun 2026 01:10:40 +0200
Subject: [PATCH 117/205] python3Packages.cfscrape: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/cfscrape/default.nix b/pkgs/development/python-modules/cfscrape/default.nix
index e8a2a1879d3a..647b93374cf0 100644
--- a/pkgs/development/python-modules/cfscrape/default.nix
+++ b/pkgs/development/python-modules/cfscrape/default.nix
@@ -3,12 +3,14 @@
   buildPythonPackage,
   fetchFromGitHub,
   requests,
+  setuptools,
 }:
 
 buildPythonPackage {
   pname = "cfscrape";
   version = "2.1.1";
-  format = "setuptools";
+  pyproject = true;
+
   src = fetchFromGitHub {
     owner = "Anorov";
     repo = "cloudflare-scrape";
@@ -16,7 +18,9 @@ buildPythonPackage {
     hash = "sha256-uO8lBZonjk+mlFYoNSaz+GIN/W9yf8VL9OQ7MKfsMgI=";
   };
 
-  propagatedBuildInputs = [ requests ];
+  build-system = [ setuptools ];
+
+  dependencies = [ requests ];
 
   doCheck = false;
 

From 3a4843f7dcdd09f8aee248810d741ba6f615d7f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Aug 2026 19:08:40 +0000
Subject: [PATCH 118/205] rain-bittorrent: 2.3.1 -> 2.4.0

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

diff --git a/pkgs/by-name/ra/rain-bittorrent/package.nix b/pkgs/by-name/ra/rain-bittorrent/package.nix
index a68aaa4a6547..0ee868c8671a 100644
--- a/pkgs/by-name/ra/rain-bittorrent/package.nix
+++ b/pkgs/by-name/ra/rain-bittorrent/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "rain";
-  version = "2.3.1";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "cenkalti";
     repo = "rain";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PrzpaFGi4uGIXQ/L8dgJl7NrLD2SQwuI2vfCq2NPLLg=";
+    hash = "sha256-Bl9d3U3ztjHnTB3tUNe/k9n4z0THXMLmC0/wzBiaGMw=";
   };
 
-  vendorHash = "sha256-/OjWPt4X4xfcFgX8H2dd2T/wl/wH9Nz1l0uA2Ejd21Q=";
+  vendorHash = "sha256-hmBUvtLtbWa/a2Ah1mr1rsZxxFT3xY0Sy6uHVyTMljw=";
 
   meta = {
     description = "BitTorrent client and library in Go";

From 5e95f33129f1febf4651d1b8d522ea92817b8ec6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Aug 2026 19:45:36 +0000
Subject: [PATCH 119/205] couchbase-shell: 1.3.0 -> 1.4.0

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

diff --git a/pkgs/by-name/co/couchbase-shell/package.nix b/pkgs/by-name/co/couchbase-shell/package.nix
index 421ec259bca8..2653fa8d2c2f 100644
--- a/pkgs/by-name/co/couchbase-shell/package.nix
+++ b/pkgs/by-name/co/couchbase-shell/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "couchbase-shell";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "couchbaselabs";
     repo = "couchbase-shell";
     rev = "v${version}";
-    hash = "sha256-t4y0VxjRaJ5G/vpqq3/oLE/pIXSDAk+l+9fCcr9n6I4=";
+    hash = "sha256-eJWkqtDwLZsU3PlVud+PuXpg5kxLWe2IpbOXTzT40kA=";
   };
 
-  cargoHash = "sha256-f2WYczO2kr5BloXGLjjlnmyaKlr9+IH7i8cqGFUEcVA=";
+  cargoHash = "sha256-dcvbSndgMMVP6PO7CxlEUYNfx60dcKFBZ3U+/963LTk=";
 
   nativeBuildInputs = [
     pkg-config

From 34083433f3a96330c5820328d09dbf8815527657 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Aug 2026 20:01:44 +0000
Subject: [PATCH 120/205] vscode-extensions.coder.coder-remote: 1.15.2 ->
 1.16.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index be0e4ba63a75..707ddc01fa3d 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1007,8 +1007,8 @@ let
         mktplcRef = {
           name = "coder-remote";
           publisher = "coder";
-          version = "1.15.2";
-          hash = "sha256-mBACvGUQF3LoaFJ9MIewN9zu4jDTWfUgyd1MQvZQUvk=";
+          version = "1.16.0";
+          hash = "sha256-ZQivZPBQ10KwtY8LaQPeDNYl5jcpY1kAkT65yiQvR+M=";
         };
         meta = {
           description = "Extension for Visual Studio Code to open any Coder workspace in VS Code with a single click";

From 560c63119aba833c03e31087c8e4577af2ed70fb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Aug 2026 20:51:17 +0000
Subject: [PATCH 121/205] python3Packages.genai-prices: 0.1.0 -> 0.1.1

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

diff --git a/pkgs/development/python-modules/genai-prices/default.nix b/pkgs/development/python-modules/genai-prices/default.nix
index 0383a4c8e91f..11ce67ede9e3 100644
--- a/pkgs/development/python-modules/genai-prices/default.nix
+++ b/pkgs/development/python-modules/genai-prices/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "genai-prices";
-  version = "0.1.0";
+  version = "0.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "genai-prices";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mljmeZ9Xga0E4NM4FVz5lHNE1th45lrFzqAA6nCqPmw=";
+    hash = "sha256-X7WWTm/kRaSUgNzbR1DhfJaujF+tS7ye4VFM/Vy/MH0=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/packages/python";

From 58ee12dccd7ab3565db01e7443f7e636d6c7da98 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Aug 2026 21:06:24 +0000
Subject: [PATCH 122/205] buildpack: 0.40.8 -> 0.40.9

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

diff --git a/pkgs/by-name/bu/buildpack/package.nix b/pkgs/by-name/bu/buildpack/package.nix
index 9cc9b7fc1cc1..454392c4f3c0 100644
--- a/pkgs/by-name/bu/buildpack/package.nix
+++ b/pkgs/by-name/bu/buildpack/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "pack";
-  version = "0.40.8";
+  version = "0.40.9";
 
   src = fetchFromGitHub {
     owner = "buildpacks";
     repo = "pack";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mD32ZQ/PxiWnOvCdDFlNx1NIevhfgPcg9+ToUmfM6jo=";
+    hash = "sha256-RBDkPqlck64ChnXGFa1sa0WmC2T66ZBN6nQbstymSHU=";
   };
 
-  vendorHash = "sha256-0cyxhyEt4P+sd0FmN177rsTugWM0x2Ebk1LEHtX9wZE=";
+  vendorHash = "sha256-iJTEdnWJb1YyZ0mkamlKkCq/dJsMP6s0h+S8Bh3CnVM=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 6828d1113cad655ce5310d4d4e6f6e89d5645abd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Aug 2026 21:35:51 +0000
Subject: [PATCH 123/205] pykickstart: 3.76 -> 3.77

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

diff --git a/pkgs/by-name/py/pykickstart/package.nix b/pkgs/by-name/py/pykickstart/package.nix
index 1ae906737749..43d15ce5977a 100644
--- a/pkgs/by-name/py/pykickstart/package.nix
+++ b/pkgs/by-name/py/pykickstart/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "pykickstart";
-  version = "3.76";
+  version = "3.77";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pykickstart";
     repo = "pykickstart";
     tag = "r${finalAttrs.version}";
-    hash = "sha256-PS6kk2KcnYNCsfPVixl6i5zymZyVLx28+cCUEbaJtJo=";
+    hash = "sha256-WoYCZ4b8fTf+JD/lG83miJY/Vo6zG+ZvU58rdR6r2k0=";
   };
 
   build-system = with python3Packages; [

From f8b9b7a087bf5a1c7358639e49af995a41d10c9f Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Mon, 10 Aug 2026 00:49:56 +0300
Subject: [PATCH 124/205] stdenv/darwin: move the libiconv alias assertion into
 tests.stdenv

The final stage asserted

    assert prevStage.libiconv == prevStage.darwin.libiconv;

On Darwin `libiconv` is `darwin.libiconv`, so this compares a value with
itself. Nix does not notice: `eqValues` short-circuits only on pointer
identity of the two value slots, and these are two slots that resolve to
one attribute set. It therefore falls through to the derivation case,
which compares `outPath`.

`lib.extendDerivation` guards `outPath` behind the derivation's validity,
which reads `config.allowUnfree`, so the assertion demanded a `config`
option while the package set was still being assembled. When `config` is a
function it is passed `pkgs`, and the loop closes:

    (import <nixpkgs> {
      system = "aarch64-darwin";
      config = { pkgs, lib, ... }: { allowUnfree = lib.isAttrs pkgs; };
    }).config.allowUnfree

failed with an infinite recursion on Darwin while evaluating on Linux,
whose stdenv never forces a derivation that early. It now evaluates on
both.

Keep checking the invariant, from `tests.stdenv` instead. By then the
package set is complete, so forcing `outPath` is just a read.
The other twelve assertions in the stage read `passthru` and
`stdenv.cc.cc`, which are ungated, and stay where they are.

Assisted-by: claude-code with claude-opus-5[1m]-high
---
 pkgs/stdenv/darwin/default.nix | 3 ---
 pkgs/test/stdenv/default.nix   | 7 +++++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 208f11551127..af853e04bfb2 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -1177,9 +1177,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
     assert isFromNixpkgs prevStage.binutils-unwrapped.src;
     assert isBuiltByNixpkgsCompiler prevStage.curl;
 
-    # libiconv should be an alias for darwin.libiconv
-    assert prevStage.libiconv == prevStage.darwin.libiconv;
-
     {
       inherit (prevStage) config overlays stdenv;
     }
diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix
index d15c5021422a..a9d7d338c209 100644
--- a/pkgs/test/stdenv/default.nix
+++ b/pkgs/test/stdenv/default.nix
@@ -249,6 +249,13 @@ in
     }
   );
 
+  # `libiconv` should be an alias for `darwin.libiconv`. Checked here and not in
+  # the Darwin stdenv because comparing derivations forces `outPath`, which is
+  # guarded behind validity, which reads `config` — a cycle during bootstrap.
+  darwin-libiconv-alias =
+    assert stdenv.hostPlatform.isDarwin -> pkgs.libiconv == pkgs.darwin.libiconv;
+    pkgs.emptyFile;
+
   outputs-no-out =
     runCommand "outputs-no-out-assert"
       {

From 014065c6606af7f9b3f0070b8e1ac8ceacc47084 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Aug 2026 22:32:27 +0000
Subject: [PATCH 125/205] doggo: 1.2.0 -> 1.3.0

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

diff --git a/pkgs/by-name/do/doggo/package.nix b/pkgs/by-name/do/doggo/package.nix
index a3893d4912cb..44134dba6511 100644
--- a/pkgs/by-name/do/doggo/package.nix
+++ b/pkgs/by-name/do/doggo/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "doggo";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "mr-karan";
     repo = "doggo";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-xzwgNuvEedqC0DS0cMi472x2Tx0mWdk+22E9Bz1G9Tk=";
+    hash = "sha256-BU32Ewfpuao7UwveIenla2ZFEbqh3qoBP86ia3AWNTE=";
   };
 
-  vendorHash = "sha256-AJQQVhrYhgazCwI2Dnvorj4Y78iwVO7mhx1gzZUA9BI=";
+  vendorHash = "sha256-8lww9fzS5o25OGk9aI/E0FBNw1J7RQ7OGJaGqHmAKKg=";
   nativeBuildInputs = [ installShellFiles ];
   subPackages = [ "cmd/doggo" ];
 

From 4966010df44353f258cfa12ae7f6a0d9582b9eea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Aug 2026 22:49:40 +0000
Subject: [PATCH 126/205] diesel-cli: 2.3.11 -> 2.3.12

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

diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix
index b70a321014f0..6ceab95ea938 100644
--- a/pkgs/by-name/di/diesel-cli/package.nix
+++ b/pkgs/by-name/di/diesel-cli/package.nix
@@ -27,15 +27,15 @@ assert lib.assertMsg (lib.elem true [
 
 rustPlatform.buildRustPackage rec {
   pname = "diesel-cli";
-  version = "2.3.11";
+  version = "2.3.12";
 
   src = fetchCrate {
     inherit version;
     crateName = "diesel_cli";
-    hash = "sha256-zxlV3AbG5cBBGUk3hx9U3OR26lB3G2QQlcxTg00WJZQ=";
+    hash = "sha256-cWroMSZqNMTH1+Pbiu8WiU4by2OHnXTgBHKSKaM3NYI=";
   };
 
-  cargoHash = "sha256-GytJ0Eq4LkdSq1fosXFoC0nI7bY0VdM8oOV/tvyUSMg=";
+  cargoHash = "sha256-0JZcDAWsZ1ojZbUhghQt4rDmm+I/naQ5tllFRnTWCnM=";
 
   nativeBuildInputs = [
     installShellFiles

From 89d4cdc2670bca94a431eb4e07598ff183f1fba5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Aug 2026 23:04:09 +0000
Subject: [PATCH 127/205] airwindows: 0-unstable-2026-07-19 ->
 0-unstable-2026-08-02

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

diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix
index 00d0ccf51fc4..e6307ac1a96f 100644
--- a/pkgs/by-name/ai/airwindows/package.nix
+++ b/pkgs/by-name/ai/airwindows/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation {
   pname = "airwindows";
-  version = "0-unstable-2026-07-19";
+  version = "0-unstable-2026-08-02";
 
   src = fetchFromGitHub {
     owner = "airwindows";
     repo = "airwindows";
-    rev = "51a71636fe38bc51cee54861689318ffb7d2e434";
-    hash = "sha256-DsY1Tto4M1/+tNVtAxdk1NvrEFxMgzZsiylmprSZtTM=";
+    rev = "5c8aae0c97ad547561056738a7c1d4d579113ffb";
+    hash = "sha256-kVUhTTFWYTw5U1P/q6Ypk2PxOvpVDS0Ze4tyGF0ZjJI=";
   };
 
   # we patch helpers because honestly im spooked out by where those variables

From ad6fe71504ff652bd8b52839de83575d15a02c29 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Aug 2026 23:57:45 +0000
Subject: [PATCH 128/205] apko: 1.2.30 -> 1.2.35

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

diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix
index 611491298716..a1269cb68133 100644
--- a/pkgs/by-name/ap/apko/package.nix
+++ b/pkgs/by-name/ap/apko/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "apko";
-  version = "1.2.30";
+  version = "1.2.35";
 
   src = fetchFromGitHub {
     owner = "chainguard-dev";
     repo = "apko";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uNUzlPuk2HD7O4ENnQ01u9h2U0PbP3a4XiYYvVuksqo=";
+    hash = "sha256-A2rzKNIhcfsFFMU0My6Ak++T1D5WGBrdK4SW1XQoCyw=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
       find "$out" -name .git -print0 | xargs -0 rm -rf
     '';
   };
-  vendorHash = "sha256-HZrL3K1gbg5fXp0yrfXxgZ780qTGJJ2bpZ7Y//EhOqo=";
+  vendorHash = "sha256-sPLqpe7oKN30igq4OQAIh13vohuhnDoijCM0q3nHIZ0=";
 
   excludedPackages = [
     "internal/gen-jsonschema"

From 553e60ba989f48abfbe58d2f7cdb8bab4f74ad72 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 00:31:17 +0000
Subject: [PATCH 129/205] browsers: 0.7.3 -> 0.7.4

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

diff --git a/pkgs/by-name/br/browsers/package.nix b/pkgs/by-name/br/browsers/package.nix
index d17f73efcb8d..62e177dc9d79 100644
--- a/pkgs/by-name/br/browsers/package.nix
+++ b/pkgs/by-name/br/browsers/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "browsers";
-  version = "0.7.3";
+  version = "0.7.4";
 
   src = fetchFromGitHub {
     owner = "Browsers-software";
     repo = "browsers";
     tag = finalAttrs.version;
-    hash = "sha256-QrIE9buG46JDxGFI6tjxzMizic82Az61MgMhKU854bY=";
+    hash = "sha256-0ITNw0xWG0BWQRRYKCRwiYhFUw6QkYukCCybt7Mdq7A=";
   };
 
-  cargoHash = "sha256-JZoc5EwOXgv50LblYjEW8tsD4roJ6uZYuCbVzXdaKSY=";
+  cargoHash = "sha256-OQbfGOd3lOd8/VxhdvkYMezNx/PO65PzRKcWlI7n/JU=";
 
   nativeBuildInputs = [
     pkg-config

From bbdf5a371ccd334139d6fc68c4782f3767753221 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 00:45:46 +0000
Subject: [PATCH 130/205] python3Packages.session-info2: 0.4.1 -> 0.4.2

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

diff --git a/pkgs/development/python-modules/session-info2/default.nix b/pkgs/development/python-modules/session-info2/default.nix
index f9aa7582be48..ade6bb457903 100644
--- a/pkgs/development/python-modules/session-info2/default.nix
+++ b/pkgs/development/python-modules/session-info2/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "session-info2";
-  version = "0.4.1";
+  version = "0.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scverse";
     repo = "session-info2";
     tag = "v${version}";
-    hash = "sha256-n568j109rnWxCWLsdu0RS7huVfUebzFshAd84i6ALM4=";
+    hash = "sha256-uq+UTbI1hwwaF7FEjWCNKuVvnEvqvXKb/XygIlo3oHg=";
   };
 
   build-system = [

From f4a1985ee6b5b5010dfdf08c834e4e71c5b7c752 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E5=9D=82=E9=9B=85?=
 <23130178+ShadowRZ@users.noreply.github.com>
Date: Fri, 24 Jul 2026 13:47:06 +0800
Subject: [PATCH 131/205] perlPackages.Gtk2AppIndicator: drop

---
 pkgs/top-level/perl-packages.nix | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index aed44234b45b..e5aa45f53bef 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -15610,29 +15610,6 @@ with self;
     };
   };
 
-  Gtk2AppIndicator = buildPerlPackage {
-    pname = "Gtk2-AppIndicator";
-    version = "0.15";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/O/OE/OESTERHOL/Gtk2-AppIndicator-0.15.tar.gz";
-      hash = "sha256-olywceIU+4m0RQqkYFAx6uibeWHhSbDW6PSRwZwUqQo=";
-    };
-    propagatedBuildInputs = [
-      pkgs.libappindicator-gtk2
-      pkgs.libdbusmenu-gtk2
-      pkgs.gtk2
-      pkgs.pkg-config
-      Gtk2
-    ];
-    # Tests fail due to no display:
-    #   Gtk-WARNING **: cannot open display:  at /nix/store/HASH-perl-Gtk2-1.2498/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/Gtk2.pm line 126.
-    doCheck = false;
-    meta = {
-      description = "Perl extension for libappindicator";
-      license = lib.licenses.artistic1;
-    };
-  };
-
   Gtk2ImageView = buildPerlPackage {
     pname = "Gtk2-ImageView";
     version = "0.05";
@@ -39912,6 +39889,7 @@ with self;
   BSON = throw "BSON has been removed"; # 2025-09-12
   BSONXS = throw "BSONXS has been removed"; # 2025-09-12
   GnuPG = throw "'GnuPG' has been removed"; # 2025-01-11
+  Gtk2AppIndicator = throw "'Gtk2AppIndicator' has been removed as it relied on gtk2"; # 2026-07-24
   Gtk2GladeXML = throw "Gtk2GladeXML has been removed"; # 2022-01-15
   MongoDB = throw "MongoDB has been removed"; # 2025-09-12
   pcscperl = throw "'pcscperl' has been renamed to 'ChipcardPCSC'"; # Added 2023-12-07

From 856bee48b991ed127c08550b3622b939ab38c944 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E5=9D=82=E9=9B=85?=
 <23130178+ShadowRZ@users.noreply.github.com>
Date: Fri, 24 Jul 2026 13:47:38 +0800
Subject: [PATCH 132/205] perlPackages.Gtk2ImageView: drop

---
 pkgs/top-level/perl-packages.nix | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e5aa45f53bef..89c94403b3d5 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -15610,28 +15610,6 @@ with self;
     };
   };
 
-  Gtk2ImageView = buildPerlPackage {
-    pname = "Gtk2-ImageView";
-    version = "0.05";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/R/RA/RATCLIFFE/Gtk2-ImageView-0.05.tar.gz";
-      hash = "sha256-CHGGw2k6zxlkUc9ZzIt/XPmnsFq+INMty8uggilT+4A=";
-    };
-    buildInputs = [
-      pkgs.gtkimageview
-      pkgs.gtk2
-    ];
-    propagatedBuildInputs = [ Gtk2 ];
-    # Tests fail due to no display server:
-    #   Gtk-WARNING **: cannot open display:  at /nix/store/HASH-perl-Gtk2-1.2498/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/Gtk2.pm line 126.
-    #   t/animview.t ...........
-    doCheck = false;
-    meta = {
-      description = "Perl bindings for the GtkImageView widget";
-      license = lib.licenses.lgpl3Plus;
-    };
-  };
-
   Gtk2Unique = buildPerlPackage {
     pname = "Gtk2-Unique";
     version = "0.07";
@@ -39890,6 +39868,7 @@ with self;
   BSONXS = throw "BSONXS has been removed"; # 2025-09-12
   GnuPG = throw "'GnuPG' has been removed"; # 2025-01-11
   Gtk2AppIndicator = throw "'Gtk2AppIndicator' has been removed as it relied on gtk2"; # 2026-07-24
+  Gtk2ImageView = throw "'Gtk2ImageView' has been removed as it relied on gtk2"; # 2026-07-24
   Gtk2GladeXML = throw "Gtk2GladeXML has been removed"; # 2022-01-15
   MongoDB = throw "MongoDB has been removed"; # 2025-09-12
   pcscperl = throw "'pcscperl' has been renamed to 'ChipcardPCSC'"; # Added 2023-12-07

From aceb90c7c6dcebbd47e774f6ad992de9cedc5d14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E5=9D=82=E9=9B=85?=
 <23130178+ShadowRZ@users.noreply.github.com>
Date: Fri, 24 Jul 2026 13:48:07 +0800
Subject: [PATCH 133/205] perlPackages.Gtk2TrayIcon: drop

---
 pkgs/top-level/perl-packages.nix | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 89c94403b3d5..e368db2d1461 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -15592,24 +15592,6 @@ with self;
     };
   };
 
-  Gtk2TrayIcon = buildPerlPackage {
-    pname = "Gtk2-TrayIcon";
-    version = "0.07";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/X/XA/XAOC/Gtk2-TrayIcon-0.07.tar.gz";
-      hash = "sha256-OfwrmabmE9qeqXfYy1MD+l4H5poVJIk03hIXqXuWRVQ=";
-    };
-    propagatedBuildInputs = [
-      pkgs.gtk2
-      Gtk2
-    ];
-    meta = {
-      description = "(DEPRECATED) Perl interface to the EggTrayIcon library";
-      license = lib.licenses.gpl2Plus;
-      broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gtk2TrayIcon.x86_64-darwin
-    };
-  };
-
   Gtk2Unique = buildPerlPackage {
     pname = "Gtk2-Unique";
     version = "0.07";
@@ -39870,6 +39852,7 @@ with self;
   Gtk2AppIndicator = throw "'Gtk2AppIndicator' has been removed as it relied on gtk2"; # 2026-07-24
   Gtk2ImageView = throw "'Gtk2ImageView' has been removed as it relied on gtk2"; # 2026-07-24
   Gtk2GladeXML = throw "Gtk2GladeXML has been removed"; # 2022-01-15
+  Gtk2TrayIcon = throw "'Gtk2TrayIcon' has been removed as it relied on gtk2"; # 2026-07-24
   MongoDB = throw "MongoDB has been removed"; # 2025-09-12
   pcscperl = throw "'pcscperl' has been renamed to 'ChipcardPCSC'"; # Added 2023-12-07
   HTTPHeaderParserXS = throw "HTTPHeaderParserXS has been removed"; # Added 2025-11-08

From 6b4ab98f016efee9ca7fb82bd7a6f2a73a68f1fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E5=9D=82=E9=9B=85?=
 <23130178+ShadowRZ@users.noreply.github.com>
Date: Fri, 24 Jul 2026 13:48:50 +0800
Subject: [PATCH 134/205] perlPackages.Gtk2Unique: drop

---
 pkgs/top-level/perl-packages.nix | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e368db2d1461..87195110b486 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -15592,28 +15592,6 @@ with self;
     };
   };
 
-  Gtk2Unique = buildPerlPackage {
-    pname = "Gtk2-Unique";
-    version = "0.07";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/X/XA/XAOC/Gtk2-Unique-0.07.tar.gz";
-      hash = "sha256-nOX2ikFgC8z31u/eMMBwqxFOk57XqKx8O3rZE5mJGGc=";
-    };
-    propagatedBuildInputs = [
-      pkgs.libunique
-      pkgs.gtk2
-      Gtk2
-    ];
-    meta = {
-      description = "(DEPRECATED) Use single instance applications";
-      license = with lib.licenses; [
-        artistic1
-        gpl1Plus
-      ];
-      broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gtk2Unique.x86_64-darwin
-    };
-  };
-
   Gtk3 = buildPerlPackage rec {
     pname = "Gtk3";
     version = "0.038";
@@ -39853,6 +39831,7 @@ with self;
   Gtk2ImageView = throw "'Gtk2ImageView' has been removed as it relied on gtk2"; # 2026-07-24
   Gtk2GladeXML = throw "Gtk2GladeXML has been removed"; # 2022-01-15
   Gtk2TrayIcon = throw "'Gtk2TrayIcon' has been removed as it relied on gtk2"; # 2026-07-24
+  Gtk2Unique = throw "'Gtk2Unique' has been removed as it relied on gtk2"; # 2026-07-24
   MongoDB = throw "MongoDB has been removed"; # 2025-09-12
   pcscperl = throw "'pcscperl' has been renamed to 'ChipcardPCSC'"; # Added 2023-12-07
   HTTPHeaderParserXS = throw "HTTPHeaderParserXS has been removed"; # Added 2025-11-08

From 77bc9d2388167b86d102bb12771a8aeada3ba929 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E5=9D=82=E9=9B=85?=
 <23130178+ShadowRZ@users.noreply.github.com>
Date: Fri, 24 Jul 2026 13:59:11 +0800
Subject: [PATCH 135/205] perlPackages.GooCanvas: drop

---
 pkgs/top-level/perl-packages.nix | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 87195110b486..477d4172d04f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -15230,28 +15230,6 @@ with self;
     };
   };
 
-  GooCanvas = buildPerlPackage {
-    pname = "Goo-Canvas";
-    version = "0.06";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/Y/YE/YEWENBIN/Goo-Canvas-0.06.tar.gz";
-      hash = "sha256-DFiMUH7tXmLRLtHMHkkcb/Oh9ZxPs9Q14UIUs3qzklE=";
-    };
-    propagatedBuildInputs = [
-      pkgs.goocanvas_1
-      pkgs.gtk2
-      Gtk2
-    ];
-    env.NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion -Wno-error=implicit-function-declaration";
-    meta = {
-      description = "Perl interface to the GooCanvas";
-      license = with lib.licenses; [
-        artistic1
-        gpl1Plus
-      ];
-    };
-  };
-
   GooCanvas2 = buildPerlPackage {
     pname = "GooCanvas2";
     version = "0.06";
@@ -39827,6 +39805,7 @@ with self;
   BSON = throw "BSON has been removed"; # 2025-09-12
   BSONXS = throw "BSONXS has been removed"; # 2025-09-12
   GnuPG = throw "'GnuPG' has been removed"; # 2025-01-11
+  GooCanvas = throw "'GooCanvas' has been removed as it relied on gtk2"; # 2026-07-24
   Gtk2AppIndicator = throw "'Gtk2AppIndicator' has been removed as it relied on gtk2"; # 2026-07-24
   Gtk2ImageView = throw "'Gtk2ImageView' has been removed as it relied on gtk2"; # 2026-07-24
   Gtk2GladeXML = throw "Gtk2GladeXML has been removed"; # 2022-01-15

From 063d83dcee187de0f9c726f1294de56243f2de4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E5=9D=82=E9=9B=85?=
 <23130178+ShadowRZ@users.noreply.github.com>
Date: Fri, 24 Jul 2026 13:49:13 +0800
Subject: [PATCH 136/205] perlPackages.Gtk2: drop

---
 pkgs/top-level/perl-packages.nix | 29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 477d4172d04f..8da70ddeedea 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -15542,34 +15542,6 @@ with self;
     };
   };
 
-  Gtk2 = buildPerlPackage {
-    pname = "Gtk2";
-    version = "1.24993";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/X/XA/XAOC/Gtk2-1.24993.tar.gz";
-      hash = "sha256-ScRDdDsu7+EadoACck9/akxI78lP8806VZ+357aTyWc=";
-    };
-
-    env = lib.optionalAttrs stdenv.cc.isGNU {
-      NIX_CFLAGS_COMPILE = "-std=gnu17";
-    };
-
-    patches = [
-      # Fix incompatible function pointer conversion (assigning `GdkNativeWindow` to `guint32`).
-      ../development/perl-modules/Gtk2-fix-incompatible-pointer-conversion.patch
-    ];
-    buildInputs = [ pkgs.gtk2 ];
-    # https://rt.cpan.org/Public/Bug/Display.html?id=130742
-    # doCheck = !stdenv.hostPlatform.isDarwin;
-    doCheck = false;
-    propagatedBuildInputs = [ Pango ];
-    meta = {
-      description = "Perl interface to the 2.x series of the Gimp Toolkit library";
-      homepage = "https://gtk2-perl.sourceforge.net";
-      license = lib.licenses.lgpl21Plus;
-    };
-  };
-
   Gtk3 = buildPerlPackage rec {
     pname = "Gtk3";
     version = "0.038";
@@ -39805,6 +39777,7 @@ with self;
   BSON = throw "BSON has been removed"; # 2025-09-12
   BSONXS = throw "BSONXS has been removed"; # 2025-09-12
   GnuPG = throw "'GnuPG' has been removed"; # 2025-01-11
+  Gtk2 = throw "'Gtk2' has been removed as it relied on gtk2"; # 2026-07-24
   GooCanvas = throw "'GooCanvas' has been removed as it relied on gtk2"; # 2026-07-24
   Gtk2AppIndicator = throw "'Gtk2AppIndicator' has been removed as it relied on gtk2"; # 2026-07-24
   Gtk2ImageView = throw "'Gtk2ImageView' has been removed as it relied on gtk2"; # 2026-07-24

From e9780aa1f00ea60ec61361e864b5388971130783 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 01:13:49 +0000
Subject: [PATCH 137/205] alpaca: 9.2.4 -> 9.2.5

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

diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix
index db1e4ab9bca0..12e29f59f251 100644
--- a/pkgs/by-name/al/alpaca/package.nix
+++ b/pkgs/by-name/al/alpaca/package.nix
@@ -33,14 +33,14 @@ let
 in
 pythonPackages.buildPythonApplication rec {
   pname = "alpaca";
-  version = "9.2.4";
+  version = "9.2.5";
   pyproject = false; # Built with meson
 
   src = fetchFromGitHub {
     owner = "Jeffser";
     repo = "Alpaca";
     tag = version;
-    hash = "sha256-rZ1H4QfxkBo+fVFCDODaio+1NEwRVjIY388Q9sR8qO4=";
+    hash = "sha256-tKbxWDTGiblXBr4LOap0ZjojM2ommERRU/i/WpFykdE=";
   };
 
   postPatch = ''

From d1e68a34c566bd6b36cbfa7428335d324889e620 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 02:02:06 +0000
Subject: [PATCH 138/205] ansible-doctor: 8.3.3 -> 8.4.0

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

diff --git a/pkgs/by-name/an/ansible-doctor/package.nix b/pkgs/by-name/an/ansible-doctor/package.nix
index b6c841af5d96..483f3733b048 100644
--- a/pkgs/by-name/an/ansible-doctor/package.nix
+++ b/pkgs/by-name/an/ansible-doctor/package.nix
@@ -9,14 +9,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "ansible-doctor";
-  version = "8.3.3";
+  version = "8.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "thegeeklab";
     repo = "ansible-doctor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3xdMTuy6Rtb2VwfzN6SV73UZmp+9fmU9SfPySHCayJg=";
+    hash = "sha256-1O6F7MNNdt8WX+NAqJD1ZNToB6PrfWKtoweT5Pbl9l8=";
   };
 
   build-system = with python3Packages; [

From 987bbb6930af82a85d227d95292de927edb8c0c9 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Wed, 5 Aug 2026 22:09:33 -0500
Subject: [PATCH 139/205] sword: fix cross-compile

* Curl package is broken on Windows ever since the introduction of
  dependency on runtimeShellPackage, which Windows lacks
* The shell script that introduces this dep is unused by sword, which
  needs only the library
---
 pkgs/by-name/sw/sword/package.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sw/sword/package.nix b/pkgs/by-name/sw/sword/package.nix
index 1c0afb3d13fb..d9496fb3cbb4 100644
--- a/pkgs/by-name/sw/sword/package.nix
+++ b/pkgs/by-name/sw/sword/package.nix
@@ -10,13 +10,21 @@
   bzip2,
   curl,
   xz,
+  zlib,
 }:
 
 stdenv.mkDerivation (
   finalAttrs:
   let
     # Used on Windows, where libpsl doesn't compile, yet
-    curlDep = curl.override { pslSupport = false; };
+    curlDep = (curl.override { pslSupport = false; }).overrideAttrs (finalCurlAttrs: {
+      buildInputs = [ ]; # Does not need runtimeShellPackage, which is Bash and unsupported on MinGW targets
+      # This is the shell script that requires runtimeShellPackage on systems, but we are
+      # only interested in the library here, not the binaries
+      postInstall = finalCurlAttrs.postInstall + ''
+        rm "''${!outputBin}/bin/wcurl"
+      '';
+    });
   in
   {
     pname = "sword";
@@ -70,6 +78,7 @@ stdenv.mkDerivation (
       "--with-xz"
       "--with-bzip2"
       "--with-icuregex"
+      "--without-zlib"
     ]);
 
     makeFlags = lib.optionals stdenv.hostPlatform.isWindows [

From db948b143144ed877b5699f8244da32f78b6a9aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 02:16:37 +0000
Subject: [PATCH 140/205] 
 vscode-extensions.ms-windows-ai-studio.windows-ai-studio: 1.6.6 -> 1.6.7

---
 .../ms-windows-ai-studio.windows-ai-studio/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix
index 5ee8388e2461..d86dab37ecd0 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "windows-ai-studio";
     publisher = "ms-windows-ai-studio";
-    version = "1.6.6";
-    hash = "sha256-3eG6OIjCLBYgP0bweyZGv9OUiKN1xQa3ufdt3JUq9FQ=";
+    version = "1.6.7";
+    hash = "sha256-87ioUa5bpqSlerMvgqSWiWB2xPbb8lje8MChSPV/mKw=";
   };
 
   meta = {

From c66537c54cb8b5d98782104304628ff5535371c5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 03:11:15 +0000
Subject: [PATCH 141/205] linuxPackages.hid-tmff2: 0.83-unstable-2026-03-10 ->
 0.83-unstable-2026-08-09

---
 pkgs/os-specific/linux/hid-tmff2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/hid-tmff2/default.nix b/pkgs/os-specific/linux/hid-tmff2/default.nix
index 786a3d5adeaf..1903fb900036 100644
--- a/pkgs/os-specific/linux/hid-tmff2/default.nix
+++ b/pkgs/os-specific/linux/hid-tmff2/default.nix
@@ -9,13 +9,13 @@
 stdenv.mkDerivation {
   pname = "hid-tmff2";
   # https://github.com/Kimplul/hid-tmff2/blob/ca168637fbfb085ebc9ade0c47fa0653dac5d25b/dkms/dkms-install.sh#L12
-  version = "0.83-unstable-2026-03-10";
+  version = "0.83-unstable-2026-08-09";
 
   src = fetchFromGitHub {
     owner = "Kimplul";
     repo = "hid-tmff2";
-    rev = "8187920ed261c7024826f8204cc7bea45153a3da";
-    hash = "sha256-ut6u3hmCI0NX5BQ9rDtFF9fReTdv/zso8B3a7UvQyGc=";
+    rev = "c5b9b79d4e61b77e0827e81dd676420b3c366743";
+    hash = "sha256-Su4Qr3z28luv+uxvCAfMVtTXVxJUuAj7K0b5F3OTmfs=";
     # For hid-tminit. Source: https://github.com/scarburato/hid-tminit
     fetchSubmodules = true;
   };

From 38300d8d9da2106203d4254b601313e2b727627e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 04:52:12 +0000
Subject: [PATCH 142/205] libresidfp: 1.1.2 -> 1.2.1

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

diff --git a/pkgs/by-name/li/libresidfp/package.nix b/pkgs/by-name/li/libresidfp/package.nix
index e4d97ce8f8f2..4cb8cefe14a9 100644
--- a/pkgs/by-name/li/libresidfp/package.nix
+++ b/pkgs/by-name/li/libresidfp/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libresidfp";
-  version = "1.1.2";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "libsidplayfp";
     repo = "libresidfp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pczQkgx7YedPzMVUKpvLi0qtn6zs14OEe/N48OSc06c=";
+    hash = "sha256-0XxQtXRHHEW7DNPKFu345ffiwo949uIDeL2oj2f8+jY=";
   };
 
   strictDeps = true;

From a3bc0cc2316a1f9a2016913b73b819f37005fce3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 06:24:10 +0000
Subject: [PATCH 143/205] az-pim-cli: 1.15.0 -> 1.16.0

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

diff --git a/pkgs/by-name/az/az-pim-cli/package.nix b/pkgs/by-name/az/az-pim-cli/package.nix
index a0fb01757576..c094530e5fd3 100644
--- a/pkgs/by-name/az/az-pim-cli/package.nix
+++ b/pkgs/by-name/az/az-pim-cli/package.nix
@@ -10,13 +10,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "az-pim-cli";
-  version = "1.15.0";
+  version = "1.16.0";
 
   src = fetchFromGitHub {
     owner = "netr0m";
     repo = "az-pim-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Pqc8pWicVORcoTXg7oT8SX1BwDRSjLHuqyyBZ6q7eio=";
+    hash = "sha256-CQS3Grw30nmMpjys/RhGF59rvK8joNUG13f+VEkKTjU=";
   };
 
   patches = [
@@ -24,7 +24,7 @@ buildGoModule (finalAttrs: {
     ./version-build-info.patch
   ];
 
-  vendorHash = "sha256-K4tv3IlVygV/aDR9twh60FX8pe4f0sXxoGNIsIV2oUA=";
+  vendorHash = "sha256-+CV4Cbpgcp9zjBo9f8UjrOvp7hrEUS+r+lGVJ/uGdes=";
 
   nativeBuildInputs = [
     installShellFiles

From f967698a9a1e53c207cd48182954a233bcd7cf87 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 06:30:05 +0000
Subject: [PATCH 144/205] wlr-layout-ui: 2.0.0 -> 2.1.0

---
 pkgs/by-name/wl/wlr-layout-ui/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wl/wlr-layout-ui/package.nix b/pkgs/by-name/wl/wlr-layout-ui/package.nix
index 2bb9f029da78..4b3a3d9df034 100644
--- a/pkgs/by-name/wl/wlr-layout-ui/package.nix
+++ b/pkgs/by-name/wl/wlr-layout-ui/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "wlr-layout-ui";
-  version = "2.0.0";
+  version = "2.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fdev31";
     repo = "wlr-layout-ui";
     tag = finalAttrs.version;
-    hash = "sha256-vniBlKWxDjcHQTgvqaMHKTyCVDVqbD5VCvNPTgUp00w=";
+    hash = "sha256-qKIf4J7l4WNGvfOqZSL4pt47/yhty7A1s3FRjB2CTPU=";
   };
 
   nativeBuildInputs = [

From 7efd919a25a00718b2e0b9a647733a2424d44003 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 08:09:23 +0000
Subject: [PATCH 145/205] dbmate: 2.34.1 -> 2.35.0

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

diff --git a/pkgs/by-name/db/dbmate/package.nix b/pkgs/by-name/db/dbmate/package.nix
index 0cf43002520c..d41149a7bf4f 100644
--- a/pkgs/by-name/db/dbmate/package.nix
+++ b/pkgs/by-name/db/dbmate/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "dbmate";
-  version = "2.34.1";
+  version = "2.35.0";
 
   src = fetchFromGitHub {
     owner = "amacneil";
     repo = "dbmate";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rDnXLNltUxtzJRw3kc1nQ0HnrWZYQKA+o1nup/WsD7E=";
+    hash = "sha256-aWouIk+EHuccJL0EXEdYgSPD0afAwO69S4lSehEDVKU=";
   };
 
-  vendorHash = "sha256-+P9K/uOLFhsSwOxWPvTVu5MBCkP+9rGAA9efmgw4R60=";
+  vendorHash = "sha256-BUqSBLc9MQpXht9sQ8HKt2sHGuf1OevKEZtN8nik+F4=";
 
   tags = [ "fts5" ];
 

From 1ef9382a1f5e440b4afe4cbfa190283ba3f65e6d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 08:24:46 +0000
Subject: [PATCH 146/205] radsecproxy: 1.11.3 -> 1.11.4

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

diff --git a/pkgs/by-name/ra/radsecproxy/package.nix b/pkgs/by-name/ra/radsecproxy/package.nix
index 50009224d609..1319a7908505 100644
--- a/pkgs/by-name/ra/radsecproxy/package.nix
+++ b/pkgs/by-name/ra/radsecproxy/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "radsecproxy";
-  version = "1.11.3";
+  version = "1.11.4";
 
   src = fetchFromGitHub {
     owner = "radsecproxy";
     repo = "radsecproxy";
     tag = finalAttrs.version;
-    hash = "sha256-QSRK7uljYn2kqGypfkZBWhVPGk/x1y6WT9FT5pqwWS0=";
+    hash = "sha256-RaDFfHNbifafa0sYr91/pjx6qetdoSLfSziI+PHIbpQ=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From a68a493c58a1cfe70064ddf408f0b9d8c0116e75 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 10 Aug 2026 10:57:55 +0200
Subject: [PATCH 147/205] bootmac: use pname and not name

---
 pkgs/by-name/bo/bootmac/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/bo/bootmac/package.nix b/pkgs/by-name/bo/bootmac/package.nix
index 776aed9967ec..80f7b86b1b0a 100644
--- a/pkgs/by-name/bo/bootmac/package.nix
+++ b/pkgs/by-name/bo/bootmac/package.nix
@@ -15,7 +15,7 @@
   udevCheckHook,
 }:
 stdenv.mkDerivation (finalAttrs: {
-  name = "bootmac";
+  pname = "bootmac";
   version = "0.7.1";
   __structuredAttrs = true;
   strictDeps = true;

From cc90abbb84a3c38c2027b0774353a641460450cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 09:08:36 +0000
Subject: [PATCH 148/205] writefreely: 0.17.1 -> 0.17.2

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

diff --git a/pkgs/by-name/wr/writefreely/package.nix b/pkgs/by-name/wr/writefreely/package.nix
index 26d988db50f3..023b144fb523 100644
--- a/pkgs/by-name/wr/writefreely/package.nix
+++ b/pkgs/by-name/wr/writefreely/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "writefreely";
-  version = "0.17.1";
+  version = "0.17.2";
 
   src = fetchFromGitHub {
     owner = "writefreely";
     repo = "writefreely";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-N6AKDNGeUhJOUPHK3eXhrNi1hC3Wl2YXPawBeFPhVw0=";
+    sha256 = "sha256-CzIlXy1StXuK8fY3+uZd2pu5hB/MWdJrN+WEdEZEzfk=";
   };
 
-  vendorHash = "sha256-e9usNyJHwmRNMjovhuL7Z4Ll7f58DgA1v1/hfJTZ4pg=";
+  vendorHash = "sha256-RrwcY2DNO90cG8YtTQ0nAkUMNnehd1JByHCw/QtGRNs=";
 
   ldflags = [
     "-s"

From a04306f612b6ec667967c9cbdc322e08de9c9f68 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 09:21:36 +0000
Subject: [PATCH 149/205] python3Packages.pydo: 0.39.0 -> 0.40.0

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

diff --git a/pkgs/development/python-modules/pydo/default.nix b/pkgs/development/python-modules/pydo/default.nix
index e0bf13efd786..2bf97930ee50 100644
--- a/pkgs/development/python-modules/pydo/default.nix
+++ b/pkgs/development/python-modules/pydo/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pydo";
-  version = "0.39.0";
+  version = "0.40.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "digitalocean";
     repo = "pydo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wo1qg8mromlI+DsYns0IYtCwsYQgLisSSpkHPtnoR/E=";
+    hash = "sha256-G0Rahecj6RnBDIL6iAqSNimMwRE6Uvhckt6A2ru56jg=";
   };
 
   build-system = [ poetry-core ];

From 484ee63140040229e9f715903b4f0156c58d8f14 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 09:44:35 +0000
Subject: [PATCH 150/205] mongodb-compass: 1.49.12 -> 1.49.14

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

diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix
index cb0ef2d742cb..fb80c1618fe3 100644
--- a/pkgs/by-name/mo/mongodb-compass/package.nix
+++ b/pkgs/by-name/mo/mongodb-compass/package.nix
@@ -52,7 +52,7 @@
 
 let
   pname = "mongodb-compass";
-  version = "1.49.12";
+  version = "1.49.14";
 
   selectSystem =
     attrs:
@@ -66,8 +66,8 @@ let
       }
     }";
     hash = selectSystem {
-      x86_64-linux = "sha256-syuoNZ2MmPHgTi55HioqkYQzS1LsbzcgdWoFeM+z2Rg=";
-      aarch64-darwin = "sha256-BY5EUWJdPg4OJ7+ehCb/H8dIAoJVYlJnNcSPp0r/XfA=";
+      x86_64-linux = "sha256-PrpL72+fbCa/C0JpbxGiEBtAEoEvvZhy9FIkJhq0g0g=";
+      aarch64-darwin = "sha256-dW99BE4w9uzGGTNb47h4RuVrGlMi0b0dklAsV/6MY3g=";
     };
   };
 

From 527b7cfd31d274634023dbdbb773ee7c9a6ceb13 Mon Sep 17 00:00:00 2001
From: BatteredBunny <ayes2022@protonmail.com>
Date: Mon, 10 Aug 2026 12:18:58 +0300
Subject: [PATCH 151/205] plezy: 2.12.1 -> 2.13.0

---
 pkgs/by-name/pl/plezy/package.nix       | 8 ++++----
 pkgs/by-name/pl/plezy/pubspec.lock.json | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/pl/plezy/package.nix b/pkgs/by-name/pl/plezy/package.nix
index b5597a551b0f..b9462482a7b4 100644
--- a/pkgs/by-name/pl/plezy/package.nix
+++ b/pkgs/by-name/pl/plezy/package.nix
@@ -27,13 +27,13 @@
 
 let
   pname = "plezy";
-  version = "2.12.1";
+  version = "2.13.0";
 
   src = fetchFromGitHub {
     owner = "edde746";
     repo = "plezy";
     tag = version;
-    hash = "sha256-Ib1ZBKbuan8GfkxKVytQ5Bn0sPKtDR3o4em4h8p78Xk=";
+    hash = "sha256-pSGHB2sN/iySd3WKskvZeBo9H9M3YrsLtfw1LoW15tA=";
   };
 
   simdutf = fetchurl {
@@ -48,7 +48,7 @@ let
   '';
 
   meta = {
-    description = "Modern cross-platform Plex & Jellyfin client built with Flutter";
+    description = "Modern cross-platform Emby, Plex & Jellyfin client built with Flutter";
     homepage = "https://github.com/edde746/plezy";
     mainProgram = "plezy";
     license = lib.licenses.gpl3Only;
@@ -146,7 +146,7 @@ let
 
     src = fetchurl {
       url = "https://github.com/edde746/plezy/releases/download/${version}/plezy-macos.dmg";
-      hash = "sha256-el4w0SXVo3kQi/aRrozl4q8KGs+Y7kCJeQmpV26+Pvk=";
+      hash = "sha256-BF9jKIOzQYpQnJUXD8d2e2GSgIc6ZsjZaqceAc01QI0=";
     };
 
     nativeBuildInputs = [
diff --git a/pkgs/by-name/pl/plezy/pubspec.lock.json b/pkgs/by-name/pl/plezy/pubspec.lock.json
index 334fc5efc3a7..8d28b8f12633 100644
--- a/pkgs/by-name/pl/plezy/pubspec.lock.json
+++ b/pkgs/by-name/pl/plezy/pubspec.lock.json
@@ -266,7 +266,7 @@
       "version": "0.4.2"
     },
     "clock": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "clock",
         "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",

From e08c77dc05e9339c707b6b01ec7c8586619ea84d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 10:43:25 +0000
Subject: [PATCH 152/205] grafanaPlugins.grafana-mqtt-datasource: 1.3.5 ->
 1.3.6

---
 .../grafana/plugins/grafana-mqtt-datasource/default.nix   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix
index be93629f7bf2..219de1d4e437 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix
@@ -2,11 +2,11 @@
 
 grafanaPlugin {
   pname = "grafana-mqtt-datasource";
-  version = "1.3.5";
+  version = "1.3.6";
   zipHash = {
-    x86_64-linux = "sha256-gYDE8TP6KNB0QKiSmTz7DUKfFcA/PUWLD3O83mh5sYA=";
-    aarch64-linux = "sha256-TjpsTOX01vLMO7BAVDis4MD0uTFT2ntSC6YiMNGpe2w=";
-    aarch64-darwin = "sha256-9a0R7roTgylxLJZAlNV4BNQTf81/Tk5L5dL4zEvG3s0=";
+    x86_64-linux = "sha256-q6o+NfRqncZYCmtPSvnMxMwKPOmdkj3zWem108kLyF4=";
+    aarch64-linux = "sha256-ej1/EGDLdlyhyVIoEMrJSsn4h0c+DrRfYUM9Y7MrpWc=";
+    aarch64-darwin = "sha256-6UWLNK9dTOh+x8mQxwlDFwS6L5R74Lpspdl7U1uiuYA=";
   };
   meta = {
     description = "Visualize streaming MQTT data from within Grafana";

From 93a691070f280f79d68bba1dc7693c39c1a4277a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 13:09:32 +0000
Subject: [PATCH 153/205] terraform-providers.ovh_ovh: 2.18.0 -> 2.19.0

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 4511966cd5ae..89404b7374e0 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1067,11 +1067,11 @@
     "vendorHash": null
   },
   "ovh_ovh": {
-    "hash": "sha256-KVYxtk94GyVhMVB0E0HZ8Cszm4RWMrSMJB0hh/Llcbk=",
+    "hash": "sha256-b5kPy36JoD+h/v06m93lnccPKvJ4zW/8wAmAttEAv/I=",
     "homepage": "https://registry.terraform.io/providers/ovh/ovh",
     "owner": "ovh",
     "repo": "terraform-provider-ovh",
-    "rev": "v2.18.0",
+    "rev": "v2.19.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 521fb9bffaf9a77f6dab11e601bc56ba694376b6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 13:14:14 +0000
Subject: [PATCH 154/205] python3Packages.indevolt-api: 1.8.6 -> 1.8.7

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

diff --git a/pkgs/development/python-modules/indevolt-api/default.nix b/pkgs/development/python-modules/indevolt-api/default.nix
index e9d082760366..9654fe2ac2df 100644
--- a/pkgs/development/python-modules/indevolt-api/default.nix
+++ b/pkgs/development/python-modules/indevolt-api/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "indevolt-api";
-  version = "1.8.6";
+  version = "1.8.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Xirt";
     repo = "indevolt-api";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KFYavUYlFNaHj3QqJsHqhn7s1KzYAPjJrR6h7lw+ttU=";
+    hash = "sha256-8zp2v21aJGnSsr4/Qw+hb0dx8Gvc5xp4px0Ilb5U6r8=";
   };
 
   build-system = [ setuptools ];

From c0cf1aee976fb3762982cb1b1ec3682c75fa2036 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 13:18:44 +0000
Subject: [PATCH 155/205] prometheus-zfs-exporter: 2.3.12 -> 2.4.0

---
 pkgs/by-name/pr/prometheus-zfs-exporter/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/prometheus-zfs-exporter/package.nix b/pkgs/by-name/pr/prometheus-zfs-exporter/package.nix
index 72a9610d1ebc..41c3258f1c3d 100644
--- a/pkgs/by-name/pr/prometheus-zfs-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-zfs-exporter/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "zfs_exporter";
-  version = "2.3.12";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "pdf";
     repo = "zfs_exporter";
     rev = "v" + version;
-    hash = "sha256-4nuZhPqBqGOR5zM1yyxPD0M4bVZNaIm72uSus6CvCrU=";
+    hash = "sha256-66JVDE9PAQzE6frdlsCk2Gt9FECEK91ezAXYjucr9zs=";
   };
 
   vendorHash = "sha256-8AUo6sfdKME5x89CvabMDxBOzq3f/+//du/+N+cvpWA=";

From 6493a836bc51e86d09c2ca3f0667ab8b6aa5e0c4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 13:23:38 +0000
Subject: [PATCH 156/205] mdfried: 0.22.4 -> 0.22.5

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

diff --git a/pkgs/by-name/md/mdfried/package.nix b/pkgs/by-name/md/mdfried/package.nix
index 52eac913a73a..c5719a97f21a 100644
--- a/pkgs/by-name/md/mdfried/package.nix
+++ b/pkgs/by-name/md/mdfried/package.nix
@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mdfried";
-  version = "0.22.4";
+  version = "0.22.5";
 
   src = fetchFromGitHub {
     owner = "benjajaja";
     repo = "mdfried";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Zcn1C8mXwljJ3HtYgYBPyU9cVHvoNBUn7qjqx45wMhE=";
+    hash = "sha256-BdcwU+9qY7gOIMgOfw7rpdh3KpBTLI1oGuNyOqO0AY8=";
   };
 
-  cargoHash = "sha256-Nt+oBl2HX/H/7j62VjaHrY29gpd2vouevBJO0W3AYAk=";
+  cargoHash = "sha256-Gi+mdABVs11TJSmOhXsC+Cc48QRbCUxODhW06y190w0=";
 
   buildFeatures = [ "pdf" ];
 

From 52568cd968347c9a6d0b7514fae4733563af9997 Mon Sep 17 00:00:00 2001
From: KangaZero <samuelyongw@gmail.com>
Date: Mon, 10 Aug 2026 22:13:45 +0900
Subject: [PATCH 157/205] lon: 0.8.0 -> 1.0.0

Added `openssl` dependency as a `buildInput` for linux platforms since
`lon` `reqwest` that uses `native-tls` which uses `openssl`
Added `versionCheckHook`
---
 pkgs/by-name/lo/lon/package.nix | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/lo/lon/package.nix b/pkgs/by-name/lo/lon/package.nix
index 7d80dd211932..562b019f4b30 100644
--- a/pkgs/by-name/lo/lon/package.nix
+++ b/pkgs/by-name/lo/lon/package.nix
@@ -1,29 +1,39 @@
 {
   rustPlatform,
   lib,
+  stdenv,
   fetchFromGitHub,
   makeBinaryWrapper,
+  pkg-config,
+  openssl,
   nix-prefetch-git,
   gitMinimal,
+  nix,
   nix-update-script,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lon";
-  version = "0.8.0";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "nikstur";
     repo = "lon";
     tag = finalAttrs.version;
-    hash = "sha256-bxu83mbdfAeDZYOnjZQYyjTs5WgZS8o6Q2irlzgbYs0=";
+    hash = "sha256-rNQ3RuTYu7gM/pmchuvb/xNeRo/m82M4iZq2g89r3UA=";
   };
 
   sourceRoot = "source/rust/lon";
 
-  cargoHash = "sha256-x+qxn0s64fPJpTG/d0PgzAdzMXegYdnsC1FFFuBpsaI=";
+  cargoHash = "sha256-mbGMStrC2GRMpL0+yr5WpLLZRT+vNDwjufymoRZwuIk=";
 
-  nativeBuildInputs = [ makeBinaryWrapper ];
+  nativeBuildInputs = [
+    makeBinaryWrapper
+    pkg-config
+  ];
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ];
 
   postInstall = ''
     wrapProgram $out/bin/lon --prefix PATH : ${
@@ -34,6 +44,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
     }
   '';
 
+  nativeCheckInputs = [
+    gitMinimal
+    nix-prefetch-git
+    nix
+  ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   passthru = {
     updateScript = nix-update-script { };
   };

From b458feb2d0a65fa75f5ad724f2dd7b76ba0942d8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 16:28:39 +0000
Subject: [PATCH 158/205] python3Packages.tilequant: 1.2.0 -> 1.2.1

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

diff --git a/pkgs/development/python-modules/tilequant/default.nix b/pkgs/development/python-modules/tilequant/default.nix
index 15e879c0f5f4..81636f283a6a 100644
--- a/pkgs/development/python-modules/tilequant/default.nix
+++ b/pkgs/development/python-modules/tilequant/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "tilequant";
-  version = "1.2.0";
+  version = "1.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     tag = version;
     # Fetch tilequant source files
     fetchSubmodules = true;
-    hash = "sha256-MgyKLwVdL2DRR8J88q7Q57rQiX4FTOlQ5rTY3UuhaJM=";
+    hash = "sha256-XYSdhRHx+TGDg24ujNedI0CwWUa1IE089jrvv6nHFXA=";
   };
 
   build-system = [

From 62464e5da2ae6cf0fae7426eaf019db0b49e0a3e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 16:45:51 +0000
Subject: [PATCH 159/205] vscode-extensions.davidanson.vscode-markdownlint:
 0.62.0 -> 0.62.1

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index aef261911bfb..47342a2a6d46 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1259,8 +1259,8 @@ let
         mktplcRef = {
           name = "vscode-markdownlint";
           publisher = "DavidAnson";
-          version = "0.62.0";
-          hash = "sha256-cupXtTdzTKxhvTEHKe/OU8TFlp1CeAIIy2XCLvLMZ5s=";
+          version = "0.62.1";
+          hash = "sha256-zR0pWpxWTTxeAEfX49vlhaTPc2YZxcJCv62abriPtRg=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog";

From e23f3f1665eb2ea368b331a4765f75604c89234d Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Mon, 10 Aug 2026 12:47:51 -0400
Subject: [PATCH 160/205] noctalia: 5.0.0-beta.7 -> 5.0.0-beta.8

Changelog: https://noctalia.dev/changelogs#v5.0.0-beta.8

Also explicitly disable tests because upstream's meson build scripts
have an issue where without explicitly disabling them, they still get
built and linked. We never use them, so there's no reason to spend time
doing this.
---
 pkgs/by-name/no/noctalia/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/no/noctalia/package.nix b/pkgs/by-name/no/noctalia/package.nix
index bfd9ace5967a..445d0e3dd69b 100644
--- a/pkgs/by-name/no/noctalia/package.nix
+++ b/pkgs/by-name/no/noctalia/package.nix
@@ -65,13 +65,13 @@ stdenv.mkDerivation (finalAttrs: {
   __structuredAttrs = true;
 
   pname = "noctalia";
-  version = "5.0.0-beta.7";
+  version = "5.0.0-beta.8";
 
   src = fetchFromGitHub {
     owner = "noctalia-dev";
     repo = "noctalia";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9RlJNIy2DFVm9SB2vwGEBsbHc1r3dIB+K+b+nd6Bdho=";
+    hash = "sha256-qy3Cheg/FQ9ZaBPTIgdq4IkmkNtC6XBpmtC8nT+wU/Y=";
   };
 
   strictDeps = true;
@@ -119,6 +119,10 @@ stdenv.mkDerivation (finalAttrs: {
     wireplumber
   ];
 
+  mesonFlags = [
+    (lib.mesonEnable "tests" false)
+  ];
+
   mesonBuildType = "release";
 
   # plugins are installed by cloning their repos

From 17baf059317f351a4b6f4c353fe7004223e7e884 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 17:09:55 +0000
Subject: [PATCH 161/205] python3Packages.stackit-resourcemanager: 0.9.0 ->
 0.9.1

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

diff --git a/pkgs/development/python-modules/stackit-resourcemanager/default.nix b/pkgs/development/python-modules/stackit-resourcemanager/default.nix
index 6a02f2f107e8..3735a2de77b5 100644
--- a/pkgs/development/python-modules/stackit-resourcemanager/default.nix
+++ b/pkgs/development/python-modules/stackit-resourcemanager/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "stackit-resourcemanager";
-  version = "0.9.0";
+  version = "0.9.1";
   pyproject = true;
 
   __structuredAttrs = true;
@@ -20,7 +20,7 @@ buildPythonPackage (finalAttrs: {
   src = fetchPypi {
     pname = "stackit_resourcemanager";
     inherit (finalAttrs) version;
-    hash = "sha256-vrDilDnoAGm0k9ejF9LFoDiBSvk4zYPXu95AbmNNQDY=";
+    hash = "sha256-Mx6rmwvKmyJPeUFuO2Z4AR9O/oxTMDs+V4Jw+2AdkHs=";
   };
 
   build-system = [ hatchling ];

From 977b3c60bed5a1c02a49f31f25a80b09b6d42e9f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 17:34:08 +0000
Subject: [PATCH 162/205] vale: 3.17.0 -> 3.17.1

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

diff --git a/pkgs/by-name/va/vale/package.nix b/pkgs/by-name/va/vale/package.nix
index 15ef4122da19..79c665d11ca1 100644
--- a/pkgs/by-name/va/vale/package.nix
+++ b/pkgs/by-name/va/vale/package.nix
@@ -11,7 +11,7 @@
 
 buildGoModule rec {
   pname = "vale";
-  version = "3.17.0";
+  version = "3.17.1";
 
   subPackages = [ "cmd/vale" ];
 
@@ -19,10 +19,10 @@ buildGoModule rec {
     owner = "vale-cli";
     repo = "vale";
     tag = "v${version}";
-    hash = "sha256-FChOhCgvV/jO795nKlkbnGiB9oFCA8XmJBlgH+DyYvs=";
+    hash = "sha256-KSfbqQRv7sLmTHXuyGiG2mUV3g1JByOy3al5wP4JJVg=";
   };
 
-  vendorHash = "sha256-95Om+XQB+4L1Xr9ZGW2T8hMDdVjvlOLiRGOIig2SJ50=";
+  vendorHash = "sha256-K7cdb+Qgs6zml+q0PMqsFBK4SDLV2s0Kda8XmV3nZ50=";
 
   ldflags = [
     "-s"

From d53c1316ef5979580d4f8eab3c7060e6a9cdfc61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= <tomas.riveral@icloud.com>
Date: Sat, 8 Aug 2026 12:09:06 +0200
Subject: [PATCH 163/205] terminal-space-program: init at 0.38.0

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

diff --git a/pkgs/by-name/te/terminal-space-program/package.nix b/pkgs/by-name/te/terminal-space-program/package.nix
new file mode 100644
index 000000000000..e043d26e3bda
--- /dev/null
+++ b/pkgs/by-name/te/terminal-space-program/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+  versionCheckHook,
+}:
+buildGoModule (finalAttrs: {
+  pname = "terminal-space-program";
+  version = "0.38.0";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "jasonfen";
+    repo = "terminal-space-program";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-pOJZ0qvR97gBz85lKAOpPvnYBWiX8mETtSLFi/OYU9o=";
+  };
+
+  vendorHash = "sha256-5bhIP7It6rqOFvXRBUIP6/nGz4X+dzm3/BjVeo3nw4I=";
+
+  ldflags = [
+    "-X github.com/jasonfen/terminal-space-program/internal/version.Version=${finalAttrs.version}"
+  ];
+
+  env.CGO_ENABLED = 0;
+
+  __darwinAllowLocalNetworking = true; # the server/multiplayer tests need local networking
+
+  doInstallCheck = true;
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Terminal-native orbital-mechanics rocket simulator";
+    homepage = "https://terminalspaceprogram.com";
+    changelog = "https://github.com/jasonfen/terminal-space-program/blob/main/docs/version-history.md";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ tomasrivera ];
+    mainProgram = "terminal-space-program";
+  };
+})

From fe9dad072895b29f8e692b89316ac36349811fd0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 19:04:10 +0000
Subject: [PATCH 164/205] taproot-assets: 0.8.0 -> 0.8.1

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

diff --git a/pkgs/by-name/ta/taproot-assets/package.nix b/pkgs/by-name/ta/taproot-assets/package.nix
index bbd886bedd8b..21b7918f412e 100644
--- a/pkgs/by-name/ta/taproot-assets/package.nix
+++ b/pkgs/by-name/ta/taproot-assets/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "taproot-assets";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "lightninglabs";
     repo = "taproot-assets";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-pgsorq+dWjGTkbdrHSIZm36S16xhcjvDCUin2bzcldc=";
+    hash = "sha256-UFb/QOSlAVqnhK0fJmdIqythxBwFGZY1/ODTdh/hS5c=";
   };
 
-  vendorHash = "sha256-K8XwCRTj4UECZpVb8g7+6VAC4khTcnRrhPaKDXJvJCI=";
+  vendorHash = "sha256-Vvy2kXBhlMDJvSNF18X8B9CVf/GxaU2cDvChWN2aBuY=";
 
   subPackages = [
     "cmd/tapcli"

From 3c83c32a1bb326d2e5baa562ea0b7b0d598e878d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 19:06:19 +0000
Subject: [PATCH 165/205] cdncheck: 1.2.47 -> 1.2.48

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

diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix
index cdb65c04adc0..ffb21050a6c6 100644
--- a/pkgs/by-name/cd/cdncheck/package.nix
+++ b/pkgs/by-name/cd/cdncheck/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "cdncheck";
-  version = "1.2.47";
+  version = "1.2.48";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "cdncheck";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JluCuvZl4CY+VtreWoljU2AOnw1HmhtFOpAmmNmIA4M=";
+    hash = "sha256-GTRKX1NlIt5oZZCariCLhU62hSp7vBu/KqNVyHAZk+U=";
   };
 
   vendorHash = "sha256-iJ1agL7sZ3ZKbW1wMA+qi8FgHdPa6gZLQ5BBPKJTNaQ=";

From 8ee6043d5f35fdecdd1b88b78bc0df5ebc5b377b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 19:18:02 +0000
Subject: [PATCH 166/205] protoc-gen-go: 1.36.11 -> 1.36.12

---
 pkgs/by-name/pr/protoc-gen-go/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/protoc-gen-go/package.nix b/pkgs/by-name/pr/protoc-gen-go/package.nix
index 4aee73f0a152..aad0e7694f23 100644
--- a/pkgs/by-name/pr/protoc-gen-go/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-go/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "protoc-gen-go";
-  version = "1.36.11";
+  version = "1.36.12";
 
   src = fetchFromGitHub {
     owner = "protocolbuffers";
     repo = "protobuf-go";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-7+w3f5dDcQCw87A6P+JZXfMejS4QHANaLGK8QbUAaQs=";
+    hash = "sha256-1jaQXOwy5x2Yqzkkb5l/kbOhFVUgZ0N1yemDhgq32VE=";
   };
 
   vendorHash = "sha256-EAkrbx9pTBhZ0y0ub14PnMINrk1M6yEgnGapzpgXqBU=";

From f390d0d6bdeaea7dad307b10be80ab1c876a7b84 Mon Sep 17 00:00:00 2001
From: Vegard Bieker Matthey <VegardMatthey@protonmail.com>
Date: Mon, 10 Aug 2026 20:44:20 +0200
Subject: [PATCH 167/205] maintainers: add ar4m1s

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f8d6c80e1752..72db3dc045e8 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2193,6 +2193,12 @@
     githubId = 8436007;
     name = "Aria Edmonds";
   };
+  ar4m1s = {
+    name = "Aramis";
+    github = "Ar4m1s";
+    githubId = 59250656;
+    matrix = "@vegardbm:matrix.org";
+  };
   arbel-arad = {
     email = "arbel@spacetime.technology";
     github = "arbel-arad";

From e6147c590ba2a6496e63c2c47bb05f771e15448e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 19:27:36 +0000
Subject: [PATCH 168/205] android-studio: 2026.1.3.7 -> 2026.1.3.8

---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 1a2d2f6b181b..d082850488d9 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -16,9 +16,9 @@ let
       inherit tiling_wm;
     };
   stableVersion = {
-    version = "2026.1.3.7"; # "Android Studio Quail 3 | 2026.1.3"
-    sha256Hash = "sha256-NoMhIlV6tzymjf2b2YndrEAQOsADyhDgTJSaH2FXimc=";
-    url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.3.7/android-studio-quail3-linux.tar.gz";
+    version = "2026.1.3.8"; # "Android Studio Quail 3 | 2026.1.3 Patch 1"
+    sha256Hash = "sha256-W9XuXW50exP4L7oyQTgL01jML0qEeBXI6GB1ffE9w18=";
+    url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.3.8/android-studio-quail3-patch1-linux.tar.gz";
   };
   betaVersion = {
     version = "2026.1.3.6"; # "Android Studio Quail 3 | 2026.1.3 RC 2"

From 5588786ea81295c8a2fa3dace0072ec20f29c0bb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 19:27:40 +0000
Subject: [PATCH 169/205] openfga-cli: 0.7.19 -> 0.7.20

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

diff --git a/pkgs/by-name/op/openfga-cli/package.nix b/pkgs/by-name/op/openfga-cli/package.nix
index 23d6877db17a..973e0c9c73ee 100644
--- a/pkgs/by-name/op/openfga-cli/package.nix
+++ b/pkgs/by-name/op/openfga-cli/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "openfga-cli";
-  version = "0.7.19";
+  version = "0.7.20";
 
   src = fetchFromGitHub {
     owner = "openfga";
     repo = "cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-/DhvUvcvopYGAdLCAqsLxTs09q0sqOd1BglxaM4as/0=";
+    hash = "sha256-9IBq5CThdc1Azmp0Vv+GzpXmIQAASpPay304X08+eG4=";
   };
 
-  vendorHash = "sha256-sIBD7Diqx16X7OHNpVCgD1XVByu8TGwFlIR6FIITTlc=";
+  vendorHash = "sha256-AUvbL/OjUcmRkzkcUuumwDsnpNWxsO6arnvM9M5hvgc=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 5696062ede47c470e7c6be12729738fc97c2ea24 Mon Sep 17 00:00:00 2001
From: whispers <whispersofthedawn@duck.com>
Date: Mon, 10 Aug 2026 15:46:29 -0400
Subject: [PATCH 170/205] libcanberra-gtk2: drop

this provides support for gtk 2, which is being removed from Nixpkgs. it
is also unused in Nixpkgs.
---
 pkgs/by-name/li/libcanberra/package.nix | 2 --
 pkgs/top-level/aliases.nix              | 1 +
 pkgs/top-level/all-packages.nix         | 3 ---
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/by-name/li/libcanberra/package.nix b/pkgs/by-name/li/libcanberra/package.nix
index c9148035ba31..baad63c8bf83 100644
--- a/pkgs/by-name/li/libcanberra/package.nix
+++ b/pkgs/by-name/li/libcanberra/package.nix
@@ -5,7 +5,6 @@
   fetchpatch,
   pkg-config,
   libtool,
-  gtk2-x11,
   gtk3-x11,
   gtkSupport ? null,
   libpulseaudio,
@@ -43,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
     gstreamer
     gst-plugins-base
   ])
-  ++ lib.optional (gtkSupport == "gtk2") gtk2-x11
   ++ lib.optional (gtkSupport == "gtk3") gtk3-x11
   ++ lib.optional stdenv.hostPlatform.isLinux libcap
   ++ lib.optional withSystemd systemd
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 491d407c1245..f39cd4ddd783 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1263,6 +1263,7 @@ mapAliases {
   libbencodetools = throw "'libbencodetools' has been renamed to/replaced by 'bencodetools'"; # Converted to throw 2025-10-27
   libbpf_1 = throw "'libbpf_1' has been renamed to/replaced by 'libbpf'"; # Converted to throw 2025-10-27
   libbson = throw "'libbson' has been renamed to/replaced by 'mongoc'"; # Converted to throw 2025-10-27
+  libcanberra-gtk2 = throw "'libcanberra-gtk2' has been removed as it depended on the deprecated GTK 2 engine. Consider using 'libcanberra-gtk3' instead."; # Added 2026-08-10
   libcef = throw "'libcef' has been removed, as no packages depend on it"; # Added 2025-11-06
   libchamplain = throw "'libchamplain' has been removed due to reliance on insecure libsoup 2.4. Consider using 'libchamplain_libsoup3' instead"; # Added 2026-05-29
   libclc = throw "'libclc' has been removed, as no packages use it; reach out to LLVM/Mesa maintainers if you need this back."; # Added 2026-08-06
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f401dca1c03c..97ed108f6e29 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5939,9 +5939,6 @@ with pkgs;
 
   libcamera-qcam = callPackage ../by-name/li/libcamera/package.nix { withQcam = true; };
 
-  libcanberra-gtk2 = pkgs.libcanberra.override {
-    gtkSupport = "gtk2";
-  };
   libcanberra-gtk3 = pkgs.libcanberra.override {
     gtkSupport = "gtk3";
   };

From c248ca686c8768f3038e071bd5d97c602352b992 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Mon, 10 Aug 2026 15:58:59 -0400
Subject: [PATCH 171/205] bichon: 2.0.0 -> 2.0.1

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

diff --git a/pkgs/by-name/bi/bichon/package.nix b/pkgs/by-name/bi/bichon/package.nix
index 73b79d9dee3d..2d88fd05c102 100644
--- a/pkgs/by-name/bi/bichon/package.nix
+++ b/pkgs/by-name/bi/bichon/package.nix
@@ -13,17 +13,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "bichon";
-  version = "2.0.0";
+  version = "2.0.1";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "rustmailer";
     repo = "bichon";
     tag = finalAttrs.version;
-    hash = "sha256-WL3FC0ohdB6iB+D7xyVAeaZVGd/vyoraEI7W9ypRcIE=";
+    hash = "sha256-pL/1W51x9ZqUHLLzdLUpb54crvhG8JhDqJu47CRZAd4=";
   };
 
-  cargoHash = "sha256-7MA+J30sE4H/UVT3HqJnpYsqefsHCQ88Dsq3240smZY=";
+  cargoHash = "sha256-R2gegIZJDr2Xu8VjOiUlPIkG4JXnyFLjMoU1gcSNcEk=";
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;

From 140a0b59a2a18913a9a263f9923430ef8be1e80b Mon Sep 17 00:00:00 2001
From: "nixpkgs-ci[bot]" <190413589+nixpkgs-ci[bot]@users.noreply.github.com>
Date: Mon, 10 Aug 2026 19:59:37 +0000
Subject: [PATCH 172/205] maintainers/github-teams.json: Automated sync

---
 maintainers/github-teams.json | 36 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json
index dd6fb2723095..662132d06a23 100644
--- a/maintainers/github-teams.json
+++ b/maintainers/github-teams.json
@@ -2,11 +2,10 @@
   "acme": {
     "description": "Maintain ACME-related packages and modules.",
     "id": 3806126,
-    "maintainers": {
-      "emilazy": 18535642
-    },
+    "maintainers": {},
     "members": {
       "arianvp": 628387,
+      "emilazy": 18535642,
       "m1cr0man": 3044438
     },
     "name": "ACME"
@@ -60,7 +59,6 @@
       "adamcstephens": 2071575,
       "ankhers": 750786,
       "gleber": 33185,
-      "minijackson": 1200507,
       "yurrriq": 1866448
     },
     "name": "Beam"
@@ -68,11 +66,10 @@
   "boot-security": {
     "description": "Maintain support for boot security technologies like Secure Boot",
     "id": 18686947,
-    "maintainers": {
-      "emilazy": 18535642
-    },
+    "maintainers": {},
     "members": {
-      "ElvishJerricco": 1365692
+      "ElvishJerricco": 1365692,
+      "emilazy": 18535642
     },
     "name": "Boot security"
   },
@@ -98,8 +95,8 @@
       "fgaz": 8182846,
       "natsukium": 25083790,
       "philiptaron": 43863,
-      "pyrotelekinetic": 29682759,
-      "tomodachi94": 68489118
+      "tomodachi94": 68489118,
+      "tr3foil": 29682759
     },
     "members": {},
     "name": "Categorization"
@@ -184,7 +181,6 @@
     "description": "Improve Darwin-support across Nixpkgs and help maintainers without access to Darwin hardware. Apply to join through https://github.com/NixOS/nixpkgs/issues/323144 to keep the process transparent.",
     "id": 2385202,
     "maintainers": {
-      "emilazy": 18535642,
       "toonn": 1486805
     },
     "members": {
@@ -211,10 +207,12 @@
       "cideM": 4246921,
       "cidkidnix": 67574902,
       "copumpkin": 2623,
+      "delafthi": 50531499,
       "devusb": 4951663,
       "domenkozar": 126339,
       "dwt": 57199,
       "eclairevoyant": 848000,
+      "emilazy": 18535642,
       "ethancedwards8": 60861925,
       "fiddlerwoaroof": 808745,
       "fulsomenko": 14945057,
@@ -580,11 +578,11 @@
     "id": 9955829,
     "maintainers": {
       "RossComputerGuy": 19699320,
-      "alyssais": 2768870,
-      "emilazy": 18535642
+      "alyssais": 2768870
     },
     "members": {
       "Ericson2314": 1055245,
+      "emilazy": 18535642,
       "peterwaller-arm": 52030119,
       "rrbutani": 7833358
     },
@@ -756,16 +754,6 @@
     },
     "name": "Nixpkgs CI"
   },
-  "nixpkgs-core": {
-    "description": "Provides leadership for and has authority over Nixpkgs.",
-    "id": 14317027,
-    "maintainers": {
-      "alyssais": 2768870,
-      "emilazy": 18535642
-    },
-    "members": {},
-    "name": "Nixpkgs core"
-  },
   "nixpkgs-merge-bot": {
     "description": "This team exists as a target for triggering the nixpkgs merge bot.",
     "id": 13926892,
@@ -1001,11 +989,11 @@
     "id": 11265412,
     "maintainers": {
       "RossComputerGuy": 19699320,
-      "emilazy": 18535642,
       "philiptaron": 43863
     },
     "members": {
       "Ericson2314": 1055245,
+      "emilazy": 18535642,
       "reckenrode": 7413633
     },
     "name": "stdenv"

From 08beff6c9ffdca5ae00b7e38e1a25ac4e3488e6b Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 10 Aug 2026 23:05:52 +0300
Subject: [PATCH 173/205] linux-firmware: 20260622 -> 20260810

Diff: https://gitlab.com/kernel-firmware/linux-firmware/-/compare/20260622...20260810
---
 pkgs/by-name/li/linux-firmware/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/linux-firmware/package.nix b/pkgs/by-name/li/linux-firmware/package.nix
index 6019480aed92..58d28198b1ac 100644
--- a/pkgs/by-name/li/linux-firmware/package.nix
+++ b/pkgs/by-name/li/linux-firmware/package.nix
@@ -23,13 +23,13 @@ let
 in
 stdenvNoCC.mkDerivation rec {
   pname = "linux-firmware";
-  version = "20260622";
+  version = "20260810";
 
   src = fetchFromGitLab {
     owner = "kernel-firmware";
     repo = "linux-firmware";
     tag = version;
-    hash = "sha256-nSoJhgI4hAxtNmnj5M6ticzuBSt9uNAYcmc1VR/yXxE=";
+    hash = "sha256-P/fPpqaatp8Z2GV+I/OChiWGn6AhV+8w1RMFuX/LqHc=";
   };
 
   postUnpack = ''

From fd9663a59e42974af81373dfac61ea26d1f77e67 Mon Sep 17 00:00:00 2001
From: Robert James Hernandez <rob@sarcasticadmin.com>
Date: Tue, 10 Mar 2026 19:23:53 +0000
Subject: [PATCH 174/205] direwolf: include darwin and BSD deps

---
 pkgs/by-name/di/direwolf/package.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/di/direwolf/package.nix b/pkgs/by-name/di/direwolf/package.nix
index 9be36e7f3b19..5622161f46e2 100644
--- a/pkgs/by-name/di/direwolf/package.nix
+++ b/pkgs/by-name/di/direwolf/package.nix
@@ -3,16 +3,22 @@
   stdenv,
   fetchFromGitHub,
   fetchpatch,
-  cmake,
+  avahi,
+  avahiSupport ? true,
   alsa-lib,
+  cmake,
+  libgpiod,
+  libgpiodSupport ? false,
   gpsd,
   gpsdSupport ? false,
   hamlib_4,
   hamlib ? hamlib_4,
   hamlibSupport ? true,
+  hidapi,
   perl,
   portaudio,
   python3,
+  sndio,
   espeak,
   udev,
   udevCheckHook,
@@ -44,7 +50,13 @@ stdenv.mkDerivation (finalAttrs: {
       alsa-lib
       udev
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ portaudio ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      hidapi
+      portaudio
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isBSD) [ sndio ]
+    ++ lib.optionals avahiSupport [ avahi ]
+    ++ lib.optionals libgpiodSupport [ libgpiod ]
     ++ lib.optionals gpsdSupport [ gpsd ]
     ++ lib.optionals hamlibSupport [ hamlib ]
     ++ lib.optionals extraScripts [

From acdf523bd6962b61e1ca830f8e56100ce63b039c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 20:35:13 +0000
Subject: [PATCH 175/205] python3Packages.cyclonedx-python-lib: 11.11.0 ->
 11.11.1

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

diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
index 89bc0b7c8bb0..7d8b3a7c96c8 100644
--- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
+++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "cyclonedx-python-lib";
-  version = "11.11.0";
+  version = "11.11.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CycloneDX";
     repo = "cyclonedx-python-lib";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-P6TJHxETBazn+zfrDYUuzCH2DHhYVtn1ceBharxCXRo=";
+    hash = "sha256-y9sAbo0O1JIna6PODpvS3Js6UF1nKUFc4s8jx8UqLwY=";
   };
 
   pythonRelaxDeps = [ "py-serializable" ];

From c84ee7d7a173c558c8bd923c61e9f4134c8809cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@cachix.org>
Date: Mon, 10 Aug 2026 15:40:59 -0500
Subject: [PATCH 176/205] lobster: unbreak on Darwin

---
 pkgs/by-name/lo/lobster/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/lo/lobster/package.nix b/pkgs/by-name/lo/lobster/package.nix
index 3e96a863080a..5ad33aa42ec8 100644
--- a/pkgs/by-name/lo/lobster/package.nix
+++ b/pkgs/by-name/lo/lobster/package.nix
@@ -60,7 +60,6 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.tests.can-run-hello-world = callPackage ./test-can-run-hello-world.nix { };
 
   meta = {
-    broken = stdenv.hostPlatform.isDarwin;
     homepage = "https://strlen.com/lobster/";
     description = "Lobster programming language";
     mainProgram = "lobster";

From d41a2169c576905a5f6637a5d2dee278f7758e10 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Aug 2026 20:41:03 +0000
Subject: [PATCH 177/205] python3Packages.sqlfmt: 0.31.0 -> 0.32.0

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

diff --git a/pkgs/development/python-modules/sqlfmt/default.nix b/pkgs/development/python-modules/sqlfmt/default.nix
index 68cda3e0e04d..b94e5a4ae8c7 100644
--- a/pkgs/development/python-modules/sqlfmt/default.nix
+++ b/pkgs/development/python-modules/sqlfmt/default.nix
@@ -26,7 +26,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "sqlfmt";
-  version = "0.31.0";
+  version = "0.32.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -34,7 +34,7 @@ buildPythonPackage (finalAttrs: {
     owner = "tconbeer";
     repo = "sqlfmt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nbgLzeMOXgiXtvV/XHu1I0LkwwaTrzj8ga6EtoZuvRk=";
+    hash = "sha256-GM+LS1jrt7cCjkjM5T/nJEVRBdTm0Jd4ib+SvCbTAdA=";
   };
 
   build-system = [ hatchling ];

From b229aef6d6541568bcdb821a9e89229f602e1c06 Mon Sep 17 00:00:00 2001
From: Ilan Joselevich <personal@ilanjoselevich.com>
Date: Mon, 10 Aug 2026 22:00:05 +0200
Subject: [PATCH 178/205] home-assistant-custom-components.oref_alert: 6.20.2
 -> 7.0.1

https://github.com/amitfin/oref_alert/releases/tag/v7.0.1

Disable tests/test_trigger.py, new in 7.0.0, which fails in the sandbox
trying to create a blueprints directory inside the read-only
testing_config directory of pytest-homeassistant-custom-component.

Assisted-by: Claude:claude-fable-5
---
 .../home-assistant/custom-components/oref_alert/package.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix b/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix
index b8bd319c3465..edd2d4a4a6a6 100644
--- a/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix
@@ -15,13 +15,13 @@
 buildHomeAssistantComponent rec {
   owner = "amitfin";
   domain = "oref_alert";
-  version = "6.20.2";
+  version = "7.0.1";
 
   src = fetchFromGitHub {
     owner = "amitfin";
     repo = "oref_alert";
     tag = "v${version}";
-    hash = "sha256-jDrSFIFlp9BVytIVUiW3lAKAmG6N0NYS0TaUxQC26eE=";
+    hash = "sha256-ZYV/pylzjzjDAR9v9CaCMUCS+ttCf5t3yii06tmjLm0=";
   };
 
   # Do not publish cards, currently broken, attempting to write to nix store.

From 54787d00032518e25c2743361ded262c6f67beee Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Mon, 10 Aug 2026 13:52:57 -0700
Subject: [PATCH 179/205] inconsolata: modernize

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/in/inconsolata/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/in/inconsolata/package.nix b/pkgs/by-name/in/inconsolata/package.nix
index 07235d816716..aee28f038649 100644
--- a/pkgs/by-name/in/inconsolata/package.nix
+++ b/pkgs/by-name/in/inconsolata/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenvNoCC,
   fetchFromGitHub,
+  installFonts,
 }:
 
 stdenvNoCC.mkDerivation {
@@ -16,11 +17,9 @@ stdenvNoCC.mkDerivation {
     rootDir = "ofl/inconsolata";
   };
 
-  installPhase = ''
-    runHook preInstall
-    install -m644 --target $out/share/fonts/truetype/inconsolata -D static/*.ttf *.ttf
-    runHook postInstall
-  '';
+  nativeBuildInputs = [
+    installFonts
+  ];
 
   meta = {
     homepage = "https://www.levien.com/type/myfonts/inconsolata.html";

From 29438842d665af120ca6f885c0bdfa020df43047 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Mon, 10 Aug 2026 14:13:04 -0700
Subject: [PATCH 180/205] python3Packages.gatus-api: init at 1.2.0

---
 .../python-modules/gatus-api/default.nix      | 43 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/python-modules/gatus-api/default.nix

diff --git a/pkgs/development/python-modules/gatus-api/default.nix b/pkgs/development/python-modules/gatus-api/default.nix
new file mode 100644
index 000000000000..52e08396d30f
--- /dev/null
+++ b/pkgs/development/python-modules/gatus-api/default.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  pytest-aiohttp,
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "gatus-api";
+  version = "1.2.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "TN-1";
+    repo = "gatus-api";
+    tag = "V${finalAttrs.version}";
+    hash = "sha256-BJ5Kzfo7REmADEkgnWrhbqObR6hyLr/fBiz18A81V+k=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [ aiohttp ];
+
+  nativeCheckInputs = [
+    pytest-aiohttp
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "gatus_api" ];
+
+  __darwinAllowLocalNetworking = true;
+
+  meta = {
+    description = "Asynchronous Python client for the Gatus API";
+    homepage = "https://github.com/TN-1/gatus-api";
+    changelog = "https://github.com/TN-1/gatus-api/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f9cb0c73e428..e0c19100ab64 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6563,6 +6563,8 @@ self: super: with self; {
     inherit (pkgs) bluez glib pkg-config;
   };
 
+  gatus-api = callPackage ../development/python-modules/gatus-api { };
+
   gawd = callPackage ../development/python-modules/gawd { };
 
   gb-io = callPackage ../development/python-modules/gb-io { };

From f9b33fb5156f492f09580c1e48b17cc66d27673f Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Mon, 10 Aug 2026 14:14:35 -0700
Subject: [PATCH 181/205] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 9d6544f23ebf..73be08978635 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2258,7 +2258,8 @@
       ];
     "gatus" =
       ps: with ps; [
-      ]; # missing inputs: gatus-api
+        gatus-api
+      ];
     "gaviota" =
       ps: with ps; [
       ];
@@ -8301,6 +8302,7 @@
     "garages_amsterdam"
     "gardena_bluetooth"
     "gate"
+    "gatus"
     "gdacs"
     "generic"
     "generic_hygrostat"

From 3f683c5235c179dfc0fea526944197f2bba05900 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 10 Aug 2026 23:25:43 +0200
Subject: [PATCH 182/205] libbluray-full: fix loongarch64-linux build

---
 pkgs/by-name/li/libbluray-full/package.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libbluray-full/package.nix b/pkgs/by-name/li/libbluray-full/package.nix
index 5a09f78f35d0..98d918dd9ea4 100644
--- a/pkgs/by-name/li/libbluray-full/package.nix
+++ b/pkgs/by-name/li/libbluray-full/package.nix
@@ -1,6 +1,11 @@
-{ libbluray }:
+{
+  lib,
+  stdenv,
+  jdk21,
+  libbluray,
+}:
 libbluray.override {
   withAACS = true;
   withBDplus = true;
-  withJava = true;
+  withJava = lib.meta.availableOn stdenv.buildPlatform jdk21;
 }

From 6093017bf351f0f649024eb2af5686e4c5772761 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Mon, 10 Aug 2026 13:39:42 -0700
Subject: [PATCH 183/205] python3Packages.pybraendstofpriser: init at 2.2.0

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

diff --git a/pkgs/development/python-modules/pybraendstofpriser/default.nix b/pkgs/development/python-modules/pybraendstofpriser/default.nix
new file mode 100644
index 000000000000..654462339877
--- /dev/null
+++ b/pkgs/development/python-modules/pybraendstofpriser/default.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  pyprojectVersionPatchHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "pybraendstofpriser";
+  version = "2.2.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "MTrab";
+    repo = "pybraendstofpriser";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-U3apX4t4c4Gb14b9KznVJdYmlGyuzjG6fzpseT1v2+U=";
+  };
+
+  nativeBuildInputs = [ pyprojectVersionPatchHook ];
+
+  build-system = [ poetry-core ];
+
+  dependencies = [ aiohttp ];
+
+  # The test script requires an API key and network access.
+  doCheck = false;
+
+  pythonImportsCheck = [ "pybraendstofpriser" ];
+
+  meta = {
+    description = "Library for fetching fuel prices from Fuelprices.dk API";
+    homepage = "https://github.com/MTrab/pybraendstofpriser";
+    changelog = "https://github.com/MTrab/pybraendstofpriser/releases/tag/${finalAttrs.src.tag}";
+    # Awaiting license clarification from upstream.
+    # https://github.com/MTrab/pybraendstofpriser/issues/44
+    license = lib.licenses.gpl3Only;
+    maintainers = [ lib.maintainers.jamiemagee ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f9cb0c73e428..b2ce51aa9702 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14245,6 +14245,8 @@ self: super: with self; {
 
   pybox2d = callPackage ../development/python-modules/pybox2d { };
 
+  pybraendstofpriser = callPackage ../development/python-modules/pybraendstofpriser { };
+
   pybravia = callPackage ../development/python-modules/pybravia { };
 
   pybreaker = callPackage ../development/python-modules/pybreaker { };

From ab04dc8c154ebf560157e40aa1388eef8f4a3760 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Mon, 10 Aug 2026 13:41:33 -0700
Subject: [PATCH 184/205] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 9d6544f23ebf..46fb0b884a16 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2185,7 +2185,8 @@
       ];
     "fuelprices_dk" =
       ps: with ps; [
-      ]; # missing inputs: pybraendstofpriser
+        pybraendstofpriser
+      ];
     "fujitsu_anywair" =
       ps: with ps; [
       ];
@@ -8293,6 +8294,7 @@
     "fronius"
     "frontend"
     "frontier_silicon"
+    "fuelprices_dk"
     "fujitsu_fglair"
     "fully_kiosk"
     "fumis"

From 0e8b08dada75d68966d6c7f2dd851aca59d73cb0 Mon Sep 17 00:00:00 2001
From: Justin ! <just1602@riseup.net>
Date: Mon, 10 Aug 2026 17:46:54 -0400
Subject: [PATCH 185/205] mtail: 3.4.6 -> 3.4.7

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

diff --git a/pkgs/by-name/mt/mtail/package.nix b/pkgs/by-name/mt/mtail/package.nix
index 708f39c7333d..e848f8f2c617 100644
--- a/pkgs/by-name/mt/mtail/package.nix
+++ b/pkgs/by-name/mt/mtail/package.nix
@@ -8,18 +8,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "mtail";
-  version = "3.4.6";
+  version = "3.4.7";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "jaqx0r";
     repo = "mtail";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-xjakb+HpctC68FL8ct6aVfwzl0qA2F8sZ3/C1SkFTkY=";
+    hash = "sha256-R7WJsC4KyEyAS5X9ut9LDFQ8feYIq9Sz5TU175yz/QA=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-/11U9jTTiIZ8ixqWWMt9/ieXhPLT00SJIKViO3m9vsk=";
+  vendorHash = "sha256-UGIjGCk7rqjmqqRPMAaLkz7rBIUHFldBWPzrQdKbLWI=";
 
   nativeBuildInputs = [
     gotools # goyacc

From 3ab69ab334af0d41158c79aa068f22b51dfedc72 Mon Sep 17 00:00:00 2001
From: sophiebsw <sophiebsw@gmail.com>
Date: Thu, 23 Jul 2026 00:57:48 -0700
Subject: [PATCH 186/205] discord: use buildFHSEnv to fix krisp

use buildFHSEnv for linking instead of patchelf. this ensures that krisp
will load properly (NixOS#195512) and avoids violating Discord's ToS.

creates a new wrapper.nix file to hold variables shared across platforms (e.g.
stageModules, disableBreakingUpdates, passthru). when called with
useFHSEnv = false, this will callPackage either linux.nix or darwin.nix
as appropriate

when called with useFHSEnv = true on linux (the default), it will
instead output a derivation built using buildFHSEnv, that exposes the
inner linux.nix package as an overrideable attribute

with both approaches, the underlying mkDerivation is overridable using
the "unwrapped" package argument, and exposed through
passthru.unwrapped

useFHSEnv defaults to *and is asserted to be* false on darwin, due to a
lack of the buildFHSEnv utility

additionally contains some general formatting cleanup and
standardization of arguments across files
---
 .../instant-messengers/discord/darwin.nix     | 110 ++-----
 .../instant-messengers/discord/default.nix    |   4 +-
 .../instant-messengers/discord/linux.nix      | 295 ++++++++----------
 .../instant-messengers/discord/wrapper.nix    | 201 ++++++++++++
 4 files changed, 358 insertions(+), 252 deletions(-)
 create mode 100644 pkgs/applications/networking/instant-messengers/discord/wrapper.nix

diff --git a/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/pkgs/applications/networking/instant-messengers/discord/darwin.nix
index 68f5bcfb690d..50379bfb098e 100644
--- a/pkgs/applications/networking/instant-messengers/discord/darwin.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/darwin.nix
@@ -1,49 +1,45 @@
 {
+  # Package metadata
   pname,
   source,
   meta,
-  stdenv,
   binaryName,
   desktopName,
-  self,
+  passthru,
+  moduleSrcs,
+  # Package utilities
+  disableBreakingUpdates,
+  stageModules,
+  # Feature flags (cross-platform)
+  withOpenASAR ? false,
+  withVencord ? false,
+  withEquicord ? false,
+  withMoonlight ? false,
+  # Disabling this would normally break Discord.
+  # The intended use-case for this is when SKIP_HOST_UPDATE is enabled via other means,
+  # for example if a settings.json is linked declaratively (e.g., with home-manager).
+  disableUpdates ? true,
+  # Package arguments
+  commandLineArgs ? "",
+  # Miscellaneous
   lib,
-  fetchurl,
+  stdenv,
   makeWrapper,
-  writeScript,
-  writeShellScript,
   brotli,
   python3,
-  runCommand,
-  branch,
-  withOpenASAR ? false,
+  writeScript,
+  fetchurl,
   openasar,
-  withVencord ? false,
   vencord,
-  withEquicord ? false,
   equicord,
-  withMoonlight ? false,
   moonlight,
-  commandLineArgs ? "",
 }:
 
 let
-  discordMods = [
-    withVencord
-    withEquicord
-    withMoonlight
-  ];
-  enabledDiscordModsCount = builtins.length (lib.filter (x: x) discordMods);
-
   inherit (source) version;
 
   src = fetchurl { inherit (source.distro) url hash; };
 
-  moduleSrcs = lib.mapAttrs (_: mod: fetchurl { inherit (mod) url hash; }) source.modules;
-
-  moduleVersions = lib.mapAttrs (_: mod: mod.version) source.modules;
-
-  configDirName = lib.replaceStrings [ " " ] [ "" ] (lib.toLower binaryName);
-
   fixDistroSymlinks = writeScript "discord-fix-distro-symlinks.py" ''
     #!${python3.interpreter}
     import pathlib
@@ -61,44 +57,16 @@ let
             path.unlink(missing_ok=True)
             path.symlink_to(member.linkname)
   '';
-
-  stageModules = writeShellScript "discord-stage-modules" ''
-    store_modules="$1"
-    user_data_dir="''${DISCORD_USER_DATA_DIR-$HOME/Library/Application Support}"
-    modules_dir="$user_data_dir''${user_data_dir:+/}${configDirName}/${version}/modules"
-    mkdir -p "$modules_dir"
-    for m in ${lib.concatStringsSep " " (lib.attrNames moduleSrcs)}; do
-      rm -rf "$modules_dir/$m"
-      ln -s "$store_modules/$m" "$modules_dir/$m"
-    done
-    echo '${builtins.toJSON (lib.mapAttrs (_: mod: { installedVersion = mod; }) moduleVersions)}' \
-      > "$modules_dir/installed.json"
-  '';
-
-  disableBreakingUpdates =
-    runCommand "disable-breaking-updates.py"
-      {
-        pythonInterpreter = "${python3.interpreter}";
-        configDirName = lib.toLower binaryName;
-        skipModuleUpdate = lib.boolToString withOpenASAR;
-        meta.mainProgram = "disable-breaking-updates.py";
-      }
-      ''
-        mkdir -p $out/bin
-        cp ${./disable-breaking-updates.py} $out/bin/disable-breaking-updates.py
-        substituteAllInPlace $out/bin/disable-breaking-updates.py
-        chmod +x $out/bin/disable-breaking-updates.py
-      '';
 in
-assert lib.assertMsg (
-  enabledDiscordModsCount <= 1
-) "discord: Only one of Vencord, Equicord or Moonlight can be enabled at the same time";
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   inherit
     pname
     version
     src
     meta
+    passthru
+    disableBreakingUpdates
+    stageModules
     ;
 
   nativeBuildInputs = [
@@ -142,8 +110,8 @@ stdenv.mkDerivation {
     # wrap executable to $out/bin
     mkdir -p $out/bin
     makeWrapper "$out/Applications/${desktopName}.app/Contents/MacOS/${binaryName}" "$out/bin/${binaryName}" \
-      --run ${lib.getExe disableBreakingUpdates} \
-      --run "${stageModules} \"$out/Applications/${desktopName}.app/Contents/Resources/modules\"" \
+      ${lib.strings.optionalString disableUpdates "--run ${lib.getExe finalAttrs.disableBreakingUpdates}"} \
+      --run "${finalAttrs.stageModules} \"$out/Applications/${desktopName}.app/Contents/Resources/modules\"" \
       --add-flags ${lib.escapeShellArg commandLineArgs}
 
     runHook postInstall
@@ -171,26 +139,4 @@ stdenv.mkDerivation {
       echo '{"name":"discord","main":"injector.js","private": true}' > "$out/Applications/${desktopName}.app/Contents/Resources/app.asar/package.json"
       echo 'require("${moonlight}/injector.js").inject(require("path").join(__dirname, "../_app.asar"));' > "$out/Applications/${desktopName}.app/Contents/Resources/app.asar/injector.js"
     '';
-
-  passthru = {
-    # make it possible to run disableBreakingUpdates standalone
-    inherit disableBreakingUpdates;
-    inherit source;
-    updateScript = ./update.py;
-
-    tests = {
-      withVencord = self.override {
-        withVencord = true;
-      };
-      withEquicord = self.override {
-        withEquicord = true;
-      };
-      withMoonlight = self.override {
-        withMoonlight = true;
-      };
-      withOpenASAR = self.override {
-        withOpenASAR = true;
-      };
-    };
-  };
-}
+})
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 4bedf5ef87fe..31facadf34d7 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -77,6 +77,7 @@ let
       infinidoge
       jopejoe1
       Scrumplex
+      sophiebsw
     ];
     platforms = [
       "x86_64-linux"
@@ -84,7 +85,6 @@ let
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
-  package = if stdenv.hostPlatform.isLinux then ./linux.nix else ./darwin.nix;
 
   sources = lib.importJSON ./sources.json;
 in
@@ -95,7 +95,7 @@ lib.genAttrs [ "discord" "discord-ptb" "discord-canary" "discord-development" ]
     platformName = if stdenv.hostPlatform.isDarwin then "osx" else "linux";
     source = sources."${platformName}-${args.branch}";
   in
-  callPackage package (
+  callPackage ./wrapper.nix (
     args
     // {
       inherit pname source;
diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix
index 5400bb2e5ace..c8dfd4333b86 100644
--- a/pkgs/applications/networking/instant-messengers/discord/linux.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix
@@ -1,195 +1,170 @@
 {
+  # Package metadata
   pname,
   source,
   meta,
   binaryName,
   desktopName,
-  self,
-  autoPatchelfHook,
+  passthru,
+  moduleSrcs,
+  # Package utilities
+  disableBreakingUpdates,
+  stageModules,
+  # Feature flags (cross-platform)
+  withOpenASAR ? false,
+  withVencord ? false,
+  withEquicord ? false,
+  withMoonlight ? false,
+  # Disabling this would normally break Discord.
+  # The intended use-case for this is when SKIP_HOST_UPDATE is enabled via other means,
+  # for example if a settings.json is linked declaratively (e.g., with home-manager).
+  disableUpdates ? true,
+  # Feature flags (Linux exclusive)
+  withTTS ? true,
+  enableAutoscroll ? false,
+  # Package arguments
+  commandLineArgs ? "",
+  useFHSEnv ? true,
+  # Miscellaneous
+  lib,
+  stdenv,
+  makeShellWrapper,
+  gtk3,
+  brotli,
   addDriverRunpath,
   fetchurl,
   makeDesktopItem,
-  lib,
-  stdenv,
+  autoPatchelfHook,
+  cups,
+  libdrm,
+  libuuid,
+  libxdamage,
+  libx11,
+  libxscrnsaver,
+  libxtst,
+  libxcb,
+  libxshmfence,
   wrapGAppsHook3,
-  makeShellWrapper,
   alsa-lib,
+  libgbm,
+  nspr,
+  nss,
+  libpulseaudio,
+  libcxx,
+  systemdLibs,
+  atk,
   at-spi2-atk,
   at-spi2-core,
-  atk,
   cairo,
-  cups,
   dbus,
   expat,
   fontconfig,
   freetype,
   gdk-pixbuf,
   glib,
-  gtk3,
-  libcxx,
-  libdrm,
   libglvnd,
   libnotify,
-  libpulseaudio,
-  libuuid,
-  libva,
-  libx11,
-  libxscrnsaver,
   libxcomposite,
+  libunity,
+  libva,
   libxcursor,
-  libxdamage,
   libxext,
   libxfixes,
   libxi,
   libxrandr,
   libxrender,
-  libxtst,
-  libxcb,
   libxkbcommon,
-  libxshmfence,
-  libgbm,
-  nspr,
-  nss,
   pango,
-  systemdLibs,
+  pipewire,
   libappindicator-gtk3,
   libdbusmenu,
-  brotli,
-  writeShellScript,
-  pipewire,
-  python3,
-  runCommand,
-  libunity,
-  speechd-minimal,
   wayland,
-  branch,
-  withOpenASAR ? false,
+  speechd-minimal,
   openasar,
-  withVencord ? false,
   vencord,
-  withEquicord ? false,
   equicord,
-  withMoonlight ? false,
   moonlight,
-  withTTS ? true,
-  enableAutoscroll ? false,
-  # Disabling this would normally break Discord.
-  # The intended use-case for this is when SKIP_HOST_UPDATE is enabled via other means,
-  # for example if a settings.json is linked declaratively (e.g., with home-manager).
-  disableUpdates ? true,
-  commandLineArgs ? "",
-}:
+}@args:
 
 let
-  discordMods = [
-    withVencord
-    withEquicord
-    withMoonlight
-  ];
-  enabledDiscordModsCount = builtins.length (lib.filter (x: x) discordMods);
-
   inherit (source) version;
 
   src = fetchurl { inherit (source.distro) url hash; };
 
-  moduleSrcs = lib.mapAttrs (_: mod: fetchurl { inherit (mod) url hash; }) source.modules;
+  targetPkgs =
+    pkgs:
+    (lib.attrValues {
+      inherit (pkgs)
+        libcxx
+        systemdLibs
+        libpulseaudio
+        libdrm
+        libgbm
+        alsa-lib
+        atk
+        at-spi2-atk
+        at-spi2-core
+        cairo
+        cups
+        dbus
+        expat
+        fontconfig
+        freetype
+        gdk-pixbuf
+        glib
+        gtk3
+        libglvnd
+        libnotify
+        libx11
+        libxcomposite
+        libunity
+        libuuid
+        libva
+        libxcursor
+        libxdamage
+        libxext
+        libxfixes
+        libxi
+        libxrandr
+        libxrender
+        libxtst
+        nspr
+        libxcb
+        libxkbcommon
+        pango
+        pipewire
+        libxscrnsaver
+        libappindicator-gtk3
+        libdbusmenu
+        wayland
+        ;
 
-  moduleVersions = lib.mapAttrs (_: mod: mod.version) source.modules;
-
-  libPath = lib.makeLibraryPath (
-    [
-      libcxx
-      systemdLibs
-      libpulseaudio
-      libdrm
-      libgbm
-      stdenv.cc.cc
-      alsa-lib
-      atk
-      at-spi2-atk
-      at-spi2-core
-      cairo
-      cups
-      dbus
-      expat
-      fontconfig
-      freetype
-      gdk-pixbuf
-      glib
-      gtk3
-      libglvnd
-      libnotify
-      libx11
-      libxcomposite
-      libunity
-      libuuid
-      libva
-      libxcursor
-      libxdamage
-      libxext
-      libxfixes
-      libxi
-      libxrandr
-      libxrender
-      libxtst
-      nspr
-      # nss is intentionally NOT in libPath: it would leak via LD_LIBRARY_PATH
-      # to xdg-open and break Firefox children when versions diverge (#514859,
-      # PR #186603)
-      libxcb
-      libxkbcommon
-      pango
-      pipewire
-      libxscrnsaver
-      libappindicator-gtk3
-      libdbusmenu
-      wayland
-    ]
-    ++ lib.optionals withTTS [ speechd-minimal ]
-  );
-
-  # Symlink native modules from the nix store into the user config dir
-  # where Discord's JS moduleUpdater expects them.
-  stageModules = writeShellScript "discord-stage-modules" ''
-    store_modules="$1"
-    user_data_dir="''${DISCORD_USER_DATA_DIR-''${XDG_CONFIG_HOME:-$HOME/.config}}"
-    modules_dir="$user_data_dir''${user_data_dir:+/}${lib.toLower binaryName}/${version}/modules"
-    rm -rf "$modules_dir"
-    mkdir -p "$modules_dir"
-    for m in ${lib.concatStringsSep " " (lib.attrNames moduleSrcs)}; do
-      ln -sn "$store_modules/$m" "$modules_dir/$m"
-    done
-    echo '${builtins.toJSON (lib.mapAttrs (_: mod: { installedVersion = mod; }) moduleVersions)}' \
-      > "$modules_dir/installed.json"
-  '';
-
-  disableBreakingUpdates =
-    runCommand "disable-breaking-updates.py"
-      {
-        pythonInterpreter = "${python3.interpreter}";
-        configDirName = lib.toLower binaryName;
-        skipModuleUpdate = lib.boolToString withOpenASAR;
-        meta.mainProgram = "disable-breaking-updates.py";
-      }
-      ''
-        mkdir -p $out/bin
-        cp ${./disable-breaking-updates.py} $out/bin/disable-breaking-updates.py
-        substituteAllInPlace $out/bin/disable-breaking-updates.py
-        chmod +x $out/bin/disable-breaking-updates.py
-      '';
+      inherit (pkgs.stdenv.cc) cc;
+    })
+    ++ lib.optionals withTTS [ pkgs.speechd-minimal ]
+    # nss is intentionally NOT in libPath: it would leak via LD_LIBRARY_PATH
+    # to xdg-open and break Firefox children when versions diverge (#514859,
+    # PR #186603)
+    ++ lib.optionals useFHSEnv [ pkgs.nss ];
 in
-assert lib.assertMsg (
-  enabledDiscordModsCount <= 1
-) "discord: Only one of Vencord, Equicord or Moonlight can be enabled at the same time";
 stdenv.mkDerivation (finalAttrs: {
   inherit
-    pname
     version
     src
     meta
+    disableBreakingUpdates
+    stageModules
     ;
 
+  pname = if useFHSEnv then "${pname}-unwrapped" else pname;
+
+  libPath = if useFHSEnv then null else lib.makeLibraryPath (targetPkgs args);
+
   nativeBuildInputs = [
+    makeShellWrapper
+    brotli
+  ]
+  ++ lib.optionals (!useFHSEnv) [
     autoPatchelfHook
     cups
     libdrm
@@ -201,13 +176,9 @@ stdenv.mkDerivation (finalAttrs: {
     libxcb
     libxshmfence
     wrapGAppsHook3
-    makeShellWrapper
-    brotli
   ];
 
-  dontWrapGApps = true;
-
-  buildInputs = [
+  buildInputs = lib.optionals (!useFHSEnv) [
     alsa-lib
     libgbm
     nspr
@@ -223,9 +194,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontUnpack = true;
 
-  inherit libPath stageModules;
+  dontPatchELF = useFHSEnv;
+  dontStrip = useFHSEnv;
 
-  autoPatchelfIgnoreMissingDeps = [
+  autoPatchelfIgnoreMissingDeps = lib.optionals (!useFHSEnv) [
     "libssl.so.1.1"
     "libcrypto.so.1.1"
   ];
@@ -251,6 +223,8 @@ stdenv.mkDerivation (finalAttrs: {
       '') moduleSrcs
     )}
 
+    mkdir -p $out/opt/${binaryName}/modules/discord_krisp/KMS/logs
+
     wrapProgramShell $out/opt/${binaryName}/${binaryName} \
         "''${gappsWrapperArgs[@]}" \
         --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
@@ -260,10 +234,14 @@ stdenv.mkDerivation (finalAttrs: {
         ''} \
         ${lib.strings.optionalString enableAutoscroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \
         --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
-        --prefix LD_LIBRARY_PATH : ${finalAttrs.libPath}:$out/opt/${binaryName}:${addDriverRunpath.driverLink}/lib \
+        ${
+          lib.strings.optionalString (!useFHSEnv)
+            "--prefix LD_LIBRARY_PATH : ${finalAttrs.libPath}:$out/opt/${binaryName}:${addDriverRunpath.driverLink}/lib"
+        } \
         --suffix VK_ADD_DRIVER_FILES : "${addDriverRunpath.driverLink}/share/vulkan/icd.d" \
-        ${lib.strings.optionalString disableUpdates "--run ${lib.getExe disableBreakingUpdates}"} \
+        ${lib.strings.optionalString disableUpdates "--run ${lib.getExe finalAttrs.disableBreakingUpdates}"} \
         --run "${finalAttrs.stageModules} $out/opt/${binaryName}/modules" \
+        --run '[ -t 1 ] || exec > /dev/null 2>&1' \
         --add-flags ${lib.escapeShellArg commandLineArgs}
 
     ln -s $out/opt/${binaryName}/${binaryName} $out/bin/
@@ -314,26 +292,7 @@ stdenv.mkDerivation (finalAttrs: {
     startupWMClass = "discord";
   };
 
-  passthru = {
-    # make it possible to run disableBreakingUpdates standalone
-    inherit disableBreakingUpdates;
-    # Exposed so reviewers can inspect which distro modules are pinned
-    inherit source moduleVersions;
-    updateScript = ./update.py;
-
-    tests = {
-      withVencord = self.override {
-        withVencord = true;
-      };
-      withEquicord = self.override {
-        withEquicord = true;
-      };
-      withMoonlight = self.override {
-        withMoonlight = true;
-      };
-      withOpenASAR = self.override {
-        withOpenASAR = true;
-      };
-    };
+  passthru = passthru // {
+    inherit targetPkgs;
   };
 })
diff --git a/pkgs/applications/networking/instant-messengers/discord/wrapper.nix b/pkgs/applications/networking/instant-messengers/discord/wrapper.nix
new file mode 100644
index 000000000000..455ee20d4ec7
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/discord/wrapper.nix
@@ -0,0 +1,201 @@
+{
+  # Package metadata
+  pname,
+  source,
+  meta,
+  binaryName,
+  desktopName,
+  self,
+  branch,
+  # Feature flags (cross-platform)
+  withOpenASAR ? false,
+  withVencord ? false,
+  withEquicord ? false,
+  withMoonlight ? false,
+  # Disabling this would normally break Discord.
+  # The intended use-case for this is when SKIP_HOST_UPDATE is enabled via other means,
+  # for example if a settings.json is linked declaratively (e.g., with home-manager).
+  disableUpdates ? true,
+  # Feature flags (Linux exclusive)
+  withTTS ? true,
+  enableAutoscroll ? false,
+  # If true, the resulting derivation will be made using buildFHSEnv to wrap the inner
+  # Discord package. If false, the unwrappedDiscord package will be returned directly.
+  # Setting this value to false is not recommended, as Krisp will refuse to load due
+  # to the Discord binary being patched.
+  useFHSEnv ? stdenv.hostPlatform.isLinux,
+  # Package arguments
+  commandLineArgs ? "",
+  unwrappedDiscord ? null,
+  # Miscellaneous
+  lib,
+  stdenv,
+  buildFHSEnv,
+  writeShellScript,
+  runCommand,
+  callPackage,
+  fetchurl,
+  python3,
+  # Discord mods
+  openasar,
+  vencord,
+  equicord,
+  moonlight,
+}@args:
+
+let
+  inherit (stdenv.hostPlatform) isLinux;
+
+  pkgArgs = removeAttrs args [
+    "branch"
+    "self"
+    "unwrappedDiscord"
+    "buildFHSEnv"
+    "writeShellScript"
+    "runCommand"
+    "callPackage"
+    "python3"
+  ];
+
+  discordMods = [
+    withVencord
+    withEquicord
+    withMoonlight
+  ];
+  enabledDiscordModsCount = builtins.length (lib.filter (x: x) discordMods);
+
+  inherit (source) version;
+
+  moduleSrcs = lib.mapAttrs (_: mod: fetchurl { inherit (mod) url hash; }) source.modules;
+
+  moduleVersions = lib.mapAttrs (_: mod: mod.version) source.modules;
+
+  configDir =
+    if isLinux then
+      "\${DISCORD_USER_DATA_DIR-\${XDG_CONFIG_HOME:-$HOME/.config}}/${lib.toLower binaryName}"
+    else
+      let
+        configDirName = lib.replaceStrings [ " " ] [ "" ] (lib.toLower binaryName);
+      in
+      "\${DISCORD_USER_DATA_DIR-$HOME/Library/Application Support}/${configDirName}";
+
+  # Symlink native modules from the nix store into the user config dir
+  # where Discord's JS moduleUpdater expects them.
+  stageModules = writeShellScript "discord-stage-modules" ''
+    store_modules="$1"
+    modules_dir="${configDir}/${version}/modules"
+    rm -rf "$modules_dir"
+    mkdir -p "$modules_dir"
+    for m in ${lib.concatStringsSep " " (lib.attrNames moduleSrcs)}; do
+      ln -sn "$store_modules/$m" "$modules_dir/$m"
+    done
+    echo '${builtins.toJSON (lib.mapAttrs (_: mod: { installedVersion = mod; }) moduleVersions)}' \
+      > "$modules_dir/installed.json"
+  '';
+
+  disableBreakingUpdates =
+    runCommand "disable-breaking-updates.py"
+      {
+        pythonInterpreter = python3.interpreter;
+        configDirName = lib.toLower binaryName;
+        skipModuleUpdate = lib.boolToString withOpenASAR;
+        meta.mainProgram = "disable-breaking-updates.py";
+      }
+      ''
+        mkdir -p $out/bin
+        cp ${./disable-breaking-updates.py} $out/bin/disable-breaking-updates.py
+        substituteAllInPlace $out/bin/disable-breaking-updates.py
+        chmod +x $out/bin/disable-breaking-updates.py
+      '';
+
+  # Remove arguments not supported by the Darwin package.
+  platformPkgArgs =
+    if isLinux then
+      pkgArgs
+    else
+      removeAttrs pkgArgs [
+        "withTTS"
+        "enableAutoscroll"
+        "useFHSEnv"
+      ];
+  finalUnwrapped =
+    if unwrappedDiscord != null then
+      unwrappedDiscord
+    else
+      callPackage (if isLinux then ./linux.nix else ./darwin.nix) (
+        platformPkgArgs
+        // {
+          inherit
+            pname
+            passthru
+            disableBreakingUpdates
+            stageModules
+            moduleSrcs
+            ;
+        }
+      );
+
+  passthru = {
+    # make it possible to run disableBreakingUpdates and stageModules standalone
+    inherit disableBreakingUpdates stageModules;
+    # Exposed so reviewers can inspect which distro modules are pinned
+    inherit source moduleVersions;
+    updateScript = ./update.py;
+
+    unwrappedDiscord = finalUnwrapped;
+
+    tests = {
+      withVencord = self.override {
+        withVencord = true;
+      };
+      withEquicord = self.override {
+        withEquicord = true;
+      };
+      withMoonlight = self.override {
+        withMoonlight = true;
+      };
+      withOpenASAR = self.override {
+        withOpenASAR = true;
+      };
+      noFHSEnv = self.override {
+        useFHSEnv = false;
+      };
+    };
+  };
+
+in
+assert lib.assertMsg (
+  enabledDiscordModsCount <= 1
+) "discord: Only one of Vencord, Equicord, or Moonlight can be enabled at the same time";
+if useFHSEnv then
+  assert lib.assertMsg isLinux "discord: buildFHSEnv is only available on Linux";
+  buildFHSEnv {
+    inherit
+      source
+      pname
+      meta
+      version
+      passthru
+      stageModules
+      disableBreakingUpdates
+      ;
+
+    inherit (finalUnwrapped.passthru) targetPkgs;
+
+    src = fetchurl { inherit (source.distro) url hash; };
+
+    extraInstallCommands = ''
+      ln -s ${finalUnwrapped}/share $out/share
+
+      # Without || true the install would fail on case-insensitive filesystems
+      ln -s $out/bin/${binaryName} $out/bin/${lib.strings.toLower binaryName} || true
+    '';
+
+    executableName = binaryName;
+
+    runScript = "${finalUnwrapped}/bin/${binaryName}";
+  }
+else
+  finalUnwrapped.overrideAttrs (oldAttrs: {
+    passthru = (oldAttrs.passthru or { }) // passthru;
+  })

From 68c8896c0ca6869e7626823a2aac413e77a924ec Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Mon, 6 Jul 2026 13:28:06 +0800
Subject: [PATCH 187/205] fltk_1_3: install CMake config to standard location
 on darwin

Upstream hard-codes the CMake package config install path to
`FLTK.framework/Resources/CMake` on Apple (CMake/setup.cmake), but we build
FLTK as plain shared dylibs, so no framework target is ever created. That
path then becomes an empty `FLTK.framework/` directory holding only the
CMake config files -- no Mach-O binary, no `Headers/`.

Downstream `find_package(FLTK)` (module mode) resolves the main FLTK
library to that bare directory, and the linker fails with
`file cannot be mmap()ed, errno=22`, which surfaces in consumers such as
tigervnc as a misleading "Incompatible version of FLTK".

Install the package config to the standard `lib/cmake/FLTK` location
instead, which also lets config-mode `find_package(FLTK)` work, and drop
the now-unnecessary move of the (no longer created) framework stub.

Assisted-by: Claude-Code:GLM-5.2

f
---
 pkgs/by-name/fl/fltk_1_3/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fl/fltk_1_3/package.nix b/pkgs/by-name/fl/fltk_1_3/package.nix
index 41762add1ce7..70769d55ea20 100644
--- a/pkgs/by-name/fl/fltk_1_3/package.nix
+++ b/pkgs/by-name/fl/fltk_1_3/package.nix
@@ -59,6 +59,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     patchShebangs documentation/make_*
+  ''
+  # https://github.com/fltk/fltk/commit/dd819a118cfaa889bec6563b6a8e1e969b91f7ee
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace CMake/setup.cmake \
+      --replace-fail 'set (FLTK_CONFIG_PATH FLTK.framework/Resources/CMake)' 'set (FLTK_CONFIG_PATH ''${FLTK_DATADIR}/fltk)'
   '';
 
   nativeBuildInputs = [
@@ -156,9 +161,6 @@ stdenv.mkDerivation (finalAttrs: {
       mv bin/{test,examples}/* $bin/bin/
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      mkdir -p $out/Library/Frameworks
-      mv $out{,/Library/Frameworks}/FLTK.framework
-
       moveAppBundles() {
         echo "Moving and symlinking $1"
         appname="$(basename "$1")"

From 769423c000eff6f5cc292b1b69b522955cc9ce7d Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Mon, 6 Jul 2026 13:41:00 +0800
Subject: [PATCH 188/205] tigervnc: unbreak the darwin build

Two darwin packaging bugs prevented the macOS viewer from installing:

1. The postPatch appends `mv "$APPROOT" "$SRCDIR/"` to release/makemacapp.in,
   but the script ends with `exit`, which fires an EXIT trap that `rm -rf`s
   the temp dir. The appended move was unreachable dead code after `exit`, so
   the freshly built `TigerVNC.app` was deleted before it could be staged.
   Extend the gawk filter to also drop the trailing `exit` so the move runs.

2. postInstall looked for `TigerVNC Viewer ${version}.app`, but upstream's
   APPROOT is `TigerVNC.app`. Update the move and the wrapper's `open` path.

Now that FLTK installs a usable CMake config on darwin (previous commit),
these two fixes let tigervnc configure, build, and install the viewer .app
end-to-end, so drop `broken = stdenv.hostPlatform.isDarwin`.

Assisted-by: Claude-Code:GLM-5.2
---
 pkgs/by-name/ti/tigervnc/package.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ti/tigervnc/package.nix b/pkgs/by-name/ti/tigervnc/package.nix
index 8830f9d8ca01..168a4a152477 100644
--- a/pkgs/by-name/ti/tigervnc/package.nix
+++ b/pkgs/by-name/ti/tigervnc/package.nix
@@ -70,9 +70,13 @@ stdenv.mkDerivation (finalAttrs: {
          --replace-fail '"/usr/bin/ssh' '"${openssh}/bin/ssh'
       source_top="$(pwd)"
     ''
+    # On Mac, do not build a .dmg, instead move the built .app to the source dir.
+    # Also drop the script's trailing `exit`: it fires an EXIT trap that
+    # `rm -rf`s the temp dir, which would delete the .app before the move we
+    # append below can run (the move would otherwise be unreachable dead code
+    # after `exit`).
     + ''
-      # On Mac, do not build a .dmg, instead copy the .app to the source dir
-      gawk -i inplace 'BEGIN { del=0 } /hdiutil/ { del=2 } del<=0 { print } /$VERSION.dmg/ { del -= 1 }' release/makemacapp.in
+      gawk -i inplace 'BEGIN { del=0 } /hdiutil/ { del=2 } /^exit$/ { next } del<=0 { print } /$VERSION.dmg/ { del -= 1 }' release/makemacapp.in
       echo "mv \"\$APPROOT\" \"\$SRCDIR/\"" >> release/makemacapp.in
     '';
 
@@ -143,10 +147,10 @@ stdenv.mkDerivation (finalAttrs: {
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
       mkdir -p $out/Applications
-      mv 'TigerVNC Viewer ${finalAttrs.version}.app' $out/Applications/
+      mv 'TigerVNC.app' $out/Applications/
       rm $out/bin/vncviewer
       echo "#!/usr/bin/env bash
-      open $out/Applications/TigerVNC\ Viewer\ ${finalAttrs.version}.app --args \$@" >> $out/bin/vncviewer
+      open $out/Applications/TigerVNC.app --args \$@" >> $out/bin/vncviewer
       chmod +x $out/bin/vncviewer
     '';
 
@@ -219,7 +223,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Fork of tightVNC, made in cooperation with VirtualGL";
     maintainers = [ ];
     platforms = lib.platforms.unix;
-    broken = stdenv.hostPlatform.isDarwin;
     # Prevent a store collision.
     priority = 4;
     mainProgram = "vncviewer";

From d09d53e1c55220f4c066dad5e2c5f9f6d8136781 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Mon, 10 Aug 2026 18:22:31 -0400
Subject: [PATCH 189/205] .github/dependabot.yml: run on .github/actions/*/*
 too

Co-authored-by: Matt Sturgeon <matt@sturgeon.me.uk>
---
 .github/dependabot.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 4dbbecef0c3b..94c89e03b699 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,7 +1,9 @@
 version: 2
 updates:
   - package-ecosystem: "github-actions"
-    directory: "/"
+    directories:
+      - "/"
+      - ".github/actions/*/*"
     schedule:
       interval: "weekly"
     labels: []

From f50a52093fac81624403a85614fdd9cfc03e0cdd Mon Sep 17 00:00:00 2001
From: phibkro <71797726+phibkro@users.noreply.github.com>
Date: Fri, 5 Jun 2026 10:59:59 +0200
Subject: [PATCH 190/205] bacula: fix x86_64-darwin build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The postPatch widens libtool's macOS-version match from "10.*" to "*"
so the generated `configure` recognises Big Sur and later. It was
gated on (isDarwin && isAarch64), which left x86_64-darwin failing at
the link step with "ld: symbol(s) not found for architecture x86_64"
because the case clause never matches modern macOS versions there
either.

The substitution targets the host-OS match in the configure script —
arch-agnostic. Gate on isDarwin alone. Verified via Hydra failure
at https://hydra.nixos.org/build/330206792 and a local x86_64-darwin
build (macOS 15.6.1 Sequoia, Intel) that now lands clean. Linux
derivation hash unchanged (postPatch is a no-op on isLinux either
way), so no rebuild fan-out elsewhere.

Also switched --replace to --replace-fail so a future configure
script change that drops the "10.*)" pattern surfaces loudly instead
of silently no-op'ing.

Assisted-by: Claude Opus 4.7 <noreply@anthropic.com>
---
 pkgs/by-name/ba/bacula/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ba/bacula/package.nix b/pkgs/by-name/ba/bacula/package.nix
index 3fa8bc29d497..b757a5ee6144 100644
--- a/pkgs/by-name/ba/bacula/package.nix
+++ b/pkgs/by-name/ba/bacula/package.nix
@@ -28,9 +28,9 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   # libtool.m4 only matches macOS 10.*
-  postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
     substituteInPlace configure \
-      --replace "10.*)" "*)"
+      --replace-fail "10.*)" "*)"
   '';
 
   buildInputs = [

From 9e4c67a55c31c6f13e0df3d7f7f618ae80a52543 Mon Sep 17 00:00:00 2001
From: phibkro <71797726+phibkro@users.noreply.github.com>
Date: Fri, 5 Jun 2026 11:15:20 +0200
Subject: [PATCH 191/205] tinycc: skip installCheck on darwin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Hydra failure on x86_64-darwin (build 330314747) bails in
installCheckPhase with `sh: codesign: command not found`. Adding
`darwin.sigtool` to nativeBuildInputs gets past that but exposes
deeper test breakage:

  codesign_allocate: fatal error: file not in an order that can be
  processed (symbol table out of place): hello, vla_test, asm-c-connect
  tcc: error: undefined symbol '___va_arg'  (abitest-tcc.exe)

i.e. tcc's Mach-O output isn't in the layout codesign_allocate
expects, and abitest needs a __va_arg helper tcc doesn't provide on
x86_64-darwin. These are upstream tcc bugs about its DARWIN-OUTPUT
code generation; the tcc binary itself works fine (verified
`tcc -run hello.c` on macOS 15.6.1 Sequoia).

aarch64-darwin already disables doInstallCheck entirely for its own
atomic-helper issue. Extending the same exclusion to x86_64-darwin is
the consistent fix. The preInstallCheck that removed tests/tests2/{108,
114}* was a partial fix for the same shape — now subsumed.

Fixes https://hydra.nixos.org/build/330314747

Assisted-by: Claude Opus 4.7 <noreply@anthropic.com>
---
 pkgs/by-name/ti/tinycc/package.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/by-name/ti/tinycc/package.nix b/pkgs/by-name/ti/tinycc/package.nix
index 95e29c1179a5..fbcc308d9eea 100644
--- a/pkgs/by-name/ti/tinycc/package.nix
+++ b/pkgs/by-name/ti/tinycc/package.nix
@@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: {
   doInstallCheck =
     !stdenv.hostPlatform.isStatic
     && stdenv.buildPlatform.canExecute stdenv.hostPlatform
-    && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64);
+    && !stdenv.hostPlatform.isDarwin;
 
   postPatch = ''
     patchShebangs texi2pod.pl
@@ -130,13 +130,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   installCheckTarget = "test";
 
-  # https://www.mail-archive.com/tinycc-devel@nongnu.org/msg10142.html
-  preInstallCheck =
-    lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64)
-      ''
-        rm tests/tests2/{108,114}*
-      '';
-
   meta = {
     homepage = "https://repo.or.cz/tinycc.git";
     description = "Small, fast, and embeddable C compiler and interpreter";

From 98a5088236f65365df5054144ee683a96ea28086 Mon Sep 17 00:00:00 2001
From: Vegard Bieker Matthey <VegardMatthey@protonmail.com>
Date: Mon, 10 Aug 2026 19:51:28 +0200
Subject: [PATCH 192/205] feedparser-sgmllib: init at 2.1.0

Co-authored-by: h7x4 <h7x4@nani.wtf>
Co-authored-by: Peder Bergebakken Sundt <pbsds@hotmail.com>
---
 .../feedparser-sgmllib/default.nix            | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/feedparser-sgmllib/default.nix

diff --git a/pkgs/development/python-modules/feedparser-sgmllib/default.nix b/pkgs/development/python-modules/feedparser-sgmllib/default.nix
new file mode 100644
index 000000000000..41d1748ff1c4
--- /dev/null
+++ b/pkgs/development/python-modules/feedparser-sgmllib/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  pytestCheckHook,
+  poetry-core,
+}:
+
+buildPythonPackage rec {
+  pname = "feedparser-sgmllib";
+  version = "2.1.0";
+  pyproject = true;
+  src = fetchPypi {
+    pname = "feedparser_sgmllib";
+    inherit version;
+    hash = "sha256-YfrPKRjEOJtbAHFPdsXgNDH/zZTNH1HWV+3WzXw5ZXk=";
+  };
+  build-system = [ poetry-core ];
+  dependencies = [ ];
+
+  doCheck = true;
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "feedparser_sgmllib" ];
+
+  meta = {
+    homepage = "https://pypi.org/project/feedparser-sgmllib/";
+    changelog = "https://github.com/python-syndication/feedparser-sgmllib/releases/tag/v${version}";
+
+    description = "Python 3 port of sgmllib designed for use with feedparser";
+    license = lib.licenses.psfl;
+    maintainers = with lib.maintainers; [ ar4m1s ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f9cb0c73e428..e48b0b2179df 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5969,6 +5969,8 @@ self: super: with self; {
 
   feedparser = callPackage ../development/python-modules/feedparser { };
 
+  feedparser-sgmllib = callPackage ../development/python-modules/feedparser-sgmllib { };
+
   fenics-basix = callPackage ../development/python-modules/fenics-basix { };
 
   fenics-dolfinx = callPackage ../development/python-modules/fenics-dolfinx { };

From 56ed81e5067d792e9f693be7cddb9a3c4ffd7ccb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?=
 =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?=
 =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= <regime_skylark.0y@icloud.com>
Date: Tue, 2 Jun 2026 14:06:01 -0400
Subject: [PATCH 193/205] azimuth: 1.0.3 -> 1.0.4

azimuth: migrate from SDL to SDL2
---
 pkgs/by-name/az/azimuth/package.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/az/azimuth/package.nix b/pkgs/by-name/az/azimuth/package.nix
index ab5634674e8e..ffa28ad915c6 100644
--- a/pkgs/by-name/az/azimuth/package.nix
+++ b/pkgs/by-name/az/azimuth/package.nix
@@ -2,10 +2,10 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libGL,
   SDL2,
-  which,
   pkg-config,
+  libGL,
+  which,
   installTool ? false,
 }:
 
@@ -33,8 +33,6 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2
   ];
 
-  env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=maybe-uninitialized" ];
-
   makeFlags = [
     "BUILDTYPE=release"
     "PREFIX=${placeholder "out"}"

From 35c6e44be6da187e2524309a00e2f9421b634fc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?=
 =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?=
 =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= <regime_skylark.0y@icloud.com>
Date: Tue, 2 Jun 2026 14:06:34 -0400
Subject: [PATCH 194/205] azimuth: overhaul build process

---
 pkgs/by-name/az/azimuth/package.nix | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/az/azimuth/package.nix b/pkgs/by-name/az/azimuth/package.nix
index ffa28ad915c6..5d1f151efda8 100644
--- a/pkgs/by-name/az/azimuth/package.nix
+++ b/pkgs/by-name/az/azimuth/package.nix
@@ -6,7 +6,6 @@
   pkg-config,
   libGL,
   which,
-  installTool ? false,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -33,17 +32,30 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2
   ];
 
-  makeFlags = [
-    "BUILDTYPE=release"
-    "PREFIX=${placeholder "out"}"
-    "INSTALLTOOL=${if installTool then "true" else "false"}"
-  ];
+  makeFlags = [ "BUILDTYPE=release" ];
 
   enableParallelBuilding = true;
 
+  postPatch = ''
+    patchShebangs src/azimuth/system/generate_blob_index.sh
+
+    # Modern Clang over-erroring measures
+    substituteInPlace Makefile \
+      --replace-fail \
+        '-Werror' \
+        '-Werror -Wno-uninitialized-const-pointer -Wno-default-const-init-var-unsafe'
+  '';
+
   doCheck = true;
   checkTarget = "test";
 
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/bin
+    install -m755 out/release/host/bin/azimuth $out/bin/
+    runHook postInstall
+  '';
+
   meta = {
     description = "Metroidvania game using only vectorial graphic";
     mainProgram = "azimuth";

From 241e90a7632db3e1794cb4d7c26faf3f8f0a374b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?=
 =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?=
 =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= <regime_skylark.0y@icloud.com>
Date: Tue, 2 Jun 2026 14:06:51 -0400
Subject: [PATCH 195/205] azimuth: add macOS support

---
 pkgs/by-name/az/azimuth/package.nix | 30 +++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/az/azimuth/package.nix b/pkgs/by-name/az/azimuth/package.nix
index 5d1f151efda8..3289c96dc486 100644
--- a/pkgs/by-name/az/azimuth/package.nix
+++ b/pkgs/by-name/az/azimuth/package.nix
@@ -6,6 +6,8 @@
   pkg-config,
   libGL,
   which,
+  makeBinaryWrapper,
+  icnsify,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -24,12 +26,18 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     pkg-config
+    makeBinaryWrapper
     which
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    icnsify
   ];
 
   buildInputs = [
-    libGL
     SDL2
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    libGL
   ];
 
   makeFlags = [ "BUILDTYPE=release" ];
@@ -44,6 +52,13 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail \
         '-Werror' \
         '-Werror -Wno-uninitialized-const-pointer -Wno-default-const-init-var-unsafe'
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # iconutil is not available in the build sandbox
+    substituteInPlace Makefile \
+      --replace-fail \
+        'iconutil -c icns $(OUTDIR)/icon.iconset -o $@ 2> /dev/null' \
+        'icnsify $(OUTDIR)/icon.iconset/icon_128x128.png -o $@'
   '';
 
   doCheck = true;
@@ -53,9 +68,20 @@ stdenv.mkDerivation (finalAttrs: {
     runHook preInstall
     mkdir -p $out/bin
     install -m755 out/release/host/bin/azimuth $out/bin/
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/Applications
+    cp -R out/release/host/Azimuth.app $out/Applications/
+  ''
+  + ''
     runHook postInstall
   '';
 
+  postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    makeBinaryWrapper "$out/Applications/Azimuth.app/Contents/MacOS/Azimuth" \
+      "$out/bin/azimuth"
+  '';
+
   meta = {
     description = "Metroidvania game using only vectorial graphic";
     mainProgram = "azimuth";
@@ -72,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl3Plus;
     homepage = "https://mdsteele.games/azimuth/index.html";
     maintainers = with lib.maintainers; [ marius851000 ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
   };
 
 })

From 4c37902a59fbe014f26425d3cf9f4cb67a859678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?=
 =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?=
 =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= <regime_skylark.0y@icloud.com>
Date: Tue, 2 Jun 2026 14:10:17 -0400
Subject: [PATCH 196/205] azimuth: update metadata

---
 pkgs/by-name/az/azimuth/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/az/azimuth/package.nix b/pkgs/by-name/az/azimuth/package.nix
index 3289c96dc486..6b879b2ca726 100644
--- a/pkgs/by-name/az/azimuth/package.nix
+++ b/pkgs/by-name/az/azimuth/package.nix
@@ -83,8 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "Metroidvania game using only vectorial graphic";
-    mainProgram = "azimuth";
+    description = "Metroidvania game with vector graphics, inspired by Super Metroid and Star Control II";
     longDescription = ''
       Azimuth is a metroidvania game, and something of an homage to the previous
       greats of the genre (Super Metroid in particular). You will need to pilot
@@ -94,10 +93,11 @@ stdenv.mkDerivation (finalAttrs: {
       weapons and upgrades to find and use, and a wide variety of enemies and
       bosses to tangle with.
     '';
-
+    homepage = "https://mdsteele.games/azimuth/";
+    changelog = "https://github.com/mdsteele/azimuth/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3Plus;
-    homepage = "https://mdsteele.games/azimuth/index.html";
     maintainers = with lib.maintainers; [ marius851000 ];
+    mainProgram = "azimuth";
     platforms = lib.platforms.unix;
   };
 

From 8650dbb8d6dc992aba662e941c950e8025690887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?=
 =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?=
 =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= <regime_skylark.0y@icloud.com>
Date: Tue, 2 Jun 2026 14:07:07 -0400
Subject: [PATCH 197/205] azimuth: add philocalyst as maintainer

---
 pkgs/by-name/az/azimuth/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/az/azimuth/package.nix b/pkgs/by-name/az/azimuth/package.nix
index 6b879b2ca726..4215dc7b9993 100644
--- a/pkgs/by-name/az/azimuth/package.nix
+++ b/pkgs/by-name/az/azimuth/package.nix
@@ -96,7 +96,10 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://mdsteele.games/azimuth/";
     changelog = "https://github.com/mdsteele/azimuth/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ marius851000 ];
+    maintainers = with lib.maintainers; [
+      philocalyst
+      marius851000
+    ];
     mainProgram = "azimuth";
     platforms = lib.platforms.unix;
   };

From 690de090b3e6bb9c7041d80af44531b58a0dd7e2 Mon Sep 17 00:00:00 2001
From: EndCredits <admin@endcredits.cc>
Date: Tue, 19 May 2026 01:30:24 +0800
Subject: [PATCH 198/205] trimal: Add support for building on darwin platform

* Override the default g++ compiler to make it work on macOS which
  is using clang.

Signed-off-by: EndCredits <admin@endcredits.cc>
---
 pkgs/by-name/tr/trimal/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/tr/trimal/package.nix b/pkgs/by-name/tr/trimal/package.nix
index 80f61cd3a0f8..e66e3a25b2bb 100644
--- a/pkgs/by-name/tr/trimal/package.nix
+++ b/pkgs/by-name/tr/trimal/package.nix
@@ -20,6 +20,11 @@ stdenv.mkDerivation (finalAttrs: {
     echo Source root reset to ''${sourceRoot}
   '';
 
+  makeFlags = [
+    "CC=${stdenv.cc.targetPrefix}c++"
+    "CXX=${stdenv.cc.targetPrefix}c++"
+  ];
+
   installPhase = ''
     mkdir -p $out/bin
     cp -a trimal readal statal $out/bin
@@ -28,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Tool for the automated removal of spurious sequences or poorly aligned regions from a multiple sequence alignment";
     license = lib.licenses.gpl3;
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
     homepage = "http://trimal.cgenomics.org";
     maintainers = [ lib.maintainers.bzizou ];
   };

From 07588d19b14d6dcd8b8de8156a7c88d1db3bc237 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?=
 =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?=
 =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= <regime_skylark.0y@icloud.com>
Date: Thu, 9 Jul 2026 12:18:41 -0400
Subject: [PATCH 199/205] supertuxkart: add myself as maintainer

---
 pkgs/by-name/su/supertuxkart/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/su/supertuxkart/package.nix b/pkgs/by-name/su/supertuxkart/package.nix
index 850e8fc6ebdc..39b16f158231 100644
--- a/pkgs/by-name/su/supertuxkart/package.nix
+++ b/pkgs/by-name/su/supertuxkart/package.nix
@@ -163,6 +163,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       peterhoeg
+      philocalyst
       SchweGELBin
     ];
     platforms = with lib.platforms; unix;

From 684644e7fd037abdbbc7d0f85a689c1ea62ed6a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?=
 =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?=
 =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= <regime_skylark.0y@icloud.com>
Date: Thu, 9 Jul 2026 12:19:22 -0400
Subject: [PATCH 200/205] supertuxkart: fix darwin build

---
 pkgs/by-name/su/supertuxkart/package.nix | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/su/supertuxkart/package.nix b/pkgs/by-name/su/supertuxkart/package.nix
index 39b16f158231..1f1f5b75d474 100644
--- a/pkgs/by-name/su/supertuxkart/package.nix
+++ b/pkgs/by-name/su/supertuxkart/package.nix
@@ -110,10 +110,10 @@ stdenv.mkDerivation (finalAttrs: {
       freetype
       libjpeg
       libpng
-      libx11
       harfbuzz
       wiiuse
     ]
+    ++ lib.optional stdenv.hostPlatform.isLinux libx11
     ++ lib.optional (stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isLinux) libopenglrecorder
     ++ lib.optional stdenv.hostPlatform.isLinux openal
     ++ lib.optional stdenv.hostPlatform.isDarwin libsamplerate
@@ -137,11 +137,16 @@ stdenv.mkDerivation (finalAttrs: {
     "-include stdexcept"
   ];
 
-  # Extract binary from built app bundle
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    mkdir $out/bin
-    mv $out/{supertuxkart.app/Contents/MacOS,bin}/supertuxkart
-    rm -rf $out/supertuxkart.app
+    app=$out/Applications/SuperTuxKart.app
+
+    mkdir -p "$out"/{bin,Applications}
+    mv "$out/supertuxkart.app" "$app"
+
+    cp "$app/Contents/MacOS/supertuxkart" \
+      "$out/bin/supertuxkart"
+    ln -sfn "$out/share/supertuxkart/data" \
+      "$app/Contents/Resources/data"
   '';
 
   # Obtain the assets directly from the fetched store path, to avoid duplicating assets across multiple engine builds
@@ -149,6 +154,11 @@ stdenv.mkDerivation (finalAttrs: {
     wrapProgram $out/bin/supertuxkart \
       --set-default SUPERTUXKART_ASSETS_DIR "${assets}" \
       --set-default SUPERTUXKART_DATADIR "$out/share/supertuxkart"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # patch the copy inside the app bundle so launching via Finder works.
+    cp $out/bin/supertuxkart \
+      $out/Applications/SuperTuxKart.app/Contents/MacOS/supertuxkart
   '';
 
   meta = {
@@ -166,7 +176,7 @@ stdenv.mkDerivation (finalAttrs: {
       philocalyst
       SchweGELBin
     ];
-    platforms = with lib.platforms; unix;
+    platforms = lib.platforms.all;
     changelog = "https://github.com/supertuxkart/stk-code/blob/${finalAttrs.version}/CHANGELOG.md";
   };
 })

From 4484ce1dd201d63ea10a4735aba0d81e2415237a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?=
 =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?=
 =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= <regime_skylark.0y@icloud.com>
Date: Thu, 9 Jul 2026 12:21:16 -0400
Subject: [PATCH 201/205] supertuxkart: move assets and bundled libs into
 passthru

personal preference, like to avoid the let block to keep it all into
finalattrs for overriding.
---
 pkgs/by-name/su/supertuxkart/package.nix | 94 ++++++++++++++----------
 1 file changed, 54 insertions(+), 40 deletions(-)

diff --git a/pkgs/by-name/su/supertuxkart/package.nix b/pkgs/by-name/su/supertuxkart/package.nix
index 1f1f5b75d474..97690e33f408 100644
--- a/pkgs/by-name/su/supertuxkart/package.nix
+++ b/pkgs/by-name/su/supertuxkart/package.nix
@@ -24,48 +24,11 @@
   sqlite,
   libsamplerate,
   shaderc,
+  nix-update-script,
   serverOnly ? false,
   nameSuffix ? "",
 }:
-let
-  assets = fetchsvn {
-    url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets";
-    rev = "18621";
-    sha256 = "sha256-iqQSezGu0tecA53qhrtYA77SLj28WUUCcL4ZCJbK5C8=";
-    name = "stk-assets";
-  };
 
-  # List of bundled libraries in stk-code/lib to keep
-  # Those are the libraries that cannot be replaced
-  # with system packages.
-  bundledLibraries = [
-    # Bullet 2.87 is incompatible (bullet 2.79 needed whereas 2.87 is packaged)
-    # The api changed in a lot of classes, too much work to adapt
-    "bullet"
-    # Upstream Libenet doesn't yet support IPv6,
-    # So we will use the bundled libenet which
-    # has been fixed to support it.
-    "enet"
-    # Internal library of STK, nothing to do about it
-    "graphics_engine"
-    # Internal library of STK, nothing to do about it
-    "graphics_utils"
-    # Internal library.
-    "simd_wrapper"
-    # This irrlicht is bundled with cmake
-    # whereas upstream irrlicht still uses
-    # archaic Makefiles, too complicated to switch to.
-    "irrlicht"
-    # Not packaged to this date
-    "libsquish"
-    # Not packaged to this date
-    "sheenbidi"
-    # Not packaged to this date
-    "tinygettext"
-    # Not packaged to this date (needed on Darwin)
-    "mojoal"
-  ];
-in
 stdenv.mkDerivation (finalAttrs: {
 
   pname = "supertuxkart${nameSuffix}";
@@ -81,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     # Deletes all bundled libs in stk-code/lib except those
     # That couldn't be replaced with system packages
-    find lib -maxdepth 1 -type d | egrep -v "^lib$|${(lib.concatStringsSep "|" bundledLibraries)}" | xargs -n1 -L1 -r -I{} rm -rf {}
+    find lib -maxdepth 1 -type d | egrep -v "^lib$|${(lib.concatStringsSep "|" finalAttrs.passthru.bundledLibraries)}" | xargs -n1 -L1 -r -I{} rm -rf {}
 
     # Allow building with system-installed wiiuse on Darwin
     substituteInPlace CMakeLists.txt \
@@ -152,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: {
   # Obtain the assets directly from the fetched store path, to avoid duplicating assets across multiple engine builds
   preFixup = ''
     wrapProgram $out/bin/supertuxkart \
-      --set-default SUPERTUXKART_ASSETS_DIR "${assets}" \
+      --set-default SUPERTUXKART_ASSETS_DIR "${finalAttrs.passthru.assets}" \
       --set-default SUPERTUXKART_DATADIR "$out/share/supertuxkart"
   ''
   + lib.optionalString stdenv.hostPlatform.isDarwin ''
@@ -161,6 +124,57 @@ stdenv.mkDerivation (finalAttrs: {
       $out/Applications/SuperTuxKart.app/Contents/MacOS/supertuxkart
   '';
 
+  passthru = {
+    updateScript = nix-update-script { };
+
+    assets = fetchsvn {
+      url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets";
+      rev = "18621";
+      sha256 = "sha256-iqQSezGu0tecA53qhrtYA77SLj28WUUCcL4ZCJbK5C8=";
+      name = "stk-assets";
+    };
+
+    # List of bundled libraries in stk-code/lib to keep
+    # Those are the libraries that cannot be replaced
+    # with system packages.
+    bundledLibraries = [
+      # Bullet 2.87 is incompatible (bullet 2.79 needed whereas 2.87 is packaged)
+      # The api changed in a lot of classes, too much work to adapt
+      "bullet"
+
+      # Upstream Libenet doesn't yet support IPv6,
+      # So we will use the bundled libenet which
+      # has been fixed to support it.
+      "enet"
+
+      # Internal library of STK, nothing to do about it
+      "graphics_engine"
+
+      # Internal library of STK, nothing to do about it
+      "graphics_utils"
+
+      # Internal library.
+      "simd_wrapper"
+
+      # This irrlicht is bundled with cmake
+      # whereas upstream irrlicht still uses
+      # archaic Makefiles, too complicated to switch to.
+      "irrlicht"
+
+      # Not packaged to this date
+      "libsquish"
+
+      # Not packaged to this date
+      "sheenbidi"
+
+      # Not packaged to this date
+      "tinygettext"
+
+      # Not packaged to this date (needed on Darwin)
+      "mojoal"
+    ];
+  };
+
   meta = {
     description = "3D open-source arcade racer";
     mainProgram = "supertuxkart";

From 94d6f42051ba7a6332204f567535952792b62898 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?=
 =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?=
 =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= <regime_skylark.0y@icloud.com>
Date: Thu, 9 Jul 2026 12:21:31 -0400
Subject: [PATCH 202/205] supertuxkart: use portable find to prune bundled libs

the old path while equivalent was posing difficulties on darwin
---
 pkgs/by-name/su/supertuxkart/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/su/supertuxkart/package.nix b/pkgs/by-name/su/supertuxkart/package.nix
index 97690e33f408..211457f32e7d 100644
--- a/pkgs/by-name/su/supertuxkart/package.nix
+++ b/pkgs/by-name/su/supertuxkart/package.nix
@@ -44,7 +44,13 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     # Deletes all bundled libs in stk-code/lib except those
     # That couldn't be replaced with system packages
-    find lib -maxdepth 1 -type d | egrep -v "^lib$|${(lib.concatStringsSep "|" finalAttrs.passthru.bundledLibraries)}" | xargs -n1 -L1 -r -I{} rm -rf {}
+    find lib -mindepth 1 -maxdepth 1 -type d \
+      ${
+        lib.concatMapStringsSep " " (
+          name: "-not -name ${lib.escapeShellArg name}"
+        ) finalAttrs.passthru.bundledLibraries
+      } \
+      -exec rm -rf {} +
 
     # Allow building with system-installed wiiuse on Darwin
     substituteInPlace CMakeLists.txt \

From c4319bf66dadb7dd64cdcab5a64137b867548380 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?=
 =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?=
 =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= <regime_skylark.0y@icloud.com>
Date: Thu, 9 Jul 2026 12:22:08 -0400
Subject: [PATCH 203/205] supertuxkart: unbundle libsquish

---
 pkgs/by-name/su/supertuxkart/package.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/su/supertuxkart/package.nix b/pkgs/by-name/su/supertuxkart/package.nix
index 211457f32e7d..cb3ec3a73ead 100644
--- a/pkgs/by-name/su/supertuxkart/package.nix
+++ b/pkgs/by-name/su/supertuxkart/package.nix
@@ -23,6 +23,7 @@
   libopenglrecorder,
   sqlite,
   libsamplerate,
+  libsquish,
   shaderc,
   nix-update-script,
   serverOnly ? false,
@@ -68,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
     mcpp
     angelscript
     sqlite
+    libsquish
   ]
   ++ lib.optionals (!serverOnly) (
     [
@@ -167,16 +169,13 @@ stdenv.mkDerivation (finalAttrs: {
       # archaic Makefiles, too complicated to switch to.
       "irrlicht"
 
-      # Not packaged to this date
-      "libsquish"
-
-      # Not packaged to this date
+      # No USE_SYSTEM_SHEENBIDI flag upstream
       "sheenbidi"
 
-      # Not packaged to this date
+      # No USE_SYSTEM_TINYGETTEXT flag upstream
       "tinygettext"
 
-      # Not packaged to this date (needed on Darwin)
+      # Used on Darwin as a static OpenAL replacement (USE_MOJOAL=ON by default on Apple)
       "mojoal"
     ];
   };

From 13cdec76bf08db0ee3deeb29c0dbcdf044d199f6 Mon Sep 17 00:00:00 2001
From: DOCtorActoAntohich <doctoractoantohich@gmail.com>
Date: Mon, 13 Apr 2026 22:23:07 +0300
Subject: [PATCH 204/205] puddletag: `aarch64-darwin` support

it seemingly works on a new target with minimal changes

also a note for future when puddletag releases with Qt6
---
 pkgs/by-name/pu/puddletag/package.nix | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/pu/puddletag/package.nix b/pkgs/by-name/pu/puddletag/package.nix
index 09c6deea9909..39435e10899b 100644
--- a/pkgs/by-name/pu/puddletag/package.nix
+++ b/pkgs/by-name/pu/puddletag/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
   python3,
   libsForQt5,
@@ -7,7 +8,6 @@
 
 let
   qt = libsForQt5;
-
 in
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "puddletag";
@@ -33,10 +33,17 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
       --replace-fail share/pixmaps share/icons
   '';
 
-  buildInputs = with qt; [
-    qtbase
-    qtwayland
-  ];
+  buildInputs =
+    with qt;
+    [
+      qtbase
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      # Note: after puddletag releases with Qt6,
+      # `qtwayland` can be safely dropped.
+      # Reason: https://github.com/NixOS/nixpkgs/pull/450591
+      qtwayland
+    ];
 
   nativeBuildInputs = with qt; [
     wrapQtAppsHook
@@ -75,6 +82,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
       peterhoeg
       dschrempf
     ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 })

From ede3b8ea8056c0a7a75a5faf173fceb2508dc8d6 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 11 Aug 2026 00:45:58 +0200
Subject: [PATCH 205/205] azimuth: fix build

---
 pkgs/by-name/az/azimuth/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/az/azimuth/package.nix b/pkgs/by-name/az/azimuth/package.nix
index 4215dc7b9993..56213ef7696d 100644
--- a/pkgs/by-name/az/azimuth/package.nix
+++ b/pkgs/by-name/az/azimuth/package.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     makeBinaryWrapper
     which
+    SDL2
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     icnsify
@@ -47,11 +48,9 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     patchShebangs src/azimuth/system/generate_blob_index.sh
 
-    # Modern Clang over-erroring measures
+    # Remove over-erroring measures
     substituteInPlace Makefile \
-      --replace-fail \
-        '-Werror' \
-        '-Werror -Wno-uninitialized-const-pointer -Wno-default-const-init-var-unsafe'
+      --replace-fail "-Werror" ""
   ''
   + lib.optionalString stdenv.hostPlatform.isDarwin ''
     # iconutil is not available in the build sandbox