From e2a322b3cdd8e851c6c9f9c744e307a2b9a1ce33 Mon Sep 17 00:00:00 2001
From: WilliButz <willibutz@posteo.de>
Date: Mon, 4 Jul 2022 19:31:16 +0200
Subject: [PATCH 01/34] nixos/gitlab: fix registry.issuer setting

Prior to this change, the configuration value for
`services.gitlab.registry.issuer` was only referenced by the
docker-registry configuration and in the `gitlab-registry-cert` service
while the gitlab config used the hard-coded value "gitlab-issuer".
---
 nixos/modules/services/misc/gitlab.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index ee59cea38dfd..5fe1e6ea31b1 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -168,7 +168,7 @@ let
         port = cfg.registry.externalPort;
         key = cfg.registry.keyFile;
         api_url = "http://${config.services.dockerRegistry.listenAddress}:${toString config.services.dockerRegistry.port}/";
-        issuer = "gitlab-issuer";
+        issuer = cfg.registry.issuer;
       };
       extra = {};
       uploads.storage_path = cfg.statePath;

From 748f2f342c3471e16aad47d5584b72d1f8369fbf Mon Sep 17 00:00:00 2001
From: Jona Enzinger <jona_enzinger@outlook.com>
Date: Tue, 16 Aug 2022 11:07:34 +0200
Subject: [PATCH 02/34] microsoft-edge: 102.0.1245.44 -> 104.0.1293.54

---
 .../networking/browsers/microsoft-edge/default.nix   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix
index c769937ee86b..6088d761748f 100644
--- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix
+++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix
@@ -1,20 +1,20 @@
 {
   beta = import ./browser.nix {
     channel = "beta";
-    version = "103.0.1264.21";
+    version = "104.0.1293.44";
     revision = "1";
-    sha256 = "sha256:1336i0hy7xnla0pi4vahaxshhmivi1zljhaxyg63352bc7w9j64f";
+    sha256 = "sha256:01accsknks9ss2v9sn5lx5w1nrmn90rindi9jkfn5i387ssf8p4v";
   };
   dev = import ./browser.nix {
     channel = "dev";
-    version = "104.0.1287.1";
+    version = "105.0.1343.4";
     revision = "1";
-    sha256 = "sha256:10h360vfsfql42i6mpdvf8d0219506ipbk3hdpwl0jhlsphmhw61";
+    sha256 = "sha256:0bz2zx11v52izv2sf6q40jnpajmzw3r67h4ggmg0pw6g0d4ridva";
   };
   stable = import ./browser.nix {
     channel = "stable";
-    version = "102.0.1245.44";
+    version = "104.0.1293.54";
     revision = "1";
-    sha256 = "sha256:10r12xlkcnag5jdmnwpqsbkjx1ih1027l573vxmcxmvpmj6y4373";
+    sha256 = "sha256:1i5h0y9dx3dlks6qnz466axbhyvrc0wfxncfz0n62a32fdj0aswi";
   };
 }

From 6f0138cc08c0ad4921c8b7373261c709c1d09889 Mon Sep 17 00:00:00 2001
From: Jona Enzinger <jona_enzinger@outlook.com>
Date: Tue, 16 Aug 2022 16:52:34 +0200
Subject: [PATCH 03/34] microsoft-edge: fix hardware acceleration

---
 .../applications/networking/browsers/microsoft-edge/browser.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix
