Merge master into staging-nixos

2026-07-20 15:41:16 +00:00 · 2026-07-13 07:09:12 +00:00
parent 655b7092bf 4f4f5fea15
commit 82b73060c5
67 changed files with 1016 additions and 175 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1943,6 +1943,11 @@
    githubId = 143312793;
    name = "Annin";
  };
+  anntnzrb = {
+    github = "anntnzrb";
+    githubId = 51257127;
+    name = "anntnzrb";
+  };
  anoa = {
    matrix = "@andrewm:amorgan.xyz";
    email = "andrew@amorgan.xyz";
@@ -10386,6 +10391,12 @@
    githubId = 273582;
    name = "greg";
  };
+  gregshuflin = {
+    email = "greg@everdayimshuflin.com";
+    github = "neunenak";
+    githubId = 311545;
+    name = "Greg Shuflin";
+  };
  greizgh = {
    email = "greizgh@ephax.org";
    github = "greizgh";
@@ -11445,6 +11456,11 @@
    githubId = 69209;
    name = "Ian Duncan";
  };
+  IanHollow = {
+    github = "IanHollow";
+    githubId = 72767437;
+    name = "Ian Holloway";
+  };
  ianliu = {
    email = "ian.liu88@gmail.com";
    github = "ianliu";
@@ -12745,6 +12761,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";
@@ -20309,6 +20331,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";
--- 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) [
--- 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 = {
--- 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}");
--- a/pkgs/by-name/ag/agent-safehouse/package.nix
+++ 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 ];
+  };
+}
--- 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;
--- 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 ];
--- 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
@@ -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
+
--- 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
@@ -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
+
--- 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
@@ -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
+
--- 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;
--- 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

--- 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
  ];
--- 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
  }
 }
--- 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;
  };

--- a/pkgs/by-name/cl/clipaste/package.nix
+++ 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";
+  };
+})
--- 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
  ];
--- 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;
  };

--- 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.7.0";
@@ -31,6 +30,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 = ''
--- 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;
--- 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

--- 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')
--- a/pkgs/by-name/di/diskonaut-ng/package.nix
+++ 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";
+  };
+})
--- 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;
--- 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"
    ];
  };

--- 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
--- 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 = ".";

--- 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 = ''
--- 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 ];
@@ -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;
  };
 })
--- 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;
--- 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')
--- a/pkgs/by-name/li/license-plist/package.nix
+++ 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 ];
+  };
+})
--- 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 ];

--- 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 ];
  };
--- 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
--- a/pkgs/by-name/lu/lulu/package.nix
+++ 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 ];
+  };
+})
--- a/pkgs/by-name/ma/mas/package.nix
+++ b/pkgs/by-name/ma/mas/package.nix
@@ -3,13 +3,15 @@
  stdenvNoCC,
  fetchurl,
  installShellFiles,
+  jq,
  libarchive,
  p7zip,
  versionCheckHook,
+  zsh,
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "mas";
-  version = "6.0.1";
+  version = "7.0.0";

  __structuredAttrs = true;

@@ -20,11 +22,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}
@@ -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
--- 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 = [
--- a/pkgs/by-name/mo/mole-cleaner/package.nix
+++ 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;
+  };
+})
--- 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 ];

--- 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;
--- a/pkgs/by-name/no/notion-app/info.json
+++ b/pkgs/by-name/no/notion-app/info.json
@@ -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=="
-  }
-}
--- 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"
--- a/pkgs/by-name/no/notion-app/sources.json
+++ 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=="
+  }
+}
--- 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" })
--- 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 = [
--- 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;
--- a/pkgs/by-name/op/openusage/package.nix
+++ 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 ];
+  };
+})
--- 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"

--- 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
--- 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
--- a/pkgs/by-name/ql/qlmarkdown/package.nix
+++ 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 ];
+  };
+})
--- 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 {
--- 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";
@@ -68,7 +70,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "stats";
-  version = "3.0.3";
+  version = "3.0.6";

  __structuredAttrs = true;
  strictDeps = true;
@@ -77,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 = [
@@ -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
@@ -350,6 +353,7 @@ stdenv.mkDerivation (finalAttrs: {
    maintainers = with lib.maintainers; [
      _4evy
      emilytrau
+      kinnrai
    ];
    platforms = lib.platforms.darwin;
  };
--- a/pkgs/by-name/sy/syntax-highlight/package.nix
+++ 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 ];
+  };
+})
--- 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";
--- 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 \
--- a/pkgs/by-name/tu/tuist/package.nix
+++ b/pkgs/by-name/tu/tuist/package.nix
@@ -4,15 +4,16 @@
  fetchurl,
  unzip,
  nix-update-script,
+  versionCheckHook,
 }:

 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;
@@ -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 = {
--- a/pkgs/by-name/vp/vpxtool/package.nix
+++ 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";
+  };
+})
--- 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 = [
--- 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=";
--- a/pkgs/by-name/wx/wxwidgets_3_2/package.nix
+++ b/pkgs/by-name/wx/wxwidgets_3_2/package.nix
@@ -50,13 +50,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 = [
--- a/pkgs/by-name/wx/wxwidgets_3_3/package.nix
+++ b/pkgs/by-name/wx/wxwidgets_3_3/package.nix
@@ -37,14 +37,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 = [
--- a/pkgs/by-name/ya/yashiki/package.nix
+++ 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;
+  };
+})
--- 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 ];
--- a/pkgs/development/python-modules/structlog/default.nix
+++ b/pkgs/development/python-modules/structlog/default.nix
@@ -10,16 +10,16 @@
  time-machine,
 }:

-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
  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=";
+    tag = finalAttrs.version;
+    hash = "sha256-Q31eqeRYAbwn6Cj3hkXfy3udeBHHglEk5/qTjKbBbL8=";
  };

  build-system = [
@@ -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 ];
  };
-}
+})
--- 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
  ];