n8n: 0.175.0 -> 0.175.1, build with Node 16

2022-05-05 22:16:55 +03:00 · 2022-05-05 22:16:55 +03:00 · 50644fd3b1
commit 50644fd3b1
parent 2ff37d7d9a
5 changed files with 91 additions and 75 deletions
--- a/pkgs/applications/networking/n8n/default.nix
+++ b/pkgs/applications/networking/n8n/default.nix
@ -1,9 +1,8 @@
-{ pkgs, nodejs-14_x, stdenv, lib }:
+{ pkgs, nodejs-16_x, stdenv, lib }:

 let
  nodePackages = import ./node-composition.nix {
    inherit pkgs;
-    nodejs = nodejs-14_x;
    inherit (stdenv.hostPlatform) system;
  };
 in
@ -12,6 +11,13 @@ nodePackages.n8n.override {
    node-pre-gyp
  ];

+  dontNpmInstall = true;
+
+  postInstall = ''
+    mkdir -p $out/bin
+    ln -s $out/lib/node_modules/n8n/bin/n8n $out/bin/n8n
+  '';
+
  passthru.updateScript = ./generate-dependencies.sh;

  meta = with lib; {
--- a/pkgs/applications/networking/n8n/generate-dependencies.sh
+++ b/pkgs/applications/networking/n8n/generate-dependencies.sh
@ -13,7 +13,7 @@
 cd "$(dirname $(readlink -f $0))"

 node2nix \
-  --14 \
+  --nodejs-16 \
  --strip-optional-dependencies \
  --node-env node-env.nix \
  --input package.json \
--- a/pkgs/applications/networking/n8n/node-composition.nix
+++ b/pkgs/applications/networking/n8n/node-composition.nix
@ -1,8 +1,8 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.11.1. Do not edit!

 {pkgs ? import <nixpkgs> {
    inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}:

 let
  nodeEnv = import ./node-env.nix {
--- a/pkgs/applications/networking/n8n/node-env.nix
+++ b/pkgs/applications/networking/n8n/node-env.nix
@ -98,7 +98,7 @@ let
      ''
      + (lib.concatMapStrings (dependency:
        ''
-          if [ ! -e "${dependency.name}" ]; then
+          if [ ! -e "${dependency.packageName}" ]; then
              ${composePackage dependency}
          fi
        ''
@ -257,8 +257,8 @@ let
          var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));

          if(![1, 2].includes(packageLock.lockfileVersion)) {
-             process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
-             process.exit(1);
+            process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
+            process.exit(1);
          }

          if(packageLock.dependencies !== undefined) {
@ -390,7 +390,7 @@ let
  buildNodePackage =
    { name
    , packageName
-    , version
+    , version ? null
    , dependencies ? []
    , buildInputs ? []
    , production ? true
@ -409,7 +409,7 @@ let
      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];
    in
    stdenv.mkDerivation ({
-      name = "${name}-${version}";
+      name = "${name}${if version == null then "" else "-${version}"}";
      buildInputs = [ tarWrapper python nodejs ]
        ++ lib.optional (stdenv.isLinux) utillinux
        ++ lib.optional (stdenv.isDarwin) libtool
@ -441,6 +441,14 @@ let
        if [ -d "$out/lib/node_modules/.bin" ]
        then
            ln -s $out/lib/node_modules/.bin $out/bin
+
+            # Patch the shebang lines of all the executables
+            ls $out/bin/* | while read i
+            do
+                file="$(readlink -f "$i")"
+                chmod u+rwx "$file"
+                patchShebangs "$file"
+            done
        fi

        # Create symlinks to the deployed manual page folders, if applicable
@ -471,7 +479,7 @@ let
  buildNodeDependencies =
    { name
    , packageName
-    , version
+    , version ? null
    , src
    , dependencies ? []
    , buildInputs ? []
@ -489,7 +497,7 @@ let
      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
    in
      stdenv.mkDerivation ({
-        name = "node-dependencies-${name}-${version}";
+        name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";

        buildInputs = [ tarWrapper python nodejs ]
          ++ lib.optional (stdenv.isLinux) utillinux
@ -519,6 +527,7 @@ let
            if [ -f ${src}/package-lock.json ]
            then
                cp ${src}/package-lock.json .
+                chmod 644 package-lock.json
            fi
          ''}

@ -541,7 +550,7 @@ let
  buildNodeShell =
    { name
    , packageName
-    , version
+    , version ? null
    , src
    , dependencies ? []
    , buildInputs ? []
@ -557,9 +566,10 @@ let

    let
      nodeDependencies = buildNodeDependencies args;
+      extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ];
    in
-    stdenv.mkDerivation {
-      name = "node-shell-${name}-${version}";
+    stdenv.mkDerivation ({
+      name = "node-shell-${name}${if version == null then "" else "-${version}"}";

      buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
      buildCommand = ''
@ -578,7 +588,7 @@ let
        export NODE_PATH=${nodeDependencies}/lib/node_modules
        export PATH="${nodeDependencies}/bin:$PATH"
      '';
-    };
+    } // extraArgs);
 in
 {
  buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
--- a/pkgs/applications/networking/n8n/node-packages.nix
+++ b/pkgs/applications/networking/n8n/node-packages.nix
@ -1,16 +1,16 @@
-# This file has been generated by node2nix 1.9.0. Do not edit!
+# This file has been generated by node2nix 1.11.1. Do not edit!

 {nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:

 let
  sources = {
-    "@azure/abort-controller-1.0.5" = {
+    "@azure/abort-controller-1.1.0" = {
      name = "_at_azure_slash_abort-controller";
      packageName = "@azure/abort-controller";
-      version = "1.0.5";
+      version = "1.1.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.0.5.tgz";
-        sha512 = "G5sjKExiVsbFQo+4YY5MBPOSsh3EUv6XmqjgJaF/VCjckWLGGKPUPGfbCSn6Xal6gzGoPQMOQ+wCCGNCX9NAPg==";
+        url = "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.1.0.tgz";
+        sha512 = "TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==";
      };
    };
    "@azure/core-asynciterator-polyfill-1.0.2" = {
@ -31,13 +31,13 @@ let
        sha512 = "7CU6DmCHIZp5ZPiZ9r3J17lTKMmYsm/zGvNkjArQwPkrLlZ1TZ+EUYfGgh2X31OLMVAQCTJZW4cXHJi02EbJnA==";
      };
    };
-    "@azure/core-http-2.2.4" = {
+    "@azure/core-http-2.2.5" = {
      name = "_at_azure_slash_core-http";
      packageName = "@azure/core-http";
-      version = "2.2.4";
+      version = "2.2.5";
      src = fetchurl {
-        url = "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.4.tgz";
-        sha512 = "QmmJmexXKtPyc3/rsZR/YTLDvMatzbzAypJmLzvlfxgz/SkgnqV/D4f6F2LsK6tBj1qhyp8BoXiOebiej0zz3A==";
+        url = "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.5.tgz";
+        sha512 = "kctMqSQ6zfnlFpuYzfUKadeTyOQYbIQ+3Rj7dzVC3Dk1dOnHroTwR9hLYKX8/n85iJpkyaksaXpuh5L7GJRYuQ==";
      };
    };
    "@azure/core-lro-2.2.4" = {
@ -976,13 +976,13 @@ let
        sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w==";
      };
    };
-    "aws-sdk-2.1125.0" = {
+    "aws-sdk-2.1129.0" = {
      name = "aws-sdk";
      packageName = "aws-sdk";
-      version = "2.1125.0";
+      version = "2.1129.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1125.0.tgz";
-        sha512 = "2syNkKDqDcDmB/chc61a5xx+KYzaarLs1/KshE0b1Opp2oSq2FARyUBbk59HgwKaDUB61uPF33ZG9sHiIVx2hQ==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1129.0.tgz";
+        sha512 = "gQZaByfW7zKCg1n/kA+xDdLhI/SauaokRTq+lztK1cCCdFkR5CShcKeK/qUgVxjy43mwB7CkeTh1WUr2NMb0jg==";
      };
    };
    "aws-sign2-0.7.0" = {
@ -1858,13 +1858,13 @@ let
        sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==";
      };
    };
-    "core-js-3.22.3" = {
+    "core-js-3.22.4" = {
      name = "core-js";
      packageName = "core-js";
-      version = "3.22.3";
+      version = "3.22.4";
      src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-3.22.3.tgz";
-        sha512 = "1t+2a/d2lppW1gkLXx3pKPVGbBdxXAkqztvWb1EJ8oF8O2gIGiytzflNiFEehYwVK/t2ryUsGBoOFFvNx95mbg==";
+        url = "https://registry.npmjs.org/core-js/-/core-js-3.22.4.tgz";
+        sha512 = "1uLykR+iOfYja+6Jn/57743gc9n73EWiOnSJJ4ba3B4fOEYDBv25MagmEZBxTp5cWq4b/KPx/l77zgsp28ju4w==";
      };
    };
    "core-util-is-1.0.2" = {
@ -2641,13 +2641,13 @@ let
        sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==";
      };
    };
-    "follow-redirects-1.14.9" = {
+    "follow-redirects-1.15.0" = {
      name = "follow-redirects";
      packageName = "follow-redirects";
-      version = "1.14.9";
+      version = "1.15.0";
      src = fetchurl {
-        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz";
-        sha512 = "MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==";
+        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.0.tgz";
+        sha512 = "aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ==";
      };
    };
    "for-each-0.3.3" = {
@ -4522,13 +4522,13 @@ let
        sha512 = "qIcmHAtVJotgiYo3vVMLwC9qaU5ih5ti4+aPu2I1onD6WEu8GMNF38AzIAceYl6U8EhvDB+DOsF/SjYHfl26iw==";
      };
    };
-    "n8n-editor-ui-0.142.0" = {
+    "n8n-editor-ui-0.142.1" = {
      name = "n8n-editor-ui";
      packageName = "n8n-editor-ui";
-      version = "0.142.0";
+      version = "0.142.1";
      src = fetchurl {
-        url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.142.0.tgz";
-        sha512 = "aDXm64Y+tcLicd0z9pIxhSfqCb/JjsMIAOJ7DB35HKg7riOE7TGBHkWQ6F61XEjusJLl6ZGr15V+9EoCTu+02g==";
+        url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.142.1.tgz";
+        sha512 = "Me8fk76HeWUmTPnksH4kzG0bKOp1yLFjAC4F+EcEllIIf+x75kjN+gSH4uwgvspzGCVO88ZnppWoGQwvHQpXQw==";
      };
    };
    "n8n-nodes-base-0.173.0" = {
@ -4567,13 +4567,13 @@ let
        sha512 = "wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==";
      };
    };
-    "nanoid-3.3.3" = {
+    "nanoid-3.3.4" = {
      name = "nanoid";
      packageName = "nanoid";
-      version = "3.3.3";
+      version = "3.3.4";
      src = fetchurl {
-        url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz";
-        sha512 = "p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==";
+        url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz";
+        sha512 = "MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==";
      };
    };
    "native-duplexpair-1.0.0" = {
@ -4693,13 +4693,13 @@ let
        sha512 = "KUdDsspqx89sD4UUyUKzdlUOper3hRkDVkrKh/89G+d9WKsU5ox51NWS4tB1XR5dPUdR4SP0E3molyEfOvSa3g==";
      };
    };
-    "nodemailer-6.7.4" = {
+    "nodemailer-6.7.5" = {
      name = "nodemailer";
      packageName = "nodemailer";
-      version = "6.7.4";
+      version = "6.7.5";
      src = fetchurl {
-        url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.4.tgz";
-        sha512 = "TBSS3qS8WG45ycUwEvEA/3UM1o3sLz9jUl4TPUKPz4ImWWM6UgRCb5pLO+HOouDKEj57yNLOrzQlO8+9IjWZoA==";
+        url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.5.tgz";
+        sha512 = "6VtMpwhsrixq1HDYSBBHvW0GwiWawE75dS3oal48VqRhUvKJNnKnJo2RI/bCVQubj1vgrgscMNW4DHaD6xtMCg==";
      };
    };
    "nopt-5.0.0" = {
@ -6367,13 +6367,13 @@ let
        sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==";
      };
    };
-    "sqlite3-5.0.6" = {
+    "sqlite3-5.0.7" = {
      name = "sqlite3";
      packageName = "sqlite3";
-      version = "5.0.6";
+      version = "5.0.7";
      src = fetchurl {
-        url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.6.tgz";
-        sha512 = "uT1dC6N3ReF+jchY01zvl1wVFFJ5xO86wSnCpK39uA/zmAHBDm6TiAq1v876QKv8JgiijxQ7/fb5C2LPm7ZAJA==";
+        url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.7.tgz";
+        sha512 = "9PUfvpol1/5SI3WZawFINwpRz6qhUeJJtFNG6rr0CvDWMXN75PJPv+3b0aVEOOx5rAZIPcXW2zVasH8foqw7Gg==";
      };
    };
    "sqlstring-2.3.3" = {
@ -6493,22 +6493,22 @@ let
        sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==";
      };
    };
-    "string.prototype.trimend-1.0.4" = {
+    "string.prototype.trimend-1.0.5" = {
      name = "string.prototype.trimend";
      packageName = "string.prototype.trimend";
-      version = "1.0.4";
+      version = "1.0.5";
      src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz";
-        sha512 = "y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==";
+        url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz";
+        sha512 = "I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==";
      };
    };
-    "string.prototype.trimstart-1.0.4" = {
+    "string.prototype.trimstart-1.0.5" = {
      name = "string.prototype.trimstart";
      packageName = "string.prototype.trimstart";
-      version = "1.0.4";
+      version = "1.0.5";
      src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz";
-        sha512 = "jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==";
+        url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz";
+        sha512 = "THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==";
      };
    };
    "string_decoder-0.10.31" = {
@ -7534,13 +7534,13 @@ in
  n8n = nodeEnv.buildNodePackage {
    name = "n8n";
    packageName = "n8n";
-    version = "0.175.0";
+    version = "0.175.1";
    src = fetchurl {
-      url = "https://registry.npmjs.org/n8n/-/n8n-0.175.0.tgz";
-      sha512 = "FKIroWsEZNZ/HUdM6iQ8QY6WxYs4uQufodBoKpbcu6JJKF/ufYO4U8lpIM0nV2YCMaB+JAVvswim0SUDB6KF3A==";
+      url = "https://registry.npmjs.org/n8n/-/n8n-0.175.1.tgz";
+      sha512 = "rInwNB6wxOs79EvC2HFALyDhdDPJwLVT+z1LivxLRD9dZOrtlMD9wdDfESpHYS5ikND4T5JW32HaxGF9nnzlJA==";
    };
    dependencies = [
-      (sources."@azure/abort-controller-1.0.5" // {
+      (sources."@azure/abort-controller-1.1.0" // {
        dependencies = [
          sources."tslib-2.4.0"
        ];
@ -7551,7 +7551,7 @@ in
          sources."tslib-2.4.0"
        ];
      })
-      (sources."@azure/core-http-2.2.4" // {
+      (sources."@azure/core-http-2.2.5" // {
        dependencies = [
          sources."tough-cookie-4.0.0"
          sources."tslib-2.4.0"
@ -7725,7 +7725,7 @@ in
        ];
      })
      sources."avsc-5.7.4"
-      (sources."aws-sdk-2.1125.0" // {
+      (sources."aws-sdk-2.1129.0" // {
        dependencies = [
          sources."buffer-4.9.2"
          sources."events-1.1.1"
@ -7902,7 +7902,7 @@ in
      sources."cookie-0.4.1"
      sources."cookie-parser-1.4.6"
      sources."cookie-signature-1.0.6"
-      sources."core-js-3.22.3"
+      sources."core-js-3.22.4"
      sources."core-util-is-1.0.2"
      sources."crc-32-1.2.2"
      sources."cron-1.7.2"
@ -8012,7 +8012,7 @@ in
      })
      sources."flatted-3.2.5"
      sources."fn.name-1.1.0"
-      sources."follow-redirects-1.14.9"
+      sources."follow-redirects-1.15.0"
      sources."for-each-0.3.3"
      sources."forever-agent-0.6.1"
      sources."form-data-4.0.0"
@ -8282,7 +8282,7 @@ in
      sources."mz-2.7.0"
      sources."n8n-core-0.116.0"
      sources."n8n-design-system-0.19.0"
-      sources."n8n-editor-ui-0.142.0"
+      sources."n8n-editor-ui-0.142.1"
      (sources."n8n-nodes-base-0.173.0" // {
        dependencies = [
          sources."iconv-lite-0.6.3"
@ -8296,7 +8296,7 @@ in
        ];
      })
      sources."nanoclone-0.2.1"
-      sources."nanoid-3.3.3"
+      sources."nanoid-3.3.4"
      sources."native-duplexpair-1.0.0"
      (sources."nearley-2.20.1" // {
        dependencies = [
@ -8317,7 +8317,7 @@ in
      sources."node-html-parser-5.3.3"
      sources."node-ssh-12.0.4"
      sources."nodeify-1.0.1"
-      sources."nodemailer-6.7.4"
+      sources."nodemailer-6.7.5"
      sources."nopt-5.0.0"
      sources."normalize-path-3.0.0"
      sources."normalize-wheel-1.0.1"
@ -8577,7 +8577,7 @@ in
        ];
      })
      sources."sprintf-js-1.1.2"
-      sources."sqlite3-5.0.6"
+      sources."sqlite3-5.0.7"
      sources."sqlstring-2.3.3"
      sources."sse-channel-3.1.1"
      sources."ssf-0.11.2"
@ -8591,8 +8591,8 @@ in
      sources."stream-shift-1.0.1"
      sources."string-similarity-4.0.4"
      sources."string-width-4.2.3"
-      sources."string.prototype.trimend-1.0.4"
-      sources."string.prototype.trimstart-1.0.4"
+      sources."string.prototype.trimend-1.0.5"
+      sources."string.prototype.trimstart-1.0.5"
      sources."string_decoder-0.10.31"
      sources."strip-ansi-6.0.1"
      sources."strtok3-6.3.0"