index 227442b1e4b6..636d1a13791f 100644
--- a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix
+++ b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
         glib nss nspr
       ];
       libGLESv2 = lib.makeLibraryPath [
-        xorg.libX11 xorg.libXext xorg.libxcb
+        xorg.libX11 xorg.libXext xorg.libxcb wayland
       ];
       libsmartscreen = lib.makeLibraryPath [
         libuuid stdenv.cc.cc.lib

From 0a3d517599256c901ca5b7f009bde21e2962729f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Aug 2022 13:22:39 +0000
Subject: [PATCH 04/34] python310Packages.azure-multiapi-storage: 0.9.0 ->
 0.10.0

---
 .../python-modules/azure-multiapi-storage/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix
index 84114684476c..442315d0566b 100644
--- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix
+++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix
@@ -7,13 +7,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.9.0";
+  version = "0.10.0";
   pname = "azure-multiapi-storage";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-7uq8uRZ3MXI1Gy+DmMkRVNV7uZPw6j8r9KfhS8d+tCY=";
+    sha256 = "sha256-QhC2s/onnlbFVxMmK6SJg2hatxp4WTrYWtMV0pXtAZ8=";
   };
 
   propagatedBuildInputs = [

From 1c83738312ee4da9d7b138e628c457e9f919d20e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 31 Aug 2022 05:02:17 +0000
Subject: [PATCH 05/34] _1password: 2.6.2 -> 2.7.0

---
 pkgs/applications/misc/1password/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix
index 26eed13ea0f1..8402e7147a66 100644
--- a/pkgs/applications/misc/1password/default.nix
+++ b/pkgs/applications/misc/1password/default.nix
@@ -12,12 +12,12 @@ let
     if extension == "zip" then fetchzip args else fetchurl args;
 
   pname = "1password-cli";
-  version = "2.6.2";
+  version = "2.7.0";
   sources = rec {
-    aarch64-linux = fetch "linux_arm64" "sha256-3R2afGRSrwffhZNNJAszzmrwfHJ0/wy4/6j2cpvMosA=" "zip";
-    i686-linux = fetch "linux_386" "sha256-QhUIm+RAmPIS7HBUE/AxPvlx2s3Pk8KeIV9tEJ22+8c=" "zip";
-    x86_64-linux = fetch "linux_amd64" "sha256-/8iuQAyCA4srH/mUlbo7W5VdlR4At7TlFCVPaqH45og=" "zip";
-    aarch64-darwin = fetch "apple_universal" "sha256-HMGR2oBTzB7TwresCN0SYHqM7fcMSiMEu8aw7BN6wyI=" "pkg";
+    aarch64-linux = fetch "linux_arm64" "sha256-6c8m+Gea52XpNrPtY7oi3gsALHwLiK5aD83rsJSp6x0=" "zip";
+    i686-linux = fetch "linux_386" "sha256-glcyQ1JWP7/cMpMY2/tTLnhPXy8nVmbzvIw4ZmP8SKg=" "zip";
+    x86_64-linux = fetch "linux_amd64" "sha256-CjHl3AzUaD7ESlXeFfreZgs5tc3C546GoEgkVJe+vv4=" "zip";
+    aarch64-darwin = fetch "apple_universal" "sha256-3HEvkGWqJQNloVpkMl64DIoee3e/sMGf+GpAmAnS1jI=" "pkg";
     x86_64-darwin = aarch64-darwin;
   };
   platforms = builtins.attrNames sources;

From 29fe749d599694ea05cd693a7cf0d2f7bd3f86cb Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Sat, 30 Jul 2022 14:54:47 +0200
Subject: [PATCH 06/34] python310Packages.treex: Enable more tests

---
 .../python-modules/treex/default.nix          | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/treex/default.nix b/pkgs/development/python-modules/treex/default.nix
index 85896ac7921f..7f247bbdc07d 100644
--- a/pkgs/development/python-modules/treex/default.nix
+++ b/pkgs/development/python-modules/treex/default.nix
@@ -14,6 +14,9 @@
 , rich
 , tensorflow
 , treeo
+, torchmetrics
+, pythonRelaxDepsHook
+, torch
 }:
 
 buildPythonPackage rec {
@@ -31,15 +34,16 @@ buildPythonPackage rec {
   # At the time of writing (2022-03-29), rich is currently at version 11.0.0.
   # The treeo dependency is compatible with a patch, but not marked as such in
   # treex. See https://github.com/cgarciae/treex/issues/68.
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'rich = "^11.2.0"' 'rich = "*"' \
-      --replace 'treeo = "^0.0.10"' 'treeo = "*"' \
-      --replace 'certifi = "^2021.10.8"' 'certifi = "*"'
-  '';
+  pythonRelaxDeps = [
+    "certifi"
+    "flax"
+    "rich"
+    "treeo"
+  ];
 
   nativeBuildInputs = [
     poetry-core
+    pythonRelaxDepsHook
   ];
 
   buildInputs = [ jaxlib ];
@@ -50,6 +54,7 @@ buildPythonPackage rec {
     pyyaml
     rich
     treeo
+    torch
   ];
 
   checkInputs = [
@@ -59,17 +64,10 @@ buildPythonPackage rec {
     keras
     pytestCheckHook
     tensorflow
+    torchmetrics
   ];
 
-  pythonImportsCheck = [
-    "treex"
-  ];
-
-  disabledTestPaths = [
-    # Require `torchmetrics` which is not packaged in `nixpkgs`.
-    "tests/metrics/test_mean_absolute_error.py"
-    "tests/metrics/test_mean_square_error.py"
-  ];
+  pythonImportsCheck = [ "treex" ];
 
   meta = with lib; {
     description = "Pytree Module system for Deep Learning in JAX";

From df365122c803f4cb2fcc620ed0cb04473c330648 Mon Sep 17 00:00:00 2001
From: Philipp Arras <c@philipp-arras.de>
Date: Wed, 31 Aug 2022 13:23:25 +0200
Subject: [PATCH 07/34] python3Packages.ducc0: 0.24.0 -> 0.25.0

---
 pkgs/development/python-modules/ducc0/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ducc0/default.nix b/pkgs/development/python-modules/ducc0/default.nix
index 218af92608d4..af7d501ee20d 100644
--- a/pkgs/development/python-modules/ducc0/default.nix
+++ b/pkgs/development/python-modules/ducc0/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "ducc0";
-  version = "0.24.0";
+  version = "0.25.0";
 
   disabled = pythonOlder "3.7";
 
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     owner = "mtr";
     repo = "ducc";
     rev = "ducc0_${lib.replaceStrings ["."] ["_"] version}";
-    sha256 = "sFgEO6f9D3AFV62yLEocgrPrj03H60e2NtdA/Ws6lQw=";
+    sha256 = "h+x6dakjyTyqOT9nzzZiCmjw5duZBGu+zpnQJnTnN1M=";
   };
 
   buildInputs = [ pybind11 ];

From ae139ef8d5dd318dd28cc0fe4181d4e6474daf49 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Sep 2022 13:18:01 +0000
Subject: [PATCH 08/34] kdash: 0.3.4 -> 0.3.5

---
 pkgs/development/tools/kdash/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/kdash/default.nix b/pkgs/development/tools/kdash/default.nix
index 7ea0b6abcab6..37e33508906a 100644
--- a/pkgs/development/tools/kdash/default.nix
+++ b/pkgs/development/tools/kdash/default.nix
@@ -12,13 +12,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "kdash";
-  version = "0.3.4";
+  version = "0.3.5";
 
   src = fetchFromGitHub {
     owner = "kdash-rs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-xKrgRUU0ENJ8CIQUaU/6dMbmxN9RX4jksQnBfgcsRYE=";
+    sha256 = "sha256-hh/Q3wUsA6HM0PwMlSfWx9LX+h/Y9w/fXm4HMYXexZU=";
   };
 
   nativeBuildInputs = [ perl python3 pkg-config ];
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ openssl xorg.xcbutil ]
     ++ lib.optional stdenv.isDarwin AppKit;
 
-  cargoSha256 = "sha256-7RQvd9zx6iXKmgYLp8N8hGDfq9IX0LoNf2jXwv+iOkM=";
+  cargoSha256 = "sha256-02AfMbR8TsIqEhkXAnslnxgO/XkyEuCW1IyBtrk1dDA=";
 
   meta = with lib; {
     description = "A simple and fast dashboard for Kubernetes";

From 295ecdfde289f77ba97715a104b7b7c0e826c7b7 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Thu, 1 Sep 2022 09:39:21 -0400
Subject: [PATCH 09/34] epick: 0.8.0 -> 0.8.1

---
 pkgs/applications/graphics/epick/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/epick/default.nix b/pkgs/applications/graphics/epick/default.nix
index 8144a901a40f..dbe745217a38 100644
--- a/pkgs/applications/graphics/epick/default.nix
+++ b/pkgs/applications/graphics/epick/default.nix
@@ -16,16 +16,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "epick";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "vv9k";
     repo = pname;
     rev = version;
-    sha256 = "sha256-LJg68YY8PqKF7Thn181XRFsCNJA0DkYKVFbIR1UkxGU=";
+    sha256 = "sha256-sZ0ZPst6PE6KQ+pmjqLdcD7bWU/gLRsGH84PtWTLdSQ=";
   };
 
-  cargoSha256 = "sha256-j6tim6dS++ECfBMdyQlS3CqN+Tr5ozHqyZ1bPKhDKV0=";
+  cargoSha256 = "sha256-kMVjX4AWn8XFRzI7P9NRW8B7AHcIC8TG8LQk7tzkz5o=";
 
   nativeBuildInputs = lib.optional stdenv.isLinux python3;
 

From 6088bad88a7a05c460d9549beb013bddd72c1e36 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Tue, 30 Aug 2022 19:04:07 +0200
Subject: [PATCH 10/34] bundler: add passthru.updateScript

---
 pkgs/development/ruby-modules/bundler/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix
index 04f97c68c6a6..efa91bfbe04a 100644
--- a/pkgs/development/ruby-modules/bundler/default.nix
+++ b/pkgs/development/ruby-modules/bundler/default.nix
@@ -1,4 +1,4 @@
-{ buildRubyGem, ruby }:
+{ buildRubyGem, ruby, writeScript }:
 
 buildRubyGem rec {
   inherit ruby;
@@ -8,6 +8,16 @@ buildRubyGem rec {
   source.sha256 = "sha256-gJJ3vHzrJo6XpHS1iwLb77jd9ZB39GGLcOJQSrgaBHw=";
   dontPatchShebangs = true;
 
+  passthru.updateScript = writeScript "gem-update-script" ''
+    #!/usr/bin/env nix-shell
+    #!nix-shell -i bash -p curl common-updater-scripts jq
+
+    set -eu -o pipefail
+
+    latest_version=$(curl -s https://rubygems.org/api/v1/gems/${gemName}.json | jq --raw-output .version)
+    update-source-version ${gemName} "$latest_version"
+  '';
+
   postFixup = ''
     sed -i -e "s/activate_bin_path/bin_path/g" $out/bin/bundle
   '';

From 6db2d6e113f6bf5c2d012edcbcad4bb3f26c6eaa Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Tue, 30 Aug 2022 18:51:50 +0200
Subject: [PATCH 11/34] bundler: 2.3.20 -> 2.3.21

---
 pkgs/development/ruby-modules/bundler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix
index efa91bfbe04a..46e5b8b3aa7a 100644
--- a/pkgs/development/ruby-modules/bundler/default.nix
+++ b/pkgs/development/ruby-modules/bundler/default.nix
@@ -4,8 +4,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "bundler";
-  version = "2.3.20";
-  source.sha256 = "sha256-gJJ3vHzrJo6XpHS1iwLb77jd9ZB39GGLcOJQSrgaBHw=";
+  version = "2.3.21";
+  source.sha256 = "sha256-+u3H/8Fno8U7ZMRj2me1DVvkOAR2HeWmjdo0TCG/0d4=";
   dontPatchShebangs = true;
 
   passthru.updateScript = writeScript "gem-update-script" ''

From d055a2ec1e75e8c7c34bc51c9d5604740b92722b Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Tue, 30 Aug 2022 19:06:19 +0200
Subject: [PATCH 12/34] bundler: add meta

---
 pkgs/development/ruby-modules/bundler/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix
index 46e5b8b3aa7a..8daf80400209 100644
--- a/pkgs/development/ruby-modules/bundler/default.nix
+++ b/pkgs/development/ruby-modules/bundler/default.nix
@@ -1,4 +1,4 @@
-{ buildRubyGem, ruby, writeScript }:
+{ lib, buildRubyGem, ruby, writeScript }:
 
 buildRubyGem rec {
   inherit ruby;
@@ -21,4 +21,11 @@ buildRubyGem rec {
   postFixup = ''
     sed -i -e "s/activate_bin_path/bin_path/g" $out/bin/bundle
   '';
+
+  meta = with lib; {
+    description = "Manage your Ruby application's gem dependencies";
+    homepage = "https://bundler.io";
+    license = licenses.mit;
+    maintainers = with maintainers; [anthonyroussel];
+  };
 }

From ccdc8f3162aa5ec41ae2c6852ce21cc64c69c25f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Sep 2022 15:01:51 +0000
Subject: [PATCH 13/34] oh-my-posh: 8.36.6 -> 8.36.7

---
 pkgs/development/tools/oh-my-posh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix
index 2c02589bdda3..667afac11584 100644
--- a/pkgs/development/tools/oh-my-posh/default.nix
+++ b/pkgs/development/tools/oh-my-posh/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "oh-my-posh";
-  version = "8.36.6";
+  version = "8.36.7";
 
   src = fetchFromGitHub {
     owner = "jandedobbeleer";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Q2vp8NkWroU/p74oB3MeGYC+Ld6Z62fjEwIMiAGjHTo=";
+    sha256 = "sha256-K4+d7HIH7FDvXkjkf6YCJjbTgPYBBMFqKDHXUNkL2Jo=";
   };
 
   vendorSha256 = "sha256-t4FpvXsGVsTYoGM8wY2JelscnlmDzrLMPYk7zGUfo58=";

From 4e180a2659fef65bf2b58d75a8bd1642a109ca0c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Sep 2022 15:12:08 +0000
Subject: [PATCH 14/34] opentelemetry-collector: 0.58.0 -> 0.59.0

---
 pkgs/tools/misc/opentelemetry-collector/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix
index a32512157cfc..1ad88a4403b9 100644
--- a/pkgs/tools/misc/opentelemetry-collector/default.nix
+++ b/pkgs/tools/misc/opentelemetry-collector/default.nix
@@ -12,17 +12,17 @@ let
 in
 buildGoModule rec {
   pname = "opentelemetry-collector";
-  version = "0.58.0";
+  version = "0.59.0";
 
   src = fetchFromGitHub {
     owner = "open-telemetry";
     repo = "opentelemetry-collector";
     rev = "v${version}";
-    sha256 = "sha256-qWRuVzRFuUBfnBkc6KDWTkPahk980KLdRqUnPbKJjpU=";
+    sha256 = "sha256-eNndY3BPdeFO9cihfkPWlDVwWfNZWnjL5gJCxlgJn9c=";
   };
   # there is a nested go.mod
   sourceRoot = "source/cmd/otelcorecol";
-  vendorSha256 = "sha256-iK4oXNZe4/4/Yh9/Rq3St9MmeqEq6bVu8sTh4rdMi0c=";
+  vendorSha256 = "sha256-+i8uKR5EZXTmOnuwoeM6Vpt934v0egSjC951ryXaZS0=";
 
   preBuild = ''
     # set the build version, can't be done via ldflags

From a6eeae2693849b1d3076f63378218e50d90aab11 Mon Sep 17 00:00:00 2001
From: Ivan Kovnatsky <75213+ivankovnatsky@users.noreply.github.com>
Date: Thu, 1 Sep 2022 17:56:52 +0300
Subject: [PATCH 15/34] vimPlugins.context-vim: init at 2022-05-02

---
 pkgs/applications/editors/vim/plugins/generated.nix  | 12 ++++++++++++
 .../editors/vim/plugins/vim-plugin-names             |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 880ea446be4f..da1aa12dabb6 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -1948,6 +1948,18 @@ final: prev:
     meta.homepage = "https://github.com/Olical/conjure/";
   };
 
+  context-vim = buildVimPluginFrom2Nix {
+    pname = "context.vim";
+    version = "2022-05-02";
+    src = fetchFromGitHub {
+      owner = "wellle";
+      repo = "context.vim";
+      rev = "c06541451aa94957c1c07a9f8a7130ad97d83a65";
+      sha256 = "1n9623cp8ljyrwnq0i4zqfaxp1fwsl5l3shg87ksn1xvj14fw66c";
+    };
+    meta.homepage = "https://github.com/wellle/context.vim/";
+  };
+
   context_filetype-vim = buildVimPluginFrom2Nix {
     pname = "context_filetype.vim";
     version = "2021-08-08";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 01b8166b6cc3..df226ed39a8d 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -163,6 +163,7 @@ https://github.com/nvim-treesitter/completion-treesitter/,,
 https://github.com/chikatoike/concealedyank.vim/,,
 https://github.com/rhysd/conflict-marker.vim/,,
 https://github.com/Olical/conjure/,,
+https://github.com/wellle/context.vim/,,
 https://github.com/Shougo/context_filetype.vim/,,
 https://github.com/github/copilot.vim/,,
 https://github.com/ms-jpq/coq.artifacts/,HEAD,

From 6aafe3897ff870dee6a30b2b712823183294ba2d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Sep 2022 15:22:30 +0000
Subject: [PATCH 16/34] opentelemetry-collector-contrib: 0.58.0 -> 0.59.0

---
 pkgs/tools/misc/opentelemetry-collector/contrib.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix
index 71b8d492fe25..e09ca61025b2 100644
--- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix
+++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix
@@ -6,17 +6,17 @@
 
 buildGoModule rec {
   pname = "opentelemetry-collector-contrib";
-  version = "0.58.0";
+  version = "0.59.0";
 
   src = fetchFromGitHub {
     owner = "open-telemetry";
     repo = "opentelemetry-collector-contrib";
     rev = "v${version}";
-    sha256 = "sha256-7gvtITPN7NqC4E8Z4nEFgz2jp1HD4HhuVrE8Qk3WM+A=";
+    sha256 = "sha256-snkrgitPtrdX5LuMscmeeY9KQeBGsPApaDc2LRfRKJ0=";
   };
   # proxy vendor to avoid hash missmatches between linux and macOS
   proxyVendor = true;
-  vendorSha256 = "sha256-aCwySLvfseMBNU+Q1f7awiivChpPyn/V7osEwzieNxg=";
+  vendorSha256 = "sha256-u0JC/4Pav0ZZIvOzE22kdUWR5wgYAUN8/fKfjsDev0g=";
 
   subPackages = [ "cmd/otelcontribcol" ];
 

From ed5bd9d73d112246ca5c633c60f38a1a71832409 Mon Sep 17 00:00:00 2001
From: matthewcroughan <matt@croughan.sh>
Date: Thu, 1 Sep 2022 17:22:43 +0100
Subject: [PATCH 17/34] trezor-suite: 22.3.2 -> 22.8.2

---
 pkgs/applications/blockchains/trezor-suite/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix
index 9c38a3f78615..b110bd4e33be 100644
--- a/pkgs/applications/blockchains/trezor-suite/default.nix
+++ b/pkgs/applications/blockchains/trezor-suite/default.nix
@@ -8,7 +8,7 @@
 
 let
   pname = "trezor-suite";
-  version = "22.3.2";
+  version = "22.8.2";
   name = "${pname}-${version}";
 
   suffix = {
@@ -19,8 +19,8 @@ let
   src = fetchurl {
     url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage";
     sha512 = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
-      aarch64-linux = "sha512-GW8wmfTjuWrXijyPKeDJgF+mas1pfEMgAASmlvCURfFwg+oSL0B/0Z2qm5QRXIHmyd7eg/Zd8nEZL7Fg2Lb9ww==";
-      x86_64-linux  = "sha512-/XQ/sI0TP++3KHlkBXLHe/SVGKcmyjT7vPkV0NCK4rlL70VE+wKLKQK6XKp4V81B5w2+3a/uPOWtmcVr5iVkSA==";
+      aarch64-linux = "sha512-tzGkEDVXOJaTfRPO4UUfDpqaddjeJvVHpf81A9hhpUTRIgbAO4fcOrTgJcgWCBotDo8nHCWjw+n5BG5PEfQ19Q==";
+      x86_64-linux  = "sha512-qUM3HGYXbVbLRYXetLGbShPU5ochuptCUNn0G5RD3tQeipVZsgRkQCSfZ1Zb3HgoPUOna3u8Mp7Ipu1n8xi3vg==";
     }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };
 

From c648a1d16885a6da9ab4b02e4b18f14bc1567b91 Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Thu, 1 Sep 2022 20:32:41 +0300
Subject: [PATCH 18/34] gzdoom: 4.7.1 -> 4.8.2

Fixes: #189159
---
 pkgs/games/gzdoom/default.nix | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix
index a10b370e648b..57825e781cae 100644
--- a/pkgs/games/gzdoom/default.nix
+++ b/pkgs/games/gzdoom/default.nix
@@ -1,19 +1,18 @@
 { lib, stdenv, fetchFromGitHub, cmake, makeWrapper, openal, fluidsynth
-, soundfont-fluid, libGL, SDL2, bzip2, zlib, libjpeg, libsndfile, mpg123
+, soundfont-fluid, libGL, SDL2, bzip2, zlib, libjpeg, libsndfile, libvpx, mpg123
 , game-music-emu, pkg-config, copyDesktopItems, makeDesktopItem }:
 
 let
-  zmusic-src = fetchFromGitHub {
-    owner = "coelckers";
-    repo = "zmusic";
-    rev = "bff02053bea30bd789e45f60b90db3ffc69c8cc8";
-    sha256 = "0vpr79gpdbhslg5qxyd1qxlv5akgli26skm1vb94yd8v69ymdcy2";
-  };
-  zmusic = stdenv.mkDerivation {
+  zmusic = stdenv.mkDerivation rec {
     pname = "zmusic";
     version = "1.1.3";
 
-    src = zmusic-src;
+    src = fetchFromGitHub {
+      owner = "ZDoom";
+      repo = "ZMusic";
+      rev = version;
+      hash = "sha256-wrNWfTIbNU/S2qFObUSkb6qyaceh+Y7Loxqudl86+W4=";
+    };
 
     nativeBuildInputs = [ cmake pkg-config ];
 
@@ -23,18 +22,17 @@ let
         -e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \
         source/mididevices/music_fluidsynth_mididevice.cpp
     '';
-
   };
 
   gzdoom = stdenv.mkDerivation rec {
     pname = "gzdoom";
-    version = "4.7.1";
+    version = "4.8.2";
 
     src = fetchFromGitHub {
-      owner = "coelckers";
+      owner = "ZDoom";
       repo = "gzdoom";
       rev = "g${version}";
-      sha256 = "sha256-3wO83RgxzeJnoxykKQxb1S1GA6QZlhZMw6GrV3YEm/0=";
+      hash = "sha256-aT7DUZih3EDqncaXYIPIyGsz4fI267N29PmN3qyVjyo=";
       fetchSubmodules = true;
     };
 
@@ -48,6 +46,7 @@ let
       zlib
       libjpeg
       libsndfile
+      libvpx
       mpg123
       game-music-emu
       zmusic
@@ -84,13 +83,11 @@ let
     '';
 
     meta = with lib; {
-      homepage = "https://github.com/coelckers/gzdoom";
-      description =
-        "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features";
-      license = licenses.gpl3;
+      homepage = "https://github.com/ZDoom/gzdoom";
+      description = "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features";
+      license = licenses.gpl3Plus;
       platforms = [ "x86_64-linux" ];
-      maintainers = with maintainers; [ lassulus ];
+      maintainers = with maintainers; [ azahi lassulus ];
     };
   };
-
 in gzdoom

From 6211e08ab16e7b647adb383e205e6c9c453e71b9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Sep 2022 17:35:03 +0000
Subject: [PATCH 19/34] timescaledb-tune: 0.14.0 -> 0.14.1

---
 pkgs/development/tools/database/timescaledb-tune/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/development/tools/database/timescaledb-tune/default.nix
index 9be1055e4762..ba773e297d7b 100644
--- a/pkgs/development/tools/database/timescaledb-tune/default.nix
+++ b/pkgs/development/tools/database/timescaledb-tune/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "timescaledb-tune";
-  version = "0.14.0";
+  version = "0.14.1";
 
   src = fetchFromGitHub {
     owner = "timescale";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-veqsVqG2UCKRRXAcJVF0bPv2FwgC/0KQ49pU+ASuIhA=";
+    sha256 = "sha256-Met+bFvTlbn7JAE2A2IFBD4f6qVtS/4gXffwV71xvZI=";
   };
 
   vendorSha256 = "sha256-n2jrg9FiR/gSrbds/QVV8Duf7BTEs36yYi4F3Ve+d0E=";

From 5324fa4edf6b2fe10e1252a11888c8291237fb3a Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Thu, 1 Sep 2022 19:49:31 +0200
Subject: [PATCH 20/34] logseq: 0.8.3 -> 0.8.4

https://github.com/logseq/logseq/releases/tag/0.8.4
---
 pkgs/applications/misc/logseq/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix
index c41aad02abc7..a8260e8f4afb 100644
--- a/pkgs/applications/misc/logseq/default.nix
+++ b/pkgs/applications/misc/logseq/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "logseq";
-  version = "0.8.3";
+  version = "0.8.4";
 
   src = fetchurl {
     url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
-    sha256 = "sha256-OJ/1SFG/UNkNSYtAQprKlc9JhT9/co4XH941mu+YsXE=";
+    sha256 = "sha256-zzMowQnSyrxL/qCSAOB1tffizOmOpbnN6UePETAqIlM=";
     name = "${pname}-${version}.AppImage";
   };
 

From 456d8dd521bb6ca28ebd964f2dcaf58342acf966 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Thu, 1 Sep 2022 14:57:02 -0300
Subject: [PATCH 21/34] qmplay2: rename libgme to game-music-emu

---
 pkgs/applications/video/qmplay2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/qmplay2/default.nix b/pkgs/applications/video/qmplay2/default.nix
index 8b2af2b9f915..49aa6c00e790 100644
--- a/pkgs/applications/video/qmplay2/default.nix
+++ b/pkgs/applications/video/qmplay2/default.nix
@@ -5,10 +5,10 @@
 , cmake
 , alsa-lib
 , ffmpeg
+, game-music-emu
 , libass
 , libcddb
 , libcdio
-, libgme
 , libpulseaudio
 , libsidplayfp
 , libva
@@ -40,11 +40,11 @@ stdenv.mkDerivation rec {
   buildInputs = [
     alsa-lib
     ffmpeg
+    game-music-emu
     libXv
     libass
     libcddb
     libcdio
-    libgme
     libpulseaudio
     libsidplayfp
     libva

From 821f5796df97ec12888088daa4b23a0e469eee54 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 1 Sep 2022 17:57:26 +0000
Subject: [PATCH 22/34] =?UTF-8?q?n8n:=200.192.0=20=E2=86=92=200.193.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../networking/n8n/node-packages.nix          | 618 +++---------------
 1 file changed, 94 insertions(+), 524 deletions(-)

diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix
index 2077c05f593d..5b1acb6c73e1 100644
--- a/pkgs/applications/networking/n8n/node-packages.nix
+++ b/pkgs/applications/networking/n8n/node-packages.nix
@@ -4,15 +4,6 @@
 
 let
   sources = {
-    "@apidevtools/json-schema-ref-parser-8.0.0" = {
-      name = "_at_apidevtools_slash_json-schema-ref-parser";
-      packageName = "@apidevtools/json-schema-ref-parser";
-      version = "8.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-8.0.0.tgz";
-        sha512 = "n4YBtwQhdpLto1BaUCyAeflizmIbaloGShsPyRtFf5qdFJxfssj+GgLavczgKJFa3Bq+3St2CKcpRJdjtB4EBw==";
-      };
-    };
     "@apidevtools/json-schema-ref-parser-9.0.9" = {
       name = "_at_apidevtools_slash_json-schema-ref-parser";
       packageName = "@apidevtools/json-schema-ref-parser";
@@ -22,42 +13,6 @@ let
         sha512 = "GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w==";
       };
     };
-    "@apidevtools/openapi-schemas-2.1.0" = {
-      name = "_at_apidevtools_slash_openapi-schemas";
-      packageName = "@apidevtools/openapi-schemas";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@apidevtools/openapi-schemas/-/openapi-schemas-2.1.0.tgz";
-        sha512 = "Zc1AlqrJlX3SlpupFGpiLi2EbteyP7fXmUOGup6/DnkRgjP9bgMM/ag+n91rsv0U1Gpz0H3VILA/o3bW7Ua6BQ==";
-      };
-    };
-    "@apidevtools/swagger-cli-4.0.0" = {
-      name = "_at_apidevtools_slash_swagger-cli";
-      packageName = "@apidevtools/swagger-cli";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@apidevtools/swagger-cli/-/swagger-cli-4.0.0.tgz";
-        sha512 = "8jDHtZxEkxFNMfqeNhyHjxiS9P3BlSj1WpetsMExs4N+PIa3d0vSNch4Fk9OlgT/2oClCK0YSc+dmmdVpHh0hg==";
-      };
-    };
-    "@apidevtools/swagger-methods-3.0.2" = {
-      name = "_at_apidevtools_slash_swagger-methods";
-      packageName = "@apidevtools/swagger-methods";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@apidevtools/swagger-methods/-/swagger-methods-3.0.2.tgz";
-        sha512 = "QAkD5kK2b1WfjDS/UQn/qQkbwF31uqRjPTrsCs5ZG9BQGAkjwvqGFjjPqAuzac/IYzpPtRzjCP1WrTuAIjMrXg==";
-      };
-    };
-    "@apidevtools/swagger-parser-9.0.1" = {
-      name = "_at_apidevtools_slash_swagger-parser";
-      packageName = "@apidevtools/swagger-parser";
-      version = "9.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@apidevtools/swagger-parser/-/swagger-parser-9.0.1.tgz";
-        sha512 = "Irqybg4dQrcHhZcxJc/UM4vO7Ksoj1Id5e+K94XUOzllqX1n47HEA50EKiXTCQbykxuJ4cYGIivjx/MRSTC5OA==";
-      };
-    };
     "@azure/abort-controller-1.1.0" = {
       name = "_at_azure_slash_abort-controller";
       packageName = "@azure/abort-controller";
@@ -265,22 +220,22 @@ let
         sha512 = "nG0gmbx4pSr8wltdG/ZdlS6OrsMK40Wt6iyuLTKHEf0TQfzKRMlWaskZHdeuWCwS6WUgqHKMf9KSwGdxPfapOg==";
       };
     };
-    "@fortawesome/fontawesome-common-types-6.1.2" = {
+    "@fortawesome/fontawesome-common-types-6.2.0" = {
       name = "_at_fortawesome_slash_fontawesome-common-types";
       packageName = "@fortawesome/fontawesome-common-types";
-      version = "6.1.2";
+      version = "6.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.1.2.tgz";
-        sha512 = "wBaAPGz1Awxg05e0PBRkDRuTsy4B3dpBm+zreTTyd9TH4uUM27cAL4xWyWR0rLJCrRwzVsQ4hF3FvM6rqydKPA==";
+        url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.0.tgz";
+        sha512 = "rBevIsj2nclStJ7AxTdfsa3ovHb1H+qApwrxcTVo+NNdeJiB9V75hsKfrkG5AwNcRUNxrPPiScGYCNmLMoh8pg==";
       };
     };
-    "@fortawesome/free-regular-svg-icons-6.1.2" = {
+    "@fortawesome/free-regular-svg-icons-6.2.0" = {
       name = "_at_fortawesome_slash_free-regular-svg-icons";
       packageName = "@fortawesome/free-regular-svg-icons";
-      version = "6.1.2";
+      version = "6.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.1.2.tgz";
-        sha512 = "xR4hA+tAwsaTHGfb+25H1gVU/aJ0Rzu+xIUfnyrhaL13yNQ7TWiI2RvzniAaB+VGHDU2a+Pk96Ve+pkN3/+TTQ==";
+        url = "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.2.0.tgz";
+        sha512 = "M1dG+PAmkYMTL9BSUHFXY5oaHwBYfHCPhbJ8qj8JELsc9XCrUJ6eEHWip4q0tE+h9C0DVyFkwIM9t7QYyCpprQ==";
       };
     };
     "@icetee/ftp-0.3.15" = {
@@ -571,15 +526,6 @@ let
         sha512 = "XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==";
       };
     };
-    "@types/bluebird-3.5.36" = {
-      name = "_at_types_slash_bluebird";
-      packageName = "@types/bluebird";
-      version = "3.5.36";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.36.tgz";
-        sha512 = "HBNx4lhkxN7bx6P0++W8E289foSu8kO8GCk2unhuVggO+cE7rh9DhZUyPhUxNRG9m+5B5BTKxZQ5ZP92x/mx9Q==";
-      };
-    };
     "@types/body-parser-1.19.2" = {
       name = "_at_types_slash_body-parser";
       packageName = "@types/body-parser";
@@ -643,42 +589,6 @@ let
         sha512 = "TyPLQaF6w8UlWdv4gj8i46B+INBVzURBNRahCozCSXfsK2VTlL1wNyTlMKw817VHygBtlcl5jfnPadlydr06Yw==";
       };
     };
-    "@types/ftp-0.3.33" = {
-      name = "_at_types_slash_ftp";
-      packageName = "@types/ftp";
-      version = "0.3.33";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/ftp/-/ftp-0.3.33.tgz";
-        sha512 = "L7wFlX3t9GsGgNS0oxLt6zbAZZGgsdptMmciL4cdxHmbL3Hz4Lysh8YqAR34eHsJ1uacJITcZBBDl5XpQlxPpQ==";
-      };
-    };
-    "@types/generic-pool-3.1.11" = {
-      name = "_at_types_slash_generic-pool";
-      packageName = "@types/generic-pool";
-      version = "3.1.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/generic-pool/-/generic-pool-3.1.11.tgz";
-        sha512 = "3mcD3ewmaKPbiAZglGj8We4ohlSMfw/xS+bbYUhTv/ALgqrrtJjyL4Ju9IgapXooBCTFEew5LAKQqzZV6/43xg==";
-      };
-    };
-    "@types/glob-7.2.0" = {
-      name = "_at_types_slash_glob";
-      packageName = "@types/glob";
-      version = "7.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz";
-        sha512 = "ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==";
-      };
-    };
-    "@types/json-diff-0.5.2" = {
-      name = "_at_types_slash_json-diff";
-      packageName = "@types/json-diff";
-      version = "0.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/json-diff/-/json-diff-0.5.2.tgz";
-        sha512 = "2oqXStJYYLDHCciNAClY277Ti3kXT+JLvPD7lLm/490i+B7g0GR6M4qiW+bd2V5vpB+yMKY8IelbsHMAYX1D0A==";
-      };
-    };
     "@types/json-schema-7.0.11" = {
       name = "_at_types_slash_json-schema";
       packageName = "@types/json-schema";
@@ -688,15 +598,6 @@ let
         sha512 = "wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==";
       };
     };
