basecamp: 0.7.2 -> 0.8.0-rc.1, vibetyper: 1.4.0 -> 1.4.1

basecamp: bump flake input to github:basecamp/basecamp-cli/v0.8.0-rc.1.
The rc.1 tag ships a stale nix/package.nix whose vendorHash does not
match the tagged go.sum (buildGoModule FOD fails) and whose `version`
was not bumped (still reads 0.7.2). Override both on the pass-through so
the input builds and reports 0.8.0-rc.1. Drop the override back to a
plain pass-through once upstream fixes package.nix for the 0.8.0 final.

vibetyper: 1.4.0 -> 1.4.1 with refreshed AppImage sha256.

.gitea/workflows/nix-update.yml

@@ -352,6 +352,47 @@ jobs:
             done
           fi
 
+          # ── Update overlay modifications (overlays/mods/) ───────────────
+          # Overlay updates live outside pkgs/ because the test suite
+          # (tests/n8n-overlay-test.nix) forbids exporting the overlay target
+          # as a local package. Each `overlays/mods/*/update.sh` or
+          # `overlays/mods/update.sh` is a self-contained updater that handles
+          # version discovery, hash recomputation, and commit on its own.
+          if [ -z "${{ inputs.package }}" ]; then
+            echo ""
+            echo "🔍 Discovering overlay update scripts in overlays/mods/ ..."
+            OVERLAY_SCRIPTS=$(find overlays/mods -maxdepth 2 -name "update.sh" 2>/dev/null | sort)
+
+            if [ -n "$OVERLAY_SCRIPTS" ]; then
+              for script in $OVERLAY_SCRIPTS; do
+                OVERLAY_NAME=$(basename "$(dirname "$script")")
+                echo "::group::Updating overlay: $OVERLAY_NAME"
+                BEFORE_HASH=$(git rev-parse HEAD)
+
+                # Overlay scripts are self-contained and use nix-shell shebangs
+                # for their dependencies. They commit on their own.
+                if bash "$script" 2>&1 | tee /tmp/update-overlay-${OVERLAY_NAME}.log; then
+                  if [ "$(git rev-parse HEAD)" != "$BEFORE_HASH" ]; then
+                    echo "✅ Updated overlay/$OVERLAY_NAME"
+                    UPDATES_FOUND=true
+                    if [ -n "$UPDATED_PACKAGES" ]; then
+                      UPDATED_PACKAGES="$UPDATED_PACKAGES, overlay/$OVERLAY_NAME"
+                    else
+                      UPDATED_PACKAGES="overlay/$OVERLAY_NAME"
+                    fi
+                  else
+                    echo "✓ overlay/$OVERLAY_NAME already up to date"
+                  fi
+                else
+                  echo "⚠️ Update failed for overlay/$OVERLAY_NAME"
+                fi
+                echo "::endgroup::"
+              done
+            else
+              echo "ℹ️ No overlay update scripts found."
+            fi
+          fi
+
           COMMIT_COUNT=$(git rev-list --count origin/master..HEAD)
 
           if [ "$COMMIT_COUNT" -gt 0 ]; then
@@ -382,6 +423,12 @@ jobs:
           SUCCESSFUL_PACKAGES=()
 
           for pkg in "${PKGS[@]}"; do
