chore: flake update
This commit is contained in:
commit
ffd27fba20
2 files changed
+34
-1
No files matched your search
+24
-1
@@ -21,13 +21,25 @@
|
||||
'';
|
||||
in
|
||||
prev.n8n.overrideAttrs (finalAttrs: previousAttrs: {
|
||||
<<<<<<< HEAD
|
||||
version = "2.44.5";
|
||||
||||||| 3dbd163
|
||||
version = "2.42.6";
|
||||
=======
|
||||
version = "2.43.5";
|
||||
>>>>>>> cbd7d982ef6f8f71bf6b8ac95d216bdf2a7a8edb
|
||||
|
||||
src = prev.fetchFromGitHub {
|
||||
owner = "n8n-io";
|
||||
repo = "n8n";
|
||||
tag = "n8n@${finalAttrs.version}";
|
||||
<<<<<<< HEAD
|
||||
hash = "sha256-FqqaYEhkybiYmJf3pYSO3stDn3Dn7iMNZKRgWz08Tng=";
|
||||
||||||| 3dbd163
|
||||
hash = "sha256-bYf0Dgh213RInRNUzZ64YtZFelANhdutgGGWBphjhOU=";
|
||||
=======
|
||||
hash = "sha256-N8QaNX6tzYPTvJ/H0ROoIdrQ7BWuyMm0VnQHsK4wnng=";
|
||||
>>>>>>> cbd7d982ef6f8f71bf6b8ac95d216bdf2a7a8edb
|
||||
};
|
||||
|
||||
pnpmDeps = prev.fetchPnpmDeps {
|
||||
@@ -35,7 +47,13 @@ in
|
||||
pnpm = prev.pnpm_11;
|
||||
fetcherVersion = 4;
|
||||
postPatch = relaxPnpmEngine;
|
||||
<<<<<<< HEAD
|
||||
hash = "sha256-vOJ+8OLpUtWvfy9QmR1X4dwOTY/GCpmM/M5HeB47BV0=";
|
||||
||||||| 3dbd163
|
||||
hash = "sha256-Dc0+xbNbgiZWnDefLpRdLag8ncBkjNXpZVrlz42jG+k=";
|
||||
=======
|
||||
hash = "sha256-ZQY9wZ7j0RNvsIqIuklvieIuQRsM0oQ2Kr3Wkyq4ywc=";
|
||||
>>>>>>> cbd7d982ef6f8f71bf6b8ac95d216bdf2a7a8edb
|
||||
};
|
||||
|
||||
postPatch = (previousAttrs.postPatch or "") + relaxPnpmEngine;
|
||||
@@ -44,8 +62,13 @@ in
|
||||
# n8n calls pnpm directly during the build (install/build/prune) and pnpm 10
|
||||
# cannot parse the pnpm-11 lockfile. The top-level pnpmConfigHook stays as
|
||||
# is — it discovers the fetcher version from pnpmDeps' .fetcher-version.
|
||||
# Match by pname/version, never by outPath: forcing 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:
|
||||
if (x.outPath or null) == prev.pnpm_10.outPath
|
||||
if (x.pname or null) == "pnpm" && prev.lib.versionOlder (x.version or "11") "11"
|
||||
then prev.pnpm_11
|
||||
else x)
|
||||
previousAttrs.nativeBuildInputs;
|
||||
|
||||
@@ -15,9 +15,19 @@
|
||||
modifiedPkgs = mkPkgs [self.overlays.modifications];
|
||||
defaultPkgs = mkPkgs [self.overlays.default];
|
||||
|
||||
<<<<<<< HEAD
|
||||
expectedVersion = "2.44.5";
|
||||
expectedSrcHash = "sha256-FqqaYEhkybiYmJf3pYSO3stDn3Dn7iMNZKRgWz08Tng=";
|
||||
expectedPnpmHash = "sha256-vOJ+8OLpUtWvfy9QmR1X4dwOTY/GCpmM/M5HeB47BV0=";
|
||||
||||||| 3dbd163
|
||||
expectedVersion = "2.42.6";
|
||||
expectedSrcHash = "sha256-bYf0Dgh213RInRNUzZ64YtZFelANhdutgGGWBphjhOU=";
|
||||
expectedPnpmHash = "sha256-Dc0+xbNbgiZWnDefLpRdLag8ncBkjNXpZVrlz42jG+k=";
|
||||
=======
|
||||
expectedVersion = "2.43.5";
|
||||
expectedSrcHash = "sha256-N8QaNX6tzYPTvJ/H0ROoIdrQ7BWuyMm0VnQHsK4wnng=";
|
||||
expectedPnpmHash = "sha256-ZQY9wZ7j0RNvsIqIuklvieIuQRsM0oQ2Kr3Wkyq4ywc=";
|
||||
>>>>>>> cbd7d982ef6f8f71bf6b8ac95d216bdf2a7a8edb
|
||||
expectedChangelog = "https://github.com/n8n-io/n8n/releases/tag/n8n@${expectedVersion}";
|
||||
expectedRootNodeModuleSymlinks = [
|
||||
"ln -s .pnpm/node_modules/sass-embedded node_modules/sass-embedded"
|
||||
|
||||
Reference in new issue
Block a user