-    "@types/jsonwebtoken-8.5.9" = {
-      name = "_at_types_slash_jsonwebtoken";
-      packageName = "@types/jsonwebtoken";
-      version = "8.5.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.9.tgz";
-        sha512 = "272FMnFGzAVMGtu9tkr29hRL6bZj4Zs1KZNeHLnKqAvp06tAIcarTMwOh8/8bz4FmKRcMxZhZNeUAQsNLoiPhg==";
-      };
-    };
     "@types/lodash-4.14.184" = {
       name = "_at_types_slash_lodash";
       packageName = "@types/lodash";
@@ -706,24 +607,6 @@ let
         sha512 = "RoZphVtHbxPZizt4IcILciSWiC6dcn+eZ8oX9IWEYfDMcocdd42f7NPI6fQj+6zI8y4E0L7gu2pcZKLGTRaV9Q==";
       };
     };
-    "@types/lodash.intersection-4.4.7" = {
-      name = "_at_types_slash_lodash.intersection";
-      packageName = "@types/lodash.intersection";
-      version = "4.4.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/lodash.intersection/-/lodash.intersection-4.4.7.tgz";
-        sha512 = "7ukD2s54bmRNNpiH9ApEErO4H6mB8+WmXFr/6RpP3e/n7h3UFhEJC7QwLcoWAqOrYCIRFMAAwDf3ambSsW8c5Q==";
-      };
-    };
-    "@types/lossless-json-1.0.1" = {
-      name = "_at_types_slash_lossless-json";
-      packageName = "@types/lossless-json";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/lossless-json/-/lossless-json-1.0.1.tgz";
-        sha512 = "zPE8kmpeL5/6L5gtTQHSOkAW/OSYYNTDRt6/2oEgLO1Zd3Rj5WVDoMloTtLJxQJhZGLGbL4pktKSh3NbzdaWdw==";
-      };
-    };
     "@types/mime-3.0.1" = {
       name = "_at_types_slash_mime";
       packageName = "@types/mime";
@@ -733,15 +616,6 @@ let
         sha512 = "Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==";
       };
     };
