Compare commits

..
31 Commits
Author SHA1 Message Date
Sascha König 4d8dea9f61 chore: vibetyper update 2026-11-14 20:52:12 +01:00
m3tam3re 1610361eec Merge pull request 'talk: 0.1.1 -> 0.1.2' (#33) from chore/talk-0.1.2 into master
Reviewed-on: #33
2026-11-14 20:47:37 +01:00
m3ta-chironandClaude Opus 5.5 fed965262b talk: 0.1.1 -> 0.1.2
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-14 20:46:02 +01:00
m3tam3re 28a7ab59eb Merge pull request 'docs(agents): Projektlandschaft-Abschnitt mit Verweis auf PM' (#32) from docs/projektlandschaft into master
Reviewed-on: #32
2026-11-14 19:35:35 +01:00
m3ta-chironandClaude Opus 5.5 8972d0ec09 docs(agents): Projektlandschaft-Abschnitt mit Verweis auf PM
CLAUDE.md und AGENTS.md nennen die direkten Abhängigkeiten zu den
Nachbar-Repos unter ~/ap und verweisen auf Gesamtübersicht und
OKF-Konzept im PM-Repo.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-14 14:22:16 +01:00
m3tam3re 566bd047da n8n: 2.47.3 -> 2.47.7 2026-11-13 15:42:38 +01:00
Sascha König 04b710cc9b n8n: 2.45.5 -> 2.47.3 2026-11-10 21:15:28 +01:00
Sascha König 6919862acb chore: flake update 2026-11-10 19:42:20 +01:00
m3ta-chiron f06bad7656 Merge pull request 'chore(agent-lib): 0.2.0 -> 0.3.0' (#31) from update/agent-lib-0.3.0 into master
Reviewed-on: #31
2026-11-05 09:14:35 +01:00
m3ta-chironandClaude Opus 5.5 d37c3fa1d9 chore(agent-lib): 0.2.0 -> 0.3.0
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 08:58:09 +01:00
m3ta-chiron f2b7a0eab0 Merge pull request 'fix(vibetyper): add libgpg-error to FHS env' (#30) from fix/vibetyper-libgpg-error into master 2026-11-03 19:47:25 +01:00
m3ta-chironandClaude Opus 5.5 f243ea2de0 fix(vibetyper): add libgpg-error to FHS env
The bundled libgcrypt.so.20 depends on libgpg-error.so.0, which the
AppImage does not ship and the FHS env no longer provides.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 19:46:42 +01:00
m3ta-chiron c06dbcd553 Merge pull request 'fix: make the flake evaluate on current nixpkgs' (#29) from fix/drop-x86_64-darwin into master 2026-11-03 18:09:06 +01:00
m3ta-chironandClaude Opus 5.5 f53130489e fix: make the flake evaluate on current nixpkgs
- Drop x86_64-darwin; nixpkgs 26.11 no longer supports it.
- Expose only packages available on each system (mem0 is Linux-only)
  and mark rofi-project-opener Linux-only.
- mem0: use posthog without its test suite; nixpkgs marks it broken
  only because the tests fail with mcp >= 2.
- devops shell: build fabric with invoke 3 so azure-cli evaluates;
  nixpkgs marks it broken over its invoke<3 pin and failing tests.
- Update flake inputs.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 18:08:52 +01:00
m3ta-chiron 919264cca8 Merge pull request 'fix(vibetyper): drop fuse2 from the FHS env' (#28) from fix/vibetyper-fuse2 into master 2026-11-03 16:17:59 +01:00
m3ta-chironandClaude Opus 5.5 0031c21701 fix(vibetyper): drop fuse2 from the FHS env
nixpkgs removed fuse2 (end of life), so evaluating vibetyper throws.
appimageTools.wrapType2 extracts the AppImage, so FUSE is not needed.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 16:16:05 +01:00
Sascha König 1fa50fe47a fix(n8n): re-link peer dependencies dropped by pnpm 12 prune --prod 2026-10-28 19:38:17 +01:00
Sascha KönigandClaude Opus 5.5 4a047cb3be fix(n8n): disable pnpm minimumReleaseAge check for offline prune
n8n >= 2.45 sets `minimumReleaseAge: 2880` in pnpm-workspace.yaml. pnpm 12
enforces that supply-chain policy on `pnpm prune --prod` (preInstall) by
fetching registry metadata for every lockfile entry, which hangs the build
in the network-less sandbox. Disable the check for prune and force
--offline so future registry access fails fast instead of stalling.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-28 18:49:12 +01:00
Sascha König 1c46b2bcc5 n8n: 2.44.7 -> 2.45.5 2026-10-28 14:21:02 +01:00
Sascha König 68e22ee34b fix(n8n/update.sh): print diagnostics instead of dying silently
Under `set -euo pipefail` the pnpmDeps hash-extraction pipeline
(`grep -oE | grep -v | tail`) returns non-zero when the nix build output
contains no real sha256 — aborting the script BEFORE the ERROR
diagnostics could run. Symptom: update.sh exited 1 right after
'Computing pnpmDeps hash ...' with no message at all.

- Append `|| true` to the extraction pipeline so the empty-hash
  diagnostics are reachable again
- Same hardening for the GitHub release lookup (curl/jq) and
  nix-prefetch-url (now with an explicit guard + message)
- New diagnostic branch for ERR_PNPM_LOCKFILE_MISSING_DEPENDENCY
  (newer upstream pnpm-lock serialisation → bump the pnpm major)
2026-10-28 14:12:07 +01:00
Sascha König 14baf2a926 chore: updates 2026-10-27 07:57:15 +01:00
Sascha König a63cbb2749 n8n: 2.44.5 -> 2.44.7 2026-10-27 07:47:36 +01:00
Sascha KönigandClaude Opus 5.5 72695e2ef0 talk: 0.1.0 -> 0.1.1 (now built from code.m3ta.dev/m3tam3re/talk)
talk moved to its own repository and is now a Go binary with a
background daemon instead of a bash script around curl/mpv.

crunch: call `talk say --wait` so the announcement finishes before the
systemd transient unit exits and takes an autostarted daemon with it;
update documented env vars.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-26 07:46:42 +01:00
Sascha KönigandClaude Fable 5.1 ed2b9fb089 fix(n8n): resolve committed merge conflict markers
Keep the 2.44.5 side (HEAD) in the overlay and its test; the 2.43.5
side was superseded by the 2.44.5 update.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
2026-10-26 07:41:33 +01:00
m3tam3re 239450162e chore: vibetyper update 2026-10-22 10:17:58 +02:00
m3tam3re ffd27fba20 chore: flake update 2026-10-22 09:52:17 +02:00
m3tam3re b47eaf47d7 chore: flake update 2026-10-22 09:50:01 +02:00
m3tam3re 80d0dd41bc n8n: 2.42.6 -> 2.44.5 2026-10-22 09:35:49 +02:00
m3ta-chiron cbd7d982ef fix(n8n): match pnpm by pname/version, not outPath
Comparing x.outPath == prev.pnpm_10.outPath forces the pnpm_10
derivation. On nixpkgs pins where pnpm_10 is insecure-marked
(nixos-26.05 ships 10.34.0 with 9 CVEs) that comparison alone throws
"Refusing to evaluate" — even though the package is only discarded
by the swap. Match on pname + major version instead: plain attrs,
nothing forced, identical swap semantics on the m3ta pin.
2026-10-14 15:06:25 +02:00
Sascha König 9a2927c2e0 n8n: 2.42.6 -> 2.43.5 2026-10-14 14:43:11 +02:00
m3ta-chiron 3dbd16339a fix(vibetyper): adapt install to upstream 1.6.0 AppImage layout
Upstream renamed the desktop file to "Vibe Typer.desktop" (also under
usr/share/applications), changed Exec to "vibe-typer", and replaced the
top-level 512x512 icon with a 256x256 one. Install the renamed files,
keep the lowercase vibe-typer.desktop name for compatibility, and
rewrite Exec to the wrapper binary.
2026-10-11 14:35:09 +02:00
16 changed files with 389 additions and 384 deletions

No files matched your search

+11
View File
@@ -82,3 +82,14 @@ bd close <id> # Complete work
- NEVER say "ready to push when you are" - YOU must push - NEVER say "ready to push when you are" - YOU must push
- If push fails, resolve and retry until it succeeds - If push fails, resolve and retry until it succeeds
<!-- END BEADS INTEGRATION --> <!-- END BEADS INTEGRATION -->
<!-- BEGIN PM-PROJEKTLANDSCHAFT -->
## Projektlandschaft
Dieses Repo ist eines von mehreren Projekten unter `~/ap`. Die Gesamtübersicht (Zweck, Remotes, Abhängigkeiten aller Repos) und das OKF-Wissensbündel liegen im privaten PM-Repo (`~/ap/PM/CLAUDE.md`, `~/ap/PM/.okf/`); das Konzept zu diesem Repo ist `.okf/systems/m3ta-nixpkgs.md`. Ist das PM-Repo nicht vorhanden, diesen Abschnitt ignorieren. Ändern sich Zweck, Schnittstellen oder Abhängigkeiten dieses Repos, dort das Konzept aktualisieren und `.okf/log.md` ergänzen.
Direkte Abhängigkeiten:
- Paketiert u. a. `agent-lib` und `talk` (eigene Repos unter `~/ap`): nach deren Releases Version und Hash nachziehen.
- Hauptkonsument ist `m3ta-home`.
<!-- END PM-PROJEKTLANDSCHAFT -->
+5
View File
@@ -0,0 +1,5 @@
# CLAUDE.md
This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
@AGENTS.md
Generated
+21 -22
View File
@@ -23,16 +23,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1785979955, "lastModified": 1794331471,
"narHash": "sha256-OP96Ak4OBydR98keoNYKdGY8j+wrIys0LafSZgwS20g=", "narHash": "sha256-8aVBqyJ4OjR8EKDZqHL+Ru+s0pREGww0rRy7NEzoffo=",
"owner": "basecamp", "owner": "basecamp",
"repo": "basecamp-cli", "repo": "basecamp-cli",
"rev": "61a5591de1da9bc99c56b8072a4d6bad2c9b9e47", "rev": "5438c38064f5e7040fd5731e80e02c3852b2bdaf",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "basecamp", "owner": "basecamp",
"ref": "v0.9.0",
"repo": "basecamp-cli", "repo": "basecamp-cli",
"type": "github" "type": "github"
} }
@@ -46,11 +45,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1791368707, "lastModified": 1794299076,
"narHash": "sha256-HmIA3HZYBSBhzUF7TZ0HDx0+DyVg4iNWJhqRoG8xZjQ=", "narHash": "sha256-rCI/5+vZQJLra+5SKib2zReO/XcXpAW/5bNDKm3AyNc=",
"owner": "mulatta", "owner": "mulatta",
"repo": "buzz.nix", "repo": "buzz.nix",
"rev": "3feda8d4f2435d430e46b204d88569d99e821839", "rev": "998a22a0cb53d7059ba7cd34bbcb5630a7f56413",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -61,11 +60,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1791594108, "lastModified": 1794042290,
"narHash": "sha256-XK4KceonkwD8LuMAt/vNrz982mXJM5jeHAxMwsUXXAQ=", "narHash": "sha256-ziZn2PvCJE5JEEpqTdxXwJpPB+L3YqoCpTAMCzyaP3U=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6510408d147d8c5e6d76043e899e9251756f6a75", "rev": "f4a03c008967841f2a0b3cb7c436fc6fc31671f6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -77,11 +76,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1791717656, "lastModified": 1794335277,
"narHash": "sha256-NHZsKA3fUek3FlFk9yIAdM/+C3JlUxqHHFini7BevD0=", "narHash": "sha256-SRTUuRAa5hCaEbrxCSAkjbUC8mpwVl3OjdIS2ZmvpLw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f38d30d14a7442201671d50c86a2ec719978168e", "rev": "36c6a8ac3d1a5d1d1d899661b97f6551a2b94ca7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -112,11 +111,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1791710828, "lastModified": 1794335094,
"narHash": "sha256-Kk5uJmhse0sKaAWg2fUC7GiAJDPIdzm9xyBLjvh5EUc=", "narHash": "sha256-vjuZMwJgtDx4Bjv4Sd6FPP1ZEhrlLfdQPB//+zaZorM=",
"owner": "anomalyco", "owner": "anomalyco",
"repo": "opencode", "repo": "opencode",
"rev": "d21b0790a6c146815f28fea604e41e922f009590", "rev": "a11e57823540db9b00f0c1ff2bd4e86cb856a434",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -144,11 +143,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1791013993, "lastModified": 1793956102,
"narHash": "sha256-BiFPwFsbFnZH5GfWbQFKYuQNg+67aNQCoRSRNTeJFQc=", "narHash": "sha256-dASUovwB3DUoTm6daga0hsNZZAFCCGlUS4FPBjK0OwA=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "7470661ba2b51156048af08464b82020223dc942", "rev": "74cebce67ef6671ea48fda353a5be2d229bd2920",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -165,11 +164,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1790542030, "lastModified": 1791885023,
"narHash": "sha256-U6m0B5+ALyOLYG4OVvtguLdem7iYgN6cIP5Q1RhM+g8=", "narHash": "sha256-C3alQ2MEt0zVrUSho5NUDo3jmhbff72++bfwoqT9Omo=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "6aca3b3649eb1edf472eca3e91e6bcc0c84a6ad3", "rev": "0d6d739a833ba9a9c93034862e4a7b061a062a1c",
"type": "github" "type": "github"
}, },
"original": { "original": {
+27 -4
View File
@@ -6,7 +6,7 @@
nixpkgs-master.url = "github:NixOS/nixpkgs/master"; nixpkgs-master.url = "github:NixOS/nixpkgs/master";
basecamp = { basecamp = {
url = "github:basecamp/basecamp-cli/v0.9.0"; url = "github:basecamp/basecamp-cli";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@@ -30,23 +30,46 @@
... ...
} @ inputs: let } @ inputs: let
# Supported systems # Supported systems
systems = ["x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"]; systems = ["x86_64-linux" "aarch64-linux" "aarch64-darwin"];
# Helper function to generate an attrset for each of the systems # Helper function to generate an attrset for each of the systems
forAllSystems = nixpkgs.lib.genAttrs systems; forAllSystems = nixpkgs.lib.genAttrs systems;
# Only expose packages whose meta.platforms include the system
# (e.g. mem0 is Linux-only), so `nix flake check --all-systems` passes.
supportedOn = pkgs:
nixpkgs.lib.filterAttrs (_: nixpkgs.lib.meta.availableOn pkgs.stdenv.hostPlatform);
# Helper to create pkgs for a given system # Helper to create pkgs for a given system
pkgsFor = system: pkgsFor = system:
import nixpkgs { import nixpkgs {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
overlays = [fabricInvoke3];
}; };
# nixpkgs marks fabric broken: it pins invoke<3 and its tests fail with
# invoke 3, but the library imports and connects fine. Needed by
# azure-cli in the devops shell.
fabricInvoke3 = _: prev: {
pythonPackagesExtensions =
prev.pythonPackagesExtensions
++ [
(_: pyPrev: {
fabric = pyPrev.fabric.overridePythonAttrs (old: {
doCheck = false;
pythonRelaxDeps = ["invoke"];
meta = old.meta // {broken = false;};
});
})
];
};
in { in {
# Custom packages - accessible via 'nix build .#package-name' # Custom packages - accessible via 'nix build .#package-name'
packages = forAllSystems (system: let packages = forAllSystems (system: let
pkgs = pkgsFor system; pkgs = pkgsFor system;
in in
import ./pkgs {inherit pkgs inputs;}); supportedOn pkgs (import ./pkgs {inherit pkgs inputs;}));
# Overlays - can be imported in your system configuration # Overlays - can be imported in your system configuration
overlays = import ./overlays {inherit inputs;}; overlays = import ./overlays {inherit inputs;};
@@ -88,7 +111,7 @@
# Checks for 'nix flake check' - verifies all packages build # Checks for 'nix flake check' - verifies all packages build
checks = forAllSystems (system: let checks = forAllSystems (system: let
pkgs = pkgsFor system; pkgs = pkgsFor system;
packages = import ./pkgs {inherit pkgs inputs;}; packages = supportedOn pkgs (import ./pkgs {inherit pkgs inputs;});
in in
builtins.mapAttrs (name: pkg: pkgs.lib.hydraJob pkg) packages builtins.mapAttrs (name: pkg: pkgs.lib.hydraJob pkg) packages
// { // {
+111 -23
View File
@@ -5,51 +5,139 @@
# field. The old lockfile-integrity workaround is therefore obsolete and has # field. The old lockfile-integrity workaround is therefore obsolete and has
# been removed. # been removed.
# #
# n8n >= 2.37.0 demands pnpm >= 11.22.0 via `engines.pnpm`, but the pinned # n8n >= 2.45 switched to pnpm 12 (packageManager pnpm@12.4.2, engines.pnpm
# nixpkgs only ships pnpm_10 (10.34.5) and pnpm_11 (11.17.0) — both too old. # ">=12.4.2"), and its pnpm-lock.yaml now serialises pnpm-12 constructs
# pnpm enforces that gate for ITSELF regardless of `engine-strict`, so both # (packageManagerDependencies, `patch_hash` keys for patchedDependencies).
# fetchPnpmDeps and the main build die with ERR_PNPM_UNSUPPORTED_ENGINE # pnpm_11 dies on that lockfile with ERR_PNPM_LOCKFILE_MISSING_DEPENDENCY
# before any hash mismatch is even reached. Additionally n8n's lockfile, # (no entry for 'lodash@4.18.1(patch_hash=...)'). The pinned nixpkgs ships
# while still declaring lockfileVersion '9.0', now serialises # pnpm_12 (12.9.0 >= 12.4.2), so fetch and build with pnpm_12. The
# patchedDependencies as plain `name@version: hash` scalars (no `path:` # engines.pnpm relaxation stays as a safety net for future upstream floor
# mapping), which pnpm 10 cannot parse (ERR_PNPM_LOCKFILE_CONFIG_MISMATCH). # bumps ahead of nixpkgs — pnpm enforces that gate for ITSELF regardless of
# We therefore build with pnpm_11 + fetcherVersion 4 and relax the engine # engine-strict, so both fetchPnpmDeps and the main build would otherwise
# gate in package.json. Drop the sed once nixpkgs ships pnpm >= 11.22 and # die with ERR_PNPM_UNSUPPORTED_ENGINE before any hash mismatch is reached.
# this overlay's nixpkgs pin has caught up.
relaxPnpmEngine = '' relaxPnpmEngine = ''
sed -i -E 's/"pnpm": *"[^"]*"/"pnpm": "*"/' package.json sed -i -E 's/"pnpm": *"[^"]*"/"pnpm": "*"/' package.json
''; '';
# n8n@2.45.5 ships an internally inconsistent pnpm-lock.yaml: the
# patchedDependencies section declares lodash@4.18.1 with patch hash
# 0384abb0…, but two snapshot references (inside @malept/flatpak-bundler
# and electron-winstaller, both electron-builder dev deps) still point at
# the hash of a PREVIOUS version of patches/lodash@4.18.1.patch
# (81ead1b0…), for which no snapshot entry exists. pnpm 12.4.2 (upstream's
# packageManager) tolerates that, pnpm >= 12.9 refuses with
# ERR_PNPM_INCONSISTENT_PATCH_HASH. Rewrite the stale references to the
# declared hash — exactly what `pnpm install --no-frozen-lockfile` would
# converge to. The sed is a no-op once upstream regenerates the lockfile.
#
# n8n@2.47.3 has the same class of defect again: the override
# `undici@7: catalog:undici-v7` was bumped to ^7.30.1 and the package entry
# undici@7.29.1 dropped from the lockfile, but the snapshot of
# @ai-sdk/provider-utils@5.0.70 (added via minimumReleaseAgeExclude) still
# lists `undici: 7.29.1`. pnpm >= 12.9 refuses with
# ERR_PNPM_LOCKFILE_MISSING_DEPENDENCY ("no entry for 'undici@7.29.1'").
# Point the stale reference at the entry that exists (7.30.1), which is
# exactly where the override resolves it anyway. No-op on clean lockfiles.
fixUpstreamLockfile = ''
sed -i 's/patch_hash=81ead1b07fc8efda87bd2724dbd876ab49f4a0aa03f96c3770060b2ea47d9e0b/patch_hash=0384abb0bf57b0811e09219dbce0b926741d818285ee77526ad4cb75a60b87a1/g' pnpm-lock.yaml
sed -i -E 's/^(\s+undici: )7\.29\.1$/\17.30.1/' pnpm-lock.yaml
'';
# After `pnpm prune --prod` (pnpm 12), walk every workspace package and
# restore each peerDependency that is no longer linked in its node_modules
# from the hoisted copy in node_modules/.pnpm/node_modules (see the
# preInstall comment below). Links are relative so they survive the move
# into $out. Peers with no hoisted copy (e.g. n8n-workflow in the node-cli
# templates) are left alone — they were never linked before either.
relinkPrunedPeers = ''
echo "Re-linking peer dependencies dropped by pnpm prune"
find packages -name node_modules -prune -o -name package.json -type f -print \
| node -e '
const fs = require("fs"), path = require("path");
const hoisted = path.resolve("node_modules/.pnpm/node_modules");
let relinked = 0;
for (const pkgJson of fs.readFileSync(0, "utf8").split("\n").filter(Boolean)) {
let pkg;
try { pkg = JSON.parse(fs.readFileSync(pkgJson, "utf8")); } catch { continue; }
const pkgDir = path.dirname(pkgJson);
for (const name of Object.keys(pkg.peerDependencies || {})) {
const link = path.join(pkgDir, "node_modules", name);
const target = path.join(hoisted, name);
if (fs.existsSync(link) || !fs.existsSync(target)) continue;
try { fs.unlinkSync(link); } catch {} // dangling leftover
fs.mkdirSync(path.dirname(link), { recursive: true });
fs.symlinkSync(path.relative(path.dirname(link), target), link);
relinked++;
}
}
console.log("Re-linked " + relinked + " pruned peer dependencies");
'
'';
in in
prev.n8n.overrideAttrs (finalAttrs: previousAttrs: { prev.n8n.overrideAttrs (finalAttrs: previousAttrs: {
version = "2.42.6"; version = "2.47.7";
src = prev.fetchFromGitHub { src = prev.fetchFromGitHub {
owner = "n8n-io"; owner = "n8n-io";
repo = "n8n"; repo = "n8n";
tag = "n8n@${finalAttrs.version}"; tag = "n8n@${finalAttrs.version}";
hash = "sha256-bYf0Dgh213RInRNUzZ64YtZFelANhdutgGGWBphjhOU="; hash = "sha256-Q9C8hGBwUlXh00+snHUknSAPKySgUm8rwLmcZCuAHmQ=";
}; };
pnpmDeps = prev.fetchPnpmDeps { pnpmDeps = prev.fetchPnpmDeps {
inherit (finalAttrs) pname version src; inherit (finalAttrs) pname version src;
pnpm = prev.pnpm_11; pnpm = prev.pnpm_12;
fetcherVersion = 4; fetcherVersion = 4;
postPatch = relaxPnpmEngine; postPatch = relaxPnpmEngine + fixUpstreamLockfile;
hash = "sha256-Dc0+xbNbgiZWnDefLpRdLag8ncBkjNXpZVrlz42jG+k="; hash = "sha256-np4qMhJJBwpEJA/Zac1WEueUmaufs2wLBaa1BUiBgcM=";
}; };
postPatch = (previousAttrs.postPatch or "") + relaxPnpmEngine; postPatch = (previousAttrs.postPatch or "") + relaxPnpmEngine + fixUpstreamLockfile;
# Swap pnpm_10 -> pnpm_11 from the inherited nativeBuildInputs: upstream # Swap the inherited pnpm (any major < 12) for pnpm_12: upstream n8n
# n8n calls pnpm directly during the build (install/build/prune) and pnpm 10 # calls pnpm directly during the build (install/build/prune) and older
# cannot parse the pnpm-11 lockfile. The top-level pnpmConfigHook stays as # majors cannot parse the pnpm-12 lockfile (see comment above). The
# is — it discovers the fetcher version from pnpmDeps' .fetcher-version. # top-level pnpmConfigHook stays as is — it discovers the fetcher version
# from pnpmDeps' .fetcher-version. Match by pname/version, never by
# outPath: forcing e.g. prev.pnpm_10.outPath instantiates that
# derivation, and on nixpkgs pins where pnpm_10 is insecure-marked (e.g.
# nixos-26.05's pnpm 10.34.0) the comparison itself throws "Refusing to
# evaluate" — even though the package is only being discarded here.
# pname/version are plain attrs and force nothing.
nativeBuildInputs = builtins.map (x: nativeBuildInputs = builtins.map (x:
if (x.outPath or null) == prev.pnpm_10.outPath if (x.pname or null) == "pnpm" && prev.lib.versionOlder (x.version or "12") "12"
then prev.pnpm_11 then prev.pnpm_12
else x) else x)
previousAttrs.nativeBuildInputs; previousAttrs.nativeBuildInputs;
# Upstream preInstall runs `pnpm prune --prod`. n8n >= 2.45 sets
# `minimumReleaseAge: 2880` in pnpm-workspace.yaml, and pnpm 12 enforces
# that supply-chain policy on prune by fetching registry metadata for every
# lockfile entry. In the network-less sandbox that stalls the build
# indefinitely right after "Removing non-deterministic and unnecessary
# files". The lockfile is fixed by pnpmDeps' hash anyway, so disable the
# check for prune and force --offline so any future registry access fails
# fast instead of hanging.
#
# pnpm 12 also changed what `prune --prod` keeps: a peerDependency that a
# workspace package only satisfies via its own devDependencies (n8n's
# convention for zod, pg, sqlite3, @langchain/core, …) is now dropped
# from that package's node_modules, whereas pnpm 11 kept the link. The
# packages are still in the store (other prod deps need them) and, with
# `hoist: true`, still linked from node_modules/.pnpm/node_modules — but
# Node's resolver never looks there, so n8n dies at startup with
# "Cannot find module 'zod'" from packages/workflow. Re-link every
# missing peer from the hoisted directory right after the prune.
preInstall =
builtins.replaceStrings
["CI=true pnpm --ignore-scripts prune --prod -w"]
[
''
CI=true pnpm --ignore-scripts --offline --config.minimum-release-age=0 prune --prod -w
${relinkPrunedPeers}''
]
previousAttrs.preInstall;
preBuild = preBuild =
(previousAttrs.preBuild or "") (previousAttrs.preBuild or "")
+ '' + ''
+24 -4
View File
@@ -71,8 +71,11 @@ TAG_PREFIX="n8n@"
# ── 1. Latest stable release ─────────────────────────────────────────────── # ── 1. Latest stable release ───────────────────────────────────────────────
echo "Fetching latest stable release of $REPO ..." echo "Fetching latest stable release of $REPO ..."
# `|| true` keeps `set -euo pipefail` from killing the script inside the
# substitution on curl/jq failure (e.g. network down) — the empty-value
# check below then produces the actual error message.
LATEST_TAG=$(curl -fsSL "https://api.github.com/repos/$REPO/releases/latest" | LATEST_TAG=$(curl -fsSL "https://api.github.com/repos/$REPO/releases/latest" |
jq -r 'select(.prerelease == false) | .tag_name') jq -r 'select(.prerelease == false) | .tag_name' || true)
if [[ -z "$LATEST_TAG" ]]; then if [[ -z "$LATEST_TAG" ]]; then
echo "ERROR: No stable release found for $REPO" >&2 echo "ERROR: No stable release found for $REPO" >&2
@@ -114,8 +117,14 @@ sed -i "s|^\([[:space:]]*\)version = \"[^\"]*\";|\1version = \"$VERSION\";|" "$N
echo "==> Computing src hash ..." echo "==> Computing src hash ..."
SRC_URL="https://github.com/$REPO/archive/refs/tags/${TAG_PREFIX}${VERSION}.tar.gz" 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 # `--name n8n-source` works around the `@` in the upstream tag name
# (nix-prefetch-url refuses filenames containing `@`). # (nix-prefetch-url refuses filenames containing `@`). `|| true` + guard so a
SRC_HASH=$(nix-prefetch-url --unpack --type sha256 --name n8n-source "$SRC_URL" 2>/dev/null) # prefetch failure (network, rate limit, vanished tag) prints an error instead
# of dying silently under `set -e` (stderr is discarded on purpose above).
SRC_HASH=$(nix-prefetch-url --unpack --type sha256 --name n8n-source "$SRC_URL" 2>/dev/null || true)
if [[ -z "$SRC_HASH" ]]; then
echo "ERROR: nix-prefetch-url could not fetch/hash $SRC_URL" >&2
exit 1
fi
SRC_SRI=$(nix hash convert --hash-algo sha256 --to sri "$SRC_HASH") SRC_SRI=$(nix hash convert --hash-algo sha256 --to sri "$SRC_HASH")
echo " src hash: $SRC_SRI" echo " src hash: $SRC_SRI"
@@ -155,10 +164,15 @@ BUILD_OUTPUT=$(nix build --impure --no-link --expr "$NIX_EXPR" 2>&1 || true)
# "specified"/"Expected" and the correct one as "got:"/"Got:". Different nix # "specified"/"Expected" and the correct one as "got:"/"Got:". Different nix
# versions label/capitalise differently, so filter out the sentinel and take # versions label/capitalise differently, so filter out the sentinel and take
# whatever real sha256 remains. # whatever real sha256 remains.
#
# The trailing `|| true` is load-bearing: with `set -euo pipefail` a pipeline
# like `grep -oE | grep -v | tail` returns non-zero when NO hash is present
# (grep finds nothing / grep -v filters everything), which used to abort the
# script right here — silently, before the diagnostics below could run.
PNPM_HASH=$(echo "$BUILD_OUTPUT" | PNPM_HASH=$(echo "$BUILD_OUTPUT" |
grep -oE 'sha256-[A-Za-z0-9+/=]+' | grep -oE 'sha256-[A-Za-z0-9+/=]+' |
grep -v 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' | grep -v 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' |
tail -1) tail -1 || true)
if [[ -z "$PNPM_HASH" ]]; then if [[ -z "$PNPM_HASH" ]]; then
echo "ERROR: could not extract a pnpmDeps hash from the build output." >&2 echo "ERROR: could not extract a pnpmDeps hash from the build output." >&2
@@ -170,6 +184,12 @@ if [[ -z "$PNPM_HASH" ]]; then
echo " Cause: the pinned pnpm cannot parse upstream's pnpm-lock.yaml" >&2 echo " Cause: the pinned pnpm cannot parse upstream's pnpm-lock.yaml" >&2
echo " anymore (lockfile serialisation changed across pnpm majors)." >&2 echo " anymore (lockfile serialisation changed across pnpm majors)." >&2
echo " Bump the pnpm major and fetcherVersion in $NIX_FILE." >&2 echo " Bump the pnpm major and fetcherVersion in $NIX_FILE." >&2
elif grep -q 'ERR_PNPM_LOCKFILE_MISSING_DEPENDENCY' <<<"$BUILD_OUTPUT"; then
echo " Cause: the pinned pnpm cannot resolve upstream's pnpm-lock.yaml" >&2
echo " (upstream serialises newer lockfile constructs, e.g. patched-" >&2
echo " dependency patch_hash keys, that this pnpm major mishandles)." >&2
echo " Bump the pnpm major in $NIX_FILE (fetchPnpmDeps AND the" >&2
echo " nativeBuildInputs swap threshold)." >&2
else else
echo " This usually means fetchPnpmDeps failed for a reason OTHER than" >&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 hash mismatch (e.g. a pnpm-lock patch in n8n.nix no longer applies," >&2
+2 -2
View File
@@ -9,14 +9,14 @@
}: }:
buildGoModule (finalAttrs: { buildGoModule (finalAttrs: {
pname = "agent-lib"; pname = "agent-lib";
version = "0.2.0"; version = "0.3.0";
src = fetchFromGitea { src = fetchFromGitea {
domain = "code.m3ta.dev"; domain = "code.m3ta.dev";
owner = "m3tam3re"; owner = "m3tam3re";
repo = "agent-lib"; repo = "agent-lib";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-2FXxL7ubbvLYDFZLURtt0UZVZ0RaHTTTJcq7TxBtdqY="; hash = "sha256-BM2CO2kL6HBTrKqu7DNAF8blV36nkmieDlooUaa0cjU=";
}; };
vendorHash = "sha256-92PSYpat2+rbHP9vu58tg7378tyxTGvwi7KtrYn7y+4="; vendorHash = "sha256-92PSYpat2+rbHP9vu58tg7378tyxTGvwi7KtrYn7y+4=";
+6 -7
View File
@@ -13,7 +13,7 @@
# crunch — Voice-notified reminders & AI crunch jobs # crunch — Voice-notified reminders & AI crunch jobs
# via systemd transient timers. # via systemd transient timers.
# #
# Requires: talk (ElevenLabs TTS) in PATH, ELEVENLABS_API_KEY env. # Requires: talk in PATH (TTS keys via TALK_ELEVENLABS_KEY etc.).
# Optional: pi, opencode for AI crunch mode. # Optional: pi, opencode for AI crunch mode.
# ═══════════════════════════════════════════════════════════════ # ═══════════════════════════════════════════════════════════════
@@ -51,8 +51,7 @@
crunch cancel mll-rausbringen-12345 crunch cancel mll-rausbringen-12345
Environment: Environment:
VOICE_NOTIFY=0 Silence voice output (passed to talk) TALK_ELEVENLABS_KEY ElevenLabs key for talk (optional, falls back to free voices)
ELEVENLABS_API_KEY Required by talk
TALK Override path to talk binary TALK Override path to talk binary
EOF EOF
} }
@@ -130,16 +129,16 @@
case "''${1:-}" in case "''${1:-}" in
_say) _say)
shift shift
exec "$TALK" "$*" exec "$TALK" say --wait "$*"
;; ;;
_ai) _ai)
engine="$2"; shift 2 engine="$2"; shift 2
case "$engine" in case "$engine" in
pi|pi-agent) pi|pi-agent)
pi -p "$*" | "$TALK" pi -p "$*" | "$TALK" say --wait
;; ;;
opencode|oc) opencode|oc)
opencode run "$*" -q | "$TALK" opencode run "$*" -q | "$TALK" say --wait
;; ;;
*) *)
echo "Unknown engine: $engine (use: pi, opencode)" >&2 echo "Unknown engine: $engine (use: pi, opencode)" >&2
@@ -153,7 +152,7 @@
rc=0 rc=0
output=$(bash "$script_path" "$@" 2>&1) || rc=$? output=$(bash "$script_path" "$@" 2>&1) || rc=$?
if [ -n "''${output:-}" ]; then if [ -n "''${output:-}" ]; then
printf '%s' "$output" | "$TALK" printf '%s' "$output" | "$TALK" say --wait
fi fi
exit "$rc" exit "$rc"
;; ;;
+1 -1
View File
@@ -62,7 +62,7 @@ in {
# source — no third-party binary cache. First build is slow (Rust + Tauri # source — no third-party binary cache. First build is slow (Rust + Tauri
# + sherpa-onnx); subsequent builds are cached in the local nix store. # + sherpa-onnx); subsequent builds are cached in the local nix store.
# Note: mulatta only publishes packages for x86_64-linux, aarch64-linux, # Note: mulatta only publishes packages for x86_64-linux, aarch64-linux,
# aarch64-darwin — x86_64-darwin will throw at build time. # aarch64-darwin.
buzz-desktop = inputs.buzz.packages.${system}.buzz-desktop; buzz-desktop = inputs.buzz.packages.${system}.buzz-desktop;
buzz = inputs.buzz.packages.${system}.buzz-desktop; buzz = inputs.buzz.packages.${system}.buzz-desktop;
} }
+93 -86
View File
@@ -3,100 +3,107 @@
nix-update-script, nix-update-script,
python3, python3,
fetchFromGitHub, fetchFromGitHub,
}: }: let
python3.pkgs.buildPythonPackage rec { # nixpkgs marks posthog broken because its test suite fails with mcp >= 2;
pname = "mem0ai"; # the library itself works, so skip its tests instead.
version = "2.0.2"; posthog = python3.pkgs.posthog.overridePythonAttrs (old: {
pyproject = true; doCheck = false;
meta = old.meta // {broken = false;};
});
in
python3.pkgs.buildPythonPackage rec {
pname = "mem0ai";
version = "2.0.2";
pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mem0ai"; owner = "mem0ai";
repo = "mem0"; repo = "mem0";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-SV/+v0WmR6iZyyhPIXtj0PcIpPlSclak0zuSsIGebUo="; hash = "sha256-SV/+v0WmR6iZyyhPIXtj0PcIpPlSclak0zuSsIGebUo=";
}; };
# Relax Python dependency version constraints # Relax Python dependency version constraints
# mem0 has strict version pins that may not match nixpkgs versions # mem0 has strict version pins that may not match nixpkgs versions
pythonRelaxDeps = true; pythonRelaxDeps = true;
build-system = with python3.pkgs; [ build-system = with python3.pkgs; [
hatchling hatchling
];
dependencies = with python3.pkgs; [
litellm
qdrant-client
pydantic
openai
posthog
pytz
sqlalchemy
protobuf
uvicorn
fastapi
];
optional-dependencies = with python3.pkgs; {
graph = [
# Note: some graph dependencies may not be available in nixpkgs
# neo4j is available, others will need to be packaged separately
]; ];
vector_stores = [
# chromadb # available in nixpkgs dependencies = with python3.pkgs; [
# pinecone-client # may need packaging litellm
# weaviate-client # may need packaging qdrant-client
# faiss # available as faiss-cpu pydantic
psycopg
pymongo
pymysql
redis
elasticsearch
];
llms = [
groq
openai openai
# together # may need packaging posthog
# litellm # may need packaging pytz
# ollama # may need packaging sqlalchemy
# google-generativeai # may need packaging protobuf
uvicorn
fastapi
]; ];
extras = [
boto3
# langchain-community # may need packaging
# sentence-transformers # may need packaging
elasticsearch
# fastembed # may need packaging
];
};
# Skip tests for now since they require additional test dependencies optional-dependencies = with python3.pkgs; {
doCheck = false; graph = [
# Note: some graph dependencies may not be available in nixpkgs
# neo4j is available, others will need to be packaged separately
];
vector_stores = [
# chromadb # available in nixpkgs
# pinecone-client # may need packaging
# weaviate-client # may need packaging
# faiss # available as faiss-cpu
psycopg
pymongo
pymysql
redis
elasticsearch
];
llms = [
groq
openai
# together # may need packaging
# litellm # may need packaging
# ollama # may need packaging
# google-generativeai # may need packaging
];
extras = [
boto3
# langchain-community # may need packaging
# sentence-transformers # may need packaging
elasticsearch
# fastembed # may need packaging
];
};
# Disable imports check because mem0 tries to create directories at import time # Skip tests for now since they require additional test dependencies
# which fails in the Nix sandbox (/homeless-shelter) doCheck = false;
pythonImportsCheck = [];
postInstall = '' # Disable imports check because mem0 tries to create directories at import time
install -Dm755 ${./server.py} $out/bin/mem0-server # which fails in the Nix sandbox (/homeless-shelter)
''; pythonImportsCheck = [];
passthru.updateScript = nix-update-script {}; postInstall = ''
install -Dm755 ${./server.py} $out/bin/mem0-server
meta = with lib; {
description = "Long-term memory layer for AI agents with REST API support";
longDescription = ''
Mem0 provides a sophisticated memory layer for AI applications, offering:
- Memory management for AI agents (add, search, update, delete)
- REST API server for easy integration
- Support for multiple vector storage backends (Qdrant, Chroma, etc.)
- Graph memory capabilities
- Multi-modal support
- Configurable LLM and embedding models
''; '';
homepage = "https://github.com/mem0ai/mem0";
changelog = "https://github.com/mem0ai/mem0/releases/tag/v${version}"; passthru.updateScript = nix-update-script {};
license = licenses.asl20;
platforms = platforms.linux; meta = with lib; {
}; description = "Long-term memory layer for AI agents with REST API support";
} longDescription = ''
Mem0 provides a sophisticated memory layer for AI applications, offering:
- Memory management for AI agents (add, search, update, delete)
- REST API server for easy integration
- Support for multiple vector storage backends (Qdrant, Chroma, etc.)
- Graph memory capabilities
- Multi-modal support
- Configurable LLM and embedding models
'';
homepage = "https://github.com/mem0ai/mem0";
changelog = "https://github.com/mem0ai/mem0/releases/tag/v${version}";
license = licenses.asl20;
platforms = platforms.linux;
};
}
+3 -3
View File
@@ -35,7 +35,7 @@
in in
rustPlatform.buildRustPackage (finalAttrs: { rustPlatform.buildRustPackage (finalAttrs: {
pname = "photocraft"; pname = "photocraft";
version = "0.7.0"; version = "0.16.0";
# AppStream <releases> date of the GitHub release — bump together with `version`. # AppStream <releases> date of the GitHub release — bump together with `version`.
releaseDate = "2026-10-11"; releaseDate = "2026-10-11";
@@ -44,10 +44,10 @@ in
owner = "storytold"; owner = "storytold";
repo = "photocraft"; repo = "photocraft";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-XyRDSkGAw1W9kF61nujHkgIR7TkTjrQbbcu+tSxWjXU="; hash = "sha256-uaZmzQb4B1zZ2XrZHjHzI/uEVGdoYRFeh10GHIxzjDA=";
}; };
cargoHash = "sha256-kpNg04RP5XbtW2rMaXUmGIKRJIqJmi7fmTbs5qHTLto="; cargoHash = "sha256-O1tUKAWSvLmOEUbpVub8bczHpoXH6XxXKSPGRVkjsHs=";
# Match the official release builds (CI builds with `--features heif`): # Match the official release builds (CI builds with `--features heif`):
# HEIC/HEIF reading via pure-Rust heic-rs — no native C dependency. # HEIC/HEIF reading via pure-Rust heic-rs — no native C dependency.
+5 -2
View File
@@ -1,4 +1,5 @@
{ {
lib,
writeShellScriptBin, writeShellScriptBin,
rofi, rofi,
libnotify, libnotify,
@@ -7,7 +8,9 @@
gnused, gnused,
jq, jq,
}: }:
writeShellScriptBin "rofi-project-opener" '' # rofi and libnotify are Linux-only.
lib.addMetaAttrs {platforms = lib.platforms.linux;}
(writeShellScriptBin "rofi-project-opener" ''
#!/usr/bin/env bash #!/usr/bin/env bash
# rofi-project-opener - Rofi-based project directory launcher # rofi-project-opener - Rofi-based project directory launcher
@@ -178,4 +181,4 @@ writeShellScriptBin "rofi-project-opener" ''
cd '$project_path' && opencode $project_args cd '$project_path' && opencode $project_args
" "
fi fi
'' '')
-98
View File
@@ -1,98 +0,0 @@
# talk
ElevenLabs TTS voice notifications with a dismissable desktop popup. Generates speech from text via the ElevenLabs API, plays it through `mpv`, and shows a notification with a **⛔ Abbrechen** button to stop playback.
## Usage
### Argument
```bash
talk "Build abgeschlossen. Alle Tests erfolgreich."
```
### Stdin (pipe)
```bash
echo "Deployment fertig" | talk
nixos-rebuild build 2>&1 | tail -3 | talk
pi -p "Fasse zusammen" | talk
```
## Environment Variables
| Variable | Required | Default | Description |
|---|---|---|---|
| `ELEVENLABS_API_KEY` | ⚠️ | — | Fallback if agenix file is absent |
| `ELEVENLABS_KEY_FILE` | ❌ | `/run/agenix/elevenlabs-key` | Path to agenix secrets file (preferred) |
| `ELEVENLABS_VOICE_ID` | ❌ | `KXxZd16DiBqt82nbarJx` | Voice ID to use |
| `VOICE_NOTIFY` | ❌ | `1` | Set to `0` to silence all output |
The API key is read from the agenix file at `/run/agenix/elevenlabs-key` by default. The file should contain just the key (trailing newline is stripped automatically via `read -r`). If the file doesn't exist, `talk` falls back to the `ELEVENLABS_API_KEY` environment variable.
## How It Works
1. Sends text to ElevenLabs `text-to-speech` API → receives MP3
2. Plays audio via `mpv` (background)
3. Shows `notify-send` popup with **⛔ Abbrechen** action (background)
4. Polls every 0.2s:
- If mpv finished → kill notification, exit
- If user clicked **Abbrechen** → kill mpv, exit
5. Cleans up temp files on exit
## Cancel Button
The notification popup has a **⛔ Abbrechen** action button. Clicking it kills `mpv` playback immediately. The popup disappears when audio finishes or is cancelled.
The poll loop uses `[ -s ]` (non-empty file check) on the action output file. This ensures the loop only reacts when `notify-send` actually writes the action key — not when the empty file is created by the shell redirect.
## Integration Patterns
### After long-running tasks
```bash
nixos-rebuild switch 2>&1 | tail -5 | talk
```
### With AI agents (print mode)
```bash
# Pi
pi -p "Review diesen Code" | talk
# OpenCode
opencode run "Erkläre diese Funktion" -q | talk
```
### With crunch (scheduled jobs)
```bash
crunch ai pi daily "08:00" "Fasse Basecamp Todos zusammen"
# → talk speaks the summary at 08:00
```
## NixOS Installation
```nix
# home-manager
home.packages = [ pkgs.m3ta.talk ];
```
The API key is read from `/run/agenix/elevenlabs-key` at runtime — set up the secret in your agenix configuration:
```nix
# secrets.nix
age.secrets."elevenlabs-key" = {
file = ./secrets/elevenlabs-key.age;
# Optionally set owner/group if needed
};
```
No need to export `ELEVENLABS_API_KEY` in shell environment anymore.
## Dependencies
- `curl` — API calls
- `python3` — JSON payload construction
- `mpv` — audio playback
- `libnotify` — desktop notification
- `busybox` — coreutils (rm, cat, grep, sleep, kill, stat)
+48 -122
View File
@@ -1,137 +1,63 @@
{ {
lib, lib,
stdenv, stdenv,
writeShellScriptBin, buildGoModule,
fetchurl, fetchFromGitea,
curl, makeWrapper,
python3, alsa-lib,
mpv, espeak-ng,
libnotify, libnotify,
busybox, nix-update-script,
}: let versionCheckHook,
icon = fetchurl { }:
url = "https://s3.m3tam3re.com/public/chiron.jpeg"; buildGoModule (finalAttrs: {
hash = "sha256-LIIR3aqJ5ePsZuvVQxJ70c6yd+L85fLE5uY/fLE5Ypo="; pname = "talk";
version = "0.1.2";
src = fetchFromGitea {
domain = "code.m3ta.dev";
owner = "m3tam3re";
repo = "talk";
tag = "v${finalAttrs.version}";
hash = "sha256-2goEKz/oMB/mfQpAiED+6iiAhCpOH9BbQlzsuFMjiYk=";
}; };
script = writeShellScriptBin "talk" ''
#!/usr/bin/env bash
set -euo pipefail
# ── Toggle: VOICE_NOTIFY=0 deaktiviert alles ─────────────────── vendorHash = "sha256-8B1ubNy4sap3XV83lX93NvpH3z4BNloWgkM7OB4hglo=";
if [ "''${VOICE_NOTIFY:-1}" = "0" ]; then
exit 0
fi
# ── Config ────────────────────────────────────────────────────── subPackages = ["cmd/talk"];
# API key: read from agenix file (preferred), fall back to env var.
# `read -r` strips the trailing newline that agenix files contain.
ELEVENLABS_KEY_FILE="''${ELEVENLABS_KEY_FILE:-/run/agenix/elevenlabs-key}"
if [ -f "$ELEVENLABS_KEY_FILE" ]; then
read -r API_KEY < "$ELEVENLABS_KEY_FILE"
elif [ -n "''${ELEVENLABS_API_KEY:-}" ]; then
API_KEY="''${ELEVENLABS_API_KEY}"
else
echo "Error: No ElevenLabs API key found." >&2
echo "Create $ELEVENLABS_KEY_FILE (agenix) or set ELEVENLABS_API_KEY env var." >&2
exit 1
fi
VOICE_ID="''${ELEVENLABS_VOICE_ID:-KXxZd16DiBqt82nbarJx}"
# Argument hat Vorrang, sonst stdin lesen wenn Pipe
if [ $# -ge 1 ]; then
TEXT="$1"
elif [ ! -t 0 ]; then
TEXT=$(cat)
else
echo "Usage: talk \"Text\" oder echo Text | talk" >&2
exit 1
fi
AUDIO_FILE="/tmp/voice-notify-$$.mp3"
ACTION_FILE="/tmp/voice-action-$$"
CURL="${lib.getExe curl}" env.CGO_ENABLED = 0;
PYTHON="${lib.getExe python3}"
MPV="${lib.getExe mpv}"
NOTIFY="${lib.getExe libnotify}"
RM="${busybox}/bin/rm"
CAT="${busybox}/bin/cat"
GREP="${busybox}/bin/grep"
SLEEP="${busybox}/bin/sleep"
KILL="${busybox}/bin/kill"
STAT="${busybox}/bin/stat"
trap '$RM -f "$AUDIO_FILE" "$ACTION_FILE"' EXIT ldflags = [
"-s"
"-w"
"-X"
"main.version=${finalAttrs.version}"
];
# ── TTS generieren ────────────────────────────────────────────── # The process-boundary tests start daemons and bind ports; not in the sandbox.
PAYLOAD=$("$PYTHON" -c ' doCheck = false;
import json, sys
print(json.dumps({
"text": sys.argv[1],
"model_id": "eleven_multilingual_v2",
"voice_settings": {"stability": 0.5, "similarity_boost": 0.75}
}))
' "$TEXT")
HTTP_CODE=$("$CURL" -s -o "$AUDIO_FILE" -w "%{http_code}" \ # oto talks to PulseAudio/PipeWire directly and falls back to ALSA via
-X POST "https://api.elevenlabs.io/v1/text-to-speech/''${VOICE_ID}" \ # dlopen; espeak-ng is the OS voice, libnotify the toast.
-H "xi-api-key: ''${API_KEY}" \ nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [makeWrapper];
-H "Content-Type: application/json" \ postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
-d "$PAYLOAD") || HTTP_CODE="000" wrapProgram $out/bin/talk \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [alsa-lib]} \
if [ "$HTTP_CODE" != "200" ]; then --prefix PATH : ${lib.makeBinPath [espeak-ng libnotify]}
ERR=$($CAT "$AUDIO_FILE" 2>/dev/null | head -c 300)
$RM -f "$AUDIO_FILE"
"$NOTIFY" -u critical "❌ Voice Fehler" "HTTP ''${HTTP_CODE}\n''${ERR}"
exit 1
fi
# ── Gleichzeitig: Audio + Notification ──────────────────────────
"$MPV" --no-video --no-terminal --really-quiet "$AUDIO_FILE" &
MPV_PID=$!
(
exec "$NOTIFY" \
--action=cancel="⛔ Abbrechen" \
--urgency=normal \
--icon=${icon} \
"🔊 KI Antwort" \
"$TEXT" > "$ACTION_FILE" 2>/dev/null
) &
NOTIFY_PID=$!
# ── Poll-Loop ───────────────────────────────────────────────────
while true; do
if ! $KILL -0 "$MPV_PID" 2>/dev/null; then
$KILL "$NOTIFY_PID" 2>/dev/null || true
break
fi
if [ -s "$ACTION_FILE" ]; then
if $GREP -q "cancel" "$ACTION_FILE" 2>/dev/null; then
$KILL "$MPV_PID" 2>/dev/null || true
fi
break
fi
$SLEEP 0.2
done
wait "$MPV_PID" 2>/dev/null || true
''; '';
in
stdenv.mkDerivation {
pname = "talk";
version = "0.1.0";
dontUnpack = true; nativeInstallCheckInputs = [versionCheckHook];
versionCheckProgramArg = "version";
doInstallCheck = true;
installPhase = '' passthru.updateScript = nix-update-script {};
mkdir -p "$out/bin"
ln -s ${script}/bin/talk "$out/bin/talk"
'';
meta = with lib; { meta = with lib; {
description = "ElevenLabs TTS voice notifications with dismissable popup"; description = "Voice notifications for scripts and AI agents";
homepage = "https://code.m3ta.dev/m3tam3re/nixpkgs"; homepage = "https://code.m3ta.dev/m3tam3re/talk";
license = licenses.mit; license = licenses.mit;
platforms = platforms.linux; mainProgram = "talk";
mainProgram = "talk"; platforms = platforms.unix;
}; };
} })
+13 -7
View File
@@ -6,12 +6,12 @@
makeWrapper, makeWrapper,
}: let }: let
pname = "vibetyper"; pname = "vibetyper";
version = "1.6.0"; version = "1.6.5";
# Upstream publishes to an unversioned URL — ./update.sh watches Last-Modified # Upstream publishes to an unversioned URL — ./update.sh watches Last-Modified
# and refreshes the sha256 when the binary changes. Bump `version` manually. # and refreshes the sha256 when the binary changes. Bump `version` manually.
src = fetchurl { src = fetchurl {
url = "https://cdn.vibetyper.com/releases/linux/VibeTyper.AppImage"; url = "https://cdn.vibetyper.com/releases/linux/VibeTyper.AppImage";
sha256 = "sha256-cpwm84imz0rxyQTPfmO6JdVmN2eqFur8oizEA4yv+xo="; sha256 = "sha256-Z0Jn3rLNfbb/8EnRWO+9xyIjCsyHmU3mBAOpw0ifUbI=";
}; };
appimageContents = appimageTools.extract {inherit pname version src;}; appimageContents = appimageTools.extract {inherit pname version src;};
in in
@@ -20,14 +20,20 @@ in
nativeBuildInputs = [makeWrapper]; nativeBuildInputs = [makeWrapper];
extraPkgs = pkgs: [pkgs.fuse2]; # The AppImage bundles libgcrypt.so.20 but not its dependency
# libgpg-error.so.0, which the FHS env does not provide.
extraPkgs = pkgs: [pkgs.libgpg-error];
extraInstallCommands = '' extraInstallCommands = ''
install -m 444 -D ${appimageContents}/vibe-typer.desktop -t $out/share/applications # Upstream 1.6.0 renamed the desktop file to "Vibe Typer.desktop"
# (Exec=vibe-typer); install it under the old lowercase name and point
# Exec at the wrapper binary.
install -m 444 -D "${appimageContents}/usr/share/applications/Vibe Typer.desktop" \
$out/share/applications/vibe-typer.desktop
substituteInPlace $out/share/applications/vibe-typer.desktop \ substituteInPlace $out/share/applications/vibe-typer.desktop \
--replace 'Exec=AppRun --no-sandbox' 'Exec=${pname}' --replace 'Exec=vibe-typer' 'Exec=${pname}'
install -m 444 -D ${appimageContents}/vibe-typer.png \ install -m 444 -D "${appimageContents}/Vibe Typer.png" \
$out/share/icons/hicolor/512x512/apps/vibe-typer.png $out/share/icons/hicolor/256x256/apps/vibe-typer.png
wrapProgram $out/bin/${pname} \ wrapProgram $out/bin/${pname} \
--set VIBE_DISABLE_HYPRLAND_INDICATOR_NO_BLUR 1 --set VIBE_DISABLE_HYPRLAND_INDICATOR_NO_BLUR 1
''; '';
+19 -3
View File
@@ -15,14 +15,21 @@
modifiedPkgs = mkPkgs [self.overlays.modifications]; modifiedPkgs = mkPkgs [self.overlays.modifications];
defaultPkgs = mkPkgs [self.overlays.default]; defaultPkgs = mkPkgs [self.overlays.default];
expectedVersion = "2.42.6"; expectedVersion = "2.47.7";
expectedSrcHash = "sha256-bYf0Dgh213RInRNUzZ64YtZFelANhdutgGGWBphjhOU="; expectedSrcHash = "sha256-Q9C8hGBwUlXh00+snHUknSAPKySgUm8rwLmcZCuAHmQ=";
expectedPnpmHash = "sha256-Dc0+xbNbgiZWnDefLpRdLag8ncBkjNXpZVrlz42jG+k="; expectedPnpmHash = "sha256-np4qMhJJBwpEJA/Zac1WEueUmaufs2wLBaa1BUiBgcM=";
expectedChangelog = "https://github.com/n8n-io/n8n/releases/tag/n8n@${expectedVersion}"; expectedChangelog = "https://github.com/n8n-io/n8n/releases/tag/n8n@${expectedVersion}";
expectedRootNodeModuleSymlinks = [ expectedRootNodeModuleSymlinks = [
"ln -s .pnpm/node_modules/sass-embedded node_modules/sass-embedded" "ln -s .pnpm/node_modules/sass-embedded node_modules/sass-embedded"
"ln -s .pnpm/node_modules/sqlite3 node_modules/sqlite3" "ln -s .pnpm/node_modules/sqlite3 node_modules/sqlite3"
]; ];
# pnpm 12: prune must run offline without the minimumReleaseAge registry
# check, and peers it drops must be re-linked from the hoisted directory.
expectedPreInstallSnippets = [
"pnpm --ignore-scripts --offline --config.minimum-release-age=0 prune --prod -w"
"Re-linking peer dependencies dropped by pnpm prune"
"node_modules/.pnpm/node_modules"
];
checkN8nOverride = overlayName: package: checkN8nOverride = overlayName: package:
if package.version != expectedVersion if package.version != expectedVersion
@@ -44,6 +51,13 @@
if !(pkgs.lib.all (symlink: pkgs.lib.hasInfix symlink (package.preBuild or "")) expectedRootNodeModuleSymlinks) 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" then throw "${overlayName} n8n preBuild should create root node_modules symlinks required by the upstream buildPhase"
else "ok"; else "ok";
checkPreInstallPnpm12 = overlayName: package:
if !(pkgs.lib.all (snippet: pkgs.lib.hasInfix snippet (package.preInstall or "")) expectedPreInstallSnippets)
then throw "${overlayName} n8n preInstall should prune offline with pnpm 12 and re-link pruned peer dependencies"
else if pkgs.lib.hasInfix "pnpm --ignore-scripts prune --prod -w" (package.preInstall or "")
then throw "${overlayName} n8n preInstall still contains the unmodified upstream prune command"
else "ok";
in in
pkgs.runCommand "n8n-overlay-test" { pkgs.runCommand "n8n-overlay-test" {
n8nOverlayFile = n8nOverlayFile =
@@ -60,6 +74,8 @@ in
defaultOverlayBuildPhase = checkBuildPhaseInherited "overlays.default" defaultPkgs.n8n; defaultOverlayBuildPhase = checkBuildPhaseInherited "overlays.default" defaultPkgs.n8n;
modificationsOverlayRootNodeModuleSymlinks = checkRootNodeModuleSymlinks "overlays.modifications" modifiedPkgs.n8n; modificationsOverlayRootNodeModuleSymlinks = checkRootNodeModuleSymlinks "overlays.modifications" modifiedPkgs.n8n;
defaultOverlayRootNodeModuleSymlinks = checkRootNodeModuleSymlinks "overlays.default" defaultPkgs.n8n; defaultOverlayRootNodeModuleSymlinks = checkRootNodeModuleSymlinks "overlays.default" defaultPkgs.n8n;
modificationsOverlayPreInstall = checkPreInstallPnpm12 "overlays.modifications" modifiedPkgs.n8n;
defaultOverlayPreInstall = checkPreInstallPnpm12 "overlays.default" defaultPkgs.n8n;
} '' } ''
touch $out touch $out
'' ''