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

fix: add n8n xlsx lockfile integrity workaround

Browse Source
This commit is contained in:
m3tam3re
2026-07-10 13:22:27 +02:00
parent 5dc91eeebb
commit 01bede8826
2 changed files with 56 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
overlays/mods/n8n.nix
+16 -4
View File
@@ -1,5 +1,14 @@
{prev}: {prev}: let
prev.n8n.overrideAttrs (finalAttrs: previousAttrs: { xlsxTarball = "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz";
xlsxIntegrity = "sha512-+nKZ39+nvK7Qq6i0PvWWRA4j/EkfWOtkP/YhMtupm+lJIiHxUrgTr1CcKv1nBk1rHtkRRQ3O2+Ih/q/sA+FXZA==";
patchXlsxLockfile = ''
substituteInPlace pnpm-lock.yaml \
--replace-fail \
"resolution: {tarball: ${xlsxTarball}}" \
"resolution: {integrity: ${xlsxIntegrity}, tarball: ${xlsxTarball}}"
'';
in
prev.n8n.overrideAttrs (finalAttrs: previousAttrs: {
version = "2.29.8"; version = "2.29.8";
src = prev.fetchFromGitHub { src = prev.fetchFromGitHub {
@@ -13,9 +22,12 @@ prev.n8n.overrideAttrs (finalAttrs: previousAttrs: {
inherit (finalAttrs) pname version src; inherit (finalAttrs) pname version src;
pnpm = prev.pnpm_10; pnpm = prev.pnpm_10;
fetcherVersion = 3; fetcherVersion = 3;
hash = "sha256-j0IrYjVl83SzRo29rhEDCQLrt8kslWHdS7m4pG11DgA="; prePnpmInstall = patchXlsxLockfile;
hash = "sha256-XMPvxTb7cKz3XmJFOAqN42B2VGyzyFPrF0eUU8g/KPU=";
}; };
prePnpmInstall = (previousAttrs.prePnpmInstall or "") + patchXlsxLockfile;
preBuild = preBuild =
(previousAttrs.preBuild or "") (previousAttrs.preBuild or "")
+ '' + ''
@@ -32,4 +44,4 @@ prev.n8n.overrideAttrs (finalAttrs: previousAttrs: {
// { // {
changelog = "https://github.com/n8n-io/n8n/releases/tag/n8n@${finalAttrs.version}"; changelog = "https://github.com/n8n-io/n8n/releases/tag/n8n@${finalAttrs.version}";
}; };
}) })
tests/n8n-overlay-test.nix
+11 -8
View File
@@ -17,9 +17,10 @@
expectedVersion = "2.29.8"; expectedVersion = "2.29.8";
expectedSrcHash = "sha256-+eiAdofrX1TRNFeD9MtTHt+XBH06c8NQHvTk6vrOU/k="; expectedSrcHash = "sha256-+eiAdofrX1TRNFeD9MtTHt+XBH06c8NQHvTk6vrOU/k=";
expectedPnpmHash = "sha256-j0IrYjVl83SzRo29rhEDCQLrt8kslWHdS7m4pG11DgA="; expectedPnpmHash = "sha256-XMPvxTb7cKz3XmJFOAqN42B2VGyzyFPrF0eUU8g/KPU=";
expectedChangelog = "https://github.com/n8n-io/n8n/releases/tag/n8n@${expectedVersion}"; expectedChangelog = "https://github.com/n8n-io/n8n/releases/tag/n8n@${expectedVersion}";
expectedXlsxTarball = "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz"; expectedXlsxTarball = "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz";
expectedXlsxIntegrity = "sha512-+nKZ39+nvK7Qq6i0PvWWRA4j/EkfWOtkP/YhMtupm+lJIiHxUrgTr1CcKv1nBk1rHtkRRQ3O2+Ih/q/sA+FXZA==";
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"
@@ -46,12 +47,14 @@
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";
checkXlsxTarballLock = overlayName: package: checkXlsxIntegrityPatch = overlayName: package:
pkgs.runCommand "${overlayName}-n8n-xlsx-tarball-lock-test" { pkgs.runCommand "${overlayName}-n8n-xlsx-integrity-patch-test" {
inherit expectedXlsxTarball; inherit expectedXlsxTarball expectedXlsxIntegrity;
} '' } ''
grep -F "xlsx@$expectedXlsxTarball:" ${package.src}/pnpm-lock.yaml cp ${package.src}/pnpm-lock.yaml pnpm-lock.yaml
grep -F "resolution: {tarball: $expectedXlsxTarball}" ${package.src}/pnpm-lock.yaml ${package.prePnpmInstall or ""}
grep -F "xlsx@$expectedXlsxTarball:" pnpm-lock.yaml
grep -F "resolution: {integrity: $expectedXlsxIntegrity, tarball: $expectedXlsxTarball}" pnpm-lock.yaml
touch $out touch $out
''; '';
in in
@@ -70,8 +73,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;
modificationsOverlayXlsxTarballLock = checkXlsxTarballLock "overlays.modifications" modifiedPkgs.n8n; modificationsOverlayXlsxIntegrityPatch = checkXlsxIntegrityPatch "overlays.modifications" modifiedPkgs.n8n;
defaultOverlayXlsxTarballLock = checkXlsxTarballLock "overlays.default" defaultPkgs.n8n; defaultOverlayXlsxIntegrityPatch = checkXlsxIntegrityPatch "overlays.default" defaultPkgs.n8n;
} '' } ''
touch $out touch $out
'' ''