-    "@types/minimatch-5.1.0" = {
-      name = "_at_types_slash_minimatch";
-      packageName = "@types/minimatch";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.0.tgz";
-        sha512 = "0RJHq5FqDWo17kdHe+SMDJLfxmLaqHbWnqZ6gNKzDvStUlrmx/eKIY17+ifLS1yybo7X86aUshQMlittDOVNnw==";
-      };
-    };
     "@types/multer-1.4.7" = {
       name = "_at_types_slash_multer";
       packageName = "@types/multer";
@@ -751,13 +625,13 @@ let
         sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA==";
       };
     };
-    "@types/node-18.7.13" = {
+    "@types/node-18.7.14" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "18.7.13";
+      version = "18.7.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-18.7.13.tgz";
-        sha512 = "46yIhxSe5xEaJZXWdIBP7GU4HDTG8/eo0qd9atdiL+lFpA03y8KS+lkTN834TWJj5767GbWv4n/P6efyTFt1Dw==";
+        url = "https://registry.npmjs.org/@types/node/-/node-18.7.14.tgz";
+        sha512 = "6bbDaETVi8oyIARulOE9qF1/Qdi/23z6emrUh0fNJRUmjznqrixD4MpGDdgOFk5Xb0m2H6Xu42JGdvAxaJR/wA==";
       };
     };
     "@types/node-fetch-2.6.2" = {
@@ -769,24 +643,6 @@ let
         sha512 = "DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==";
       };
     };
-    "@types/promise-ftp-1.3.4" = {
-      name = "_at_types_slash_promise-ftp";
-      packageName = "@types/promise-ftp";
-      version = "1.3.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/promise-ftp/-/promise-ftp-1.3.4.tgz";
-        sha512 = "fCIX7I84e25RX6bZ+qiIv0Puu5axWhCj9+El+4Kz1gZZyO/NvwdGTNQ33y6jdrPuTn3Df3kg7nMi1HohjNQLog==";
-      };
-    };
-    "@types/promise-ftp-common-1.1.0" = {
-      name = "_at_types_slash_promise-ftp-common";
-      packageName = "@types/promise-ftp-common";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/promise-ftp-common/-/promise-ftp-common-1.1.0.tgz";
-        sha512 = "mqo6D4qdiJdzeqlzFwEIchQQZk2hZacjssmjoAX7nClcREmRUUsnmgbWXEfA2qK986rwOPqepfRoSu7rsjAKag==";
-      };
-    };
     "@types/qs-6.9.7" = {
       name = "_at_types_slash_qs";
       packageName = "@types/qs";
@@ -814,33 +670,6 @@ let
         sha512 = "z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==";
       };
     };
-    "@types/shelljs-0.8.11" = {
-      name = "_at_types_slash_shelljs";
-      packageName = "@types/shelljs";
-      version = "0.8.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/shelljs/-/shelljs-0.8.11.tgz";
-        sha512 = "x9yaMvEh5BEaZKeVQC4vp3l+QoFj3BXcd4aYfuKSzIIyihjdVARAadYy3SMNIz0WCCdS2vB9JL/U6GQk5PaxQw==";
-      };
-    };
-    "@types/snowflake-sdk-1.6.7" = {
-      name = "_at_types_slash_snowflake-sdk";
-      packageName = "@types/snowflake-sdk";
-      version = "1.6.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/snowflake-sdk/-/snowflake-sdk-1.6.7.tgz";
-        sha512 = "qFObD4B02XTgVX1LsAdehdoxzhvJIn2WB5I7oJBr53JC+1X/0AzaUXm7tenuf53FWg6wyVuBgG79yxxBIJpKFA==";
-      };
-    };
-    "@types/swagger-ui-express-4.1.3" = {
-      name = "_at_types_slash_swagger-ui-express";
-      packageName = "@types/swagger-ui-express";
-      version = "4.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/swagger-ui-express/-/swagger-ui-express-4.1.3.tgz";
-        sha512 = "jqCjGU/tGEaqIplPy3WyQg+Nrp6y80DCFnDEAvVKWkJyv0VivSSDCChkppHRHAablvInZe6pijDFMnavtN0vqA==";
-      };
-    };
     "@types/tough-cookie-2.3.8" = {
       name = "_at_types_slash_tough-cookie";
       packageName = "@types/tough-cookie";
@@ -859,15 +688,6 @@ let
         sha512 = "sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==";
       };
     };
-    "@types/yamljs-0.2.31" = {
-      name = "_at_types_slash_yamljs";
-      packageName = "@types/yamljs";
-      version = "0.2.31";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/yamljs/-/yamljs-0.2.31.tgz";
-        sha512 = "QcJ5ZczaXAqbVD3o8mw/mEBhRvO5UAdTtbvgwL/OgoWubvNBh6/MxLBAigtcgIFaq3shon9m3POIxQaLQt4fxQ==";
-      };
-    };
     "@vue/compiler-sfc-2.7.10" = {
       name = "_at_vue_slash_compiler-sfc";
       packageName = "@vue/compiler-sfc";
@@ -1264,13 +1084,13 @@ let
         sha512 = "vkyt1+sj6qaD9oMtqqLE2pZ2IcHI66kFx8lpnVuXp55SnNPjKghfOhVfZpaDwDPpY0oVWP3Qu1uHZWxF3E856A==";
       };
     };
-    "aws-sdk-2.1202.0" = {
+    "aws-sdk-2.1207.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.1202.0";
+      version = "2.1207.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1202.0.tgz";
-        sha512 = "fFoEX+Id8/h/RIHw/gTZl3GnFF+RaXRmXueF7qCOqHm4g7mFOOgUUbc4BLbZ4gCDYRiyxNlGgija/je8EhLNRw==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1207.0.tgz";
+        sha512 = "UDNYNeWw9ATbz+pH4lI3AUQgnmK3RwowCrXmW+lVV0bZYo+efiB/LEWQKe0nZK9K2h1LxZYihIih9dOvaGme/w==";
       };
     };
     "aws-sign2-0.7.0" = {
@@ -1723,15 +1543,6 @@ let
         sha512 = "gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==";
       };
     };
-    "camelcase-5.3.1" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "5.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz";
-        sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==";
-      };
-    };
     "capital-case-1.0.4" = {
       name = "capital-case";
       packageName = "capital-case";
@@ -1768,15 +1579,6 @@ let
         sha512 = "KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==";
       };
     };
