Compare commits
35
Commits
e751573b29
..
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4d8dea9f61 | ||
|
|
1610361eec | ||
|
|
fed965262b | ||
|
|
28a7ab59eb | ||
|
|
8972d0ec09 | ||
|
|
566bd047da | ||
|
|
04b710cc9b | ||
|
|
6919862acb | ||
|
|
f06bad7656 | ||
|
|
d37c3fa1d9 | ||
|
|
f2b7a0eab0 | ||
|
|
f243ea2de0 | ||
|
|
c06dbcd553 | ||
|
|
f53130489e | ||
|
|
919264cca8 | ||
|
|
0031c21701 | ||
|
|
1fa50fe47a | ||
|
|
4a047cb3be | ||
|
|
1c46b2bcc5 | ||
|
|
68e22ee34b | ||
|
|
14baf2a926 | ||
|
|
a63cbb2749 | ||
|
|
72695e2ef0 | ||
|
|
ed2b9fb089 | ||
|
|
239450162e | ||
|
|
ffd27fba20 | ||
|
|
b47eaf47d7 | ||
|
|
80d0dd41bc | ||
|
|
cbd7d982ef | ||
|
|
9a2927c2e0 | ||
|
|
3dbd16339a | ||
|
|
ebd79d5ca5 | ||
|
|
b857f5d038 | ||
|
|
e220f022fa | ||
|
|
7cc6d2316e |
No files matched your search
@@ -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 -->
|
||||||
@@ -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
+24
-25
@@ -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": 1788856318,
|
"lastModified": 1794299076,
|
||||||
"narHash": "sha256-bOLED82KPrzIXTWELw30y3PVI6MBmlY4Y2F2lwrdOnM=",
|
"narHash": "sha256-rCI/5+vZQJLra+5SKib2zReO/XcXpAW/5bNDKm3AyNc=",
|
||||||
"owner": "mulatta",
|
"owner": "mulatta",
|
||||||
"repo": "buzz.nix",
|
"repo": "buzz.nix",
|
||||||
"rev": "fdd0152c12c6be339fe01d91887122bb10823aaf",
|
"rev": "998a22a0cb53d7059ba7cd34bbcb5630a7f56413",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -61,11 +60,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1789006805,
|
"lastModified": 1794042290,
|
||||||
"narHash": "sha256-xB8mKMOx1IA9vTDNLmJZ6n4wCMq/cuWBBOzGCRnqxrU=",
|
"narHash": "sha256-ziZn2PvCJE5JEEpqTdxXwJpPB+L3YqoCpTAMCzyaP3U=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "8ce4ef6cb6f871616146b9fe26d2a5ae594e94fe",
|
"rev": "f4a03c008967841f2a0b3cb7c436fc6fc31671f6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -77,11 +76,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-master": {
|
"nixpkgs-master": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1789139724,
|
"lastModified": 1794335277,
|
||||||
"narHash": "sha256-QEoQ8xoSO3H2tmwHNBYFL/5Y8Gt10U+bg5ETMsWXiIM=",
|
"narHash": "sha256-SRTUuRAa5hCaEbrxCSAkjbUC8mpwVl3OjdIS2ZmvpLw=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e27e37949736566430ed2f6157bebcdade8860c5",
|
"rev": "36c6a8ac3d1a5d1d1d899661b97f6551a2b94ca7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -93,11 +92,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776683584,
|
"lastModified": 1790510107,
|
||||||
"narHash": "sha256-NuTLMrr10Tng72hurYG8jYQ4XKK8wnpJmOGcPiis96g=",
|
"narHash": "sha256-EVMNYv7hYDDD9TGVT/hIyTYgpiXA8y3m5xIEIxuGNU0=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "9dd5558b06dbdacbf635a3dd36dce1b1a7ee3a89",
|
"rev": "3181085bfd08663b6b9e60bc7a8395c2aaa741bd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -112,11 +111,11 @@
|
|||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1789132601,
|
"lastModified": 1794335094,
|
||||||
"narHash": "sha256-2+j5RuHoqrsnjssZ4VfIfSKzGdrPNFT4nazJ2QxNdu0=",
|
"narHash": "sha256-vjuZMwJgtDx4Bjv4Sd6FPP1ZEhrlLfdQPB//+zaZorM=",
|
||||||
"owner": "anomalyco",
|
"owner": "anomalyco",
|
||||||
"repo": "opencode",
|
"repo": "opencode",
|
||||||
"rev": "95daf90670b7c039c436c85537da5fbfe2205b41",
|
"rev": "a11e57823540db9b00f0c1ff2bd4e86cb856a434",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -144,11 +143,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1788591095,
|
"lastModified": 1793956102,
|
||||||
"narHash": "sha256-Vh+BeLWfbTT9AecazIsQ/Tkg/RzJeX3lEduANf256WA=",
|
"narHash": "sha256-dASUovwB3DUoTm6daga0hsNZZAFCCGlUS4FPBjK0OwA=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "c361047d3a538f547f1617bb6b410411929ac9cc",
|
"rev": "74cebce67ef6671ea48fda353a5be2d229bd2920",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -165,11 +164,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1786901030,
|
"lastModified": 1791885023,
|
||||||
"narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=",
|
"narHash": "sha256-C3alQ2MEt0zVrUSho5NUDo3jmhbff72++bfwoqT9Omo=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa",
|
"rev": "0d6d739a833ba9a9c93034862e4a7b061a062a1c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -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
@@ -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.5";
|
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-jZ5MfeoOY+HE9e4jFXJ/WkjB9UUvZnZg0gFt2YoCbmE=";
|
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
@@ -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
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ Custom package registry using `callPackage` pattern for flake-wide availability.
|
|||||||
- `launch-webapp/`: Webapp wrapper
|
- `launch-webapp/`: Webapp wrapper
|
||||||
- `mem0/`: Python package + custom `server.py`
|
- `mem0/`: Python package + custom `server.py`
|
||||||
- `msty-studio/`: AppImage wrapper
|
- `msty-studio/`: AppImage wrapper
|
||||||
|
- `photocraft/`: Rust package (Photoshop reimplementation, built from source)
|
||||||
- `pomodoro-timer/`: Timer utility
|
- `pomodoro-timer/`: Timer utility
|
||||||
- `tuxedo-backlight/`: Hardware control
|
- `tuxedo-backlight/`: Hardware control
|
||||||
- `zellij-ps/`: Gitea-hosted package
|
- `zellij-ps/`: Gitea-hosted package
|
||||||
|
|||||||
@@ -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=";
|
||||||
|
|||||||
@@ -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"
|
||||||
;;
|
;;
|
||||||
|
|||||||
+2
-1
@@ -21,6 +21,7 @@ in {
|
|||||||
launch-webapp = pkgs.callPackage ./launch-webapp {};
|
launch-webapp = pkgs.callPackage ./launch-webapp {};
|
||||||
mem0 = pkgs.callPackage ./mem0 {};
|
mem0 = pkgs.callPackage ./mem0 {};
|
||||||
msty-studio = pkgs.callPackage ./msty-studio {};
|
msty-studio = pkgs.callPackage ./msty-studio {};
|
||||||
|
photocraft = pkgs.callPackage ./photocraft {};
|
||||||
pomodoro-timer = pkgs.callPackage ./pomodoro-timer {};
|
pomodoro-timer = pkgs.callPackage ./pomodoro-timer {};
|
||||||
rofi-project-opener = pkgs.callPackage ./rofi-project-opener {};
|
rofi-project-opener = pkgs.callPackage ./rofi-project-opener {};
|
||||||
stt-ptt = pkgs.callPackage ./stt-ptt {};
|
stt-ptt = pkgs.callPackage ./stt-ptt {};
|
||||||
@@ -61,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;
|
||||||
}
|
}
|
||||||
@@ -3,7 +3,14 @@
|
|||||||
nix-update-script,
|
nix-update-script,
|
||||||
python3,
|
python3,
|
||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
}:
|
}: let
|
||||||
|
# nixpkgs marks posthog broken because its test suite fails with mcp >= 2;
|
||||||
|
# the library itself works, so skip its tests instead.
|
||||||
|
posthog = python3.pkgs.posthog.overridePythonAttrs (old: {
|
||||||
|
doCheck = false;
|
||||||
|
meta = old.meta // {broken = false;};
|
||||||
|
});
|
||||||
|
in
|
||||||
python3.pkgs.buildPythonPackage rec {
|
python3.pkgs.buildPythonPackage rec {
|
||||||
pname = "mem0ai";
|
pname = "mem0ai";
|
||||||
version = "2.0.2";
|
version = "2.0.2";
|
||||||
|
|||||||
@@ -0,0 +1,110 @@
|
|||||||
|
{
|
||||||
|
lib,
|
||||||
|
rustPlatform,
|
||||||
|
fetchFromGitHub,
|
||||||
|
makeWrapper,
|
||||||
|
nix-update-script,
|
||||||
|
# Not linked at build time — dlopen'd by the app at runtime (see postFixup).
|
||||||
|
dbus,
|
||||||
|
libglvnd,
|
||||||
|
libx11,
|
||||||
|
libxcursor,
|
||||||
|
libxi,
|
||||||
|
libxrandr,
|
||||||
|
libxkbcommon,
|
||||||
|
vulkan-loader,
|
||||||
|
wayland,
|
||||||
|
}: let
|
||||||
|
# PhotoCraft reaches the windowing/graphics stack exclusively through
|
||||||
|
# dlopen (wayland-sys, x11-dl, ash → libvulkan, glutin → libEGL/libGL):
|
||||||
|
# Cargo.lock contains no native *-sys crate, so the build needs zero
|
||||||
|
# buildInputs and these libraries are provided via LD_LIBRARY_PATH instead
|
||||||
|
# (same pattern as neovide). dbus.lib is dlopen'd by rfd's xdg-desktop-portal
|
||||||
|
# backend — without it, file dialogs fall back to zenity.
|
||||||
|
runtimeLibs = [
|
||||||
|
dbus.lib
|
||||||
|
libglvnd
|
||||||
|
libx11
|
||||||
|
libxcursor
|
||||||
|
libxi
|
||||||
|
libxrandr
|
||||||
|
libxkbcommon
|
||||||
|
vulkan-loader
|
||||||
|
wayland
|
||||||
|
];
|
||||||
|
in
|
||||||
|
rustPlatform.buildRustPackage (finalAttrs: {
|
||||||
|
pname = "photocraft";
|
||||||
|
version = "0.16.0";
|
||||||
|
|
||||||
|
# AppStream <releases> date of the GitHub release — bump together with `version`.
|
||||||
|
releaseDate = "2026-10-11";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "storytold";
|
||||||
|
repo = "photocraft";
|
||||||
|
tag = "v${finalAttrs.version}";
|
||||||
|
hash = "sha256-uaZmzQb4B1zZ2XrZHjHzI/uEVGdoYRFeh10GHIxzjDA=";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoHash = "sha256-O1tUKAWSvLmOEUbpVub8bczHpoXH6XxXKSPGRVkjsHs=";
|
||||||
|
|
||||||
|
# Match the official release builds (CI builds with `--features heif`):
|
||||||
|
# HEIC/HEIF reading via pure-Rust heic-rs — no native C dependency.
|
||||||
|
# Scoped per binary so the CLI ships the same codec set as the app.
|
||||||
|
buildFeatures = [
|
||||||
|
"photocraft/heif"
|
||||||
|
"photocraft-cli/heif"
|
||||||
|
];
|
||||||
|
|
||||||
|
# The workspace default also builds xtask; ship only the two user-facing
|
||||||
|
# binaries (desktop app + headless CLI with batch and MCP support).
|
||||||
|
cargoBuildFlags = [
|
||||||
|
"-p"
|
||||||
|
"photocraft"
|
||||||
|
"-p"
|
||||||
|
"photocraft-cli"
|
||||||
|
];
|
||||||
|
|
||||||
|
# ~260 test binaries, and the corpus tests additionally fetch external
|
||||||
|
# files (cargo xtask corpus). Skip the suite in the package build.
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
|
nativeBuildInputs = [makeWrapper];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
install -Dm644 packaging/linux/ai.storyteller.photocraft.desktop \
|
||||||
|
-t $out/share/applications
|
||||||
|
|
||||||
|
mkdir -p $out/share/metainfo
|
||||||
|
substitute packaging/linux/ai.storyteller.photocraft.metainfo.xml.in \
|
||||||
|
$out/share/metainfo/ai.storyteller.photocraft.metainfo.xml \
|
||||||
|
--replace-fail @VERSION@ ${finalAttrs.version} \
|
||||||
|
--replace-fail @DATE@ ${finalAttrs.releaseDate}
|
||||||
|
|
||||||
|
install -Dm644 packaging/linux/ai.storyteller.photocraft.mime.xml \
|
||||||
|
$out/share/mime/packages/ai.storyteller.photocraft.xml
|
||||||
|
|
||||||
|
mkdir -p $out/share/icons
|
||||||
|
cp -R assets/app-icon/hicolor $out/share/icons
|
||||||
|
chmod -R u+w $out/share/icons
|
||||||
|
'';
|
||||||
|
|
||||||
|
postFixup = ''
|
||||||
|
wrapProgram $out/bin/photocraft \
|
||||||
|
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath runtimeLibs}
|
||||||
|
'';
|
||||||
|
|
||||||
|
# Update with: nix run github:NixOS/nixpkgs#nix-update -- --flake <repo-root> photocraft
|
||||||
|
# (bumps version, src hash and cargoHash in one run)
|
||||||
|
passthru.updateScript = nix-update-script {};
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Open-source, clean-room reimplementation of Adobe Photoshop in pure Rust";
|
||||||
|
homepage = "https://getartcraft.com/apps/photocraft";
|
||||||
|
changelog = "https://github.com/storytold/photocraft/releases/tag/v${finalAttrs.version}";
|
||||||
|
license = with lib.licenses; [asl20 mit];
|
||||||
|
mainProgram = "photocraft";
|
||||||
|
platforms = lib.platforms.linux;
|
||||||
|
};
|
||||||
|
})
|
||||||
@@ -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
|
||||||
''
|
'')
|
||||||
@@ -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)
|
|
||||||
+50
-124
@@ -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=";
|
|
||||||
};
|
|
||||||
script = writeShellScriptBin "talk" ''
|
|
||||||
#!/usr/bin/env bash
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
# ── Toggle: VOICE_NOTIFY=0 deaktiviert alles ───────────────────
|
|
||||||
if [ "''${VOICE_NOTIFY:-1}" = "0" ]; then
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# ── Config ──────────────────────────────────────────────────────
|
|
||||||
# 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}"
|
|
||||||
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
|
|
||||||
|
|
||||||
# ── TTS generieren ──────────────────────────────────────────────
|
|
||||||
PAYLOAD=$("$PYTHON" -c '
|
|
||||||
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}" \
|
|
||||||
-X POST "https://api.elevenlabs.io/v1/text-to-speech/''${VOICE_ID}" \
|
|
||||||
-H "xi-api-key: ''${API_KEY}" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-d "$PAYLOAD") || HTTP_CODE="000"
|
|
||||||
|
|
||||||
if [ "$HTTP_CODE" != "200" ]; then
|
|
||||||
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";
|
pname = "talk";
|
||||||
version = "0.1.0";
|
version = "0.1.2";
|
||||||
|
|
||||||
dontUnpack = true;
|
src = fetchFromGitea {
|
||||||
|
domain = "code.m3ta.dev";
|
||||||
|
owner = "m3tam3re";
|
||||||
|
repo = "talk";
|
||||||
|
tag = "v${finalAttrs.version}";
|
||||||
|
hash = "sha256-2goEKz/oMB/mfQpAiED+6iiAhCpOH9BbQlzsuFMjiYk=";
|
||||||
|
};
|
||||||
|
|
||||||
installPhase = ''
|
vendorHash = "sha256-8B1ubNy4sap3XV83lX93NvpH3z4BNloWgkM7OB4hglo=";
|
||||||
mkdir -p "$out/bin"
|
|
||||||
ln -s ${script}/bin/talk "$out/bin/talk"
|
subPackages = ["cmd/talk"];
|
||||||
|
|
||||||
|
env.CGO_ENABLED = 0;
|
||||||
|
|
||||||
|
ldflags = [
|
||||||
|
"-s"
|
||||||
|
"-w"
|
||||||
|
"-X"
|
||||||
|
"main.version=${finalAttrs.version}"
|
||||||
|
];
|
||||||
|
|
||||||
|
# The process-boundary tests start daemons and bind ports; not in the sandbox.
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
|
# oto talks to PulseAudio/PipeWire directly and falls back to ALSA via
|
||||||
|
# dlopen; espeak-ng is the OS voice, libnotify the toast.
|
||||||
|
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [makeWrapper];
|
||||||
|
postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||||
|
wrapProgram $out/bin/talk \
|
||||||
|
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [alsa-lib]} \
|
||||||
|
--prefix PATH : ${lib.makeBinPath [espeak-ng libnotify]}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
nativeInstallCheckInputs = [versionCheckHook];
|
||||||
|
versionCheckProgramArg = "version";
|
||||||
|
doInstallCheck = true;
|
||||||
|
|
||||||
|
passthru.updateScript = nix-update-script {};
|
||||||
|
|
||||||
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;
|
||||||
};
|
};
|
||||||
}
|
})
|
||||||
@@ -6,12 +6,12 @@
|
|||||||
makeWrapper,
|
makeWrapper,
|
||||||
}: let
|
}: let
|
||||||
pname = "vibetyper";
|
pname = "vibetyper";
|
||||||
version = "1.5.4";
|
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-6469c8ykHxv7Ps3gLd6TrDM+ONKkEO+NzVZcx3V4qZE=";
|
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
|
||||||
'';
|
'';
|
||||||
|
|||||||
@@ -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.5";
|
expectedVersion = "2.47.7";
|
||||||
expectedSrcHash = "sha256-jZ5MfeoOY+HE9e4jFXJ/WkjB9UUvZnZg0gFt2YoCbmE=";
|
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
|
||||||
''
|
''
|
||||||
Reference in new issue
Block a user