+            # Overlay updates (e.g. "overlay/n8n") have no top-level flake
+            # attribute — `nix flake check` already verifies them above.
+            if [[ "$pkg" == overlay/* ]]; then
+              echo "⊘ Skipping per-package build for $pkg (verified via flake check)"
+              continue
+            fi
             echo "::group::Building $pkg"
             if nix build .#$pkg 2>&1 | tee /tmp/build-${pkg}.log; then
               echo "✅ Build successful for $pkg"

CHANGELOG.md

@@ -5,6 +5,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/).
 
 ## [Unreleased]
 
+### Added
+- `opencode-desktop` re-added as a pure pass-through from the `anomalyco/opencode` flake input (Electron app, tracked on `dev`); the input intentionally does not follow nixpkgs so upstream's `node_modules` FOD hashes stay valid
+
+### Fixed
+- `openwork` 0.17.30: upstream renamed desktop/icon assets from `@openworkdesktop.{desktop,png}` to `openwork.{desktop,png}` and dropped the `Icon=`/`--no-sandbox` substitutions that are no longer needed
+
 ### Changed
 - Remove duplicate opencode-rules.nix (backward-compat alias preserved)
 - Tool-agnostic naming in coding-rules lib internals

docs/packages/README.md

@@ -15,7 +15,6 @@ These packages are built from source in `pkgs/<name>/`:
 | `sidecar` | Companion tool for CLI agents with diffs, file trees, and task management | Go | `pkgs/sidecar/` |
 | `td` | Minimalist CLI for tracking tasks across AI coding sessions | Go | `pkgs/td/` |
 | `code2prompt` | Convert code to prompts | Go | `pkgs/code2prompt/` |
-| `eigent` | Eigenvalue tool | Python | `pkgs/eigent/` |
 | `hyprpaper-random` | Random wallpaper setter for Hyprpaper | Shell | `pkgs/hyprpaper-random/` |
 | `kestractl` | CLI for Kestra workflow orchestration | Go | `pkgs/kestractl/` |
 | `launch-webapp` | Launch web applications | Shell | `pkgs/launch-webapp/` |
@@ -36,7 +35,7 @@ These entries override upstream nixpkgs packages via `overlays.modifications`. T
 
 | Package | Source | Modification | Location |
 |---------|--------|--------------|----------|
-| `n8n` | `nixpkgs#n8n` | Pins a newer release and fetch hashes | `overlays/mods/default.nix` |
+| `n8n` | `nixpkgs#n8n` | Pins a newer release and fetch hashes | `overlays/mods/n8n.nix` |
 
 ### Pass-Through Packages
 
@@ -44,7 +43,7 @@ These packages are imported directly from flake inputs with minor modifications:
 
 | Package | Source | Modification | Location |
 |---------|--------|-------------|----------|
-| `opencode-desktop` | `inputs.opencode` | Tauri desktop wrapper + Wayland fix | `pkgs/opencode-desktop/` |
+| `opencode-desktop` | `inputs.opencode` | Electron desktop app (pure pass-through) | `pkgs/default.nix` |
 
 ## Adding Package Documentation
 

docs/packages/n8n.md

@@ -265,7 +265,7 @@ n8n worker
 
 ## Build Information
 
-- **Version**: 2.4.1
+- **Version**: 2.29.8
 - **Language**: TypeScript/JavaScript (Node.js)
 - **Package Manager**: pnpm
 - **License**: Sustainable Use (Fair-Code)

docs/packages/opencode.md

@@ -1,37 +1,56 @@
-# opencode (Deprecated)
+# opencode & opencode-desktop
 
-> **Note**: The `opencode` package has been removed from this repository.
+## opencode (CLI)
 
-## Why was it removed?
+The standalone `opencode` CLI is **not** packaged here. Use the well-maintained
-
+upstream flake instead:
-OpenCode (CLI version) has been removed because there is now a well-maintained upstream repository for AI coding tools:
 
 **[numtide/llm-agents.nix](https://github.com/numtide/llm-agents.nix)**
 
-This repository provides Nix packages for various AI coding agents, including OpenCode and others, with active maintenance and updates.
-
-## What should I use instead?
-
-Use the [llm-agents.nix](https://github.com/numtide/llm-agents.nix) flake directly:
-
 ```nix
 {
-  inputs = {
+  inputs.llm-agents.url = "github:numtide/llm-agents.nix";
-    llm-agents.url = "github:numtide/llm-agents.nix";
-  };
-
-  outputs = { inputs, ... }: {
-    # Access packages via inputs.llm-agents.packages.${system}
-  };
 }
 ```
 
-Or run directly:
-
 ```bash
 nix run github:numtide/llm-agents.nix#opencode
 ```
 
-## What about opencode-desktop?
+## opencode-desktop
 
-The `opencode-desktop` package remains available in this repository as it includes a Wayland support workaround for [upstream issue #11755](https://github.com/opencode-ai/opencode/issues/11755). Once this issue is resolved upstream, `opencode-desktop` may also be removed in favor of the llm-agents.nix repository.
+`opencode-desktop` is provided as a **pure pass-through** from the upstream
+flake input [`anomalyco/opencode`](https://github.com/anomalyco/opencode)
+(tracked on the `dev` branch). It is the official Electron desktop app built
+upstream via `nix/desktop.nix`.
+
+```bash
+nix build git+https://code.m3ta.dev/m3tam3re/nixpkgs#opencode-desktop
+nix run   git+https://code.m3ta.dev/m3tam3re/nixpkgs#opencode-desktop
+```
+
+### How it is wired
+
+- **Flake input** (`flake.nix`):
+
+  ```nix
+  opencode.url = "github:anomalyco/opencode/dev";
+  ```
+
+  It intentionally does **not** follow this repo's `nixpkgs`: upstream pins a
+  `node_modules` fixed-output derivation hash in `nix/hashes.json` against its
+  own nixpkgs snapshot, so following would risk FOD hash mismatches.
+
+- **Registry** (`pkgs/default.nix`):
+
+  ```nix
+  opencode-desktop = inputs.opencode.packages.${system}.opencode-desktop;
+  ```
+
+  No local derivation exists — the package is imported as-is.
+
+### Wayland
+
+The upstream wrapper already passes `--ozone-platform-hint=auto` (plus Wayland
+window decorations and IME flags) when `NIXOS_OZONE_WL` is set, so no local
+Wayland wrapper is required.

flake.lock

@@ -3,11 +3,11 @@
     "agents": {
       "flake": false,
       "locked": {
-        "lastModified": 1780133320,
+        "lastModified": 1783016143,
-        "narHash": "sha256-8AiN9tV9PBb5xblJiPlhumBbKj61qLjzqXXFtkj3vvY=",
+        "narHash": "sha256-3qejDAo4g2XfzTyWCaX8RVKH17JXnw/fujsbXQA+Mzc=",
         "ref": "refs/heads/master",
-        "rev": "920c00313ae242bd93275c30131b9ab1e52ee2fb",
+        "rev": "83284d752d2ac325d4bf3ab7b38acad1c2fffe3a",
-        "revCount": 88,
+        "revCount": 98,
         "type": "git",
         "url": "https://code.m3ta.dev/m3tam3re/AGENTS"
       },
@@ -23,27 +23,27 @@
         ]
       },
       "locked": {
-        "lastModified": 1774505501,
+        "lastModified": 1785348116,
-        "narHash": "sha256-7UiRrDptj7yuEFwToOfdunUMz/i3jRLR7CmMoYQjq6k=",
+        "narHash": "sha256-AVycTcomtfvQJ/AHvMg5xu7lVoOzDXxjN+pV7mqUIQ4=",
         "owner": "basecamp",
         "repo": "basecamp-cli",
-        "rev": "f087e6ef84002503d0dbc75ea1c8c928a8928d9e",
+        "rev": "e1059fb123a03295ce6176272e4bbaf43d7971c6",
         "type": "github"
       },
       "original": {
         "owner": "basecamp",
-        "ref": "v0.7.2",
+        "ref": "v0.8.0-rc.1",
         "repo": "basecamp-cli",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1782467914,
+        "lastModified": 1785318670,
-        "narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=",
+        "narHash": "sha256-dN6Ou5x/+23FZLEpYP3IffO+NyJFzUlGumt1uu3MMaY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e73de5be04e0eff4190a1432b946d469c794e7b4",
+        "rev": "0954f7ee2f6bb3dc7d4e3d0d8bcb8fd4bde4cfc5",
         "type": "github"
       },
       "original": {
@@ -55,11 +55,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1782540244,
+        "lastModified": 1785386845,
-        "narHash": "sha256-3skOZJEfAUG7LSB/Ok2AQUiqeagYLSq+8wKjtS1hOyc=",
+        "narHash": "sha256-CvXXTgWxbwTn6Diev4nLTP5+8tsFtth/SQAtaR9iVY0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a65184fc373636356fcaf460dc09655a919c66ea",
+        "rev": "3c5a718ce27c9283364d4c664fac4e4a23acdfb4",
         "type": "github"
       },
       "original": {
@@ -69,6 +69,41 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1776683584,
+        "narHash": "sha256-NuTLMrr10Tng72hurYG8jYQ4XKK8wnpJmOGcPiis96g=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9dd5558b06dbdacbf635a3dd36dce1b1a7ee3a89",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "opencode": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1785386452,
+        "narHash": "sha256-iYfkMmn1ZKbi0cv8XIAXVgPH4idzsVSK4cWyi/KGMJQ=",
+        "owner": "anomalyco",
+        "repo": "opencode",
+        "rev": "f7204902192624481e526b1852cdedaadb914e24",
+        "type": "github"
+      },
+      "original": {
+        "owner": "anomalyco",
+        "ref": "dev",
+        "repo": "opencode",
+        "type": "github"
+      }
+    },
     "openspec": {
       "inputs": {
         "nixpkgs": [
@@ -76,11 +111,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1782291243,
+        "lastModified": 1785371113,
-        "narHash": "sha256-0pVn5pDqlKpqSgzf4eG9TFCjkjzOtnmGTpbILso7GwI=",
+        "narHash": "sha256-r3fwnb5gMTV9UXBj7bqkKpTZIWwF4AgghULOIv2Fr4c=",
         "owner": "Fission-AI",
         "repo": "OpenSpec",
-        "rev": "737518b36fe4b6fdb09c83eeaf8d873a428c92e6",
+        "rev": "2b3d368539132be6311e55db58899abbf5306b81",
         "type": "github"
       },
       "original": {
@@ -95,6 +130,7 @@
         "basecamp": "basecamp",
         "nixpkgs": "nixpkgs",
         "nixpkgs-master": "nixpkgs-master",
+        "opencode": "opencode",
         "openspec": "openspec"
       }
     }

flake.nix

@@ -6,7 +6,7 @@
     nixpkgs-master.url = "github:NixOS/nixpkgs/master";
 
     basecamp = {
-      url = "github:basecamp/basecamp-cli/v0.7.2";
+      url = "github:basecamp/basecamp-cli/v0.8.0-rc.1";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -16,6 +16,13 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    # opencode - open-source coding agent; provides the opencode-desktop
+    # Electron app. NOTE: intentionally does NOT follow nixpkgs. Upstream
+    # pins a node_modules fixed-output derivation hash in nix/hashes.json
+    # against its own nixpkgs snapshot; following would risk FOD hash
+    # mismatches. Tracking the `dev` default branch (flake.lock pins the rev).
+    opencode.url = "github:anomalyco/opencode/dev";
+
     # Agent definitions and coding rules
     agents = {
       url = "git+https://code.m3ta.dev/m3tam3re/AGENTS";
@@ -48,17 +55,7 @@
       import ./pkgs {inherit pkgs inputs;});
 
     # Overlays - can be imported in your system configuration
-    overlays = {
+    overlays = import ./overlays {inherit inputs;};
-      # Default overlay: adds all custom packages and applies package modifications.
-      default = final: prev:
-        import ./pkgs {
-          pkgs = final;
-          inputs = inputs;
-        }
-        // import ./overlays/mods {inherit prev;};
-
-      modifications = final: prev: import ./overlays/mods {inherit prev;};
-    };
 
     # NixOS modules - for system-level configuration
     nixosModules = {

overlays/default.nix

@@ -0,0 +1,16 @@
+{inputs, ...}: let
+  # Package modifications for upstream nixpkgs packages.
+  modifications = final: prev: {
+    n8n = import ./mods/n8n.nix {inherit prev;};
+  };
+in {
+  # Default overlay: adds all custom packages and applies package modifications.
+  default = final: prev:
+    import ../pkgs {
+      pkgs = final;
+      inherit inputs;
+    }
+    // (modifications final prev);
+
+  inherit modifications;
+}

overlays/mods/default.nix

@@ -1,57 +0,0 @@
-{prev}: {
-  # n8n advances quickly. Keep using nixpkgs' package expression and only override
-  # the release-specific fetch hashes when we need a newer stable than upstream.
-  n8n = prev.n8n.overrideAttrs (finalAttrs: previousAttrs: {
-    version = "2.29.4";
-
-    src = prev.fetchFromGitHub {
-      owner = "n8n-io";
-      repo = "n8n";
-      tag = "n8n@${finalAttrs.version}";
-      hash = "sha256-Vc10fXKn21PSlv6Sk+5zyi2efkKup1Vi+9+vyJd2I1k=";
-    };
-
-    pnpmDeps = prev.fetchPnpmDeps {
-      inherit (finalAttrs) pname version src;
-      pnpm = prev.pnpm_10;
-      fetcherVersion = 3;
-      hash = "sha256-2UFKP5bo06afaMPD+dIYQ7O0NiyZai4i8vkidi7HfxE=";
-    };
-
-    preBuild = ''
-      # Force sass-embedded to use our dart-sass instead of bundled binaries.
-      # The bundled Dart binary can't run in the Nix sandbox (no /lib64/ld-linux-x86-64.so.2).
-      for dep in node_modules/.pnpm/sass-embedded@*; do
-        substituteInPlace "$dep/node_modules/sass-embedded/dist/lib/src/compiler-path.js" \
-          --replace-fail \
-            'compilerCommand = (() => {' \
-            'compilerCommand = (() => { return ["${prev.lib.getExe prev.dart-sass}"];'
-      done
-    '';
-
-    buildPhase = ''
-      runHook preBuild
-
-      pushd node_modules/sqlite3
-      node-gyp rebuild
-      popd
-
-      # isolated-vm is a native addon required by n8n-nodes-base (Merge node SQL sandbox)
-      # since n8n 2.11.x; must be compiled before pnpm build runs generate-metadata
-      pushd node_modules/isolated-vm
-      node-gyp rebuild
-      popd
-
-      # TODO: use deploy after resolved https://github.com/pnpm/pnpm/issues/5315
-      pnpm build --filter=n8n
-
-      runHook postBuild
-    '';
-
-    meta =
-      previousAttrs.meta
-      // {
-        changelog = "https://github.com/n8n-io/n8n/releases/tag/n8n@${finalAttrs.version}";
-      };
-  });
-}

overlays/mods/n8n.nix

@@ -0,0 +1,46 @@
+{prev}: let
+  # n8n >= 2.32 replaced the sheetjs-CDN `xlsx@0.20.2` tarball (which lacked an
+  # integrity checksum and had to be patched into pnpm-lock.yaml) with the
+  # regular npm package `@e965/xlsx@0.20.3`, which already carries an integrity
+  # field. The old lockfile-integrity workaround is therefore obsolete and has
+  # been removed.
+in
+  prev.n8n.overrideAttrs (finalAttrs: previousAttrs: {
+    version = "2.32.7";
+
+    src = prev.fetchFromGitHub {
+      owner = "n8n-io";
+      repo = "n8n";
+      tag = "n8n@${finalAttrs.version}";
+      hash = "sha256-Lyz0k5LD+lVPt5yeNUm08p9x2xqRIqW4AsMp3IGZGdc=";
+    };
+
+    pnpmDeps = prev.fetchPnpmDeps {
+      inherit (finalAttrs) pname version src;
+      pnpm = prev.pnpm_10;
+      fetcherVersion = 3;
+      hash = "sha256-QzUJCF+VIku9/HrmiUR9FNCU3MlYtyKOILZjFNXvN8U=";
+    };
+
+    preBuild =
+      (previousAttrs.preBuild or "")
+      + ''
+        if [ ! -e node_modules/sass-embedded ] && [ -e node_modules/.pnpm/node_modules/sass-embedded ]; then
+          ln -s .pnpm/node_modules/sass-embedded node_modules/sass-embedded
+        fi
+        if [ ! -e node_modules/sqlite3 ] && [ -e node_modules/.pnpm/node_modules/sqlite3 ]; then
+          ln -s .pnpm/node_modules/sqlite3 node_modules/sqlite3
+        fi
+      '';
+
+    # Self-contained update script (./update.sh) — fetches latest stable
+    # release from n8n-io/n8n, recomputes both src and pnpmDeps hashes.
+    # The CI workflow in .gitea/workflows/nix-update.yml discovers and runs it.
+    passthru = (previousAttrs.passthru or {}) // {updateScript = ./update.sh;};
+
+    meta =
+      previousAttrs.meta
+      // {
+        changelog = "https://github.com/n8n-io/n8n/releases/tag/n8n@${finalAttrs.version}";
+      };
+  })

overlays/mods/update.sh

@@ -0,0 +1,172 @@
+#!/usr/bin/env nix-shell
+#!nix-shell --pure -i bash -p bash curl jq nix nix-prefetch cacert git
+# shellcheck shell=bash
+set -euo pipefail
+
+# Update the n8n overlay (overlays/mods/n8n.nix) to the latest stable GitHub
+# release of n8n-io/n8n.
+#
+# This is a self-contained updater (not nix-update), because the overlay file
+# is a `prev.n8n.overrideAttrs` form rather than a standalone derivation and
+# the test suite (tests/n8n-overlay-test.nix) explicitly forbids exporting a
+# local n8n package. The CI workflow discovers and runs this script directly.
+#
+# What it does, in order:
+#   1. Fetch latest stable (non-prerelease) tag from the GitHub API
+#   2. Strip the `n8n@` prefix → version
+#   3. Compare to the version pinned in overlays/mods/n8n.nix
+#   4. Compute new src hash (fetchFromGitHub tarball) via nix-prefetch-url
+#   5. Compute new pnpmDeps hash via the fake-hash trick
+#   6. Commit
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+NIX_FILE="$SCRIPT_DIR/n8n.nix"
+NIXPKGS_ROOT=$(git -C "$SCRIPT_DIR" rev-parse --show-toplevel 2>/dev/null || true)
+
+# Snapshot the current n8n.nix so we can restore it if anything goes wrong
+# (error, SIGINT, SIGTERM, or a killed build) — otherwise a failed/aborted run
+# leaves a stale version bump and/or the fake-hash sentinel behind. Restoring
+# from the snapshot (rather than `git checkout`) also preserves any
+# pre-existing working-tree edits the user may have made. The trap is disarmed
+# once we reach a successful commit.
+RESTORE_FILE="$(mktemp)"
+cp "$NIX_FILE" "$RESTORE_FILE"
+restore_on_failure() {
+	if [[ -z "${UPDATE_SUCCEEDED:-}" ]]; then
+		cp -f "$RESTORE_FILE" "$NIX_FILE" 2>/dev/null || true
+	fi
+	rm -f "$RESTORE_FILE"
+}
+trap restore_on_failure EXIT
+
+REPO="n8n-io/n8n"
+TAG_PREFIX="n8n@"
+
+# ── 1. Latest stable release ───────────────────────────────────────────────
+echo "Fetching latest stable release of $REPO ..."
+LATEST_TAG=$(curl -fsSL "https://api.github.com/repos/$REPO/releases/latest" |
+	jq -r 'select(.prerelease == false) | .tag_name')
+
+if [[ -z "$LATEST_TAG" ]]; then
+	echo "ERROR: No stable release found for $REPO" >&2
+	exit 1
+fi
+
+VERSION="${LATEST_TAG#"${TAG_PREFIX}"}"
+echo "Latest version: $VERSION"
+
+# ── 2. Current version from the nix file ───────────────────────────────────
+CURRENT=$(awk '
+  /^[[:space:]]*version = "/ {
+    gsub(/^[[:space:]]*version = "/, "")
+    gsub(/".*/, "")
+    print
+    exit
+  }
+' "$NIX_FILE")
+echo "Current version: $CURRENT"
+
+if [[ "$VERSION" == "$CURRENT" ]]; then
+	echo "Already at latest version, nothing to do."
+	exit 0
+fi
+
+echo "==> Updating n8n $CURRENT -> $VERSION"
+
+# ── 3. Bump version in the file ────────────────────────────────────────────
+sed -i "s|^\([[:space:]]*\)version = \"[^\"]*\";|\1version = \"$VERSION\";|" "$NIX_FILE"
+
+# ── 4. Compute and apply src hash ──────────────────────────────────────────
+echo "==> Computing src hash ..."
+SRC_URL="https://github.com/$REPO/archive/refs/tags/${TAG_PREFIX}${VERSION}.tar.gz"
+# `--name n8n-source` works around the `@` in the upstream tag name
+# (nix-prefetch-url refuses filenames containing `@`).
+SRC_HASH=$(nix-prefetch-url --unpack --type sha256 --name n8n-source "$SRC_URL" 2>/dev/null)
+SRC_SRI=$(nix hash convert --hash-algo sha256 --to sri "$SRC_HASH")
+echo "    src hash: $SRC_SRI"
+
+# Replace the FIRST `hash = "sha256-...";` occurrence (the src block sits above pnpmDeps)
+awk -v sri="$SRC_SRI" '
+  !src_done && /^[[:space:]]*hash = "sha256-/ {
+    sub(/"sha256-[A-Za-z0-9+/=]+"/, "\"" sri "\"")
+    src_done = 1
+  }
+  { print }
+' "$NIX_FILE" >"$NIX_FILE.tmp" && mv "$NIX_FILE.tmp" "$NIX_FILE"
+
+# ── 5. Compute pnpmDeps hash via the fake-hash trick ───────────────────────
+echo "==> Computing pnpmDeps hash (this may take a while) ..."
+
+# A literal SRI sentinel (equal to lib.fakeHash). We write the literal rather
+# than `lib.fakeHash` so we don't depend on `lib` being in scope inside
+# n8n.nix — the overlay is imported with just `{ prev = pkgs; }`, so `lib`
+# is not bound there.
+FAKE_HASH='sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA='
+
+# 5a. Temporarily set the pnpmDeps hash to the fake sentinel.
+awk -v fake="\"$FAKE_HASH\"" '
+  !pnpm_started && /^[[:space:]]*pnpmDeps = / { pnpm_started = 1 }
+  pnpm_started && !pnpm_done && /^[[:space:]]*hash = "sha256-/ {
+    sub(/"sha256-[A-Za-z0-9+/=]+"/, fake)
+    pnpm_done = 1
+  }
+  { print }
+' "$NIX_FILE" >"$NIX_FILE.tmp" && mv "$NIX_FILE.tmp" "$NIX_FILE"
+
+# 5b. Evaluate n8nModified.pnpmDeps — fixed-output derivation with a wrong hash
+#     will fail and print the correct hash in the "got:" line.
+NIX_EXPR="(let
+    flake = builtins.getFlake (toString ./.);
+    pkgs = flake.inputs.nixpkgs.legacyPackages.\${builtins.currentSystem};
+    n8nModified = import ./overlays/mods/n8n.nix { prev = pkgs; };
+  in n8nModified.pnpmDeps)"
+
+BUILD_OUTPUT=$(nix build --impure --no-link --expr "$NIX_EXPR" 2>&1 || true)
+
+# Hash mismatch errors list two sha256 values: the fake sentinel (all A's) as
+# "specified"/"Expected" and the correct one as "got:"/"Got:". Different nix
+# versions label/capitalise differently, so filter out the sentinel and take
+# whatever real sha256 remains.
+PNPM_HASH=$(echo "$BUILD_OUTPUT" |
+	grep -oE 'sha256-[A-Za-z0-9+/=]+' |
+	grep -v 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' |
+	tail -1)
+
+if [[ -z "$PNPM_HASH" ]]; then
+	echo "ERROR: could not extract a pnpmDeps hash from the build output." >&2
+	echo "       This usually means fetchPnpmDeps failed for a reason OTHER than" >&2
+	echo "       a hash mismatch (e.g. a pnpm-lock patch in n8n.nix no longer applies," >&2
+	echo "       a tarball vanished, or the build was interrupted). Full output:" >&2
+	echo "$BUILD_OUTPUT" >&2
+	echo "Restoring n8n.nix via the EXIT trap." >&2
+	exit 1
+fi
+
+echo "    pnpmDeps hash: $PNPM_HASH"
+
+# 5c. Replace the fake sentinel with the real hash. The sentinel only appears
+#     in the pnpmDeps block (the src hash was already updated in step 4), so a
+#     plain literal substitution is sufficient.
+sed -i "s|$FAKE_HASH|$PNPM_HASH|" "$NIX_FILE"
+
+# ── 6. Verify the file parses and commit ───────────────────────────────────
+echo "==> Verifying nix evaluation ..."
+if ! nix eval --impure --expr "
+  let
+    flake = builtins.getFlake (toString ./.);
+    pkgs = flake.inputs.nixpkgs.legacyPackages.\${builtins.currentSystem};
+  in (import ./overlays/mods/n8n.nix { prev = pkgs; }).version
+" >/dev/null 2>&1; then
+	echo "ERROR: nix evaluation failed after update; restoring n8n.nix via the EXIT trap." >&2
+	exit 1
+fi
+
+if [[ -n "$NIXPKGS_ROOT" ]] &&
+	[[ -n "$(git -C "$NIXPKGS_ROOT" status --porcelain "$NIX_FILE")" ]]; then
+	git -C "$NIXPKGS_ROOT" add "$NIX_FILE"
+	git -C "$NIXPKGS_ROOT" commit -m "n8n: $CURRENT -> $VERSION"
+	echo "==> Committed"
+fi
+
+UPDATE_SUCCEEDED=1
+echo "==> Done"