-    "chalk-3.0.0" = {
-      name = "chalk";
-      packageName = "chalk";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz";
-        sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==";
-      };
-    };
     "chalk-4.1.2" = {
       name = "chalk";
       packageName = "chalk";
@@ -1930,15 +1732,6 @@ let
         sha512 = "k8AvUYJon0vv75ufoVo4nALYb/qwFFicO3I0+39C6xEdflqVtr+f9cy+0ZxAduoVSTfhP5DX2tY2XICAd5hy6Q==";
       };
     };
-    "cliui-6.0.0" = {
-      name = "cliui";
-      packageName = "cliui";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz";
-        sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==";
-      };
-    };
     "cliui-7.0.4" = {
       name = "cliui";
       packageName = "cliui";
@@ -2452,15 +2245,6 @@ let
         sha512 = "syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw==";
       };
     };
-    "decamelize-1.2.0" = {
-      name = "decamelize";
-      packageName = "decamelize";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz";
-        sha512 = "z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==";
-      };
-    };
     "deep-is-0.1.4" = {
       name = "deep-is";
       packageName = "deep-is";
@@ -3181,15 +2965,6 @@ let
         sha512 = "5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==";
       };
     };
-    "find-up-4.1.0" = {
-      name = "find-up";
-      packageName = "find-up";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz";
-        sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==";
-      };
-    };
     "flatted-3.2.7" = {
       name = "flatted";
       packageName = "flatted";
@@ -3811,13 +3586,13 @@ let
         sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==";
       };
     };
-    "ics-2.37.0" = {
+    "ics-2.40.0" = {
       name = "ics";
       packageName = "ics";
-      version = "2.37.0";
+      version = "2.40.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ics/-/ics-2.37.0.tgz";
-        sha512 = "pwjHe4nPFB/YulKlNo35z8BjjHej0PE/FcET/P7zMH+6pAfME1+NiUSFu/QbJN+o7AOJVXous626kNxrb33blg==";
+        url = "https://registry.npmjs.org/ics/-/ics-2.40.0.tgz";
+        sha512 = "PPkE9ij60sGhqdTxZZzsXQPB/TCXAB/dD3NqUf1I/GkbJzPeJHHMzaoMQiYAsm1pFaHRp2OIhFDgUBihkk8s/w==";
       };
     };
     "ieee754-1.1.13" = {
@@ -4684,15 +4459,6 @@ let
         sha512 = "n418Cn5ynvJd7m/N1d9WVJISLJF/ellZnfsLnx8WBWGzxv/ntNcFkJ1o6se5quUhCplfLGBNL5tYHiq5WF3Nug==";
       };
     };
-    "locate-path-5.0.0" = {
-      name = "locate-path";
-      packageName = "locate-path";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz";
-        sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==";
-      };
-    };
     "lodash-4.17.21" = {
       name = "lodash";
       packageName = "lodash";
@@ -5278,13 +5044,13 @@ let
         sha512 = "5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==";
       };
     };
-    "moment-timezone-0.5.35" = {
+    "moment-timezone-0.5.37" = {
       name = "moment-timezone";
       packageName = "moment-timezone";
-      version = "0.5.35";
+      version = "0.5.37";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.35.tgz";
-        sha512 = "cY/pBOEXepQvlgli06ttCTKcIf8cD1nmNwOKQQAdHBqYApQSpAqotBMX0RJZNgMp6i0PlZuf1mFtnlyEkwyvFw==";
+        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.37.tgz";
+        sha512 = "uEDzDNFhfaywRl+vwXxffjjq1q0Vzr+fcQpQ1bU0kbzorfS7zVtZnCnGc8mhWmF39d4g4YriF6kwA75mJKE/Zg==";
       };
     };
     "monaco-editor-0.30.1" = {
@@ -5404,49 +5170,49 @@ let
         sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
       };
     };
-    "n8n-core-0.132.0" = {
+    "n8n-core-0.133.1" = {
       name = "n8n-core";
       packageName = "n8n-core";
-      version = "0.132.0";
+      version = "0.133.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.132.0.tgz";
-        sha512 = "MfP86+vK7fF7T5Qvq55ej5Uq0Lt1kGlCdvfxhukDDIqM+I5UwRjoyaU+8NIN+BEs5jNrfgJtA9iTKGB7pvx9IQ==";
+        url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.133.1.tgz";
+        sha512 = "PB5tpo9I44FbSoYIkqplXuhTQGLg7WSJBM7V/wDtuO3l2mQT2L8DCSFz1G0UrKa8ykV7BN+lM1UfWqAx6dgHMg==";
       };
     };
-    "n8n-design-system-0.32.0" = {
+    "n8n-design-system-0.33.0" = {
       name = "n8n-design-system";
       packageName = "n8n-design-system";
-      version = "0.32.0";
+      version = "0.33.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.32.0.tgz";
-        sha512 = "zyVpImrrIt9KgHn7GTGfAMJD5nD53Y+JYU/m96uoT7QJS3VPoAm22uvPEhn+rhLgFN+4znG24g8cFbt6hX2b7g==";
+        url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.33.0.tgz";
+        sha512 = "JykV5I33Qy9Y7e/wrRX6rYPvtw+bwzg0Lw+fahAL1wZPYNej4UsBvcvQTLouHOys0r6jnnvfTJXBah0menOWGQ==";
       };
     };
-    "n8n-editor-ui-0.158.0" = {
+    "n8n-editor-ui-0.159.2" = {
       name = "n8n-editor-ui";
       packageName = "n8n-editor-ui";
-      version = "0.158.0";
+      version = "0.159.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.158.0.tgz";
-        sha512 = "FN6uzwSR6xA4S270uCxTrDJ/gaHAnA3wnV+l7lBwgwvZC0yRJj5S8ogCoSpj/wJt/uKUJ6ufrfh31zSSnN4QsA==";
+        url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.159.2.tgz";
+        sha512 = "/1IpLjHT9J42gPwMXj7sh6INM85cg3eFRMeT19WsQOcLwfam5hlP0kTB3qqayRBfni79UFASPBGBW5+p753uYw==";
       };
     };
-    "n8n-nodes-base-0.190.0" = {
+    "n8n-nodes-base-0.191.1" = {
       name = "n8n-nodes-base";
       packageName = "n8n-nodes-base";
-      version = "0.190.0";
+      version = "0.191.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.190.0.tgz";
-        sha512 = "jdL3V9FGZA/xQIFtQhdZ5BUCjUyH4IwPDYuTd3epu1wKW0SdnUNjATiBF1AjX0/+axZjTLwm43gSN3JA8ZK+Wg==";
+        url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.191.1.tgz";
+        sha512 = "5ZBnz98Q+w4jl9sm5c4qSqVeshOnavCauqR1sJm0uAhxZq67i+xiW3nyBxoHp4uQLKFAlwBQNFQ+atc+uBjoaA==";
       };
     };
-    "n8n-workflow-0.114.0" = {
+    "n8n-workflow-0.115.0" = {
       name = "n8n-workflow";
       packageName = "n8n-workflow";
-      version = "0.114.0";
+      version = "0.115.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.114.0.tgz";
-        sha512 = "fLYrprWB8P3GyJmKN/St8H7t0DxLQv/ozuVjYeWlXkJoDbKXT7S6OCzAx55YhUF6zf1MSQT1+UR3YVR20m0utw==";
+        url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.115.0.tgz";
+        sha512 = "EWASemkbwDxzcqlEUPuyctV/dbxgMq/epeYHgqe9Wk0sijPSF9MWqYGdntANKYMfMuGN9GlyRxeFDZ9Nj5rFrg==";
       };
     };
     "named-placeholders-1.1.2" = {
@@ -5593,13 +5359,13 @@ let
         sha512 = "mGA53bSqo7j62PjmMuFPdO0efNT9pqiGYhQTNVCWkY7PdduRIECJF7n7NOrr5cb+d/js1GdYRLpoTYDwawRk6A==";
       };
     };
-    "node-html-parser-5.4.1" = {
+    "node-html-parser-5.4.2" = {
       name = "node-html-parser";
       packageName = "node-html-parser";
-      version = "5.4.1";
+      version = "5.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-5.4.1.tgz";
-        sha512 = "xy/O2wOEBJsIRLs4avwa1lVY7tIpXXOoHHUJLa0GvnoPPqMG1hgBVl1tNI3GHOwRktTVZy+Y6rjghk4B9/NLyg==";
+        url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-5.4.2.tgz";
+        sha512 = "RaBPP3+51hPne/OolXxcz89iYvQvKOydaqoePpOgXcrOKZhjVIzmpKZz+Hd/RBO2/zN2q6CNJhQzucVz+u3Jyw==";
       };
     };
     "node-ssh-12.0.5" = {
@@ -5836,15 +5602,6 @@ let
         sha512 = "XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==";
       };
     };
-    "openapi-types-1.3.5" = {
-      name = "openapi-types";
-      packageName = "openapi-types";
-      version = "1.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/openapi-types/-/openapi-types-1.3.5.tgz";
-        sha512 = "11oi4zYorsgvg5yBarZplAqbpev5HkuVNPlZaPTknPDzAynq+lnJdXAmruGWP0s+dNYZS7bjM+xrTpJw7184Fg==";
-      };
-    };
     "openapi-types-10.0.0" = {
       name = "openapi-types";
       packageName = "openapi-types";
@@ -5935,24 +5692,6 @@ let
         sha512 = "LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==";
       };
     };
-    "p-limit-2.3.0" = {
-      name = "p-limit";
-      packageName = "p-limit";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz";
-        sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==";
-      };
-    };
-    "p-locate-4.1.0" = {
-      name = "p-locate";
-      packageName = "p-locate";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz";
-        sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==";
-      };
-    };
     "p-map-2.1.0" = {
       name = "p-map";
       packageName = "p-map";
@@ -5971,15 +5710,6 @@ let
         sha512 = "rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==";
       };
     };
-    "p-try-2.2.0" = {
-      name = "p-try";
-      packageName = "p-try";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz";
-        sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==";
-      };
-    };
     "pac-proxy-agent-5.0.0" = {
       name = "pac-proxy-agent";
       packageName = "pac-proxy-agent";
@@ -6160,15 +5890,6 @@ let
         sha512 = "ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==";
       };
     };
-    "path-exists-4.0.0" = {
-      name = "path-exists";
-      packageName = "path-exists";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz";
-        sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==";
-      };
-    };
     "path-is-absolute-1.0.1" = {
       name = "path-is-absolute";
       packageName = "path-is-absolute";
@@ -6268,15 +5989,6 @@ let
         sha512 = "7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==";
       };
     };
-    "pg-8.7.1" = {
-      name = "pg";
-      packageName = "pg";
-      version = "8.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pg/-/pg-8.7.1.tgz";
-        sha512 = "7bdYcv7V6U3KAtWjpQJJBww0UEsWuh4yQ/EjNf2HeO/NnvKjpvhEIe/A/TleP6wtmSKnUnghs5A9jUoK6iDdkA==";
-      };
-    };
     "pg-8.8.0" = {
       name = "pg";
       packageName = "pg";
@@ -6322,13 +6034,13 @@ let
         sha512 = "His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w==";
       };
     };
-    "pg-promise-10.11.1" = {
+    "pg-promise-10.12.0" = {
       name = "pg-promise";
       packageName = "pg-promise";
-      version = "10.11.1";
+      version = "10.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.11.1.tgz";
-        sha512 = "HAv32WSKf2m2RqHerW5RmANn/mcXIwWXbg/gOfGQcoS0SE+8iBi3Jj4JmoR4PNzSEozo/y/npy4e6F16psOItw==";
+        url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.12.0.tgz";
+        sha512 = "7uN64iEHrhtRcOaU/AT3925S20JzQJG2nWVK2IUz5SlhB1eNdkXjAYoQtei+5kLJo81mOWcFq7x9J9VRldp0ig==";
       };
     };
     "pg-protocol-1.5.0" = {
@@ -7006,15 +6718,6 @@ let
         sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==";
       };
     };
