m3tam3re/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: n8n overlay

Browse Source
This commit is contained in:
m3tam3re
2026-07-05 18:41:05 +02:00
parent 94af31806a
commit f279ae9c89
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
overlays/mods/n8n.nix
+3 -3
View File
@@ -1,19 +1,19 @@
{prev}: {prev}:
prev.n8n.overrideAttrs (finalAttrs: previousAttrs: { prev.n8n.overrideAttrs (finalAttrs: previousAttrs: {
version = "2.29.4"; version = "2.28.6";
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-Vc10fXKn21PSlv6Sk+5zyi2efkKup1Vi+9+vyJd2I1k="; hash = "sha256-xll2dZon+WyJUXaCoel0htwgOGUqzpZvef/tDLTomZQ=";
}; };
pnpmDeps = prev.fetchPnpmDeps { pnpmDeps = prev.fetchPnpmDeps {
inherit (finalAttrs) pname version src; inherit (finalAttrs) pname version src;
pnpm = prev.pnpm_10; pnpm = prev.pnpm_10;
fetcherVersion = 3; fetcherVersion = 3;
hash = "sha256-2UFKP5bo06afaMPD+dIYQ7O0NiyZai4i8vkidi7HfxE="; hash = "sha256-SjmKXjxIuRY1uFbFLTMlXd0WW+3cVfu4TU+NoZtEYSo=";
}; };
meta = meta =
tests/n8n-overlay-test.nix
+15 -3
View File
@@ -15,10 +15,11 @@
modifiedPkgs = mkPkgs [self.overlays.modifications]; modifiedPkgs = mkPkgs [self.overlays.modifications];
defaultPkgs = mkPkgs [self.overlays.default]; defaultPkgs = mkPkgs [self.overlays.default];
expectedVersion = "2.29.4"; expectedVersion = "2.28.6";
expectedSrcHash = "sha256-Vc10fXKn21PSlv6Sk+5zyi2efkKup1Vi+9+vyJd2I1k="; expectedSrcHash = "sha256-xll2dZon+WyJUXaCoel0htwgOGUqzpZvef/tDLTomZQ=";
expectedPnpmHash = "sha256-2UFKP5bo06afaMPD+dIYQ7O0NiyZai4i8vkidi7HfxE="; expectedPnpmHash = "sha256-SjmKXjxIuRY1uFbFLTMlXd0WW+3cVfu4TU+NoZtEYSo=";
expectedChangelog = "https://github.com/n8n-io/n8n/releases/tag/n8n@${expectedVersion}"; expectedChangelog = "https://github.com/n8n-io/n8n/releases/tag/n8n@${expectedVersion}";
expectedXlsxIntegrity = "sha512-+nKZ39+nvK7Qq6i0PvWWRA4j/EkfWOtkP/YhMtupm+lJIiHxUrgTr1CcKv1nBk1rHtkRRQ3O2+Ih/q/sA+FXZA==";
checkN8nOverride = overlayName: package: checkN8nOverride = overlayName: package:
if package.version != expectedVersion if package.version != expectedVersion
@@ -37,6 +38,15 @@
else if package.buildPhase != upstreamPkgs.n8n.buildPhase else if package.buildPhase != upstreamPkgs.n8n.buildPhase
then throw "${overlayName} n8n buildPhase should be inherited from upstream nixpkgs" then throw "${overlayName} n8n buildPhase should be inherited from upstream nixpkgs"
else "ok"; else "ok";
checkXlsxIntegrity = overlayName: package:
pkgs.runCommand "${overlayName}-n8n-xlsx-integrity-test" {
inherit expectedXlsxIntegrity;
} ''
grep -F "xlsx@https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz:" ${package.src}/pnpm-lock.yaml
grep -F "resolution: {integrity: $expectedXlsxIntegrity, tarball: https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz}" ${package.src}/pnpm-lock.yaml
touch $out
'';
in in
pkgs.runCommand "n8n-overlay-test" { pkgs.runCommand "n8n-overlay-test" {
n8nOverlayFile = n8nOverlayFile =
@@ -51,6 +61,8 @@ in
defaultOverlayN8n = checkN8nOverride "overlays.default" defaultPkgs.n8n; defaultOverlayN8n = checkN8nOverride "overlays.default" defaultPkgs.n8n;
modificationsOverlayPhases = checkPhasesInherited "overlays.modifications" modifiedPkgs.n8n; modificationsOverlayPhases = checkPhasesInherited "overlays.modifications" modifiedPkgs.n8n;
defaultOverlayPhases = checkPhasesInherited "overlays.default" defaultPkgs.n8n; defaultOverlayPhases = checkPhasesInherited "overlays.default" defaultPkgs.n8n;
modificationsOverlayXlsxIntegrity = checkXlsxIntegrity "overlays.modifications" modifiedPkgs.n8n;
defaultOverlayXlsxIntegrity = checkXlsxIntegrity "overlays.default" defaultPkgs.n8n;
} '' } ''
touch $out touch $out
'' ''