From 5bbc0ca205eb1ec55775d34f62ad6d359912346e Mon Sep 17 00:00:00 2001
From: Myzel394 <myzel394.xyllian@pm.me>
Date: Sun, 5 Apr 2026 22:19:26 +0200
Subject: [PATCH 01/64] openusage: init at 0.6.13

---
 pkgs/by-name/op/openusage/package.nix | 54 +++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 pkgs/by-name/op/openusage/package.nix

diff --git a/pkgs/by-name/op/openusage/package.nix b/pkgs/by-name/op/openusage/package.nix
new file mode 100644
index 000000000000..6d4326bc5d68
--- /dev/null
+++ b/pkgs/by-name/op/openusage/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  nix-update-script,
+  undmg,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "openusage";
+  version = "0.6.13";
+
+  # if is aarch64 download aarch64, otherwise intel
+  src =
+    if stdenvNoCC.hostPlatform.isAarch64 then
+      fetchurl {
+        url = "https://github.com/robinebers/openusage/releases/download/v${finalAttrs.version}/OpenUsage_${finalAttrs.version}_aarch64.dmg";
+        hash = "sha256-Zfv1VAJSDHFdo2R9KgZ3TN/gu2Ua9Uleq5wNXrBBEH4=";
+      }
+    else if stdenvNoCC.hostPlatform.isx86_64 then
+      fetchurl {
+        url = "https://github.com/robinebers/openusage/releases/download/v${finalAttrs.version}/OpenUsage_${finalAttrs.version}_x64.dmg";
+        hash = "sha256-tllecJOGNUDG3GwQhjeRaNrTHVK2GPzstfiT/GanZmM=";
+      }
+    else
+      throw "Unsupported architecture";
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/Applications
+    cp -r "OpenUsage.app" $out/Applications/
+
+    runHook postInstall
+  '';
+
+  nativeBuildInputs = [ undmg ];
+  sourceRoot = ".";
+
+  dontBuild = true;
+  dontFixup = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Burning through your subscriptions too fast? Paying for stuff you never use? Stop guessing. OpenUsage is free and open source.";
+    homepage = "https://www.openusage.ai/";
+    changelog = "https://github.com/robinebers/openusage/releases/tag/v${finalAttrs.version}";
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    platforms = lib.platforms.darwin;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ myzel394 ];
+  };
+})

From 097bc92dee5a3acc370b19c4356fc8533891884d 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, 7 May 2026 14:41:34 -0400
Subject: [PATCH 02/64] lulu: init at 4.3.1

---
 pkgs/by-name/lu/lulu/package.nix | 52 ++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 pkgs/by-name/lu/lulu/package.nix

diff --git a/pkgs/by-name/lu/lulu/package.nix b/pkgs/by-name/lu/lulu/package.nix
new file mode 100644
index 000000000000..6dc2ddbcd8a8
--- /dev/null
+++ b/pkgs/by-name/lu/lulu/package.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  undmg,
+  nix-update-script,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "lulu";
+  version = "4.3.1";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  src = fetchurl {
+    url = "https://github.com/objective-see/LuLu/releases/download/v${finalAttrs.version}/LuLu_${finalAttrs.version}.dmg";
+    hash = "sha256-zANmUn8fQSMpX9EzKaCAMaZgr9JWB23asD5gdDZc75M=";
+  };
+
+  nativeBuildInputs = [ undmg ];
+
+  unpackPhase = ''
+    runHook preUnpack
+    undmg "$src"
+    runHook postUnpack
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/Applications"
+    cp -R LuLu.app "$out/Applications/LuLu.app"
+
+    runHook postInstall
+  '';
+
+  dontFixup = true; # Preserve upstream's notarized app bundle and system extension signature.
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Free open-source macOS firewall that alerts you to outgoing network connections";
+    homepage = "https://objective-see.org/products/lulu.html";
+    changelog = "https://github.com/objective-see/LuLu/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "LuLu";
+    maintainers = with lib.maintainers; [ philocalyst ];
+    platforms = lib.platforms.darwin;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+})

From c547b0d10bdf20d9d5a1e4d3cdf49b01ed866148 Mon Sep 17 00:00:00 2001
From: Jeremy Stucki <dev@jeremystucki.ch>
Date: Tue, 12 May 2026 13:48:31 +0200
Subject: [PATCH 03/64] maintainers: add jeremystucki

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2e12985a6319..e5283f3771ea 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -12511,6 +12511,12 @@
     githubId = 5741620;
     name = "Jeremy Schlatter";
   };
+  jeremystucki = {
+    email = "dev@jeremystucki.ch";
+    github = "jeremystucki";
+    githubId = 7629727;
+    name = "Jeremy Stucki";
+  };
   jerith666 = {
     email = "github@matt.mchenryfamily.org";
     github = "jerith666";

From 9b556d8f14f87012ce74d6f54eaea0c6bbbdc655 Mon Sep 17 00:00:00 2001
From: Jeremy Stucki <dev@jeremystucki.ch>
Date: Tue, 12 May 2026 13:48:31 +0200
Subject: [PATCH 04/64] license-plist: init at 3.27.7

---
 pkgs/by-name/li/license-plist/package.nix | 46 +++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 pkgs/by-name/li/license-plist/package.nix

diff --git a/pkgs/by-name/li/license-plist/package.nix b/pkgs/by-name/li/license-plist/package.nix
new file mode 100644
index 000000000000..95ade33eaca5
--- /dev/null
+++ b/pkgs/by-name/li/license-plist/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchzip,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "license-plist";
+  version = "3.27.7";
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  src = fetchzip {
+    url = "https://github.com/mono0926/LicensePlist/releases/download/${finalAttrs.version}/portable_licenseplist.zip";
+    hash = "sha256-Z8jDFRZj0s6X+edexNZ0Qx2qUC8Bm2GC9uOrKWbXtCI=";
+    stripRoot = false;
+  };
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 license-plist $out/bin/license-plist
+    runHook postInstall
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "License list generator for iOS application dependencies";
+    homepage = "https://github.com/mono0926/LicensePlist";
+    changelog = "https://github.com/mono0926/LicensePlist/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.mit;
+    mainProgram = "license-plist";
+    maintainers = with lib.maintainers; [ jeremystucki ];
+    platforms = lib.platforms.darwin;
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+  };
+})

From aac345d252c9b9bf6aad461c4eadbba96971f29e Mon Sep 17 00:00:00 2001
From: Myzel394 <myzel394.xyllian@pm.me>
Date: Mon, 25 May 2026 22:43:02 +0200
Subject: [PATCH 05/64] agent-safehouse: init at 0.10.1

---
 pkgs/by-name/ag/agent-safehouse/package.nix | 48 +++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 pkgs/by-name/ag/agent-safehouse/package.nix

diff --git a/pkgs/by-name/ag/agent-safehouse/package.nix b/pkgs/by-name/ag/agent-safehouse/package.nix
new file mode 100644
index 000000000000..ca43776cf6ec
--- /dev/null
+++ b/pkgs/by-name/ag/agent-safehouse/package.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+stdenvNoCC.mkDerivation rec {
+  pname = "safehouse";
+  version = "0.10.1";
+
+  src = fetchFromGitHub {
+    owner = "eugene1g";
+    repo = "agent-safehouse";
+    rev = "v" + version;
+    hash = "sha256-Nm04UnyQ2mVLkIIEspDd2vbdcJxZ17MH07fW6PvokJI=";
+  };
+
+  postPatch = "patchShebangs scripts bin";
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  buildPhase = ''
+    runHook preBuild
+    scripts/generate-dist.sh
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 dist/safehouse.sh $out/bin/safehouse
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Sandbox your local AI agents so they can read/write only what they need";
+    homepage = "https://github.com/eugene1g/agent-safehouse";
+    mainProgram = "safehouse";
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ myzel394 ];
+  };
+}

From 229abfe6347faba1901de8fdd298739173092f1c Mon Sep 17 00:00:00 2001
From: anntnzrb <anntnzrb@proton.me>
Date: Thu, 4 Jun 2026 23:49:47 -0500
Subject: [PATCH 06/64] maintainers: add anntnzrb

Assisted-by: OpenAI ChatGPT
---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 65f863a17051..83d7fc282d7e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1910,6 +1910,11 @@
     githubId = 143312793;
     name = "Annin";
   };
+  anntnzrb = {
+    github = "anntnzrb";
+    githubId = 51257127;
+    name = "anntnzrb";
+  };
   anoa = {
     matrix = "@andrewm:amorgan.xyz";
     email = "andrew@amorgan.xyz";

From 23fe2ffa3f844330f2607fa7dd03b0b391032cbf Mon Sep 17 00:00:00 2001
From: anntnzrb <anntnzrb@proton.me>
Date: Thu, 4 Jun 2026 23:49:47 -0500
Subject: [PATCH 07/64] yashiki: init at 0.14.0

Assisted-by: OpenAI ChatGPT
---
 pkgs/by-name/ya/yashiki/package.nix | 69 +++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 pkgs/by-name/ya/yashiki/package.nix

diff --git a/pkgs/by-name/ya/yashiki/package.nix b/pkgs/by-name/ya/yashiki/package.nix
new file mode 100644
index 000000000000..fdcf7936644c
--- /dev/null
+++ b/pkgs/by-name/ya/yashiki/package.nix
@@ -0,0 +1,69 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  installShellFiles,
+  versionCheckHook,
+  nix-update-script,
+  apple-sdk_15,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "yashiki";
+  version = "0.14.0";
+
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "typester";
+    repo = "yashiki";
+    tag = "yashiki-v${finalAttrs.version}";
+    hash = "sha256-ePZ8ONdvj3gaQps+5Ua0OLeFdzNdJhoB9yw6pC7qoEQ=";
+  };
+
+  cargoHash = "sha256-JMrftBKyD188SZqEGI4fA/MrfEK8JLKSeEqrQxhSs3U=";
+
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
+  buildInputs = [
+    apple-sdk_15
+  ];
+
+  postInstall = ''
+    app="$out/Applications/Yashiki.app"
+
+    mkdir -p "$app/Contents/MacOS" "$app/Contents/Resources/layouts"
+
+    ln -s "$out/bin/yashiki" "$app/Contents/MacOS/yashiki"
+    ln -s "$out/bin/yashiki-layout-tatami" "$app/Contents/Resources/layouts/yashiki-layout-tatami"
+    ln -s "$out/bin/yashiki-layout-byobu" "$app/Contents/Resources/layouts/yashiki-layout-byobu"
+
+    cp resources/icon/Assets.car "$app/Contents/Resources/Assets.car"
+    substitute Info.plist.template "$app/Contents/Info.plist" \
+      --replace-fail VERSION_PLACEHOLDER "${finalAttrs.version}" \
+      --replace-fail "<string>yashiki-launcher</string>" "<string>yashiki</string>"
+
+    installShellCompletion --cmd yashiki --zsh completions/zsh/_yashiki
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "version";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "macOS tiling window manager";
+    homepage = "https://github.com/typester/yashiki";
+    changelog = "https://github.com/typester/yashiki/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    sourceProvenance = [ lib.sourceTypes.fromSource ];
+    maintainers = with lib.maintainers; [ anntnzrb ];
+    mainProgram = "yashiki";
+    platforms = lib.platforms.darwin;
+  };
+})

From 1b83aeca36138f0694304104c7e9f043a9dc1d74 Mon Sep 17 00:00:00 2001
From: William Tan <1284324+Ninja3047@users.noreply.github.com>
Date: Tue, 9 Jun 2026 01:19:47 -0400
Subject: [PATCH 08/64] container: 0.12.3 -> 1.0.0

Assisted-by: OpenAI Codex harness (gpt-5.5)
---
 pkgs/by-name/co/container/package.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/container/package.nix b/pkgs/by-name/co/container/package.nix
index 4e9d69648b62..19c20f2f0a07 100644
--- a/pkgs/by-name/co/container/package.nix
+++ b/pkgs/by-name/co/container/package.nix
@@ -5,23 +5,25 @@
   libarchive,
   xar,
   installShellFiles,
+  makeWrapper,
   versionCheckHook,
   nix-update-script,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "container";
-  version = "0.12.3";
+  version = "1.0.0";
 
   src = fetchurl {
     url = "https://github.com/apple/container/releases/download/${finalAttrs.version}/container-${finalAttrs.version}-installer-signed.pkg";
-    hash = "sha256-g/NjEmrB8GRYjeOc1rR0NA1InBkmSSosTlnE1Uqm2OM=";
+    hash = "sha256-E/RfJtqUw1Sty+/h6PdjHn8SbpPF1N1qWlOKpmtPR50=";
   };
 
   nativeBuildInputs = [
     libarchive
     xar
     installShellFiles
+    makeWrapper
   ];
 
   dontUnpack = true;
@@ -43,6 +45,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       --zsh <($out/bin/${finalAttrs.meta.mainProgram} --generate-completion-script zsh)
   '';
 
+  postFixup = ''
+    wrapProgram $out/bin/container \
+      --set-default CONTAINER_INSTALL_ROOT "$out"
+    wrapProgram $out/bin/container-apiserver \
+      --set-default CONTAINER_INSTALL_ROOT "$out"
+  '';
+
   nativeInstallCheckInputs = [
     versionCheckHook
   ];

From a425f3de7cb9f0db54735e618175c4967ff2ca2a Mon Sep 17 00:00:00 2001
From: OttNorml <2350859+ottnorml@users.noreply.github.com>
Date: Tue, 9 Jun 2026 05:48:16 +0200
Subject: [PATCH 09/64] mas: 6.0.1 -> 7.0.0

Diff: https://github.com/mas-cli/mas/compare/v6.0.1...v7.0.0
---
 pkgs/by-name/ma/mas/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/mas/package.nix b/pkgs/by-name/ma/mas/package.nix
index b9014aa454c1..e880ce60fffc 100644
--- a/pkgs/by-name/ma/mas/package.nix
+++ b/pkgs/by-name/ma/mas/package.nix
@@ -9,7 +9,7 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "mas";
-  version = "6.0.1";
+  version = "7.0.0";
 
   __structuredAttrs = true;
 