-    "require-main-filename-2.0.0" = {
-      name = "require-main-filename";
-      packageName = "require-main-filename";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz";
-        sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==";
-      };
-    };
     "requires-port-1.0.0" = {
       name = "requires-port";
       packageName = "requires-port";
@@ -8068,13 +7771,13 @@ let
         sha512 = "yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==";
       };
     };
-    "tough-cookie-4.1.1" = {
+    "tough-cookie-4.1.2" = {
       name = "tough-cookie";
       packageName = "tough-cookie";
-      version = "4.1.1";
+      version = "4.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.1.tgz";
-        sha512 = "Ns3k8QxkEzIfLZbRwLOrMPDqRa1BEAl4BzNNAOYY4BhBmEkf+HvP467F4NrD9loK3NcYflWOpUH3LJg0ehq/rQ==";
+        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz";
+        sha512 = "G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==";
       };
     };
     "tr46-0.0.3" = {
@@ -8500,13 +8203,13 @@ let
         sha512 = "ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==";
       };
     };
-    "vm2-3.9.10" = {
+    "vm2-3.9.11" = {
       name = "vm2";
       packageName = "vm2";
-      version = "3.9.10";
+      version = "3.9.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vm2/-/vm2-3.9.10.tgz";
-        sha512 = "AuECTSvwu2OHLAZYhG716YzwodKCIJxB6u1zG7PgSQwIgAlEaoXH52bxdcvT8GkGjnYK7r7yWDW0m0sOsPuBjQ==";
+        url = "https://registry.npmjs.org/vm2/-/vm2-3.9.11.tgz";
+        sha512 = "PFG8iJRSjvvBdisowQ7iVF580DXb1uCIiGaXgm7tynMR1uTBlv7UJlB1zdv5KJ+Tmq1f0Upnj3fayoEOPpCBKg==";
       };
     };
     "vue-2.7.10" = {
@@ -8599,15 +8302,6 @@ let
         sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==";
       };
     };
-    "which-module-2.0.0" = {
-      name = "which-module";
-      packageName = "which-module";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz";
-        sha512 = "B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==";
-      };
-    };
     "which-typed-array-1.1.8" = {
       name = "which-typed-array";
       packageName = "which-typed-array";
@@ -8806,15 +8500,6 @@ let
         sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==";
       };
     };
-    "y18n-4.0.3" = {
-      name = "y18n";
-      packageName = "y18n";
-      version = "4.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz";
-        sha512 = "JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==";
-      };
-    };
     "y18n-5.0.8" = {
       name = "y18n";
       packageName = "y18n";
@@ -8860,15 +8545,6 @@ let
         sha512 = "C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ==";
       };
     };
-    "yargs-15.4.1" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "15.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz";
-        sha512 = "aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==";
-      };
-    };
     "yargs-16.2.0" = {
       name = "yargs";
       packageName = "yargs";
@@ -8887,24 +8563,6 @@ let
         sha512 = "c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ==";
       };
     };
-    "yargs-17.5.1" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "17.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz";
-        sha512 = "t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==";
-      };
-    };
-    "yargs-parser-18.1.3" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "18.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz";
-        sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==";
-      };
-    };
     "yargs-parser-20.2.9" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
@@ -8914,15 +8572,6 @@ let
         sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==";
       };
     };
-    "yargs-parser-21.1.1" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "21.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz";
-        sha512 = "tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==";
-      };
-    };
     "yup-0.32.11" = {
       name = "yup";
       packageName = "yup";
@@ -8932,15 +8581,6 @@ let
         sha512 = "Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==";
       };
     };
-    "z-schema-4.2.4" = {
-      name = "z-schema";
-      packageName = "z-schema";
-      version = "4.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/z-schema/-/z-schema-4.2.4.tgz";
-        sha512 = "YvBeW5RGNeNzKOUJs3rTL4+9rpcvHXt5I051FJbOcitV8bl40pEfcG0Q+dWSwS0/BIYrMZ/9HHoqLllMkFhD0w==";
-      };
-    };
     "zen-observable-0.8.15" = {
       name = "zen-observable";
       packageName = "zen-observable";
@@ -8965,19 +8605,16 @@ in
   n8n = nodeEnv.buildNodePackage {
     name = "n8n";
     packageName = "n8n";
-    version = "0.192.0";
+    version = "0.193.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/n8n/-/n8n-0.192.0.tgz";
-      sha512 = "5Rv7u7cMKaThA6py4MSa/nIPmWEmyIa9x2r0xxMhaMFzsfbRWDokXYdsYVW+/ICSi6frZLFFjCmhSP5Evj/YyQ==";
+      url = "https://registry.npmjs.org/n8n/-/n8n-0.193.3.tgz";
+      sha512 = "iJA+ofjbTSEoxxSnA7iwdoJB3/PjgrDN5lZ0bXrBV+WOmoaBjKbdoxkhJJnUPQRnxQ/5ePEf5qgh7tVG9cEMKA==";
     };
     dependencies = [
-      sources."@apidevtools/json-schema-ref-parser-8.0.0"
-      sources."@apidevtools/openapi-schemas-2.1.0"
-      sources."@apidevtools/swagger-cli-4.0.0"
-      sources."@apidevtools/swagger-methods-3.0.2"
-      (sources."@apidevtools/swagger-parser-9.0.1" // {
+      (sources."@apidevtools/json-schema-ref-parser-9.0.9" // {
         dependencies = [
-          sources."openapi-types-1.3.5"
+          sources."argparse-2.0.1"
+          sources."js-yaml-4.1.0"
         ];
       })
       (sources."@azure/abort-controller-1.1.0" // {
@@ -8998,7 +8635,7 @@ in
       (sources."@azure/core-http-2.2.6" // {
         dependencies = [
           sources."@azure/core-tracing-1.0.0-preview.13"
-          sources."tough-cookie-4.1.1"
+          sources."tough-cookie-4.1.2"
           sources."tslib-2.4.0"
           sources."universalify-0.2.0"
         ];
@@ -9068,8 +8705,8 @@ in
         ];
       })
       sources."@fontsource/open-sans-4.5.11"
-      sources."@fortawesome/fontawesome-common-types-6.1.2"
-      sources."@fortawesome/free-regular-svg-icons-6.1.2"
+      sources."@fortawesome/fontawesome-common-types-6.2.0"
+      sources."@fortawesome/free-regular-svg-icons-6.2.0"
       (sources."@icetee/ftp-0.3.15" // {
         dependencies = [
           sources."isarray-0.0.1"
@@ -9095,11 +8732,6 @@ in
       })
       (sources."@oclif/core-1.16.0" // {
         dependencies = [
-          (sources."chalk-4.1.2" // {
-            dependencies = [
-              sources."supports-color-7.2.0"
-            ];
-          })
           sources."supports-color-8.1.1"
           sources."tslib-2.4.0"
           sources."wrap-ansi-7.0.0"
@@ -9116,14 +8748,12 @@ in
       (sources."@oclif/help-1.0.1" // {
         dependencies = [
           sources."@oclif/config-1.18.2"
-          sources."chalk-4.1.2"
           sources."tslib-2.4.0"
         ];
       })
       sources."@oclif/linewrap-1.0.0"
       (sources."@oclif/parser-3.8.7" // {
         dependencies = [
-          sources."chalk-4.1.2"
           sources."tslib-2.4.0"
         ];
       })
@@ -9138,7 +8768,6 @@ in
       sources."@tediousjs/connection-string-0.3.0"
       sources."@tokenizer/token-0.3.0"
       sources."@tootallnate/once-1.1.2"
-      sources."@types/bluebird-3.5.36"
       sources."@types/body-parser-1.19.2"
       sources."@types/connect-3.4.35"
       sources."@types/es-aggregate-error-1.0.2"
@@ -9146,35 +8775,21 @@ in
       sources."@types/express-jwt-0.0.42"
       sources."@types/express-serve-static-core-4.17.30"
       sources."@types/express-unless-0.5.3"
-      sources."@types/ftp-0.3.33"
-      sources."@types/generic-pool-3.1.11"
-      sources."@types/glob-7.2.0"
-      sources."@types/json-diff-0.5.2"
       sources."@types/json-schema-7.0.11"
-      sources."@types/jsonwebtoken-8.5.9"
       sources."@types/lodash-4.14.184"
-      sources."@types/lodash.intersection-4.4.7"
-      sources."@types/lossless-json-1.0.1"
       sources."@types/mime-3.0.1"
-      sources."@types/minimatch-5.1.0"
       sources."@types/multer-1.4.7"
-      sources."@types/node-18.7.13"
+      sources."@types/node-18.7.14"
       (sources."@types/node-fetch-2.6.2" // {
         dependencies = [
           sources."form-data-3.0.1"
         ];
       })
-      sources."@types/promise-ftp-1.3.4"
-      sources."@types/promise-ftp-common-1.1.0"
       sources."@types/qs-6.9.7"
       sources."@types/range-parser-1.2.4"
       sources."@types/serve-static-1.15.0"
-      sources."@types/shelljs-0.8.11"
-      sources."@types/snowflake-sdk-1.6.7"
-      sources."@types/swagger-ui-express-4.1.3"
       sources."@types/tough-cookie-2.3.8"
       sources."@types/tunnel-0.0.3"
-      sources."@types/yamljs-0.2.31"
       sources."@vue/compiler-sfc-2.7.10"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.8"
@@ -9234,7 +8849,7 @@ in
       })
       sources."available-typed-arrays-1.0.5"
       sources."avsc-5.7.5"
-      (sources."aws-sdk-2.1202.0" // {
+      (sources."aws-sdk-2.1207.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."events-1.1.1"
@@ -9310,7 +8925,6 @@ in
           sources."tslib-2.4.0"
         ];
       })
-      sources."camelcase-5.3.1"
       (sources."capital-case-1.0.4" // {
         dependencies = [
           sources."tslib-2.4.0"
@@ -9323,7 +8937,7 @@ in
           sources."adler-32-1.3.1"
         ];
       })
-      sources."chalk-3.0.0"
+      sources."chalk-4.1.2"
       (sources."change-case-4.1.2" // {
         dependencies = [
           sources."tslib-2.4.0"
@@ -9342,19 +8956,18 @@ in
       sources."cli-cursor-3.1.0"
       (sources."cli-highlight-2.1.11" // {
         dependencies = [
-          sources."chalk-4.1.2"
-          sources."cliui-7.0.4"
           sources."parse5-5.1.1"
-          sources."wrap-ansi-7.0.0"
-          sources."y18n-5.0.8"
           sources."yargs-16.2.0"
-          sources."yargs-parser-20.2.9"
         ];
       })
       sources."cli-progress-3.11.2"
       sources."cli-width-3.0.0"
       sources."client-oauth2-4.3.3"
-      sources."cliui-6.0.0"
+      (sources."cliui-7.0.4" // {
+        dependencies = [
+          sources."wrap-ansi-7.0.0"
+        ];
+      })
       sources."cluster-key-slot-1.1.0"
       sources."codepage-1.15.0"
       (sources."color-3.2.1" // {
@@ -9393,11 +9006,7 @@ in
       })
       sources."content-disposition-0.5.4"
       sources."content-type-1.0.4"
-      (sources."convict-6.2.3" // {
-        dependencies = [
-          sources."yargs-parser-20.2.9"
-        ];
-      })
+      sources."convict-6.2.3"
       sources."cookie-0.4.1"
       sources."cookie-parser-1.4.6"
       sources."cookie-signature-1.0.6"
@@ -9423,7 +9032,6 @@ in
       sources."data-uri-to-buffer-3.0.1"
       sources."debug-4.3.4"
       sources."debuglog-1.0.1"
