From f279ae9c89d59f3e0deb0fd6307800f4cb993815 Mon Sep 17 00:00:00 2001 From: m3tam3re Date: Sun, 5 Jul 2026 18:41:05 +0200 Subject: [PATCH] fix: n8n overlay --- overlays/mods/n8n.nix | 6 +++--- tests/n8n-overlay-test.nix | 18 +++++++++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/overlays/mods/n8n.nix b/overlays/mods/n8n.nix index dc8a5b3..568c5a9 100644 --- a/overlays/mods/n8n.nix +++ b/overlays/mods/n8n.nix @@ -1,19 +1,19 @@ {prev}: prev.n8n.overrideAttrs (finalAttrs: previousAttrs: { - version = "2.29.4"; + version = "2.28.6"; src = prev.fetchFromGitHub { owner = "n8n-io"; repo = "n8n"; tag = "n8n@${finalAttrs.version}"; - hash = "sha256-Vc10fXKn21PSlv6Sk+5zyi2efkKup1Vi+9+vyJd2I1k="; + hash = "sha256-xll2dZon+WyJUXaCoel0htwgOGUqzpZvef/tDLTomZQ="; }; pnpmDeps = prev.fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = prev.pnpm_10; fetcherVersion = 3; - hash = "sha256-2UFKP5bo06afaMPD+dIYQ7O0NiyZai4i8vkidi7HfxE="; + hash = "sha256-SjmKXjxIuRY1uFbFLTMlXd0WW+3cVfu4TU+NoZtEYSo="; }; meta = diff --git a/tests/n8n-overlay-test.nix b/tests/n8n-overlay-test.nix index 6873eaf..ef18edb 100644 --- a/tests/n8n-overlay-test.nix +++ b/tests/n8n-overlay-test.nix @@ -15,10 +15,11 @@ modifiedPkgs = mkPkgs [self.overlays.modifications]; defaultPkgs = mkPkgs [self.overlays.default]; - expectedVersion = "2.29.4"; - expectedSrcHash = "sha256-Vc10fXKn21PSlv6Sk+5zyi2efkKup1Vi+9+vyJd2I1k="; - expectedPnpmHash = "sha256-2UFKP5bo06afaMPD+dIYQ7O0NiyZai4i8vkidi7HfxE="; + expectedVersion = "2.28.6"; + expectedSrcHash = "sha256-xll2dZon+WyJUXaCoel0htwgOGUqzpZvef/tDLTomZQ="; + expectedPnpmHash = "sha256-SjmKXjxIuRY1uFbFLTMlXd0WW+3cVfu4TU+NoZtEYSo="; 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: if package.version != expectedVersion @@ -37,6 +38,15 @@ else if package.buildPhase != upstreamPkgs.n8n.buildPhase then throw "${overlayName} n8n buildPhase should be inherited from upstream nixpkgs" 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 pkgs.runCommand "n8n-overlay-test" { n8nOverlayFile = @@ -51,6 +61,8 @@ in defaultOverlayN8n = checkN8nOverride "overlays.default" defaultPkgs.n8n; modificationsOverlayPhases = checkPhasesInherited "overlays.modifications" modifiedPkgs.n8n; defaultOverlayPhases = checkPhasesInherited "overlays.default" defaultPkgs.n8n; + modificationsOverlayXlsxIntegrity = checkXlsxIntegrity "overlays.modifications" modifiedPkgs.n8n; + defaultOverlayXlsxIntegrity = checkXlsxIntegrity "overlays.default" defaultPkgs.n8n; } '' touch $out ''