diff --git a/overlays/mods/n8n.nix b/overlays/mods/n8n.nix index ae72239..ea454b9 100644 --- a/overlays/mods/n8n.nix +++ b/overlays/mods/n8n.nix @@ -21,25 +21,13 @@ ''; 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 { @@ -47,13 +35,7 @@ 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; diff --git a/tests/n8n-overlay-test.nix b/tests/n8n-overlay-test.nix index b78b4ba..0fb48a5 100644 --- a/tests/n8n-overlay-test.nix +++ b/tests/n8n-overlay-test.nix @@ -15,19 +15,9 @@ 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"