@@ -20,11 +20,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         {
           x86_64-darwin = {
             arch = "x86_64";
-            hash = "sha256-7+iDBr4GG5bdTuAlAmMQkEkIzVgLo2+DEdravClaLtQ=";
+            hash = "sha256-m8od4ftuoZyeC517fIUkkCDJ7WWp1DTC70CJai8zlfk=";
           };
           aarch64-darwin = {
             arch = "arm64";
-            hash = "sha256-BZ9UE8H28kjqiMNdLDUUyC9madR4rBV1mLUGyj6ol3Y=";
+            hash = "sha256-vCGKhUyF2eHJVJapayYoe7ZgVrlWiLkPkdBPpi7SG3U=";
           };
         }
         .${stdenvNoCC.hostPlatform.system}

From a796ec392dc5b6bd08d8516225e9e24f75b2ed79 Mon Sep 17 00:00:00 2001
From: OttNorml <2350859+ottnorml@users.noreply.github.com>
Date: Thu, 11 Jun 2026 05:58:31 +0200
Subject: [PATCH 10/64] mas: fix 7.0.0 wrapper installation

---
 pkgs/by-name/ma/mas/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/ma/mas/package.nix b/pkgs/by-name/ma/mas/package.nix
index e880ce60fffc..1822215e189d 100644
--- a/pkgs/by-name/ma/mas/package.nix
+++ b/pkgs/by-name/ma/mas/package.nix
@@ -3,9 +3,11 @@
   stdenvNoCC,
   fetchurl,
   installShellFiles,
+  jq,
   libarchive,
   p7zip,
   versionCheckHook,
+  zsh,
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "mas";
@@ -58,6 +60,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook preInstall
 
     installBin usr/local/opt/mas/bin/mas
+    install -D --mode=755 usr/local/opt/mas/libexec/bin/mas "$out/libexec/bin/mas"
+
+    substituteInPlace "$out/bin/mas" \
+      --replace-fail "#!/bin/zsh" "#!${lib.getExe zsh}" \
+      --replace-fail "/usr/bin/jq" "${lib.getExe jq}"
 
     installManPage usr/local/opt/mas/share/man/man1/mas.1
     installShellCompletion --bash usr/local/opt/mas/etc/bash_completion.d/mas

From abaec6c71e5aa1ae03c05abe4717daa0a48a79bb Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Wed, 1 Jul 2026 13:39:23 +0800
Subject: [PATCH 11/64] clipaste: init at 2.4.0

---
 pkgs/by-name/cl/clipaste/package.nix | 38 ++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 pkgs/by-name/cl/clipaste/package.nix

diff --git a/pkgs/by-name/cl/clipaste/package.nix b/pkgs/by-name/cl/clipaste/package.nix
new file mode 100644
index 000000000000..6ba9af4fa198
--- /dev/null
+++ b/pkgs/by-name/cl/clipaste/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  testers,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "clipaste";
+  version = "2.4.0";
+
+  src = fetchFromGitHub {
+    owner = "hqhq1025";
+    repo = "clipaste";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-MNrhOvdyYs99Z6Wwf2X+xCNRzc6erpLpFB/GHBJRhrg=";
+  };
+
+  cargoHash = "sha256-QrUR3xHZ/1FFkBYt5qxi0mNVTvEaWBcLSjp6OnzR9GY=";
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  passthru = {
+    tests.version = testers.testVersion {
+      package = finalAttrs.finalPackage;
+    };
+  };
+
+  meta = {
+    description = "Screenshot clipboard paste fix for AI agents";
+    homepage = "https://github.com/hqhq1025/clipaste";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ aaronjheng ];
+    mainProgram = "clipaste";
+  };
+})

From bc04a345e3c4e3a2a76bcd82d89e37e56fe059e9 Mon Sep 17 00:00:00 2001
From: kinnrai <me@kinnrai.com>
Date: Thu, 2 Jul 2026 21:56:21 +0800
Subject: [PATCH 12/64] keka: add kinnrai to maintainers

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

diff --git a/pkgs/by-name/ke/keka/package.nix b/pkgs/by-name/ke/keka/package.nix
index fcea35e15e49..b9b6aab74111 100644
--- a/pkgs/by-name/ke/keka/package.nix
+++ b/pkgs/by-name/ke/keka/package.nix
@@ -31,7 +31,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://www.keka.io";
     license = lib.licenses.unfree;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    maintainers = with lib.maintainers; [ emilytrau ];
+    maintainers = with lib.maintainers; [
+      emilytrau
+      kinnrai
+    ];
     platforms = lib.platforms.darwin;
   };
 })

From d6b5a6979f9d350a2cac259b1381f659e8ccc73b Mon Sep 17 00:00:00 2001
From: kinnrai <me@kinnrai.com>
Date: Thu, 2 Jul 2026 21:57:39 +0800
Subject: [PATCH 13/64] keka: 1.6.0 -> 1.6.7

Changelog: https://github.com/aonez/Keka/releases/tag/v1.6.7
Diff: https://github.com/aonez/Keka/compare/v1.6.0...v1.6.7
---
 pkgs/by-name/ke/keka/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ke/keka/package.nix b/pkgs/by-name/ke/keka/package.nix
index b9b6aab74111..2dbdb9d454bc 100644
--- a/pkgs/by-name/ke/keka/package.nix
+++ b/pkgs/by-name/ke/keka/package.nix
@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "keka";
-  version = "1.6.0";
+  version = "1.6.7";
 
   src = fetchzip {
     url = "https://github.com/aonez/Keka/releases/download/v${finalAttrs.version}/Keka-${finalAttrs.version}.zip";
-    hash = "sha256-E0KvDgjx86myZk5+QsydonDaT31CS+B1QGOUXCOaJxY=";
+    hash = "sha256-6zC8lQLkJ/Qppyo3XwK6fy4f/bLsIg0L+4GwFfiVlvg=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 507974e1084da073bb4078c4757a4f84ae46cf59 Mon Sep 17 00:00:00 2001
From: Pradyuman Vig <me@pmn.co>
Date: Sun, 5 Jul 2026 22:18:08 -0500
Subject: [PATCH 14/64] notion-app: 4.24.0 -> 7.24.0

---
 pkgs/by-name/no/notion-app/info.json         | 12 ------------
 pkgs/by-name/no/notion-app/package.nix       |  7 +++++--
 pkgs/by-name/no/notion-app/sources.json      | 12 ++++++++++++
 pkgs/by-name/no/notion-app/update/update.mjs |  2 +-
 4 files changed, 18 insertions(+), 15 deletions(-)
 delete mode 100644 pkgs/by-name/no/notion-app/info.json
 create mode 100644 pkgs/by-name/no/notion-app/sources.json

diff --git a/pkgs/by-name/no/notion-app/info.json b/pkgs/by-name/no/notion-app/info.json
deleted file mode 100644
index 4d756a41cfb4..000000000000
--- a/pkgs/by-name/no/notion-app/info.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "x86_64-darwin": {
-    "version": "4.24.0",
-    "url": "https://desktop-release.notion-static.com/Notion-4.24.0.zip",
-    "hash": "sha512-E/DXvtRD3HFNsliQqFpLG4xoAJIcqWX3xkLNTDMxy8bssc5V9/dN2K3AGLnN8HUj9+FwWySNCJhFPDqzf/nyTQ=="
-  },
-  "aarch64-darwin": {
-    "version": "4.24.0",
-    "url": "https://desktop-release.notion-static.com/Notion-arm64-4.24.0.zip",
-    "hash": "sha512-b0zeG0dBPxMigOb+1o8riB3i9HbKdJ+oZYY02MILpIg70uUttq5f4j5ekZ8d5xwkIHGF9wqhqUddRdyb+qXxtw=="
-  }
-}
diff --git a/pkgs/by-name/no/notion-app/package.nix b/pkgs/by-name/no/notion-app/package.nix
index 05f9d46c7683..e99f9bb0fa1e 100644
--- a/pkgs/by-name/no/notion-app/package.nix
+++ b/pkgs/by-name/no/notion-app/package.nix
@@ -6,7 +6,7 @@
 }:
 let
   info =
-    (lib.importJSON ./info.json)."${stdenvNoCC.hostPlatform.parsed.cpu.name}-darwin"
+    (lib.importJSON ./sources.json)."${stdenvNoCC.hostPlatform.parsed.cpu.name}-darwin"
       or (throw "Unsupported CPU architecture: ${stdenvNoCC.hostPlatform.parsed.cpu.name}");
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
@@ -32,7 +32,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "App to write, plan, collaborate, and get organised";
     homepage = "https://www.notion.so/";
     license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ xiaoxiangmoe ];
+    maintainers = with lib.maintainers; [
+      xiaoxiangmoe
+      pradyuman
+    ];
     platforms = [
       "x86_64-darwin"
       "aarch64-darwin"
diff --git a/pkgs/by-name/no/notion-app/sources.json b/pkgs/by-name/no/notion-app/sources.json
new file mode 100644
index 000000000000..9269ee50a86b
--- /dev/null
+++ b/pkgs/by-name/no/notion-app/sources.json
@@ -0,0 +1,12 @@
+{
+  "x86_64-darwin": {
+    "version": "7.24.0",
+    "url": "https://desktop-release.notion-static.com/Notion-7.24.0.zip",
+    "hash": "sha512-3X7E6ZSEJMrArof7p/OgqUk4i3cewF0zMTPVhkhSgNVzOqHt9kvthGIpKUN6M/u0xdYAkRQgSWHkJ/RoA5Q6Hw=="
+  },
+  "aarch64-darwin": {
+    "version": "7.24.0",
+    "url": "https://desktop-release.notion-static.com/Notion-arm64-7.24.0.zip",
+    "hash": "sha512-tQVL3z0SOMOeGaqYr4Gq1tULj/kKy4qmmsJN3uwCwDXkmenzLGCWiEmWmkK52T2xW8mMrbSBAAZGNDi0qQw5yA=="
+  }
+}
diff --git a/pkgs/by-name/no/notion-app/update/update.mjs b/pkgs/by-name/no/notion-app/update/update.mjs
index d17e5d38bf9e..a4d56e8ff3d8 100755
--- a/pkgs/by-name/no/notion-app/update/update.mjs
+++ b/pkgs/by-name/no/notion-app/update/update.mjs
@@ -57,7 +57,7 @@ async function getInfo(liveCheckFile) {
 }
 
 async function main() {
-  const filePath = path.join(__dirname, "../info.json");
+  const filePath = path.join(__dirname, "../sources.json");
   /** @type {InfoMap} */
   const oldInfo = JSON.parse(
     await fsPromises.readFile(filePath, { encoding: "utf-8" })

From 3b221ed3a0049e3e39ffdaf2d776411691bb040c Mon Sep 17 00:00:00 2001
From: Pradyuman Vig <me@pmn.co>
Date: Mon, 6 Jul 2026 00:01:49 -0500
Subject: [PATCH 15/64] linear: 1.30.2 -> 1.31.1

---
 pkgs/by-name/li/linear/package.nix |  9 ++++++---
 pkgs/by-name/li/linear/update.sh   | 12 ++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/li/linear/package.nix b/pkgs/by-name/li/linear/package.nix
index a0c8816a50bd..f8a2122dd09e 100644
--- a/pkgs/by-name/li/linear/package.nix
+++ b/pkgs/by-name/li/linear/package.nix
@@ -7,11 +7,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "linear";
-  version = "1.30.2";
+  version = "1.31.1";
 
   src = fetchurl {
     url = "https://releases.linear.app/Linear-${finalAttrs.version}-universal.dmg";
-    hash = "sha256-udtN7sOnbT1B684q/JhPFGq8mYvhc5CbTxuJi6NYFac=";
+    hash = "sha256-haZz9RdbcQiFbCqdy/S25aCsFoSKn3dFAkYL8NgoTYw=";
   };
 
   strictDeps = true;
@@ -41,7 +41,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "App to manage software development and track bugs";
     homepage = "https://linear.app/";
     license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ iniw ];
+    maintainers = with lib.maintainers; [
+      iniw
+      pradyuman
+    ];
     platforms = lib.platforms.darwin;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
diff --git a/pkgs/by-name/li/linear/update.sh b/pkgs/by-name/li/linear/update.sh
index c6ee30c2ac3a..8a381a4bc560 100755
--- a/pkgs/by-name/li/linear/update.sh
+++ b/pkgs/by-name/li/linear/update.sh
@@ -1,18 +1,18 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p coreutils curl gnugrep common-updater-scripts
+#!nix-shell -i bash -p coreutils curl gnugrep jq common-updater-scripts
 #shellcheck shell=bash
 
-set -eu -o pipefail
+set -euo pipefail
 
-source_url="https://releases.linear.app/mac"
-
-version="$(curl -L -I "$source_url" | grep -ioE 'filename="Linear-[0-9]+(\.[0-9]+)*-universal\.dmg"' | grep -oE '[0-9]+(\.[0-9]+)*')"
+releases_url="https://releases.linear.app"
+version_pattern='filename="Linear-\K[0-9]+(\.[0-9]+)*(?=-universal\.dmg")'
+version="$(curl -fsSLI "$releases_url/mac" | grep -ioP "$version_pattern")"
 
 if [[ -z $version ]]; then
   echo "Could not find the latest Linear version in release headers" >&2
   exit 1
 fi
 
-hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$(nix-prefetch-url --type sha256 "https://releases.linear.app/Linear-${version}-universal.dmg")")
+hash="$(nix store prefetch-file --json "$releases_url/Linear-${version}-universal.dmg" | jq -r .hash)"
 
 update-source-version linear "$version" "$hash" --ignore-same-version

From 0fa5cf35d656c986047e100085dcd828adec42b3 Mon Sep 17 00:00:00 2001
From: kinnrai <me@kinnrai.com>
Date: Tue, 7 Jul 2026 00:52:37 +0800
Subject: [PATCH 16/64] stats: add kinnrai to maintainer

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

diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix
index 0825a624f088..130053230bab 100644
--- a/pkgs/by-name/st/stats/package.nix
+++ b/pkgs/by-name/st/stats/package.nix
@@ -350,6 +350,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       FlameFlag
       emilytrau
+      kinnrai
     ];
     platforms = lib.platforms.darwin;
   };

From 8654dc424fb58b2d109a59442bd2188e4661b9c6 Mon Sep 17 00:00:00 2001
From: kinnrai <me@kinnrai.com>
Date: Tue, 7 Jul 2026 00:53:31 +0800
Subject: [PATCH 17/64] stats: fix missing app icon

---
 pkgs/by-name/st/stats/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix
