Unverified Commit aec90852 authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #215706 from K900/n8n-0.215.0

n8n: 0.214.3 -> 0.215.0
parents 5c4a6ca6 736d02b4
Loading
Loading
Loading
Loading
+1 −5
Original line number Diff line number Diff line
@@ -15,16 +15,12 @@ nodePackages.n8n.override {
    pkgs.postgresql
  ];

  # Patch minified source with changes from https://github.com/n8n-io/n8n/pull/5052
  preRebuild = ''
    patch -p1 -i ${./fix-permissions.diff}
  '' +
  # Oracle's official package on npm is binary only (WHY?!) and doesn't provide binaries for aarch64.
  # This can supposedly be fixed by building a custom copy of the module from source, but that's way
  # too much complexity for a setup no one would ever actually run.
  #
  # NB: If you _are_ actually running n8n on Oracle on aarch64, feel free to submit a patch.
  lib.optionalString stdenv.isAarch64 ''
  preRebuild = lib.optionalString stdenv.isAarch64 ''
    rm -rf node_modules/oracledb
  '';

+0 −28
Original line number Diff line number Diff line
--- a/dist/LoadNodesAndCredentials.js
+++ b/dist/LoadNodesAndCredentials.js
@@ -216,6 +216,7 @@
         const { types } = loader;
         this.types.nodes = this.types.nodes.concat(types.nodes);
         this.types.credentials = this.types.credentials.concat(types.credentials);
+        let seen = new Set();
         const iconPromises = Object.entries(types).flatMap(([typeName, typesArr]) => typesArr.map((type) => {
             var _a;
             if (!((_a = type.icon) === null || _a === void 0 ? void 0 : _a.startsWith('file:')))
@@ -226,7 +227,16 @@
             type.iconUrl = iconUrl;
             const source = path_1.default.join(dir, icon);
             const destination = path_1.default.join(constants_1.GENERATED_STATIC_DIR, iconUrl);
-            return (0, promises_1.mkdir)(path_1.default.dirname(destination), { recursive: true }).then(async () => (0, promises_1.copyFile)(source, destination));
+            if (!seen.has(destination)) {
+                seen.add(destination);
+                return (0, promises_1.mkdir)(path_1.default.dirname(destination), { recursive: true }).then(async () => {
+                    await (0, promises_1.copyFile)(source, destination);
+                    await (0, promises_1.chmod)(destination, 0o644);
+                });
+            }
+            else {
+                return Promise.resolve();
+            }
         }));
         await Promise.all(iconPromises);
         for (const nodeTypeName in loader.nodeTypes) {
+206 −273

File changed.

Preview size limit exceeded, changes collapsed.