pkgs/default.nix

@@ -3,7 +3,7 @@
 # Flake inputs used:
 #   inputs.basecamp  → basecamp (pass-through)
 #   inputs.openspec → openspec (pass-through)
-#   inputs.opencode → opencode-desktop (build inputs + patches)
+#   inputs.opencode → opencode-desktop (Electron desktop app, pure pass-through)
 #   inputs.agents   → not used directly here (used by lib/)
 {
   pkgs,
@@ -18,7 +18,6 @@ in {
 
   sidecar = pkgs.callPackage ./sidecar {};
   td = pkgs.callPackage ./td {};
-  eigent = pkgs.callPackage ./eigent {};
   hyprpaper-random = pkgs.callPackage ./hyprpaper-random {};
   launch-webapp = pkgs.callPackage ./launch-webapp {};
   mem0 = pkgs.callPackage ./mem0 {};
@@ -38,6 +37,20 @@ in {
   # ── Pass-through packages ──────────────────────────────────────────
   # Imported directly from flake inputs. No local modifications.
 
-  basecamp = inputs.basecamp.packages.${system}.default;
+  # basecamp: tracked at github:basecamp/basecamp-cli/v0.8.0-rc.1.
+  # The rc.1 tag ships a stale nix/package.nix:
+  #   - vendorHash does not match the tagged go.sum (buildGoModule FOD fails)
+  #   - `version` was not bumped and still reads "0.7.2"
+  # We override both here so the input builds and reports the rc.1 version.
+  # When upstream fixes package.nix (expected for the 0.8.0 final), drop this
+  # override back to the plain pass-through.
+  basecamp = inputs.basecamp.packages.${system}.default.overrideAttrs (_: {
+    version = "0.8.0-rc.1";
+    vendorHash = "sha256-m1UF/Ga9C9GJF0JtZMXFOX88chb+f279/aoAaiwfxvg=";
+    # src stays the flake input (lib.cleanSource ./.. pinned by flake.lock to
+    # rc.1) — only the version label that upstream forgot to bump is corrected.
+    __intentionallyOverridingVersion = true;
+  });
   openspec = inputs.openspec.packages.${system}.default;
+  opencode-desktop = inputs.opencode.packages.${system}.opencode-desktop;
 }

pkgs/msty-studio/default.nix

@@ -1,3 +1,4 @@
+# last-modified: Wed, 24 Sep 2025 00:17:41 GMT
 {
   appimageTools,
   fetchurl,
@@ -9,6 +10,8 @@
 }: let
   pname = "msty-studio";
   version = "2.0.0-beta.4";
+  # Upstream publishes to an unversioned URL — ./update.sh watches Last-Modified
+  # and refreshes the sha256 when the binary changes. Bump `version` manually.
   src = fetchurl {
     url = "https://next-assets.msty.studio/app/alpha/linux/MstyStudio_x86_64.AppImage";
     sha256 = "sha256-zJcGK7QEL3ROgVJy13mMdY/437H3Zx8EwSXy7rEhV9w=";
@@ -34,6 +37,8 @@ in
               wrapProgram $out/bin/${pname} \
                       --prefix PATH : ${nodejs}/bin:${uv}/bin:${python3}/bin
     '';
+    passthru.updateScript = ./update.sh;
+
     meta = {
       description = "Msty Studio enables advanced, privacy‑preserving AI workflows entirely on your local machine.";
       license = lib.licenses.unfree;

pkgs/msty-studio/update.sh

@@ -0,0 +1,62 @@
+#!/usr/bin/env nix-shell
+#!nix-shell --pure -i bash -p bash curl nix nix-prefetch cacert git
+set -euo pipefail
+
+# Update msty-studio AppImage hash.
+#
+# Upstream publishes to an unversioned URL (MstyStudio_x86_64.AppImage) — no
+# version-pinned URL and no usable GitHub release. To still catch updates, we:
+#   1. HEAD the URL and read the Last-Modified header
+#   2. Compare to the value stored as a `# last-modified:` comment in default.nix
+#   3. If changed: re-download, compute sha256, update hash + comment, commit
+#
+# The version attribute stays static (manual bump) — only the binary hash is
+# refreshed automatically.
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+NIX_FILE="$SCRIPT_DIR/default.nix"
+URL="https://next-assets.msty.studio/app/alpha/linux/MstyStudio_x86_64.AppImage"
+
+echo "Checking $URL ..."
+HEADERS=$(curl -fsSIL "$URL")
+NEW_LAST_MODIFIED=$(echo "$HEADERS" | tr -d '\r' \
+  | awk -F': ' 'tolower($1)=="last-modified" {print $2; exit}')
+
+if [[ -z "$NEW_LAST_MODIFIED" ]]; then
+  echo "ERROR: Could not read Last-Modified header from $URL" >&2
+  exit 1
+fi
+
+CURRENT_LAST_MODIFIED=$(awk -F': ' '/^# last-modified:/ {sub(/^# last-modified: /, ""); print; exit}' "$NIX_FILE")
+
+echo "Current: ${CURRENT_LAST_MODIFIED:-<none>}"
+echo "Latest:  $NEW_LAST_MODIFIED"
+
+if [[ "$NEW_LAST_MODIFIED" == "$CURRENT_LAST_MODIFIED" ]]; then
+  echo "No change, nothing to do."
+  exit 0
+fi
+
+echo "==> Content changed, refreshing hash..."
+
+HASH=$(nix-prefetch-url --type sha256 "$URL" 2>/dev/null)
+SRI=$(nix hash convert --hash-algo sha256 --to sri "$HASH")
+echo "New sha256: $SRI"
+
+sed -i "s|^\([[:space:]]*\)sha256 = \"[^\"]*\";|\1sha256 = \"$SRI\";|" "$NIX_FILE"
+
+if grep -q '^# last-modified:' "$NIX_FILE"; then
+  sed -i "s|^# last-modified:.*|# last-modified: $NEW_LAST_MODIFIED|" "$NIX_FILE"
+else
+  sed -i "1i # last-modified: $NEW_LAST_MODIFIED" "$NIX_FILE"
+fi
+
+echo "Updated $NIX_FILE"
+
+NIXPKGS_ROOT=$(git -C "$SCRIPT_DIR" rev-parse --show-toplevel 2>/dev/null || true)
+if [[ -n "$NIXPKGS_ROOT" ]] && \
+   [[ -n "$(git -C "$NIXPKGS_ROOT" status --porcelain "$NIX_FILE")" ]]; then
+  git -C "$NIXPKGS_ROOT" add "$NIX_FILE"
+  git -C "$NIXPKGS_ROOT" commit -m "msty-studio: refresh AppImage ($NEW_LAST_MODIFIED)"
+  echo "==> Committed"
+fi

pkgs/openwork/default.nix

@@ -6,7 +6,7 @@
   stdenvNoCC,
 }: let
   pname = "openwork";
-  version = "0.17.3";
+  version = "0.18.11";
 
   src = fetchurl {
     url =
@@ -16,7 +16,7 @@
     hash =
       if stdenvNoCC.hostPlatform.system == "aarch64-linux"
       then "sha256-ZSoAcOH0/gQynSCY8qCvysaNBnUl/G8Zz66a11y60Qs="
-      else "sha256-vrbakPeBY+6N12KOfjRzqTt5CsJ98G1rFH0caaI2qX8=";
+      else "sha256-wh2I5Il4f/VruMA2mRskaB7ldcbSan0upon6Y+Vm1Rw=";
   };
 
   appimageContents = appimageTools.extractType2 {inherit pname version src;};
@@ -25,12 +25,11 @@ in
     inherit pname version src;
 
     extraInstallCommands = ''
-      install -m 444 -D ${appimageContents}/@openworkdesktop.desktop \
+      install -m 444 -D ${appimageContents}/com.differentai.openwork.desktop \
         $out/share/applications/openwork.desktop
       substituteInPlace $out/share/applications/openwork.desktop \
-        --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=${pname} %U' \
+        --replace-fail 'Exec=AppRun %U' 'Exec=${pname} %U'
-        --replace-fail 'Icon=@openworkdesktop' 'Icon=${pname}'
+      install -m 444 -D ${appimageContents}/openwork.png \
-      install -m 444 -D ${appimageContents}/@openworkdesktop.png \
         $out/share/icons/hicolor/512x512/apps/${pname}.png
     '';
 

pkgs/vibetyper/default.nix

@@ -1,3 +1,4 @@
+# last-modified: Fri, 24 Jul 2026 10:50:57 GMT
 {
   appimageTools,
   fetchurl,
@@ -5,10 +6,12 @@
   makeWrapper,
 }: let
   pname = "vibetyper";
-  version = "1.3.6";
+  version = "1.4.1";
+  # Upstream publishes to an unversioned URL — ./update.sh watches Last-Modified
+  # and refreshes the sha256 when the binary changes. Bump `version` manually.
   src = fetchurl {
     url = "https://cdn.vibetyper.com/releases/linux/VibeTyper.AppImage";
-    sha256 = "sha256-uJ8OlV6L8omWAM14YYEBW9+bC0RqB4wqzdY8o1Ac6fI=";
+    sha256 = "sha256-mhXWEKvDgzxJrqIjzUWpfPM8qwKf6YYLsbjqqjtEk5s=";
   };
   appimageContents = appimageTools.extractType2 {inherit pname version src;};
 in
@@ -29,6 +32,8 @@ in
               --set VIBE_DISABLE_HYPRLAND_INDICATOR_NO_BLUR 1
     '';
 
+    passthru.updateScript = ./update.sh;
+
     meta = {
       description = "VibeTyper - AI-powered typing assistant";
       homepage = "https://vibetyper.com";

pkgs/vibetyper/update.sh

@@ -0,0 +1,68 @@
+#!/usr/bin/env nix-shell
+#!nix-shell --pure -i bash -p bash curl nix nix-prefetch cacert git
+set -euo pipefail
+
+# Update vibetyper AppImage hash.
+#
+# Upstream publishes to an unversioned URL (VibeTyper.AppImage) — there is no
+# version-pinned URL and no usable GitHub release. To still catch updates, we:
+#   1. HEAD the URL and read the Last-Modified header
+#   2. Compare to the value stored as a `# last-modified:` comment in default.nix
+#   3. If changed: re-download, compute sha256, update hash + comment, commit
+#
+# The version attribute stays static (manual bump) — only the binary hash is
+# refreshed automatically.
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+NIX_FILE="$SCRIPT_DIR/default.nix"
+URL="https://cdn.vibetyper.com/releases/linux/VibeTyper.AppImage"
+
+echo "Checking $URL ..."
+# -f: fail on HTTP errors, -s: silent, -S: show errors, -I: HEAD, -L: follow redirects
+HEADERS=$(curl -fsSIL "$URL")
+NEW_LAST_MODIFIED=$(echo "$HEADERS" | tr -d '\r' \
+  | awk -F': ' 'tolower($1)=="last-modified" {print $2; exit}')
+
+if [[ -z "$NEW_LAST_MODIFIED" ]]; then
+  echo "ERROR: Could not read Last-Modified header from $URL" >&2
+  exit 1
+fi
+
+# Read stored Last-Modified from `# last-modified:` comment in the nix file
+CURRENT_LAST_MODIFIED=$(awk -F': ' '/^# last-modified:/ {sub(/^# last-modified: /, ""); print; exit}' "$NIX_FILE")
+
+echo "Current: ${CURRENT_LAST_MODIFIED:-<none>}"
+echo "Latest:  $NEW_LAST_MODIFIED"
+
+if [[ "$NEW_LAST_MODIFIED" == "$CURRENT_LAST_MODIFIED" ]]; then
+  echo "No change, nothing to do."
+  exit 0
+fi
+
+echo "==> Content changed, refreshing hash..."
+
+# Compute new sha256 (SRI form, matches existing `sha256 = "sha256-..."` style)
+HASH=$(nix-prefetch-url --type sha256 "$URL" 2>/dev/null)
+SRI=$(nix hash convert --hash-algo sha256 --to sri "$HASH")
+echo "New sha256: $SRI"
+
+# Update the sha256 attribute (keeps the existing `sha256 = "sha256-..."` shape)
+sed -i "s|^\([[:space:]]*\)sha256 = \"[^\"]*\";|\1sha256 = \"$SRI\";|" "$NIX_FILE"
+
+# Update or insert the last-modified marker comment
+if grep -q '^# last-modified:' "$NIX_FILE"; then
+  sed -i "s|^# last-modified:.*|# last-modified: $NEW_LAST_MODIFIED|" "$NIX_FILE"
+else
+  sed -i "1i # last-modified: $NEW_LAST_MODIFIED" "$NIX_FILE"
+fi
+
+echo "Updated $NIX_FILE"
+
+# Commit when inside a git repo
+NIXPKGS_ROOT=$(git -C "$SCRIPT_DIR" rev-parse --show-toplevel 2>/dev/null || true)
+if [[ -n "$NIXPKGS_ROOT" ]] && \
+   [[ -n "$(git -C "$NIXPKGS_ROOT" status --porcelain "$NIX_FILE")" ]]; then
+  git -C "$NIXPKGS_ROOT" add "$NIX_FILE"
+  git -C "$NIXPKGS_ROOT" commit -m "vibetyper: refresh AppImage ($NEW_LAST_MODIFIED)"
+  echo "==> Committed"
+fi

pkgs/zellij-ps/default.nix

@@ -12,12 +12,15 @@ with lib;
     pname = "zellij-ps";
     version = "0.1.0";
 
+    # Branch-tracking source: follows the tip of the master branch of
+    # code.m3ta.dev/m3tam3re/helper-scripts. The repo has no tags, so we
+    # track commits via the Gitea API (see ./update.sh).
     src = fetchFromGitea {
       domain = "code.m3ta.dev";
       owner = "m3tam3re";
       repo = "helper-scripts";
-      rev = "08a3217b83391c1110545c1ee3161eecd5dbe5e9";
+      rev = "d30382d8692399d952a1aacbdb77e6ab87ba046d";
-      sha256 = "1sc4i58mwcg3qsq0wwl5rvk08ykbxc497bq7mrxiirndsarskby7";
+      sha256 = "0zrl8089qj14gwn9k3b73vnw2zn48f9yh9w0qbh8g8mb171sxyaj";
     };
 
     propagatedBuildInputs = [fish fd fzf zellij];
@@ -33,6 +36,8 @@ with lib;
       chmod +x $out/bin/zellij-ps
     '';
 
+    passthru.updateScript = ./update.sh;
+
     meta = {
       description = "Zellij project switcher - quickly switch between project folders";
       license = lib.licenses.mit;

pkgs/zellij-ps/update.sh

@@ -0,0 +1,75 @@
+#!/usr/bin/env nix-shell
+#!nix-shell --pure -i bash -p bash curl jq nix nix-prefetch cacert git
+set -euo pipefail
+
+# Update zellij-ps to the latest commit on the helper-scripts master branch.
+# The upstream repo (m3ta.dev/m3tam3re/helper-scripts) has no tags/releases,
+# so we track the tip of master via the Gitea API.
+#
+# This is a "branch-tracking" updater: always pulls the newest commit,
+# NOT a stable release. Suitable for personal script repos.
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+NIX_FILE="$SCRIPT_DIR/default.nix"
+
+DOMAIN="code.m3ta.dev"
+OWNER="m3tam3re"
+REPO="helper-scripts"
+BRANCH="master"
+
+echo "Fetching latest commit on $BRANCH of $DOMAIN/$OWNER/$REPO..."
+LATEST_SHA=$(curl -fsSL "https://$DOMAIN/api/v1/repos/$OWNER/$REPO/branches/$BRANCH" \
+  | jq -r '.commit.id')
+
+if [[ -z "$LATEST_SHA" ]]; then
+  echo "ERROR: Failed to fetch latest commit from $DOMAIN/$OWNER/$REPO" >&2
+  exit 1
+fi
+
+# Read current rev from the nix file
+CURRENT_SHA=$(awk '
+  /^[[:space:]]*rev = "/ {
+    gsub(/^[[:space:]]*rev = "/, "")
+    gsub(/".*/, "")
+    print
+    exit
+  }
+' "$NIX_FILE")
+
+echo "Current: ${CURRENT_SHA:0:10}"
+echo "Latest:  ${LATEST_SHA:0:10}"
+
+if [[ "$LATEST_SHA" == "$CURRENT_SHA" ]]; then
+  echo "Already at latest commit, nothing to do."
+  exit 0
+fi
+
+echo "==> Updating zellij-ps: ${CURRENT_SHA:0:10} -> ${LATEST_SHA:0:10}"
+
+# Compute new sha256 via nix-prefetch-url (matches existing sha256 = "..." style)
+ARCHIVE_URL="https://$DOMAIN/$OWNER/$REPO/archive/$LATEST_SHA.tar.gz"
+echo "Prefetching: $ARCHIVE_URL"
+HASH=$(nix-prefetch-url --unpack --type sha256 "$ARCHIVE_URL" 2>/dev/null)
+
+if [[ -z "$HASH" ]]; then
+  echo "ERROR: nix-prefetch-url failed" >&2
+  exit 1
+fi
+
+echo "New sha256: $HASH"
+
+# Update rev and sha256 in the nix file
+sed -i "s|^\([[:space:]]*\)rev = \"[^\"]*\";|\1rev = \"$LATEST_SHA\";|" "$NIX_FILE"
+sed -i "s|^\([[:space:]]*\)sha256 = \"[^\"]*\";|\1sha256 = \"$HASH\";|" "$NIX_FILE"
+
+echo "Updated $NIX_FILE"
+
+# Commit when inside a git repo
+NIXPKGS_ROOT=$(git -C "$SCRIPT_DIR" rev-parse --show-toplevel 2>/dev/null || true)
+if [[ -n "$NIXPKGS_ROOT" ]] && \
+   [[ -n "$(git -C "$NIXPKGS_ROOT" status --porcelain "$NIX_FILE")" ]]; then
+  SHORT="${LATEST_SHA:0:10}"
+  git -C "$NIXPKGS_ROOT" add "$NIX_FILE"
+  git -C "$NIXPKGS_ROOT" commit -m "zellij-ps: update helper-scripts to $SHORT"
+  echo "==> Committed"
+fi

tests/n8n-overlay-test.nix

@@ -4,20 +4,25 @@
   self,
 }: let
   localPackages = import ../pkgs {inherit pkgs inputs;};
-  mkPkgsWithOverlay = overlay:
+  mkPkgs = overlays:
     import inputs.nixpkgs {
       system = pkgs.stdenv.hostPlatform.system;
       config.allowUnfree = true;
-      overlays = [overlay];
+      inherit overlays;
     };
 
-  modifiedPkgs = mkPkgsWithOverlay self.overlays.modifications;
+  upstreamPkgs = mkPkgs [];
-  defaultPkgs = mkPkgsWithOverlay self.overlays.default;
+  modifiedPkgs = mkPkgs [self.overlays.modifications];
+  defaultPkgs = mkPkgs [self.overlays.default];
 
-  expectedVersion = "2.29.4";
+  expectedVersion = "2.32.6";
-  expectedSrcHash = "sha256-Vc10fXKn21PSlv6Sk+5zyi2efkKup1Vi+9+vyJd2I1k=";
+  expectedSrcHash = "sha256-wWm6vGyJ2I2SBU38gRGaZG2FR5FBxH6V/sWQwn5B4Ac=";
-  expectedPnpmHash = "sha256-2UFKP5bo06afaMPD+dIYQ7O0NiyZai4i8vkidi7HfxE=";
+  expectedPnpmHash = "sha256-QzUJCF+VIku9/HrmiUR9FNCU3MlYtyKOILZjFNXvN8U=";
   expectedChangelog = "https://github.com/n8n-io/n8n/releases/tag/n8n@${expectedVersion}";
+  expectedRootNodeModuleSymlinks = [
+    "ln -s .pnpm/node_modules/sass-embedded node_modules/sass-embedded"
+    "ln -s .pnpm/node_modules/sqlite3 node_modules/sqlite3"
+  ];
 
   checkN8nOverride = overlayName: package:
     if package.version != expectedVersion
@@ -29,14 +34,32 @@
     else if package.meta.changelog != expectedChangelog
     then throw "${overlayName} n8n changelog is ${package.meta.changelog}, expected ${expectedChangelog}"
     else "ok";
+
+  checkBuildPhaseInherited = overlayName: package:
+    if package.buildPhase != upstreamPkgs.n8n.buildPhase
+    then throw "${overlayName} n8n buildPhase should be inherited from upstream nixpkgs"
+    else "ok";
+
+  checkRootNodeModuleSymlinks = overlayName: package:
+    if !(pkgs.lib.all (symlink: pkgs.lib.hasInfix symlink (package.preBuild or "")) expectedRootNodeModuleSymlinks)
+    then throw "${overlayName} n8n preBuild should create root node_modules symlinks required by the upstream buildPhase"
+    else "ok";
 in
   pkgs.runCommand "n8n-overlay-test" {
+    n8nOverlayFile =
+      if builtins.pathExists ../overlays/mods/n8n.nix
+      then "ok"
+      else throw "n8n overlay override must live in overlays/mods/n8n.nix";
     localN8nAbsent =
       if localPackages ? n8n
       then throw "pkgs/default.nix must not export a local n8n package"
       else "ok";
     modificationsOverlayN8n = checkN8nOverride "overlays.modifications" modifiedPkgs.n8n;
     defaultOverlayN8n = checkN8nOverride "overlays.default" defaultPkgs.n8n;
+    modificationsOverlayBuildPhase = checkBuildPhaseInherited "overlays.modifications" modifiedPkgs.n8n;
+    defaultOverlayBuildPhase = checkBuildPhaseInherited "overlays.default" defaultPkgs.n8n;
+    modificationsOverlayRootNodeModuleSymlinks = checkRootNodeModuleSymlinks "overlays.modifications" modifiedPkgs.n8n;
+    defaultOverlayRootNodeModuleSymlinks = checkRootNodeModuleSymlinks "overlays.default" defaultPkgs.n8n;
   } ''
     touch $out
   ''