index 130053230bab..3cb77f8bf21a 100644
--- a/pkgs/by-name/st/stats/package.nix
+++ b/pkgs/by-name/st/stats/package.nix
@@ -46,6 +46,8 @@ let
     toPlist {
       CFBundleDevelopmentRegion = "en";
       CFBundleExecutable = "Stats";
+      CFBundleIconFile = "AppIcon";
+      CFBundleIconName = "AppIcon";
       CFBundleIdentifier = "eu.exelban.Stats";
       CFBundleInfoDictionaryVersion = "6.0";
       CFBundleName = "Stats";
@@ -317,6 +319,7 @@ stdenv.mkDerivation (finalAttrs: {
       --platform macosx \
       --minimum-deployment-target 14.0 \
       --app-icon AppIcon \
+      --output-partial-info-plist /dev/null \
       "Stats/Supporting Files/Assets.xcassets"
 
     # Copy localization files

From 44ce924f439fb8f6c8fce046d5341eced03d0d31 Mon Sep 17 00:00:00 2001
From: kinnrai <me@kinnrai.com>
Date: Tue, 7 Jul 2026 01:18:56 +0800
Subject: [PATCH 18/64] stats: 3.0.3 -> 3.0.6

Changelog: https://github.com/exelban/Stats/releases/tag/v3.0.6
Diff: https://github.com/exelban/Stats/compare/v3.0.3...v3.0.6
---
 pkgs/by-name/st/stats/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix
index 3cb77f8bf21a..4e997db72128 100644
--- a/pkgs/by-name/st/stats/package.nix
+++ b/pkgs/by-name/st/stats/package.nix
@@ -70,7 +70,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "stats";
-  version = "3.0.3";
+  version = "3.0.6";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "exelban";
     repo = "Stats";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HYuS0mFzzln+EjYUmQgjCPFsF4aGP+4QWalDL0vt3OA=";
+    hash = "sha256-ztBV+nT3TjislSmItyUFSGvs2atKy5+ZrNHlijIFvTw=";
   };
 
   nativeBuildInputs = [

From 97ce2b3225a1d6d2c3103971b444c75d19a6864e Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Tue, 7 Jul 2026 21:25:30 -0700
Subject: [PATCH 19/64] devin-cli: remove x86_64-darwin

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/de/devin-cli/package.nix | 5 -----
 pkgs/by-name/de/devin-cli/update.sh   | 1 -
 2 files changed, 6 deletions(-)

diff --git a/pkgs/by-name/de/devin-cli/package.nix b/pkgs/by-name/de/devin-cli/package.nix
index a0599a264759..a84ae6c956b3 100644
--- a/pkgs/by-name/de/devin-cli/package.nix
+++ b/pkgs/by-name/de/devin-cli/package.nix
@@ -26,11 +26,6 @@ let
       url = "https://static.devin.ai/cli/${version}/devin-${version}-aarch64-apple-darwin.tar.gz";
       hash = "sha256-x+g7kILZuWG2JX4tc+GdIE7XqpHIzWt6+xPQU/gzyeA=";
     };
-
-    x86_64-darwin = fetchurl {
-      url = "https://static.devin.ai/cli/${version}/devin-${version}-x86_64-apple-darwin.tar.gz";
-      hash = "sha256-LF1Mk53ds28Avvq+TtyvIu/BPYSHm9tBVjAlUXAyJVU=";
-    };
   };
 in
 
diff --git a/pkgs/by-name/de/devin-cli/update.sh b/pkgs/by-name/de/devin-cli/update.sh
index 8b1773684578..33955c67802e 100755
--- a/pkgs/by-name/de/devin-cli/update.sh
+++ b/pkgs/by-name/de/devin-cli/update.sh
@@ -16,7 +16,6 @@ update-source-version devin-cli $latestVersion || true
 for system in \
     x86_64-linux \
     aarch64-linux \
-    x86_64-darwin \
     aarch64-darwin; do
     hash=$(nix store prefetch-file --json --hash-type sha256 \
       $(nix-instantiate --eval --raw -E "with import ./. {}; devin-cli.src.url" --system "$system") | jq -r '.hash')

From 91024213c322e6e4ba1701cda7aa0bac2695fd82 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sun, 28 Jun 2026 19:49:12 -0700
Subject: [PATCH 20/64] leetgpu: remove x86_64-darwin

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/le/leetgpu/package.nix | 5 -----
 pkgs/by-name/le/leetgpu/update.sh   | 1 -
 2 files changed, 6 deletions(-)

diff --git a/pkgs/by-name/le/leetgpu/package.nix b/pkgs/by-name/le/leetgpu/package.nix
index c1225e123892..78a13e1fffa3 100644
--- a/pkgs/by-name/le/leetgpu/package.nix
+++ b/pkgs/by-name/le/leetgpu/package.nix
@@ -26,11 +26,6 @@ let
       url = "https://cli.leetgpu.com/dist/${version}/leetgpu-macos-arm64";
       hash = "sha256-B1Sdyw+6fDBKS3PsINmiNA9PnOtEpDZiodFPsx+qk1Y=";
     };
-
-    x86_64-darwin = fetchurl {
-      url = "https://cli.leetgpu.com/dist/${version}/leetgpu-macos-amd64";
-      hash = "sha256-Iw2w0qDddM38OE37mVZ4krRTqjKGhXPxZSCav+oM1ac=";
-    };
   };
 
   src = srcs.${stdenvNoCC.hostPlatform.system} or throwSystem;
diff --git a/pkgs/by-name/le/leetgpu/update.sh b/pkgs/by-name/le/leetgpu/update.sh
index 6a1f26c5d462..b30ac924cbe9 100755
--- a/pkgs/by-name/le/leetgpu/update.sh
+++ b/pkgs/by-name/le/leetgpu/update.sh
@@ -16,7 +16,6 @@ update-source-version leetgpu $latestVersion || true
 for system in \
     x86_64-linux \
     aarch64-linux \
-    x86_64-darwin \
     aarch64-darwin; do
     hash=$(nix store prefetch-file --json --hash-type sha256 \
       $(nix-instantiate --eval --raw -E "with import ./. {}; leetgpu.src.url" --system "$system") | jq -r '.hash')

From 4bda9b3643409b35f2997318414ab711a20c5ce4 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sun, 28 Jun 2026 19:50:18 -0700
Subject: [PATCH 21/64] hamrs-pro: remove x86_64-darwin

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/ha/hamrs-pro/package.nix | 7 -------
 pkgs/by-name/ha/hamrs-pro/update.sh   | 1 -
 2 files changed, 8 deletions(-)

diff --git a/pkgs/by-name/ha/hamrs-pro/package.nix b/pkgs/by-name/ha/hamrs-pro/package.nix
index d13f584425ce..743efa9d5159 100644
--- a/pkgs/by-name/ha/hamrs-pro/package.nix
+++ b/pkgs/by-name/ha/hamrs-pro/package.nix
@@ -22,12 +22,6 @@ let
       url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-linux-arm64.AppImage";
       hash = "sha256-5WUQBFyvMHZyyIH2aImCRUYdzou8BadaH/M4+5DeQdo=";
     };
-
-    x86_64-darwin = fetchurl {
-      url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-mac-x64.dmg";
-      hash = "sha256-BboXYdKT10+SBGhlxW5t1zPZ+0BMC1gUjwTlkQU+/Bk=";
-    };
-
     aarch64-darwin = fetchurl {
       url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-mac-arm64.dmg";
       hash = "sha256-/9UamFxEJ9NkswgsI8mcfher9nFpVt5Vk0QYFpRXRB4=";
@@ -51,7 +45,6 @@ let
       "x86_64-linux"
       "aarch64-linux"
       "aarch64-darwin"
-      "x86_64-darwin"
     ];
   };
 
diff --git a/pkgs/by-name/ha/hamrs-pro/update.sh b/pkgs/by-name/ha/hamrs-pro/update.sh
index 7913ced30cbb..a12439b3a10e 100755
--- a/pkgs/by-name/ha/hamrs-pro/update.sh
+++ b/pkgs/by-name/ha/hamrs-pro/update.sh
@@ -17,7 +17,6 @@ update-source-version hamrs-pro $latestVersion || true
 for system in \
     x86_64-linux \
     aarch64-linux \
-    x86_64-darwin \
     aarch64-darwin; do
     hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; hamrs-pro.src.url" --system "$system" | tr -d '"')))
     update-source-version hamrs-pro $latestVersion $hash --system=$system --ignore-same-version