-      sources."decamelize-1.2.0"
       sources."deep-is-0.1.4"
       sources."deepmerge-1.5.2"
       sources."default-user-agent-1.0.0"
@@ -9531,7 +9139,6 @@ in
           sources."ms-2.0.0"
         ];
       })
-      sources."find-up-4.1.0"
       sources."flatted-3.2.7"
       sources."fn.name-1.1.0"
       sources."follow-redirects-1.15.1"
@@ -9630,7 +9237,7 @@ in
       sources."humanize-ms-1.2.1"
       sources."hyperlinker-1.0.0"
       sources."iconv-lite-0.4.24"
-      sources."ics-2.37.0"
+      sources."ics-2.40.0"
       sources."ieee754-1.2.1"
       sources."ignore-5.2.0"
       (sources."imap-0.8.19" // {
@@ -9644,11 +9251,7 @@ in
       sources."indent-string-4.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      (sources."inquirer-7.3.3" // {
-        dependencies = [
-          sources."chalk-4.1.2"
-        ];
-      })
+      sources."inquirer-7.3.3"
       sources."internal-slot-1.0.3"
       sources."interpret-1.4.0"
       sources."ioredis-4.28.5"
@@ -9697,11 +9300,7 @@ in
       sources."isexe-2.0.0"
       sources."iso-639-1-2.1.15"
       sources."isstream-0.1.2"
-      (sources."jake-10.8.5" // {
-        dependencies = [
-          sources."chalk-4.1.2"
-        ];
-      })
+      sources."jake-10.8.5"
       sources."jmespath-0.16.0"
       sources."join-component-1.1.0"
       sources."js-md4-0.3.2"
@@ -9710,13 +9309,7 @@ in
       sources."jsbn-0.1.1"
       sources."json-diff-0.5.5"
       sources."json-schema-0.4.0"
-      (sources."json-schema-ref-parser-9.0.9" // {
-        dependencies = [
-          sources."@apidevtools/json-schema-ref-parser-9.0.9"
-          sources."argparse-2.0.1"
-          sources."js-yaml-4.1.0"
-        ];
-      })
+      sources."json-schema-ref-parser-9.0.9"
       sources."json-schema-traverse-0.4.1"
       sources."json-stable-stringify-without-jsonify-1.0.1"
       sources."json-stringify-safe-5.0.1"
@@ -9747,15 +9340,9 @@ in
       sources."linkify-it-4.0.0"
       (sources."localtunnel-2.0.2" // {
         dependencies = [
-          sources."cliui-7.0.4"
           sources."debug-4.3.2"
-          sources."wrap-ansi-7.0.0"
-          sources."y18n-5.0.8"
-          sources."yargs-17.1.1"
-          sources."yargs-parser-20.2.9"
         ];
       })
-      sources."locate-path-5.0.0"
       sources."lodash-4.17.21"
       sources."lodash-es-4.17.21"
       sources."lodash.clonedeep-4.5.0"
@@ -9841,7 +9428,7 @@ in
         ];
       })
       sources."moment-2.29.4"
-      sources."moment-timezone-0.5.35"
+      sources."moment-timezone-0.5.37"
       sources."monaco-editor-0.30.1"
       sources."mongodb-3.7.3"
       sources."moo-0.5.1"
@@ -9872,15 +9459,15 @@ in
         ];
       })
       sources."mz-2.7.0"
-      sources."n8n-core-0.132.0"
-      sources."n8n-design-system-0.32.0"
-      sources."n8n-editor-ui-0.158.0"
-      (sources."n8n-nodes-base-0.190.0" // {
+      sources."n8n-core-0.133.1"
+      sources."n8n-design-system-0.33.0"
+      sources."n8n-editor-ui-0.159.2"
+      (sources."n8n-nodes-base-0.191.1" // {
         dependencies = [
           sources."iconv-lite-0.6.3"
         ];
       })
-      sources."n8n-workflow-0.114.0"
+      sources."n8n-workflow-0.115.0"
       (sources."named-placeholders-1.1.2" // {
         dependencies = [
           sources."lru-cache-4.1.5"
@@ -9910,7 +9497,7 @@ in
       sources."node-ensure-0.0.0"
       sources."node-fetch-2.6.7"
       sources."node-html-markdown-1.2.0"
-      sources."node-html-parser-5.4.1"
+      sources."node-html-parser-5.4.2"
       sources."node-ssh-12.0.5"
       sources."nodeify-1.0.1"
       sources."nodemailer-6.7.8"
@@ -9944,11 +9531,8 @@ in
       sources."osx-release-1.1.0"
       sources."p-cancelable-2.1.1"
       sources."p-finally-1.0.0"
-      sources."p-limit-2.3.0"
-      sources."p-locate-4.1.0"
       sources."p-map-2.1.0"
       sources."p-timeout-3.2.0"
-      sources."p-try-2.2.0"
       sources."pac-proxy-agent-5.0.0"
       sources."pac-resolver-5.0.1"
       sources."packet-reader-1.0.0"
@@ -9984,7 +9568,6 @@ in
         ];
       })
       sources."path-dirname-1.0.2"
-      sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-key-2.0.1"
       sources."path-parse-1.0.7"
@@ -10004,11 +9587,7 @@ in
       sources."pg-int8-1.0.1"
       sources."pg-minify-1.6.2"
       sources."pg-pool-3.5.2"
-      (sources."pg-promise-10.11.1" // {
-        dependencies = [
-          sources."pg-8.7.1"
-        ];
-      })
+      sources."pg-promise-10.12.0"
       sources."pg-protocol-1.5.0"
       sources."pg-types-2.2.0"
       (sources."pgpass-1.0.5" // {
@@ -10115,7 +9694,6 @@ in
       })
       sources."require-at-1.0.6"
       sources."require-directory-2.1.1"
-      sources."require-main-filename-2.0.0"
       sources."requires-port-1.0.0"
       sources."resize-observer-polyfill-1.5.1"
       sources."resolve-1.22.1"
@@ -10312,15 +9890,9 @@ in
         dependencies = [
           sources."argparse-2.0.1"
           sources."buffer-6.0.3"
-          sources."chalk-4.1.2"
-          sources."cliui-7.0.4"
           sources."js-yaml-4.1.0"
           sources."mkdirp-1.0.4"
           sources."tslib-2.4.0"
-          sources."wrap-ansi-7.0.0"
-          sources."y18n-5.0.8"
-          sources."yargs-17.5.1"
-          sources."yargs-parser-21.1.1"
         ];
       })
       sources."uc.micro-1.0.6"
@@ -10376,7 +9948,7 @@ in
           sources."core-util-is-1.0.2"
         ];
       })
-      sources."vm2-3.9.10"
+      sources."vm2-3.9.11"
       sources."vue-2.7.10"
       sources."vue-color-2.8.1"
       sources."vue-fragment-1.5.1"
@@ -10387,7 +9959,6 @@ in
       sources."whatwg-url-5.0.0"
       sources."which-1.3.1"
       sources."which-boxed-primitive-1.0.2"
-      sources."which-module-2.0.0"
       sources."which-typed-array-1.1.8"
       sources."wide-align-1.1.5"
       sources."widest-line-3.1.0"
@@ -10423,13 +9994,12 @@ in
         ];
       })
       sources."xtend-4.0.2"
-      sources."y18n-4.0.3"
+      sources."y18n-5.0.8"
       sources."yallist-4.0.0"
       sources."yamljs-0.3.0"
-      sources."yargs-15.4.1"
-      sources."yargs-parser-18.1.3"
+      sources."yargs-17.1.1"
+      sources."yargs-parser-20.2.9"
       sources."yup-0.32.11"
-      sources."z-schema-4.2.4"
       sources."zen-observable-0.8.15"
       sources."zen-observable-ts-1.2.5"
     ];

From 848c87cf983b4a926c6d28b556c803e0a2668a8a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Sep 2022 18:03:43 +0000
Subject: [PATCH 23/34] wasmtime: 0.40.0 -> 0.40.1

---
 pkgs/development/interpreters/wasmtime/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix
index d3d4516ca3eb..96fbdb27c63c 100644
--- a/pkgs/development/interpreters/wasmtime/default.nix
+++ b/pkgs/development/interpreters/wasmtime/default.nix
@@ -2,17 +2,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wasmtime";
-  version = "0.40.0";
+  version = "0.40.1";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-i3dtjKy5YTyNkEaDcGxsrd4lbyUBd25OARESbJVK9uY=";
+    sha256 = "sha256-VHDeK5BxRyw4AIPcVIzXGZgRdzuyFTZ0hL1u4NMJKBM=";
     fetchSubmodules = true;
   };
 