From 43b49ca9888a8b050968da1b531a3a105591473e Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sun, 28 Jun 2026 19:55:26 -0700
Subject: [PATCH 22/64] hamrs: remove x86_64-darwin

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/ha/hamrs/darwin.nix | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ha/hamrs/darwin.nix b/pkgs/by-name/ha/hamrs/darwin.nix
index fd8f413ba6d8..69e1c40da6fd 100644
--- a/pkgs/by-name/ha/hamrs/darwin.nix
+++ b/pkgs/by-name/ha/hamrs/darwin.nix
@@ -12,19 +12,12 @@
 stdenvNoCC.mkDerivation (finalAttrs: {
   inherit pname version;
 
-  src =
-    if stdenvNoCC.hostPlatform.isAarch64 then
-      (fetchurl {
-        url = "https://hamrs-releases.s3.us-east-2.amazonaws.com/${finalAttrs.version}/HAMRS-${finalAttrs.version}.dmg";
-        hash = "sha256-IQ7r2OLwJW4auiNDddzZ99jXxrtPw3uYoGIUEHU1gtc=";
-      })
-    else
-      (fetchurl {
-        url = "https://hamrs-releases.s3.us-east-2.amazonaws.com/${finalAttrs.version}/HAMRS-${finalAttrs.version}-intel.dmg";
-        hash = "sha256-bgWeIARE3gO5FA9MqidfXo1Wdn5wDUa/RNzZBxSKloM=";
-      });
+  src = fetchurl {
+    url = "https://hamrs-releases.s3.us-east-2.amazonaws.com/${finalAttrs.version}/HAMRS-${finalAttrs.version}.dmg";
+    hash = "sha256-IQ7r2OLwJW4auiNDddzZ99jXxrtPw3uYoGIUEHU1gtc=";
+  };
 
-  nativeBuildInputs = if stdenvNoCC.hostPlatform.isAarch64 then [ _7zz ] else [ undmg ];
+  nativeBuildInputs = [ _7zz ];
 
   sourceRoot = ".";
 

From d7d5100e15f230a0d825c996321ada75f2c949bc Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Wed, 8 Jul 2026 07:52:32 +0200
Subject: [PATCH 23/64] wxwidgets_3_2: 3.2.9 -> 3.2.11

https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.2.11/docs/changes.txt
---
 pkgs/by-name/wx/wxwidgets_3_2/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wx/wxwidgets_3_2/package.nix b/pkgs/by-name/wx/wxwidgets_3_2/package.nix
index bc33af7fc265..0b1edf024fd9 100644
--- a/pkgs/by-name/wx/wxwidgets_3_2/package.nix
+++ b/pkgs/by-name/wx/wxwidgets_3_2/package.nix
@@ -47,13 +47,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "wxwidgets";
-  version = "3.2.9";
+  version = "3.2.11";
 
   src = fetchFromGitHub {
     owner = "wxWidgets";
     repo = "wxWidgets";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mYMUW3FnFkKHDQXb/k9UosSiWCPW7OQn+/orwq4Q95k=";
+    hash = "sha256-YaQrPJSlTpJKwjXLdRsGB04f7wKJCWfHjXWkB45qyEg=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From fde12a2c5936d75458825b7e9efdf079a34263d7 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Wed, 8 Jul 2026 07:53:39 +0200
Subject: [PATCH 24/64] wxwidgets_3_3: 3.3.2 -> 3.3.3.1

https://raw.githubusercontent.com/wxWidgets/wxWidgets/v3.3.3.1/docs/changes.txt
---
 pkgs/by-name/wx/wxwidgets_3_3/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wx/wxwidgets_3_3/package.nix b/pkgs/by-name/wx/wxwidgets_3_3/package.nix
index be8899dea103..e35d0e76dfd9 100644
--- a/pkgs/by-name/wx/wxwidgets_3_3/package.nix
+++ b/pkgs/by-name/wx/wxwidgets_3_3/package.nix
@@ -32,14 +32,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wxwidgets";
-  version = "3.3.2";
+  version = "3.3.3.1";
 
   src = fetchFromGitHub {
     owner = "wxWidgets";
     repo = "wxWidgets";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-UL1NuByKFGMQ/dhjuWRdnWTgdy4+1cD9pSls3e1mur8=";
+    hash = "sha256-gB+mEk8rHpB4z1m8RWJSV+upKzLt7pZtlviS2g03EHY=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From 63b0a2ce52ec2637d8362b5553bc09cf8f131d26 Mon Sep 17 00:00:00 2001
From: kinnrai <me@kinnrai.com>
Date: Wed, 8 Jul 2026 19:54:46 +0800
Subject: [PATCH 25/64] syntax-highlight: init at 2.1.30

---
 pkgs/by-name/sy/syntax-highlight/package.nix | 46 ++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 pkgs/by-name/sy/syntax-highlight/package.nix

diff --git a/pkgs/by-name/sy/syntax-highlight/package.nix b/pkgs/by-name/sy/syntax-highlight/package.nix
new file mode 100644
index 000000000000..1a552f7d6d46
--- /dev/null
+++ b/pkgs/by-name/sy/syntax-highlight/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchzip,
+  nix-update-script,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "syntax-highlight";
+  version = "2.1.30";
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  src = fetchzip {
+    url = "https://github.com/sbarex/SourceCodeSyntaxHighlight/releases/download/${finalAttrs.version}/Syntax.Highlight.zip";
+    hash = "sha256-URjobIBo43xtc2S6Ppr88lzeTo5KdbhF2T5weUjaxsA=";
+    stripRoot = false;
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/Applications" "$out/bin"
+    cp -R "Syntax Highlight.app" "$out/Applications/"
+
+    ln -s \
+      "$out/Applications/Syntax Highlight.app/Contents/Resources/syntax_highlight_cli" \
+      "$out/bin/syntax_highlight_cli"
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Quick Look extension for syntax-highlighted source file previews on macOS";
+    homepage = "https://github.com/sbarex/SourceCodeSyntaxHighlight";
+    changelog = "https://github.com/sbarex/SourceCodeSyntaxHighlight/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ kinnrai ];
+    mainProgram = "syntax_highlight_cli";
+    platforms = lib.platforms.darwin;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+})

From 543d7660b8c58a46186d7946af0370c84c557ed5 Mon Sep 17 00:00:00 2001
From: qrzbing <qrzbing@foxmail.com>
Date: Thu, 9 Jul 2026 11:20:53 +0800
Subject: [PATCH 26/64] picgo: 2.5.3 -> 3.0.0

---
 pkgs/by-name/pi/picgo/package.nix | 33 +++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/pi/picgo/package.nix b/pkgs/by-name/pi/picgo/package.nix
index 6692f1434b70..e751fa0e7c50 100644
--- a/pkgs/by-name/pi/picgo/package.nix
+++ b/pkgs/by-name/pi/picgo/package.nix
@@ -6,7 +6,7 @@
   pnpm_10,
   fetchPnpmDeps,
   pnpmConfigHook,
-  electron_40,
+  electron_41,
   makeWrapper,
   copyDesktopItems,
   makeDesktopItem,
@@ -18,20 +18,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "picgo";
-  version = "2.5.3";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "Molunerfinn";
     repo = "PicGo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4Ih7PPBo6scJoUS8yTAR0iyG5vxNc/c0CCw5FGaIbHM=";
+    hash = "sha256-ruTgNgZsjpdu2Cc2Q4HxPdoQHUww1UTbvLazglaz75c=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) version src;
     inherit pnpm;
     pname = "picgo";
-    hash = "sha256-tILvWDoHAN5XT1F/cJYgfeMzowuO/fhiughI+0FvHzc=";
+    hash = "sha256-IAuTtI0Ljm4+xCeMGIQAf7lK37CQ6qf7PJsksLIti7Q=";
     fetcherVersion = 3; # lockfileVersion 9.0 corresponds to fetcherVersion 3
   };
 
@@ -56,6 +56,17 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postBuild
   '';
 
+  postBuild = ''
+    cp -r src/renderer/public/. dist_electron/renderer/
+
+    # Renderer assets are loaded from a file:// URL, so root-relative paths like
+    # /squareLogo.png resolve to the filesystem root. Copy the renderer public assets
+    # next to index.html and rewrite those references to relative paths.
+    # https://github.com/Molunerfinn/PicGo/blob/dev/src/renderer/components/independent-window/mini/picgo-mini-page.tsx
+    substituteInPlace dist_electron/renderer/assets/mini-*.js \
+      --replace-fail '"/squareLogo.png"' '"./squareLogo.png"'
+  '';
+
   installPhase = ''
     runHook preInstall
 
@@ -73,10 +84,20 @@ stdenv.mkDerivation (finalAttrs: {
 
     # Create startup script
     mkdir -p $out/bin
-    makeWrapper ${lib.getExe electron_40} $out/bin/picgo \
+    # PicGo uses app.isPackaged to decide whether it is running in development mode.
+    # With the nixpkgs Electron wrapper the executable is still the generic electron
+    # binary, so app.isPackaged is false unless we force the packaged code path.
+    # https://github.com/Molunerfinn/PicGo/blob/4d92ca199b7afead168785d7375a525ca156b25f/src/main/utils/env.ts#L17-L22
+
+    # ELECTRON_FORCE_IS_PACKAGED makes PicGo use its production resource path,
+    # but with the nixpkgs Electron wrapper process.resourcesPath points to Electron
+    # itself, so point PicGo at the installed public assets
+    makeWrapper ${lib.getExe electron_41} $out/bin/picgo \
+      --add-flags "--class=picgo" \
       --add-flags "$out/lib/picgo/.launcher.cjs" \
-      --add-flags "--name picgo" \
       --set NODE_ENV production \
+      --set ELECTRON_FORCE_IS_PACKAGED 1 \
+      --set STATIC_PATH "$out/lib/picgo/public" \
       --set-default ELECTRON_OZONE_PLATFORM_HINT auto \
       --chdir "$out/lib/picgo"
 

From 4cd430ae54d9d53c3041727e32cf8a78b946ea96 Mon Sep 17 00:00:00 2001
From: Jack Henry <jack@jackerickson.net>
Date: Thu, 9 Jul 2026 08:43:55 -0700
Subject: [PATCH 27/64] nixos/networkd-dispatcher: add warning when useNetworkd
 is not enabled

networkd-dispatcher is driven by systemd-networkd events, so enabling
the module without `networking.useNetworkd = true` leaves configured
scripts unrun with no indication of why. Warn at evaluation time to make
the misconfiguration obvious. (See #538523)
---
 nixos/modules/services/networking/networkd-dispatcher.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/services/networking/networkd-dispatcher.nix b/nixos/modules/services/networking/networkd-dispatcher.nix
index eb874447bb3a..adc948104da3 100644
--- a/nixos/modules/services/networking/networkd-dispatcher.nix
+++ b/nixos/modules/services/networking/networkd-dispatcher.nix
@@ -93,6 +93,10 @@ in
 
   config = mkIf cfg.enable {
 
+    warnings = mkIf (!config.networking.useNetworkd) [
+      "services.networkd-dispatcher will not execute any scripts unless networking.useNetworkd is enabled."
+    ];
+
     systemd = {
       packages = [ pkgs.networkd-dispatcher ];
       services.networkd-dispatcher = {

From cf2f7bbc640a080199fa47cf1e58a0f7ed30ee8a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jul 2026 02:57:53 +0000
Subject: [PATCH 28/64] python3Packages.python-qube-heatpump: 1.11.2 -> 1.12.0

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

diff --git a/pkgs/development/python-modules/python-qube-heatpump/default.nix b/pkgs/development/python-modules/python-qube-heatpump/default.nix
index a6a4245fe38b..32ceed11d511 100644
--- a/pkgs/development/python-modules/python-qube-heatpump/default.nix
+++ b/pkgs/development/python-modules/python-qube-heatpump/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "python-qube-heatpump";
-  version = "1.11.2";
+  version = "1.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "MattieGit";
     repo = "python-qube-heatpump";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-B2tId45VbKpeI0vGWjV1h51Lwuj44zAsxWqt/Lz88Iw=";
+    hash = "sha256-49zRXAWHo5+Ooo/D+Cb3ydIKD3vMIslSql5lmAHtaeA=";
   };
 
   build-system = [ hatchling ];

From f0f45392d9818b3ce428ccae0f658dc2f93a9295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20Bj=C3=B8rnkj=C3=A6r=20Bennedsgaard?=
 <abbennedsgaard@gmail.com>
Date: Fri, 10 Jul 2026 11:52:39 +0200
Subject: [PATCH 29/64] databricks-cli: set version build ldflags

---
 pkgs/by-name/da/databricks-cli/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix
index 35713557d1c4..25f9f2e2752f 100644
--- a/pkgs/by-name/da/databricks-cli/package.nix
+++ b/pkgs/by-name/da/databricks-cli/package.nix
@@ -7,7 +7,6 @@
   versionCheckHook,
   nix-update-script,
 }:
-
 buildGoModule (finalAttrs: {
   pname = "databricks-cli";
   version = "1.2.1";
@@ -43,6 +42,12 @@ buildGoModule (finalAttrs: {
 
   ldflags = [
     "-X github.com/databricks/cli/internal/build.buildVersion=${finalAttrs.version}"
+    "-X github.com/databricks/cli/internal/build.buildTag=v${finalAttrs.version}"
+    "-X github.com/databricks/cli/internal/build.buildSummary=v${finalAttrs.version}"
+    "-X github.com/databricks/cli/internal/build.buildMajor=${lib.versions.major finalAttrs.version}"
+    "-X github.com/databricks/cli/internal/build.buildMinor=${lib.versions.minor finalAttrs.version}"
+    "-X github.com/databricks/cli/internal/build.buildPatch=${lib.versions.patch finalAttrs.version}"
+    "-X github.com/databricks/cli/internal/build.buildIsSnapshot=false"
   ];
 
   postBuild = ''

From 3bf35dd6372a05e3c43cd1e0bff93c3bb47906aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 01:21:51 +0000
Subject: [PATCH 30/64] gh-gei: 1.30.2 -> 1.30.3

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

diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix
index 99b5c929c083..789301891d6e 100644
--- a/pkgs/by-name/gh/gh-gei/package.nix
+++ b/pkgs/by-name/gh/gh-gei/package.nix
@@ -7,13 +7,13 @@
 
 buildDotnetModule rec {
   pname = "gh-gei";
-  version = "1.30.2";
+  version = "1.30.3";
 
   src = fetchFromGitHub {
     owner = "github";
     repo = "gh-gei";
     rev = "v${version}";
-    hash = "sha256-z3eBORwrccIgTijdHcK7en4DvRY0fE3807Amn0MCuA8=";
+    hash = "sha256-kWL/ZKBLCXzXXy4gVALfP275PUI2UPlM/WJVqQS+5ak=";
   };
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx;

From dc4ed616b96121b814b38842c4f75cedd96ae99f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 06:56:08 +0000
Subject: [PATCH 31/64] tigerbeetle: 0.17.8 -> 0.17.9

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

diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix
index 84d7636fa278..2b4fe6b29b98 100644
--- a/pkgs/by-name/ti/tigerbeetle/package.nix
+++ b/pkgs/by-name/ti/tigerbeetle/package.nix
@@ -10,14 +10,14 @@ let
   platform =
     if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system;
   hash = builtins.getAttr platform {
-    "universal-macos" = "sha256-4WwsY0UzKpBFoVT2FbSyc8zMat8gD5m+32ui2IS/nIg=";
-    "x86_64-linux" = "sha256-PKG0BqSZwLfrte2DKHxHMEcGHjqqHoCBBtmvWVy1CRM=";
-    "aarch64-linux" = "sha256-Xv8qOs64sJPd9SfbkawtBFC99ByVdZkvD4BZaeqVNCg=";
+    "universal-macos" = "sha256-kvTRqAZ1kX9ojZdto5sRxPm/sUU8dRGb31GKszr5KTo=";
+    "x86_64-linux" = "sha256-fuNmpCZ/0cV+AuOLeG5RvBxFd/hGYrx005QJWCihPpY=";
+    "aarch64-linux" = "sha256-4mSFOvgoz7d14iKWl6B6jYwkEz1Yud8Apt9yT/E7ynY=";
   };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tigerbeetle";
-  version = "0.17.8";
+  version = "0.17.9";
 
   src = fetchzip {
     url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip";

From acd89b704b64fbd776f84dc6f756ec35aea0fa14 Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Sat, 11 Jul 2026 10:19:39 +0300
Subject: [PATCH 32/64] tuist: 4.144.0 -> 4.202.1

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

diff --git a/pkgs/by-name/tu/tuist/package.nix b/pkgs/by-name/tu/tuist/package.nix
index 12296f5ac958..e2bc04ec5a1f 100644
--- a/pkgs/by-name/tu/tuist/package.nix
+++ b/pkgs/by-name/tu/tuist/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tuist";
-  version = "4.144.0";
+  version = "4.202.1";
 
   src = fetchurl {
     url = "https://github.com/tuist/tuist/releases/download/${finalAttrs.version}/tuist.zip";
-    hash = "sha256-t6nqGnrIwZQFfji7r1I2MvV0e8MFtUTlpOmOi8i8aYM=";
+    hash = "sha256-J/xlwRRW3zLr03jA6Xpa5frlRQGHa/nmzzlj35/30tw=";
   };
 
   dontUnpack = true;

From 5875c4451ba0c6ee9c5747a54464e1f635f6c04e Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Sat, 11 Jul 2026 10:20:14 +0300
Subject: [PATCH 33/64] tuist: add version check

---
 pkgs/by-name/tu/tuist/package.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/by-name/tu/tuist/package.nix b/pkgs/by-name/tu/tuist/package.nix
index e2bc04ec5a1f..b8c6fed3bc6d 100644
--- a/pkgs/by-name/tu/tuist/package.nix
+++ b/pkgs/by-name/tu/tuist/package.nix
@@ -4,6 +4,7 @@
   fetchurl,
   unzip,
   nix-update-script,
+  versionCheckHook,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
@@ -35,6 +36,24 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "version";
+  versionCheckKeepEnvironment = [
+    "HOME"
+    "XDG_CACHE_HOME"
+    "XDG_CONFIG_HOME"
+    "XDG_STATE_HOME"
+  ];
+  preVersionCheck = ''
+    export HOME=$(mktemp -d)
+    export XDG_CACHE_HOME=$HOME/.cache
+    export XDG_CONFIG_HOME=$HOME/.config
+    export XDG_STATE_HOME=$HOME/.local/state
+  '';
+
   passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=^([0-9.]+)$" ]; };
 
   meta = {

From 995e5e5bde9b1bfcfdd177a0e70a90e3d1838a39 Mon Sep 17 00:00:00 2001
From: kinnrai <me@kinnrai.com>
Date: Wed, 8 Jul 2026 22:30:50 +0800
Subject: [PATCH 34/64] qlmarkdown: init at 1.5.2

---
 pkgs/by-name/ql/qlmarkdown/package.nix | 46 ++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 pkgs/by-name/ql/qlmarkdown/package.nix

diff --git a/pkgs/by-name/ql/qlmarkdown/package.nix b/pkgs/by-name/ql/qlmarkdown/package.nix
new file mode 100644
index 000000000000..845a0e81a651
--- /dev/null
+++ b/pkgs/by-name/ql/qlmarkdown/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchzip,
+  nix-update-script,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "qlmarkdown";
+  version = "1.5.2";
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  src = fetchzip {
+    url = "https://github.com/sbarex/QLMarkdown/releases/download/${finalAttrs.version}/QLMarkdown.zip";
+    hash = "sha256-duQwlY87yWKn5RXEaPqZz8oICIsHid8m1i5V7+5bIf4=";
+    stripRoot = false;
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/Applications" "$out/bin"
+    cp -R "QLMarkdown.app" "$out/Applications/"
+
+    ln -s \
+      "$out/Applications/QLMarkdown.app/Contents/Resources/qlmarkdown_cli" \
+      "$out/bin/qlmarkdown_cli"
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Quick Look extension for Markdown previews on macOS";
+    homepage = "https://github.com/sbarex/QLMarkdown";
+    changelog = "https://github.com/sbarex/QLMarkdown/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ kinnrai ];
+    mainProgram = "qlmarkdown_cli";
+    platforms = lib.platforms.darwin;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+})

From de1fd69eb30dee555e9bbaec2837c5055710e61b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Sat, 11 Jul 2026 10:32:45 -0400
Subject: [PATCH 35/64] caffeine: fix darwin build (fixes #540657)

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

diff --git a/pkgs/by-name/ca/caffeine/package.nix b/pkgs/by-name/ca/caffeine/package.nix
index 881d85276502..36a4aaa70e15 100644
--- a/pkgs/by-name/ca/caffeine/package.nix
+++ b/pkgs/by-name/ca/caffeine/package.nix
@@ -5,6 +5,7 @@
   apple-sdk,
   darwin,
   xcbuildHook,
+  llvmPackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -31,6 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     xcbuildHook
     darwin.autoSignDarwinBinariesHook
+    # TODO: Remove once #536365 reaches this branch
+    llvmPackages.lld
   ];
 
   buildInputs = [
@@ -42,6 +45,9 @@ stdenv.mkDerivation (finalAttrs: {
     "-configuration Release"
   ];
 
+  # TODO: Remove once #536365 reaches this branch
+  env.NIX_CFLAGS_LINK = "-fuse-ld=lld";
+
   installPhase = ''
     runHook preInstall
 

From 1f6f094ec0e18408b25b9487d34b402e79cdebc7 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sat, 11 Jul 2026 14:12:37 -0600
Subject: [PATCH 36/64] imhex: fix build on darwin

---
 pkgs/by-name/im/imhex/package.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix
index 7b9f98853290..0ce61eea2f86 100644
--- a/pkgs/by-name/im/imhex/package.nix
+++ b/pkgs/by-name/im/imhex/package.nix
@@ -23,6 +23,7 @@
   nix-update-script,
   autoPatchelfHook,
   makeWrapper,
+  llvmPackages,
 }:
 
 let
@@ -61,7 +62,9 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     makeWrapper
   ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
+  ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook
+  # TODO: Remove once #536365 reaches this branch
+  ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.lld;
 
   buildInputs = [
     capstone
@@ -103,7 +106,13 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "CMAKE_INSTALL_NAME_DIR" "@executable_path/../Frameworks")
   ];
 
-  env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+  env = {
+    NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+  }
+  // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    # TODO: Remove once #536365 reaches this branch
+    NIX_CFLAGS_LINK = "-fuse-ld=lld";
+  };
 
   # Comment out fixup_bundle in PostprocessBundle.cmake as we are not building a standalone application
   postPatch = ''

From 53bd18aca0a74eae9553c36ecccb84211d75a206 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sat, 11 Jul 2026 14:30:40 -0600
Subject: [PATCH 37/64] picocrypt{,-ng}: fix build on darwin

---
 pkgs/by-name/pi/picocrypt-ng/package.nix | 13 +++++++++++--
 pkgs/by-name/pi/picocrypt/package.nix    | 13 +++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pi/picocrypt-ng/package.nix b/pkgs/by-name/pi/picocrypt-ng/package.nix
index 026dbbad8989..f3535dfa8f22 100644
--- a/pkgs/by-name/pi/picocrypt-ng/package.nix
+++ b/pkgs/by-name/pi/picocrypt-ng/package.nix
@@ -12,6 +12,7 @@
   pkg-config,
   wrapGAppsHook3,
   writableTmpDirAsHomeHook,
+  llvmPackages,
 }:
 
 buildGoModule (finalAttrs: {
@@ -49,7 +50,9 @@ buildGoModule (finalAttrs: {
     pkg-config
     wrapGAppsHook3
     writableTmpDirAsHomeHook
-  ];
+  ]
+  # TODO: Remove once #536365 reaches this branch
+  ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.lld;
 
   # git ls-files doesn't work as source is not a git repo
   checkFlags =
@@ -61,7 +64,13 @@ buildGoModule (finalAttrs: {
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
-  env.CGO_ENABLED = 1;
+  env = {
+    CGO_ENABLED = 1;
+  }
+  // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    # TODO: Remove once #536365 reaches this branch
+    NIX_CFLAGS_LINK = "-fuse-ld=lld";
+  };
 
   postInstall = ''
     mv $out/bin/picocrypt $out/bin/picocrypt-ng-gui
diff --git a/pkgs/by-name/pi/picocrypt/package.nix b/pkgs/by-name/pi/picocrypt/package.nix
index cfa8906fdd91..4728d400dc5c 100644
--- a/pkgs/by-name/pi/picocrypt/package.nix
+++ b/pkgs/by-name/pi/picocrypt/package.nix
@@ -11,6 +11,7 @@
   gtk3,
   pkg-config,
   wrapGAppsHook3,
+  llvmPackages,
 }:
 
 buildGoModule (finalAttrs: {
@@ -46,9 +47,17 @@ buildGoModule (finalAttrs: {
     copyDesktopItems
     pkg-config
     wrapGAppsHook3
-  ];
+  ]
+  # TODO: Remove once #536365 reaches this branch
+  ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.lld;
 
-  env.CGO_ENABLED = 1;
+  env = {
+    CGO_ENABLED = 1;
+  }
+  // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    # TODO: Remove once #536365 reaches this branch
+    NIX_CFLAGS_LINK = "-fuse-ld=lld";
+  };
 
   postInstall = ''
     mv $out/bin/Picocrypt $out/bin/picocrypt-gui

From 941ad82de3a7a721b9f4aa3f43d1de76a4ec622d Mon Sep 17 00:00:00 2001
From: Nikolas Moya <nikolasmoya@gmail.com>
Date: Sun, 12 Jul 2026 02:39:07 +0200
Subject: [PATCH 38/64] vpxtool: init at 0.33.4

Add vpxtool, a terminal-based frontend and utility suite for the Visual Pinball ecosystem.

This package builds vpxtool from source with rustPlatform.buildRustPackage and installs one public executable: vpxtool.

Tables, ROMs, and the Visual Pinball executable are not packaged. Users must provide their own .vpx tables,
PinMAME ROMs, and vpinball executable where required by vpxtool commands. Runtime configuration remains managed
by vpxtool through its normal config file under the user's platform-specific configuration directory.

The upstream source is pinned to release v0.33.4. Upstream Cargo metadata declares the package as MIT licensed,
so the nixpkgs package uses lib.licenses.mit.

The package enables upstream cargo tests and a version install check.

It has been built and smoke-tested on x86_64-linux with:
  nix-build -A vpxtool
  ./result/bin/vpxtool --version
---
 maintainers/maintainer-list.nix     |  6 +++++
 pkgs/by-name/vp/vpxtool/package.nix | 37 +++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/by-name/vp/vpxtool/package.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 61211f99f36c..5bd0b0663343 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -20010,6 +20010,12 @@
     githubId = 4242897;
     name = "Nikolai Mishin";
   };
+  nmoya = {
+    email = "nikolasmoya@gmail.com";
+    github = "nmoya";
+    githubId = 1767648;
+    name = "Nikolas Moya";
+  };
   noaccos = {
     name = "Francesco Noacco";
     email = "francesco.noacco2000@gmail.com";
diff --git a/pkgs/by-name/vp/vpxtool/package.nix b/pkgs/by-name/vp/vpxtool/package.nix
new file mode 100644
index 000000000000..5180b0d7fdff
--- /dev/null
+++ b/pkgs/by-name/vp/vpxtool/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  fetchFromGitHub,
+  nix-update-script,
+  rustPlatform,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "vpxtool";
+  version = "0.33.4";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "francisdb";
+    repo = "vpxtool";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-bXKfXBm1y4cdGvNQA8InYdsxOo4GJzSX5w24QUkeHs8=";
+  };
+
+  cargoHash = "sha256-07Muapi8zILczLgCSP/+mEqynm8Abc6EclVX4eDVZmw=";
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Terminal based frontend and utilities for Visual Pinball";
+    homepage = "https://github.com/francisdb/vpxtool";
+    changelog = "https://github.com/francisdb/vpxtool/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nmoya ];
+    mainProgram = "vpxtool";
+  };
+})

From dff61847ca0be92925623d18fdff9feb7bfe9e4a Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Sun, 12 Jul 2026 11:01:16 +0200
Subject: [PATCH 39/64] claude-code: 2.1.206 -> 2.1.207

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

Assisted-by: Claude Code (Claude Opus 4.8)
---
 pkgs/by-name/cl/claude-code/manifest.json | 59 +++++++++++++++--------
 1 file changed, 40 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json
index 3a61d357e015..964233ccd1eb 100644
--- a/pkgs/by-name/cl/claude-code/manifest.json
+++ b/pkgs/by-name/cl/claude-code/manifest.json
@@ -1,47 +1,68 @@
 {
-  "version": "2.1.206",
-  "commit": "edc8ebf7f852d3abffad32a5bf8e49e439f92afb",
-  "buildDate": "2026-07-09T01:48:20Z",
+  "version": "2.1.207",
+  "commit": "bc512d56332530b2be3f5079e29ec17aa20b8553",
+  "buildDate": "2026-07-10T21:39:38Z",
   "platforms": {
     "darwin-arm64": {
       "binary": "claude",
-      "checksum": "3197aba4442dbd5b3df42b6f35e6d7bd03b5e48ce18b7a3c5c6f5f8c28e03b7f",
-      "size": 240395024
+      "checksum": "1397a062c6889675055e3314dd956376ac51262a7734ad9e819c26975d71547a",
+      "size": 241237136
     },
     "darwin-x64": {
       "binary": "claude",
-      "checksum": "b1e1636917a12c7d4e1fa54cd13f7f76ba3779fb988180610b6ca483258c2f46",
-      "size": 248431568
+      "checksum": "8a4355d251a60c90d8cf08f32fdb22a8157dd3d085542f95d0da0475f9a2c57c",
+      "size": 249273680
     },
     "linux-arm64": {
       "binary": "claude",
-      "checksum": "cb8ccaf4ae6beb558747227a362010c6b32b4f4a5868c3a7e96aa9972fc6ef58",
-      "size": 255376112
+      "checksum": "8bc14a284065383460f37981d724b8f7aa7ca93c9849d2fe367e08f03383f454",
+      "size": 256228080
     },
     "linux-x64": {
       "binary": "claude",
-      "checksum": "d131494be407ff56a62f4e99a96ba60102002d01e3b6b1494db16bef4b7f060f",
-      "size": 258566968
+      "checksum": "85e7e988a392d859f90802ca21fb26e89d3c9ab527f5ed0b08df3955e34d5c83",
+      "size": 259402552
     },
     "linux-arm64-musl": {
       "binary": "claude",
-      "checksum": "b1920556c3b077694d52397f4e5221df2419ad9b44af641be0f49647b51f87ad",
-      "size": 248624312
+      "checksum": "ec3b657344dcf6693f434fe11ffe4592381d31d4e6a7976649c1a610770dcc74",
+      "size": 249476280
     },
     "linux-x64-musl": {
       "binary": "claude",
-      "checksum": "b0d780783401de979024c25f14a2cae665873afbcfe718c090b73e13c4cd08a0",
-      "size": 253251968
+      "checksum": "09a43ff41e33cbb0c4903a4939353933ee8f0d1964abab4b837004a951edb9ee",
+      "size": 254091648
     },
     "win32-x64": {
       "binary": "claude.exe",
-      "checksum": "d5072b25b9a20bffb24625d36129a05ed2be4d2eb7e35625aad6aa35596892c2",
-      "size": 248682144
+      "checksum": "781fdc2c89868b1cb05cc22c253ef142a0b44e7cc36236aecd6335745c7d42d0",
+      "size": 249485472
     },
     "win32-arm64": {
       "binary": "claude.exe",
-      "checksum": "c17ac3a5a8edf5cfa658e82bd41fcf83170af21538e51cc9d4cbaeefe382aba3",
-      "size": 243149984
+      "checksum": "fa0c887a3f944ba1915766b525538b82b029ca8078ed6ee180c3b83c1b862521",
+      "size": 243952800
     }
+  },
+  "sdkCompat": {
+    "testedWrapperVersions": [
+      "0.3.181",
+      "0.3.182",
+      "0.3.183",
+      "0.3.185",
+      "0.3.186",
+      "0.3.187",
+      "0.3.190",
+      "0.3.191",
+      "0.3.195",
+      "0.3.196",
+      "0.3.197",
+      "0.3.198",
+      "0.3.201",
+      "0.3.202",
+      "0.3.204",
+      "0.3.205"
+    ],
+    "harnessSchema": 1
   }
 }

From 089b0058af9a62d6eef53ab9b13f05a319cd6ff4 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Sun, 12 Jul 2026 11:01:17 +0200
Subject: [PATCH 40/64] vscode-extensions.anthropic.claude-code: 2.1.206 ->
 2.1.207

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

Assisted-by: Claude Code (Claude Opus 4.8)
---
 .../extensions/anthropic.claude-code/default.nix       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index e6d1da26f2ca..f547aec1465c 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -21,26 +21,26 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
       sources = {
         "x86_64-linux" = {
           arch = "linux-x64";
-          hash = "sha256-OY34TyyPj0Vjc6rLdR7uaVYsgmCXQFTS/1+QLA9pGgk=";
+          hash = "sha256-QxZa6ugaMC7otLQmDZU54Fv3OGMNYO5iyjqjCLDNdbI=";
         };
         "aarch64-linux" = {
           arch = "linux-arm64";
-          hash = "sha256-A8CrNx6GfFmaFWe1Awck/2B0VuJhNX6HHI5YNSG1qVo=";
+          hash = "sha256-lgE5dld8lvt/dyGVNjR1ZiV2qtBu9pMZayNe5dBfHo0=";
         };
         "x86_64-darwin" = {
           arch = "darwin-x64";
-          hash = "sha256-egXg308OJWvMyMqLHiANNEIGCSza/yKPFIqWq1X6JdE=";
+          hash = "sha256-AnqO7aZ3uybYnAHYCi5ppZ/5xOuiTqs+75TflN7bVow=";
         };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
-          hash = "sha256-BmI7NTlKUVMnTBS8nf2jqYYSA+LT3qP9Yu5gQIv7Mxo=";
+          hash = "sha256-KKuUXjfIsngnKrSLTMYNzb6XVZkJszUwIihCGHQJ0gU=";
         };
       };
     in
     {
       name = "claude-code";
       publisher = "anthropic";
-      version = "2.1.206";
+      version = "2.1.207";
     }
     // sources.${stdenvNoCC.hostPlatform.system}
       or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");

From 1b97280b9bc7190dd11547b403b749ca2d7d7548 Mon Sep 17 00:00:00 2001
From: sinanmohd <sinan@sinanmohd.com>
Date: Sun, 12 Jul 2026 14:32:13 +0530
Subject: [PATCH 41/64] dendrite: set mainProgram

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

diff --git a/pkgs/by-name/de/dendrite/package.nix b/pkgs/by-name/de/dendrite/package.nix
index 227a78356917..6186e6723e06 100644
--- a/pkgs/by-name/de/dendrite/package.nix
+++ b/pkgs/by-name/de/dendrite/package.nix
@@ -67,6 +67,7 @@ buildGoModule (finalAttrs: {
 
   meta = {
     homepage = "https://element-hq.github.io/dendrite";
+    mainProgram = "dendrite";
     description = "Second-generation Matrix homeserver written in Go";
     changelog = "https://github.com/element-hq/dendrite/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.agpl3Plus;

From 697892036759f011d4fcb8dbddf75de53f52dfb6 Mon Sep 17 00:00:00 2001
From: sinanmohd <sinan@sinanmohd.com>
Date: Sun, 12 Jul 2026 14:32:56 +0530
Subject: [PATCH 42/64] nixos/dendrite: add package option

---
 nixos/modules/services/matrix/dendrite.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/matrix/dendrite.nix b/nixos/modules/services/matrix/dendrite.nix
index 4a55c30c839b..671c3821da4d 100644
--- a/nixos/modules/services/matrix/dendrite.nix
+++ b/nixos/modules/services/matrix/dendrite.nix
@@ -13,6 +13,7 @@ in
 {
   options.services.dendrite = {
     enable = lib.mkEnableOption "matrix.org dendrite";
+    package = lib.mkPackageOption pkgs "dendrite" { };
     httpPort = lib.mkOption {
       type = lib.types.nullOr lib.types.port;
       default = 8008;
@@ -321,7 +322,7 @@ in
         ];
         ExecStart = lib.strings.concatStringsSep " " (
           [
-            "${pkgs.dendrite}/bin/dendrite"
+            (lib.getExe cfg.package)
             "--config /run/dendrite/dendrite.yaml"
           ]
           ++ lib.optionals (cfg.httpPort != null) [

From ada8a569823a7c0ba0858d4013d7e8eb347d3791 Mon Sep 17 00:00:00 2001
From: Myzel394 <myzel394.xyllian@pm.me>
Date: Sun, 12 Jul 2026 12:24:22 +0200
Subject: [PATCH 43/64] claude-usage-tracker: 3.1.1 -> 3.2.0

Diff: https://github.com/hamed-elfayome/Claude-Usage-Tracker/compare/v3.1.1...v3.2.0

Changelog: https://github.com/hamed-elfayome/Claude-Usage-Tracker/releases/tag/v3.2.0
---
 pkgs/by-name/cl/claude-usage-tracker/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cl/claude-usage-tracker/package.nix b/pkgs/by-name/cl/claude-usage-tracker/package.nix
index 3b508e0f0501..ee882c953e8a 100644
--- a/pkgs/by-name/cl/claude-usage-tracker/package.nix
+++ b/pkgs/by-name/cl/claude-usage-tracker/package.nix
@@ -7,11 +7,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "claude-usage-tracker";
-  version = "3.1.1";
+  version = "3.2.0";
 
   src = fetchzip {
     url = "https://github.com/hamed-elfayome/Claude-Usage-Tracker/releases/download/v${finalAttrs.version}/Claude-Usage.zip";
-    hash = "sha256-g2mTU64iEWg7YaEQdWhAnnB1Tb1PrTDezojDw+535H0=";
+    hash = "sha256-V8fc5OuEBHf4w0fe5QX9znSLlu/xGkycVi3JzShVk+A=";
     stripRoot = false;
   };
 

From 62a87bee4917fb98cb38b533e97d58942be6430f Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Sun, 12 Jul 2026 14:30:20 +0530
Subject: [PATCH 44/64] backrest: 1.13.0 -> 1.14.1

Diff: https://github.com/garethgeorge/backrest/compare/v1.13.0...v1.14.1
Changelog: https://github.com/garethgeorge/backrest/releases/tag/v1.14.1

Add backrest-tray with tray support enabled.

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 ...d-import-github.com-ncruces-go-sqlit.patch | 52 +++++++++++++++++++
 ...0002-fix-exit-after-printing-version.patch | 26 ++++++++++
 ...3-fix-quit-tray-on-graceful-shutdown.patch | 28 ++++++++++
 pkgs/by-name/ba/backrest/package.nix          | 21 ++++++--
 4 files changed, 123 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/by-name/ba/backrest/0001-fix-rm-deprecated-import-github.com-ncruces-go-sqlit.patch
 create mode 100644 pkgs/by-name/ba/backrest/0002-fix-exit-after-printing-version.patch
 create mode 100644 pkgs/by-name/ba/backrest/0003-fix-quit-tray-on-graceful-shutdown.patch

diff --git a/pkgs/by-name/ba/backrest/0001-fix-rm-deprecated-import-github.com-ncruces-go-sqlit.patch b/pkgs/by-name/ba/backrest/0001-fix-rm-deprecated-import-github.com-ncruces-go-sqlit.patch
new file mode 100644
index 000000000000..2212a241e92d
--- /dev/null
+++ b/pkgs/by-name/ba/backrest/0001-fix-rm-deprecated-import-github.com-ncruces-go-sqlit.patch
@@ -0,0 +1,52 @@
+From c2d19683ba90d7cd3919ca3ea21ae4332d3ea82b Mon Sep 17 00:00:00 2001
+From: phanirithvij <phanirithvij2000@gmail.com>
+Date: Sun, 12 Jul 2026 14:39:09 +0530
+Subject: [PATCH 1/3] fix: rm deprecated import
+ github.com/ncruces/go-sqlite3/embed
+
+Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
+---
+ internal/kvstore/sqlitekvstore.go         | 1 -
+ internal/logstore/logstore.go             | 1 -
+ internal/oplog/sqlitestore/sqlitestore.go | 1 -
+ 3 files changed, 3 deletions(-)
+
+diff --git a/internal/kvstore/sqlitekvstore.go b/internal/kvstore/sqlitekvstore.go
+index 9453228..e360a2c 100644
+--- a/internal/kvstore/sqlitekvstore.go
++++ b/internal/kvstore/sqlitekvstore.go
+@@ -8,7 +8,6 @@ import (
+ 	"strings"
+ 
+ 	_ "github.com/ncruces/go-sqlite3/driver"
+-	_ "github.com/ncruces/go-sqlite3/embed"
+ )
+ 
+ var ErrNotExist = errors.New("key does not exist")
+diff --git a/internal/logstore/logstore.go b/internal/logstore/logstore.go
+index 48e0509..dd6ac17 100644
+--- a/internal/logstore/logstore.go
++++ b/internal/logstore/logstore.go
+@@ -17,7 +17,6 @@ import (
+ 
+ 	"github.com/hashicorp/go-multierror"
+ 	_ "github.com/ncruces/go-sqlite3/driver"
+-	_ "github.com/ncruces/go-sqlite3/embed"
+ 	"go.uber.org/zap"
+ )
+ 
+diff --git a/internal/oplog/sqlitestore/sqlitestore.go b/internal/oplog/sqlitestore/sqlitestore.go
+index 41b12ac..08a53e0 100644
+--- a/internal/oplog/sqlitestore/sqlitestore.go
++++ b/internal/oplog/sqlitestore/sqlitestore.go
+@@ -27,7 +27,6 @@ import (
+ 
+ 	"github.com/gofrs/flock"
+ 	_ "github.com/ncruces/go-sqlite3/driver"
+-	_ "github.com/ncruces/go-sqlite3/embed"
+ 	"github.com/ncruces/go-sqlite3/vfs"
+ 	"github.com/ncruces/go-sqlite3/vfs/memdb"
+ 	_ "github.com/ncruces/go-sqlite3/vfs/memdb"
+-- 
+2.54.0
+
diff --git a/pkgs/by-name/ba/backrest/0002-fix-exit-after-printing-version.patch b/pkgs/by-name/ba/backrest/0002-fix-exit-after-printing-version.patch
new file mode 100644
index 000000000000..d78462d64dde
--- /dev/null
+++ b/pkgs/by-name/ba/backrest/0002-fix-exit-after-printing-version.patch
@@ -0,0 +1,26 @@
+From 2d84683ee874d9f7ca506c61f810aaf4bdc06e63 Mon Sep 17 00:00:00 2001
+From: phanirithvij <phanirithvij2000@gmail.com>
+Date: Sun, 12 Jul 2026 15:12:39 +0530
+Subject: [PATCH 2/3] fix: exit after printing version
+
+Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
+---
+ cmd/backrest/backrest.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmd/backrest/backrest.go b/cmd/backrest/backrest.go
+index dd59512..9c0ca7e 100644
+--- a/cmd/backrest/backrest.go
++++ b/cmd/backrest/backrest.go
+@@ -58,7 +58,7 @@ func runApp() {
+ 	flag.Parse()
+ 	if *printVersion {
+ 		fmt.Printf("backrest version: %s, commit: %s\n", version, commit)
+-		return
++		os.Exit(0)
+ 	}
+ 	installLoggers(version, commit)
+ 
+-- 
+2.54.0
+
diff --git a/pkgs/by-name/ba/backrest/0003-fix-quit-tray-on-graceful-shutdown.patch b/pkgs/by-name/ba/backrest/0003-fix-quit-tray-on-graceful-shutdown.patch
new file mode 100644
index 000000000000..6137bd5136b0
--- /dev/null
+++ b/pkgs/by-name/ba/backrest/0003-fix-quit-tray-on-graceful-shutdown.patch
@@ -0,0 +1,28 @@
+From 809a1e95a2d322ac2c00f95a274b639860d3b5bc Mon Sep 17 00:00:00 2001
+From: phanirithvij <phanirithvij2000@gmail.com>
+Date: Sun, 12 Jul 2026 16:07:29 +0530
+Subject: [PATCH 3/3] fix: quit tray on graceful shutdown
+
+---
+ cmd/backrest/tray.go | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/cmd/backrest/tray.go b/cmd/backrest/tray.go
+index 68db4f2..cca1b36 100644
+--- a/cmd/backrest/tray.go
++++ b/cmd/backrest/tray.go
+@@ -16,7 +16,10 @@ func startTray() {
+ 	status := newTrayStatus()
+ 	// Observe oplog status in-process so the icon can reflect backup state.
+ 	onOpLogReady = status.attach
+-	go runApp()
++	go func() {
++		runApp()
++		systray.Quit()
++	}()
+ 	systray.Run(func() { onReady(status) }, func() {})
+ }
+ 
+-- 
+2.54.0
+
diff --git a/pkgs/by-name/ba/backrest/package.nix b/pkgs/by-name/ba/backrest/package.nix
index 0e79b0605e0d..9157c8e337a5 100644
--- a/pkgs/by-name/ba/backrest/package.nix
+++ b/pkgs/by-name/ba/backrest/package.nix
@@ -22,13 +22,13 @@ let
   pnpm = pnpm_11;
 
   pname = "backrest";
-  version = "1.13.0";
+  version = "1.14.1";
 
   src = fetchFromGitHub {
     owner = "garethgeorge";
     repo = "backrest";
     tag = "v${version}";
-    hash = "sha256-JcrHQDjoaaK6BONEcn6XKsjhGlth4SaZKqfxa3cD0gY=";
+    hash = "sha256-RxjPjvnKy8UM1OXRklJF/HSZ6FMiHWYQBsZ6owMJMF0=";
     leaveDotGit = true;
     postFetch = ''
       cd "$out"
@@ -62,7 +62,7 @@ let
       inherit pnpm;
       sourceRoot = "${finalAttrs.src.name}/webui";
       fetcherVersion = 4;
-      hash = "sha256-xPZg7kYRlqdO/EfZr+m+IVhDcyYegQ6v8ZAF2EjrKjU=";
+      hash = "sha256-y6NYFPepibiTuvPMwyc5cN3TwAc2W7RtPbCmzWDozNQ=";
     };
 
     postPatch = ''
@@ -99,6 +99,15 @@ buildGoModule (finalAttrs: {
   __structuredAttrs = true;
   strictDeps = true;
 
+  patches = [
+    # https://github.com/garethgeorge/backrest/pull/1293
+    ./0001-fix-rm-deprecated-import-github.com-ncruces-go-sqlit.patch
+    # https://github.com/garethgeorge/backrest/pull/1294
+    ./0002-fix-exit-after-printing-version.patch
+    # https://github.com/garethgeorge/backrest/pull/1295
+    ./0003-fix-quit-tray-on-graceful-shutdown.patch
+  ];
+
   postPatch = ''
     sed -i -e \
       '/func installRestic(targetPath string) error {/a\
@@ -107,7 +116,7 @@ buildGoModule (finalAttrs: {
   '';
 
   proxyVendor = true;
-  vendorHash = "sha256-1PecXGXdSu4FzOKVZ15lTLLPy3VlLiGvGeTUDzqe9sc=";
+  vendorHash = "sha256-yadRulgtcDPthWLeTydcMol/vwriflKvDu7zgoehZCM=";
 
   subPackages = [ "cmd/backrest" ];
 
@@ -116,6 +125,8 @@ buildGoModule (finalAttrs: {
     makeBinaryWrapper
   ];
 
+  tags = [ "tray" ];
+
   ldflags = [
     "-s"
     "-X main.version=${finalAttrs.version}"
@@ -164,6 +175,8 @@ buildGoModule (finalAttrs: {
   postInstall = ''
     wrapProgram $out/bin/backrest \
       --set-default BACKREST_RESTIC_COMMAND "${lib.getExe restic}"
+    makeBinaryWrapper $out/bin/backrest $out/bin/backrest-tray \
+      --add-flags "-tray"
   '';
 
   doInstallCheck = true;

From 5ce128c4d99036a72c5c4c2044a954ebcd8e0801 Mon Sep 17 00:00:00 2001
From: Samiser <github@me.samiser.xyz>
Date: Sun, 12 Jul 2026 12:17:54 +0100
Subject: [PATCH 45/64] lima: fix build on Darwin by linking with lld

---
 pkgs/by-name/li/lima/package.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/lima/package.nix b/pkgs/by-name/li/lima/package.nix
index c998ae4731b6..8d4d63925e30 100644
--- a/pkgs/by-name/li/lima/package.nix
+++ b/pkgs/by-name/li/lima/package.nix
@@ -11,6 +11,7 @@
   apple-sdk_15,
   withAdditionalGuestAgents ? false,
   lima-additional-guestagents,
+  llvmPackages,
   writableTmpDirAsHomeHook,
   versionCheckHook,
   testers,
@@ -35,7 +36,16 @@ buildGoModule (finalAttrs: {
     # For checkPhase, and installPhase(required to build completion)
     writableTmpDirAsHomeHook
   ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ];
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    darwin.sigtool
+    # TODO: Remove when NixOS/nixpkgs#536365 reaches master.
+    llvmPackages.lld
+  ];
+
+  # TODO: Remove when NixOS/nixpkgs#536365 reaches master.
+  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    NIX_CFLAGS_LINK = "-fuse-ld=${lib.getExe' llvmPackages.lld "ld64.lld"}";
+  };
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ];
 

From 9bfbbc61f6e0e2528f44fa87394b7bf348dcfdb2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 16:52:15 +0000
Subject: [PATCH 46/64] ananicy-rules-cachyos: 0-unstable-2026-06-24 ->
 0-unstable-2026-07-11

---
 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 8cfac9b66729..56fac813c8eb 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-06-24";
+  version = "0-unstable-2026-07-11";
 
   src = fetchFromGitHub {
     owner = "CachyOS";
     repo = "ananicy-rules";
-    rev = "c273ac846fade148468bce83d0221ed80d238c57";
-    hash = "sha256-upHgVyGnR6BIgXRzA3FCoryBukqx/CFp/39jKsc7BFo=";
+    rev = "c59d59711268395b324fa5d4af149f2f94f17b4f";
+    hash = "sha256-+hDuzZtsKkoP5mD0VmzO/mXNjP0RPLz+hzK2XFUBvpc=";
   };
 
   dontConfigure = true;

From c9e406bc4309ed6f1d84eb19e9af705b2788a092 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 12 Jul 2026 10:04:44 -0700
Subject: [PATCH 47/64] python3Packages.structlog: 25.5.0 -> 26.1.0

Diff: https://github.com/hynek/structlog/compare/25.5.0...26.1.0

Changelog: https://github.com/hynek/structlog/blob/26.1.0/CHANGELOG.md
---
 pkgs/development/python-modules/structlog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix
index 10c60fc80aff..48f5f93ea2cb 100644
--- a/pkgs/development/python-modules/structlog/default.nix
+++ b/pkgs/development/python-modules/structlog/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "structlog";
-  version = "25.5.0";
+  version = "26.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hynek";
     repo = "structlog";
     tag = version;
-    hash = "sha256-dY18eZ7IEzP/eKR7d2CjpTRr2KfXy+YmeZMueHkLSQY=";
+    hash = "sha256-Q31eqeRYAbwn6Cj3hkXfy3udeBHHglEk5/qTjKbBbL8=";
   };
 
   build-system = [

From 8836d92ccdbe17dcd259e497f67133af23c91f60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 12 Jul 2026 10:06:07 -0700
Subject: [PATCH 48/64] python3Packages.structlog: use finalAttrs

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

diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix
index 48f5f93ea2cb..1acd553a108b 100644
--- a/pkgs/development/python-modules/structlog/default.nix
+++ b/pkgs/development/python-modules/structlog/default.nix
@@ -10,7 +10,7 @@
   time-machine,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "structlog";
   version = "26.1.0";
   pyproject = true;
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "hynek";
     repo = "structlog";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-Q31eqeRYAbwn6Cj3hkXfy3udeBHHglEk5/qTjKbBbL8=";
   };
 
@@ -39,8 +39,8 @@ buildPythonPackage rec {
   meta = {
     description = "Painless structural logging";
     homepage = "https://github.com/hynek/structlog";
-    changelog = "https://github.com/hynek/structlog/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/hynek/structlog/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ dotlambda ];
   };
-}
+})

From f93cef19e8c20f24cd5aff2617ac99917b489ea6 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 12 Jul 2026 14:37:38 -0400
Subject: [PATCH 49/64] topgrade: fix Darwin build

Fixes https://hydra.nixos.org/build/337394047
---
 pkgs/by-name/to/topgrade/package.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/to/topgrade/package.nix b/pkgs/by-name/to/topgrade/package.nix
index c3609237d5a3..45ef928a6052 100644
--- a/pkgs/by-name/to/topgrade/package.nix
+++ b/pkgs/by-name/to/topgrade/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   rustPlatform,
   installShellFiles,
+  llvmPackages,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -21,14 +22,18 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   nativeBuildInputs = [
     installShellFiles
-  ];
+  ]
+  # TODO: Remove once #536365 reaches this branch
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.lld ];
 
-  env.NIX_CFLAGS_COMPILE = toString (
-    lib.optionals stdenv.hostPlatform.isDarwin [
+  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
+    NIX_CFLAGS_COMPILE = toString [
       "-framework"
       "AppKit"
-    ]
-  );
+    ];
+    # TODO: Remove once #536365 reaches this branch
+    NIX_CFLAGS_LINK = "-fuse-ld=lld";
+  };
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd topgrade \

From 3bd158e72e6a22a4505479360e05a84b0c83a503 Mon Sep 17 00:00:00 2001
From: Daniel Woffinden <daw@hey.com>
Date: Sun, 12 Jul 2026 22:35:36 +0100
Subject: [PATCH 50/64] cgt-calc: fix build by backporting uv-build relaxation

On latest unstable:
```
ERROR Missing dependencies:
        uv_build<0.11.0,>=0.8.23
error: Cannot build '/nix/store/w9vn8bl71zib3lgf4dfrdkrfasz9alnx-cgt-calc-2.0.0.drv'.
       Reason: builder failed with exit code 1.
       Output paths:
         /nix/store/kg4zwzbh10vn51h0r6g6jmlhh0wb6k93-cgt-calc-2.0.0-dist
         /nix/store/wnr2qzvnw7l0czbaa0qqm2wdjyfrbnfb-cgt-calc-2.0.0
       Last 25 log lines:
       > Using pypaBuildPhase
       > Sourcing python-runtime-deps-check-hook
       > Using pythonRuntimeDepsCheckHook
       > Sourcing pypa-install-hook
       > Using pypaInstallPhase
       > Sourcing python-imports-check-hook.sh
       > Using pythonImportsCheckPhase
       > Sourcing python-namespaces-hook
       > Sourcing python-catch-conflicts-hook.sh
       > Running phase: unpackPhase
       > unpacking source archive /nix/store/xf1v660b4w4kv0sk1qhwx5lx9gapacgz-source
       > source root is source
       > setting SOURCE_DATE_EPOCH to timestamp 315619200 of file "source/uv.lock"
       > Running phase: patchPhase
       > Running phase: updateAutotoolsGnuConfigScriptsPhase
       > Running phase: configurePhase
       > no configure script, doing nothing
       > Running phase: buildPhase
       > Executing pypaBuildPhase
       > Creating a wheel...
       > pypa build flags: --no-isolation --outdir dist/ --wheel
       > * Getting build dependencies for wheel...
       >
       > ERROR Missing dependencies:
       >     uv_build<0.11.0,>=0.8.23
       For full logs, run:
         nix log /nix/store/w9vn8bl71zib3lgf4dfrdkrfasz9alnx-cgt-calc-2.0.0.drv
```

Fix is upstream but not yet released: https://github.com/KapJI/capital-gains-calculator/pull/781
---
 pkgs/by-name/cg/cgt-calc/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/cg/cgt-calc/package.nix b/pkgs/by-name/cg/cgt-calc/package.nix
index 700ead59662e..482be86743b2 100644
--- a/pkgs/by-name/cg/cgt-calc/package.nix
+++ b/pkgs/by-name/cg/cgt-calc/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   fetchFromGitHub,
+  fetchpatch,
   python3Packages,
   withTeXLive ? true,
   texliveSmall,
@@ -17,6 +18,15 @@ python3Packages.buildPythonApplication (finalAttrs: {
     hash = "sha256-KPzADW+n82X08IMfSIl5JyYPm8fxbbowud8sBdUxRgA=";
   };
 
+  patches = [
+    (fetchpatch {
+      # https://github.com/KapJI/capital-gains-calculator/pull/781
+      name = "update uv-build requirement.patch";
+      url = "https://github.com/KapJI/capital-gains-calculator/commit/0222eafdcf1911f3e2fd781697dc53311f529f62.patch";
+      hash = "sha256-L8jgrdA9t3x8mdaLmAuW6vFhHCLGA+0gQ/8j9EcYKhE=";
+    })
+  ];
+
   build-system = with python3Packages; [
     uv-build
   ];

From 74d2f39773933ba2b511ff9c816b5a45b785c8e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 21:59:00 +0000
Subject: [PATCH 51/64] olympus-unwrapped: 26.06.06.03 -> 26.07.12.04

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

diff --git a/pkgs/by-name/ol/olympus-unwrapped/package.nix b/pkgs/by-name/ol/olympus-unwrapped/package.nix
index 3d6293a20071..85ad6c72d8a1 100644
--- a/pkgs/by-name/ol/olympus-unwrapped/package.nix
+++ b/pkgs/by-name/ol/olympus-unwrapped/package.nix
@@ -22,9 +22,9 @@ let
 
   phome = "$out/lib/olympus";
   # The following variables are to be updated by the update script.
-  version = "26.06.06.03";
-  buildId = "5632"; # IMPORTANT: This line is matched with regex in update.sh.
-  rev = "bc2ed6f1e1082d4bff67c871be2d0f215f6dbc85";
+  version = "26.07.12.04";
+  buildId = "5707"; # IMPORTANT: This line is matched with regex in update.sh.
+  rev = "e2fb5adc8c1b122b44f0d5aab84ef2d5d609812a";
 in
 buildDotnetModule {
   pname = "olympus-unwrapped";
@@ -37,7 +37,7 @@ buildDotnetModule {
     owner = "EverestAPI";
     repo = "Olympus";
     fetchSubmodules = true; # Required. See upstream's README.
-    hash = "sha256-86APse6yodcqWUgi7eG/LJIcoN1JEiIgyKaZRHTstCY=";
+    hash = "sha256-0ChH9lm1RZU8MdNF12fZneAXHpKwr7j/0m42eBoqw0E=";
   };
 
   nativeBuildInputs = [

From f1b59d97c81379101f573128acc662ea7a412f6f Mon Sep 17 00:00:00 2001
From: Greg Shuflin <greg@everydayimshuflin.com>
Date: Fri, 27 Feb 2026 12:33:01 -0800
Subject: [PATCH 52/64] maintainers: add gregshuflin

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 440be83abd63..2c00b975c4b9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10386,6 +10386,12 @@
     githubId = 273582;
     name = "greg";
   };
+  gregshuflin = {
+    email = "greg@everdayimshuflin.com";
+    github = "neunenak";
+    githubId = 311545;
+    name = "Greg Shuflin";
+  };
   greizgh = {
     email = "greizgh@ephax.org";
     github = "greizgh";

From aedfc6e5ae39778fffb10ced56437e4749d2be00 Mon Sep 17 00:00:00 2001
From: Greg Shuflin <greg@everydayimshuflin.com>
Date: Fri, 27 Feb 2026 12:33:23 -0800
Subject: [PATCH 53/64] diskonaut-ng: init at 0.13.2

---
 pkgs/by-name/di/diskonaut-ng/package.nix | 40 ++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 pkgs/by-name/di/diskonaut-ng/package.nix

diff --git a/pkgs/by-name/di/diskonaut-ng/package.nix b/pkgs/by-name/di/diskonaut-ng/package.nix
new file mode 100644
index 000000000000..3735ed81bc59
--- /dev/null
+++ b/pkgs/by-name/di/diskonaut-ng/package.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+
+  __structuredAttrs = true;
+
+  pname = "diskonaut-ng";
+  version = "0.13.2";
+
+  src = fetchFromGitHub {
+    owner = "neunenak";
+    repo = "diskonaut";
+    tag = finalAttrs.version;
+    hash = "sha256-4gfJnqACJP1lV62Bkuarp85Idoh/H8zQ5W085yNZR5Q=";
+  };
+
+  cargoHash = "sha256-+NwZbR3fRj8Wi95GtsUQFWOyaZ0ekC4chsoJ5rsH3Zg=";
+
+  # 1 passed; 44 failed https://hydra.nixos.org/build/148943783/nixlog/1
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Terminal disk space navigator";
+    homepage = "https://github.com/neunenak/diskonaut";
+    changelog = "https://github.com/neunenak/diskonaut/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      gregshuflin
+    ];
+    mainProgram = "diskonaut";
+  };
+})

From bbc5f642aa59b59866ff131ac4fd0985ec27d13a Mon Sep 17 00:00:00 2001
From: Thane Gill <me@thanegill.com>
Date: Thu, 9 Jul 2026 18:03:22 -0700
Subject: [PATCH 54/64] daisydisk: 4.33.3 -> 4.34.2

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

diff --git a/pkgs/by-name/da/daisydisk/package.nix b/pkgs/by-name/da/daisydisk/package.nix
index e6d6676a0852..784b352b8d82 100644
--- a/pkgs/by-name/da/daisydisk/package.nix
+++ b/pkgs/by-name/da/daisydisk/package.nix
@@ -10,11 +10,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "daisydisk";
-  version = "4.33.3";
+  version = "4.34.2";
 
   src = fetchzip {
     url = "https://daisydiskapp.com/download/DaisyDisk.zip";
-    hash = "sha256-2QhaY4oQV+bkvcyC88Zsk7eZJ6dySsb5G2+juH8HNjI=";
+    hash = "sha256-lSV367twsKDp0e5TsVYfjYO5GPcjtteBCxmUIOrz+0E=";
     stripRoot = false;
   };
 

From c1e2fbb4b1568ae730f600505d0efe1b6a32124a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 00:00:58 +0000
Subject: [PATCH 55/64] nezha: 2.2.9 -> 2.2.10

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

diff --git a/pkgs/by-name/ne/nezha/package.nix b/pkgs/by-name/ne/nezha/package.nix
index 7515c28f10cd..691b09c2a228 100644
--- a/pkgs/by-name/ne/nezha/package.nix
+++ b/pkgs/by-name/ne/nezha/package.nix
@@ -49,13 +49,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "nezha";
-  version = "2.2.9";
+  version = "2.2.10";
 
   src = fetchFromGitHub {
     owner = "nezhahq";
     repo = "nezha";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5Mg44BTSL8J/i6fchb/8T9MOugZ0fetgsmiiEOwpLNs=";
+    hash = "sha256-eAJj+R3tSaZNa7aSfwLg8fS9grbGJRoBUBXdQpncqdI=";
   };
 
   proxyVendor = true;

From 9f53e2e035d68afd3d124450313fb96041322ccb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 00:06:36 +0000
Subject: [PATCH 56/64] application-title-bar: 0.9.1 -> 0.10.0

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

diff --git a/pkgs/by-name/ap/application-title-bar/package.nix b/pkgs/by-name/ap/application-title-bar/package.nix
index 9e9d47d7e283..7bbec0256a79 100644
--- a/pkgs/by-name/ap/application-title-bar/package.nix
+++ b/pkgs/by-name/ap/application-title-bar/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "application-title-bar";
-  version = "0.9.1";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "antroids";
     repo = "application-title-bar";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UsAZaYA088nJWnVkT7Awcib3G3JUNTY0mA8ao+9m4d0=";
+    hash = "sha256-Zph+TwPXyf2r3PpJqWSdR0V9fFt2b2XWVfsAzuY3bP4=";
   };
 
   propagatedUserEnvPkgs = with kdePackages; [ kconfig ];

From 16a5d8d871cb9cdce2a1c4bd1b5e624192973de1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 01:38:59 +0000
Subject: [PATCH 57/64] memtier-benchmark: 2.4.3 -> 2.4.4

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

diff --git a/pkgs/by-name/me/memtier-benchmark/package.nix b/pkgs/by-name/me/memtier-benchmark/package.nix
index ce04d0ecae9c..249091106d63 100644
--- a/pkgs/by-name/me/memtier-benchmark/package.nix
+++ b/pkgs/by-name/me/memtier-benchmark/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "memtier-benchmark";
-  version = "2.4.3";
+  version = "2.4.4";
 
   src = fetchFromGitHub {
     owner = "redis";
     repo = "memtier_benchmark";
     tag = finalAttrs.version;
-    hash = "sha256-k2xhY4EsPVZIEGfdkDc/Mr3oJomNu2bhbn3MzCfOaDg=";
+    hash = "sha256-2r/8u+gbgN6zwOoVfA9QCAXeYOK15znq03b6OcS+FLM=";
   };
 
   nativeBuildInputs = [

From 39434a41fb5dcaf197647f6dfd694698dc3f0ed5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 01:40:42 +0000
Subject: [PATCH 58/64] wttrbar: 0.14.5 -> 0.15.0

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

diff --git a/pkgs/by-name/wt/wttrbar/package.nix b/pkgs/by-name/wt/wttrbar/package.nix
index b444e62a896b..c36129ea1b06 100644
--- a/pkgs/by-name/wt/wttrbar/package.nix
+++ b/pkgs/by-name/wt/wttrbar/package.nix
@@ -9,13 +9,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wttrbar";
-  version = "0.14.5";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "bjesus";
     repo = "wttrbar";
     tag = finalAttrs.version;
-    hash = "sha256-ztCidqh6DPtGBM8rfEmPi5AXqo4iF8n9lvyBGMxuh1o=";
+    hash = "sha256-Fr9Zlzssw69YUdiQA1AcqQdHVg1cZghuoVB1EgS1vak=";
   };
 
   cargoHash = "sha256-oumahPzbX8EjuQt1ke7yc1KAGayjsRcucsSm9uT6gOs=";

From 46ba397fff9782269b38f5e507a1531182a0957a Mon Sep 17 00:00:00 2001
From: Ian Holloway <72767437+IanHollow@users.noreply.github.com>
Date: Sat, 21 Mar 2026 17:18:53 -0400
Subject: [PATCH 59/64] mole-cleaner: init at 1.31.0

---
 maintainers/maintainer-list.nix          |  5 ++
 pkgs/by-name/mo/mole-cleaner/package.nix | 97 ++++++++++++++++++++++++
 2 files changed, 102 insertions(+)
 create mode 100644 pkgs/by-name/mo/mole-cleaner/package.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fca8333325bf..d75b96a285ff 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11084,6 +11084,11 @@
     githubId = 69209;
     name = "Ian Duncan";
   };
+  IanHollow = {
+    github = "IanHollow";
+    githubId = 72767437;
+    name = "Ian Holloway";
+  };
   ianliu = {
     email = "ian.liu88@gmail.com";
     github = "ianliu";
diff --git a/pkgs/by-name/mo/mole-cleaner/package.nix b/pkgs/by-name/mo/mole-cleaner/package.nix
new file mode 100644
index 000000000000..ad79f8ac2612
--- /dev/null
+++ b/pkgs/by-name/mo/mole-cleaner/package.nix
@@ -0,0 +1,97 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  makeWrapper,
+  coreutils,
+  gnused,
+  gawk,
+  fd,
+  gitUpdater,
+  versionCheckHook,
+  writableTmpDirAsHomeHook,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "mole-cleaner";
+  version = "1.31.0";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "tw93";
+    repo = "Mole";
+    tag = "V${finalAttrs.version}";
+    hash = "sha256-dalmW3W/seGZreSWuYP7JN/nMUbs3WyDHzKU83EveeY=";
+  };
+
+  vendorHash = "sha256-LznLZ0NO8VBWP95ReAVORUMIDhh7/pgTY5mGNN2tND8=";
+
+  subPackages = [
+    "cmd/analyze"
+    "cmd/status"
+  ];
+
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+    writableTmpDirAsHomeHook
+    coreutils
+    gnused
+    gawk
+  ];
+
+  postInstall = ''
+    install -Dm755 mole $out/libexec/mole/mole
+    install -Dm755 mo $out/libexec/mole/mo
+    cp -r bin lib $out/libexec/mole/
+
+    mv $out/bin/analyze $out/libexec/mole/bin/analyze-go
+    mv $out/bin/status $out/libexec/mole/bin/status-go
+
+    patchShebangs $out/libexec/mole
+
+    makeWrapper $out/libexec/mole/mole $out/bin/mole \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          fd
+          coreutils
+          gnused
+          gawk
+        ]
+      }
+    makeWrapper $out/libexec/mole/mo $out/bin/mo \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          fd
+          coreutils
+          gnused
+          gawk
+        ]
+      }
+  '';
+
+  doInstallCheck = true;
+  versionCheckKeepEnvironment = [ "HOME" ];
+  versionCheckProgramArg = "--version";
+  installCheckPhase = ''
+    runHook preInstallCheck
+    $out/bin/mole --help > /dev/null
+    $out/bin/mo --help > /dev/null
+    runHook postInstallCheck
+  '';
+
+  passthru.updateScript = gitUpdater { rev-prefix = "V"; };
+
+  meta = {
+    description = "CLI tool for cleaning and optimizing macOS systems";
+    homepage = "https://github.com/tw93/Mole";
+    changelog = "https://github.com/tw93/Mole/releases/tag/V${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ IanHollow ];
+    mainProgram = "mole";
+    platforms = lib.platforms.darwin;
+  };
+})

From fb1098a45c2fab12474f4a1ddfdec34605fc0409 Mon Sep 17 00:00:00 2001
From: Gerhard Schwanzer <geri@sdf.org>
Date: Sun, 12 Jul 2026 23:44:37 +0200
Subject: [PATCH 60/64] python314Packages.vtherm-api: don't propagate
 home-assistant

Home Assistant is the host application and is already provided by consumers. Keep it in nativeCheckInputs for the upstream tests and import check without adding the full application to the library closure.

Restrict the package to Home Assistant's Python version, matching homeassistant-stubs and avoiding unsupported cross-version check environments.

Assisted-by: pi coding agent / Mika (OpenAI gpt-5.6-sol)
---
 pkgs/development/python-modules/vtherm-api/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/vtherm-api/default.nix b/pkgs/development/python-modules/vtherm-api/default.nix
index 37abc93a5435..bc8f9d5dbe6a 100644
--- a/pkgs/development/python-modules/vtherm-api/default.nix
+++ b/pkgs/development/python-modules/vtherm-api/default.nix
@@ -3,9 +3,9 @@
   buildPythonPackage,
   fetchFromGitHub,
   home-assistant,
-  pythonOlder,
   pytest-asyncio,
   pytestCheckHook,
+  python,
   setuptools,
 }:
 
@@ -14,7 +14,7 @@ buildPythonPackage (finalAttrs: {
   version = "0.3.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.14";
+  disabled = python.version != home-assistant.python3Packages.python.version;
 
   src = fetchFromGitHub {
     owner = "jmcollin78";
@@ -25,9 +25,8 @@ buildPythonPackage (finalAttrs: {
 
   build-system = [ setuptools ];
 
-  dependencies = [ home-assistant ];
-
   nativeCheckInputs = [
+    home-assistant
     pytest-asyncio
     pytestCheckHook
   ];

From 5690096bbf9e36e7a9ce6eab48bac0b1fa705bbe Mon Sep 17 00:00:00 2001
From: eymeric <hatchchien@protonmail.com>
Date: Mon, 13 Jul 2026 11:08:16 +0700
Subject: [PATCH 61/64] onlyoffice-documentserver: revert back to standard icu

Reverts onlyoffice-documentserver to use the standard icu version again (which is icu76/icu77) as nodejs reverted to icu77 again.

This keeps the robust symlinking/development header fix from f9f60a4 to facilitate any future overrides.
---
 pkgs/by-name/on/onlyoffice-documentserver/x2t.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix b/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix
index 09208f3e79a2..17d891a27037 100644
--- a/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix
+++ b/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix
@@ -12,7 +12,7 @@
   optipng,
   x265,
   libde265,
-  icu78,
+  icu,
   jdk,
   lib,
   nodejs_22,
@@ -30,9 +30,6 @@
 }:
 
 let
-  # default at the time of writing is still 76,
-  # but libv8 from nodejs_22 needs 78
-  icu = icu78;
   openssl' = openssl.override {
     enableMD2 = true;
     static = true;

From 131549afe408b01fad09274cfa1eb95776979854 Mon Sep 17 00:00:00 2001
From: Benedikt Ritter <beneritter@gmail.com>
Date: Mon, 13 Jul 2026 07:52:28 +0200
Subject: [PATCH 62/64] motus: 0.4.0 -> 0.5.0

---
 pkgs/by-name/mo/motus/package.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/mo/motus/package.nix b/pkgs/by-name/mo/motus/package.nix
index e9d99d833707..994896a26dcf 100644
--- a/pkgs/by-name/mo/motus/package.nix
+++ b/pkgs/by-name/mo/motus/package.nix
@@ -13,23 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
   __structuredAttrs = true;
 
   pname = "motus";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "oleiade";
     repo = "motus";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lMNXg6YYTxAycxOiVtBGrSHpccLwerIQcY25K/NkqMo=";
+    hash = "sha256-7lFKlU9+/NvJi9NsVpve3IvzpS8OVHaH9cs/WRGjBV8=";
   };
 
-  cargoHash = "sha256-6MKEHnB2MJVB4cNvz3JYlhuzxhzsA+Pq5OkpLNoAEyU=";
-
-  # The CLI crate version was not bumped to match the v0.4.0 release tag:
-  # https://github.com/oleiade/motus/issues/58
-  postPatch = ''
-    substituteInPlace crates/motus-cli/src/main.rs \
-      --replace-fail '#[command(version = "0.3.1")]' '#[command(version = "${finalAttrs.version}")]'
-  '';
+  cargoHash = "sha256-0qK3omTkzVxkjFn2fIowl+sFmjF/hSHAROyge5CDdFg=";
 
   buildInputs = lib.optionals (withClipboard && stdenv.hostPlatform.isLinux) [ libxcb ];
 

From d5b877ed10d7ee4ad06d6bc2767e7a2b8e9c47e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 05:53:53 +0000
Subject: [PATCH 63/64] rainfrog: 0.3.19 -> 0.3.20

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

diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix
index 56b3eb1b04cc..d38466427948 100644
--- a/pkgs/by-name/ra/rainfrog/package.nix
+++ b/pkgs/by-name/ra/rainfrog/package.nix
@@ -7,7 +7,7 @@
   rainfrog,
 }:
 let
-  version = "0.3.19";
+  version = "0.3.20";
 in
 rustPlatform.buildRustPackage {
   inherit version;
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage {
     owner = "achristmascarl";
     repo = "rainfrog";
     tag = "v${version}";
-    hash = "sha256-tVnz2AMcFBbeH7jv1FGJlSA6+rDmvgG1X7Xc1gUc/TQ=";
+    hash = "sha256-Il8/vj56xQQXLefg9cCKMCRZ65+kp/NcXzFQUU0lKbQ=";
   };
 
-  cargoHash = "sha256-wXNuh3eJPiFb49yOFw7srihc6IiNx0rWB/waYrrKKPU=";
+  cargoHash = "sha256-aRjQYQQVOQu5VQWyqC0br/0w/EdZWWpkVgoFZStUE3I=";
 
   passthru = {
     tests.version = testers.testVersion {

From dcf3bad7177c31de3c87b6631a7b6bcda08e3900 Mon Sep 17 00:00:00 2001
From: Gerhard Schwanzer <geri@sdf.org>
Date: Mon, 13 Jul 2026 07:55:05 +0200
Subject: [PATCH 64/64] whipper: fix build

Pin setuptools 80 because whipper 0.10.0 imports pkg_resources,
which was removed in setuptools 82.

Assisted-by: pi coding agent / Mika (OpenAI gpt-5.6-sol)
---
 pkgs/by-name/wh/whipper/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/wh/whipper/package.nix b/pkgs/by-name/wh/whipper/package.nix
index f64d01150360..3f60058a23cf 100644
--- a/pkgs/by-name/wh/whipper/package.nix
+++ b/pkgs/by-name/wh/whipper/package.nix
@@ -66,7 +66,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     ruamel-yaml
     discid
     pillow
-    setuptools
+    setuptools_80
   ];
 
   buildInputs = [