-  cargoSha256 = "sha256-wlcYdZ8Akkpicyw74sh4CNwSstCtUJxf+oSEL/mUtKc=";
+  cargoSha256 = "sha256-QAS9L7ZOiD/1+jkMC+ekHkOu9ONl5l/F/fmn6NX4qAQ=";
 
   cargoBuildFlags = [
     "--package wasmtime-cli"

From 04ef0da0cf8a882add69c7d707b06cdececd228f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= <root@pedrohlc.com>
Date: Thu, 1 Sep 2022 15:51:23 -0300
Subject: [PATCH 24/34] vulkan-caps-viewer: 3.24 -> 3.25

---
 pkgs/tools/graphics/vulkan-caps-viewer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix
index 7b6a43b43331..291c70d8eccf 100644
--- a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix
+++ b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vulkan-caps-viewer";
-  version = "3.24";
+  version = "3.25";
 
   src = fetchFromGitHub {
     owner = "SaschaWillems";
     repo = "VulkanCapsViewer";
-    rev = "${version}";
-    hash = "sha256-BSydAPZ74rGzW4UA/aqL2K/86NTK/eZqc3MZUbdq7iU=";
+    rev = if version == "3.25" then "${version}_fixed" else version;
+    hash = "sha256-JQMnR9WNR8OtcgVfE5iZebdvZ/JmZNDchET5cK/Bruc=";
     # Note: this derivation strictly requires vulkan-header to be the same it was developed against.
     # To help they put in a git-submodule.
     # It works with older vulkan-loaders.

From 1c6676511e13eb54c25500b6434fa8e17b59ebc1 Mon Sep 17 00:00:00 2001
From: bandthedoge <bandithedoge@protonmail.com>
Date: Wed, 31 Aug 2022 19:18:58 +0200
Subject: [PATCH 25/34] nim-unwrapped: fix library path

---
 pkgs/development/compilers/nim/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index 2a65c3fc2ec9..df26de4b5656 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -143,6 +143,7 @@ in {
       runHook preInstall
       install -Dt $out/bin bin/*
       ln -sf $out/nim/bin/nim $out/bin/nim
+      ln -sf $out/nim/lib $out/lib
       ./install.sh $out
       runHook postInstall
     '';

From 28875b0fbf05d05a956f1abfac78c415685f1b2c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Sep 2022 16:20:38 +0000
Subject: [PATCH 26/34] gpsprune: 21.3 -> 22

---
 pkgs/applications/misc/gpsprune/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix
index 4c917ce9050b..133a4c210686 100644
--- a/pkgs/applications/misc/gpsprune/default.nix
+++ b/pkgs/applications/misc/gpsprune/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gpsprune";
-  version = "21.3";
+  version = "22";
 
   src = fetchurl {
     url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar";
-    sha256 = "sha256-0uPCMMWixw1dZeG12kvFO4FTp8qrOsLyLTKtGSVJxuw=";
+    sha256 = "sha256-T4lzw3UupnSF+anrdZDhg68OxSJsD7M3djK7WpKXq6Q=";
   };
 
   dontUnpack = true;

From 1a0bcbcb08b9f7614ad2644a166493eb6e35c3eb Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 1 Sep 2022 05:54:12 +1000
Subject: [PATCH 27/34] ffmpeg_5: 5.1 -> 5.1.1

https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/1bad30dbe34f2d100b43e8f773d3fe0b5eb23523:/Changelog#l4
---
 .../libraries/ffmpeg-full/default.nix         |  4 --
 pkgs/development/libraries/ffmpeg/5.nix       | 10 +----
 .../ffmpeg/ipfs-remove-default-gateway.patch  | 37 -------------------
 3 files changed, 2 insertions(+), 49 deletions(-)
 delete mode 100644 pkgs/development/libraries/ffmpeg/ipfs-remove-default-gateway.patch

diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 1bc3d49bea2f..e4c6d4b013c6 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -261,10 +261,6 @@ stdenv.mkDerivation rec {
       --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1
     substituteInPlace doc/filters.texi \
       --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1
-  '' +
-  # ffmpeg 5.1 https://trac.ffmpeg.org/ticket/9841
-  ''
-    substituteInPlace tests/Makefile --replace 'include $(SRC_PATH)/tests/fate/imf.mak' ""
   '';
 
   configurePlatforms = [];
diff --git a/pkgs/development/libraries/ffmpeg/5.nix b/pkgs/development/libraries/ffmpeg/5.nix
index 22dbe293ef85..b16bd4ddf381 100644
--- a/pkgs/development/libraries/ffmpeg/5.nix
+++ b/pkgs/development/libraries/ffmpeg/5.nix
@@ -5,14 +5,8 @@
 }@args:
 
 callPackage ./generic.nix (rec {
-  version = "5.1";
+  version = "5.1.1";
   branch = version;
-  sha256 = "sha256-MrVvsBzpDUUpWK4l6RyVZKv0ntVFPBJ77CPGPlMKqPo=";
+  sha256 = "sha256-zQ4W+QNCEmbVzN3t97g7nldUrvS596fwbOnkyALwVFs=";
   darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
-
-  # Newly introduced IPFS support in ffmpeg 5.1 relies on untrusted third
-  # party services, leading to consent and privacy issues. See upstream
-  # discussion for more information:
-  # https://ffmpeg.org/pipermail/ffmpeg-devel/2022-August/299924.html
-  patches = [ ./ipfs-remove-default-gateway.patch ];
 } // args)
diff --git a/pkgs/development/libraries/ffmpeg/ipfs-remove-default-gateway.patch b/pkgs/development/libraries/ffmpeg/ipfs-remove-default-gateway.patch
deleted file mode 100644
index e4b25a4b6cbf..000000000000
--- a/pkgs/development/libraries/ffmpeg/ipfs-remove-default-gateway.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-A gateway can see everything, and we should not be shipping a hardcoded
-default from a third party company; it's a security risk.
-
-Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
----
- libavformat/ipfsgateway.c | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/libavformat/ipfsgateway.c b/libavformat/ipfsgateway.c
-index 5a5178c563..907b61b017 100644
---- a/libavformat/ipfsgateway.c
-+++ b/libavformat/ipfsgateway.c
-@@ -240,13 +240,8 @@ static int translate_ipfs_to_http(URLContext *h, const char *uri, int flags, AVD
-         ret = populate_ipfs_gateway(h);
- 
-         if (ret < 1) {
--            // We fallback on dweb.link (managed by Protocol Labs).
--            snprintf(c->gateway_buffer, sizeof(c->gateway_buffer), "https://dweb.link");
--
--            av_log(h, AV_LOG_WARNING,
--                   "IPFS does not appear to be running. "
--                   "You’re now using the public gateway at dweb.link.\n");
--            av_log(h, AV_LOG_INFO,
-+            av_log(h, AV_LOG_ERROR,
-+                   "IPFS does not appear to be running.\n\n"
-                    "Installing IPFS locally is recommended to "
-                    "improve performance and reliability, "
-                    "and not share all your activity with a single IPFS gateway.\n"
-@@ -259,6 +254,8 @@ static int translate_ipfs_to_http(URLContext *h, const char *uri, int flags, AVD
-                    "3. Define an $IPFS_PATH environment variable "
-                    "and point it to the IPFS data path "
-                    "- this is typically ~/.ipfs\n");
-+            ret = AVERROR(EINVAL);
-+            goto err;
-         }
-     }
- 

From 55f8c48b10ebdbe6376c6fcc4c9af67d028db392 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 1 Sep 2022 13:46:54 +1000
Subject: [PATCH 28/34] jellyfin-ffmpeg: fix build

---
 pkgs/development/libraries/jellyfin-ffmpeg/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix
index b29cf2296c0d..bb95fa5606fb 100644
--- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix
+++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix
@@ -2,6 +2,7 @@
 , nv-codec-headers-11
 , fetchFromGitHub
 , lib
+, fetchpatch
 }:
 
 (ffmpeg_5-full.override {
@@ -21,6 +22,15 @@
     "--disable-ptx-compression" # https://github.com/jellyfin/jellyfin/issues/7944#issuecomment-1156880067
   ];
 
+  patches = old.patches ++ [
+    # fixed in upstream ffmpeg 5.1.1 https://trac.ffmpeg.org/ticket/9841
+    (fetchpatch {
+      name = "rename-imf-fate-target.patch";
+      url = "https://github.com/FFmpeg/FFmpeg/commit/80d1b8938eb227f0e9efde91050836b1e9a051a9.patch";
+      sha256 = "sha256-weUbLKSQ9iRYSQ3hgXcVpo8jfKajpXK21qD1GrZYHYQ=";
+    })
+  ];
+
   postPatch = ''
     for file in $(cat debian/patches/series); do
       patch -p1 < debian/patches/$file

From 937266ba5515b96e1731ef3846af358b2cd8d5a5 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Thu, 1 Sep 2022 18:09:08 +0300
Subject: [PATCH 29/34] =?UTF-8?q?josm:=2018531=20=E2=86=92=2018543?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/misc/josm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 5a680cc76b54..7d99bd8558a9 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -3,15 +3,15 @@
 }:
 let
   pname = "josm";
-  version = "18531";
+  version = "18543";
   srcs = {
     jar = fetchurl {
       url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-      sha256 = "sha256-/esGbLbidQ60+auMC1W2GwH7V5qdTVzblDNsskuhcjs=";
+      hash = "sha256-AQmdBwgOVws8MDAX8i3P7bsk3r69g7x3jhADGwRWa2c=";
     };
     macosx = fetchurl {
       url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip";
-      sha256 = "sha256-ldcTuacUUxsssJqJ8cRjbP+TWlxQdcNtVbj8clDNEGw=";
+      hash = "sha256-pGVn+NgfSlyYcT0BCTj+Ntbe7d0l6LJSeDi9xve0K4g=";
     };
     pkg = fetchsvn {
       url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";

From cb70375ef33983c4241ea88879ca3e77eb93a8a6 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
Date: Thu, 1 Sep 2022 13:02:09 -0500
Subject: [PATCH 30/34] helix: 22.08 -> 22.08.1

---
 pkgs/applications/editors/helix/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix
index 349ef8f7ba00..cc62190aeb1b 100644
--- a/pkgs/applications/editors/helix/default.nix
+++ b/pkgs/applications/editors/helix/default.nix
@@ -2,17 +2,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "helix";
-  version = "22.08";
+  version = "22.08.1";
 
   # This release tarball includes source code for the tree-sitter grammars,
   # which is not ordinarily part of the repository.
   src = fetchzip {
     url = "https://github.com/helix-editor/helix/releases/download/${version}/helix-${version}-source.tar.xz";
-    sha256 = "sha256-PSTsPt+OQhYQ/m/hm5PgHWrQXtbooT+tG0767KyiJJw=";
+    sha256 = "sha256-pqAhUxKeFN7eebVdNN3Ge38sA30SUSu4Xn4HDZAjjyY=";
     stripRoot = false;
   };
 
-  cargoSha256 = "sha256-5Ap/PU8IjAPKKiFxzHqWQMspWkbTYIwTNiSMWIceUPc=";
+  cargoSha256 = "sha256-idItRkymr+cxk3zv2mPBR/frCGvzEUdSAhY7gghfR3M=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From e661714656aa2994b1202bae65330c54692c1ef1 Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Fri, 2 Sep 2022 00:12:29 +0200
Subject: [PATCH 31/34] firefox: use ffmpeg_5

Allows for AV1 VAAPI decoding
---
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 6f1de80c24bd..ba44513ceea2 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -2,7 +2,7 @@
 , fetchurl, zip, unzip, jq, xdg-utils, writeText
 
 ## various stuff that can be plugged in
-, ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc
+, ffmpeg_5, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc
 , gnome/*.gnome-shell*/
 , browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire
 , tridactyl-native
@@ -73,7 +73,7 @@ let
         );
       libs =   lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils ]
             ++ lib.optional pipewireSupport pipewire
-            ++ lib.optional ffmpegSupport ffmpeg
+            ++ lib.optional ffmpegSupport ffmpeg_5
             ++ lib.optional gssSupport libkrb5
             ++ lib.optional useGlvnd libglvnd
             ++ lib.optionals (cfg.enableQuakeLive or false)

From 1be806f07f1393fabe37badb3ff66fe17058e7b6 Mon Sep 17 00:00:00 2001
From: Stefan Radziuk <stefan@radziuk.pl>
Date: Thu, 1 Sep 2022 23:31:31 +0100
Subject: [PATCH 32/34] google-chrome: add commandLineArgs after wayland flags
 (#189199)

---
 .../networking/browsers/google-chrome/default.nix             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index def7c989e5bc..f4b441669ae1 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -148,8 +148,8 @@ in stdenv.mkDerivation {
       --suffix PATH            : "${lib.makeBinPath [ xdg-utils ]}" \
       --prefix XDG_DATA_DIRS   : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addOpenGLRunpath.driverLink}/share" \
       --set CHROME_WRAPPER  "google-chrome-$dist" \
-      --add-flags ${escapeShellArg commandLineArgs} \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" \
+      --add-flags ${escapeShellArg commandLineArgs}
 
     for elf in $out/share/google/$appname/{chrome,chrome-sandbox,${crashpadHandlerBinary},nacl_helper}; do
       patchelf --set-rpath $rpath $elf

From 5741b035f93e3dc451aeae09f0351537f6fdebe2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Sep 2022 22:38:20 +0000
Subject: [PATCH 33/34] ocamlPackages.ssl: 0.5.11 -> 0.5.12

---
 pkgs/development/ocaml-modules/ssl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix
index ef82749367b0..4159cee607ff 100644
--- a/pkgs/development/ocaml-modules/ssl/default.nix
+++ b/pkgs/development/ocaml-modules/ssl/default.nix
@@ -10,13 +10,13 @@
 
 buildDunePackage rec {
   pname = "ssl";
-  version = "0.5.11";
+  version = "0.5.12";
 
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-ssl";
     rev = version;
-    sha256 = "sha256-uFr+XSKDGMHaM2o5DODYmt7+LkhnDzzlVX//CtAXBm4=";
+    sha256 = "sha256-cQUJ7t7C9R74lDy1/lt+up4E5CogiPbeZpaDveDzJ7c=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From d32eae0f230f5713c254b08edf91f1571c4f73a2 Mon Sep 17 00:00:00 2001
From: Stefan Radziuk <stefan.radziuk19@imperial.ac.uk>
Date: Fri, 2 Sep 2022 00:38:22 +0100
Subject: [PATCH 34/34] chromium: add commandLineArgs after wayland flags
 (#189371)

---
 pkgs/applications/networking/browsers/chromium/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 79a53fbfea47..55863787f41c 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -184,8 +184,8 @@ in stdenv.mkDerivation {
     mkdir -p "$out/bin"
 
     makeWrapper "${browserBinary}" "$out/bin/chromium" \
-      --add-flags ${escapeShellArg commandLineArgs} \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" \
+      --add-flags ${escapeShellArg commandLineArgs}
 
     ed -v -s "$out/bin/chromium" << EOF
     2i