diff --git a/patches/167490.patch b/patches/167490.patch deleted file mode 100644 index b4aecef0..00000000 --- a/patches/167490.patch +++ /dev/null @@ -1,110 +0,0 @@ -From efcf757b645494653d7fe8bc443111dd98e730fc Mon Sep 17 00:00:00 2001 -From: Charlotte Van Petegem -Date: Wed, 6 Apr 2022 09:42:41 +0200 -Subject: [PATCH] matrix-appservice-slack: 1.10.0 -> 1.11.0 - ---- - .../matrix-appservice-slack/default.nix | 4 ++-- - .../generate-dependencies.sh | 6 ++--- - .../matrix-appservice-slack/node-packages.nix | 22 +++++++++---------- - 3 files changed, 16 insertions(+), 16 deletions(-) - -diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix -index eb3d82e14d0b4..a00d983e91bb5 100644 ---- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix -+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix -@@ -3,8 +3,8 @@ let - src = fetchFromGitHub { - owner = "matrix-org"; - repo = "matrix-appservice-slack"; -- rev = "1.10.0"; -- sha256 = "WnonduUhhrxCMuXOgLk8voNnn+f6R5CsJ7VKpEmGwzk="; -+ rev = "1.11.0"; -+ sha256 = "U1EHL1ZwcpCXA9sjya6ry/3Q+gwdQWPUDFN+wp1qjrg="; - }; - - nodePackages = import ./node-composition.nix { -diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh b/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh -index 2503d6d7ef353..1fceed1c72c1c 100755 ---- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh -+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh -@@ -1,9 +1,9 @@ - #!/usr/bin/env nix-shell - #! nix-shell -i bash -p nodePackages.node2nix - --# Download package.json and package-lock.json from the v1.10.0 release --curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.10.0/package.json -o package.json --curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.10.0/package-lock.json -o package-lock.json -+# Download package.json and package-lock.json from the v1.11.0 release -+curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.11.0/package.json -o package.json -+curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.11.0/package-lock.json -o package-lock.json - - node2nix \ - --nodejs-12 \ -diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix -index dc0bd7b052bf1..6bc864cd1089d 100644 ---- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix -+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix -@@ -762,13 +762,13 @@ let - sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; - }; - }; -- "axios-0.24.0" = { -+ "axios-0.26.0" = { - name = "axios"; - packageName = "axios"; -- version = "0.24.0"; -+ version = "0.26.0"; - src = fetchurl { -- url = "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz"; -- sha512 = "Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA=="; -+ url = "https://registry.npmjs.org/axios/-/axios-0.26.0.tgz"; -+ sha512 = "lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og=="; - }; - }; - "balanced-match-1.0.2" = { -@@ -1959,13 +1959,13 @@ let - sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; - }; - }; -- "follow-redirects-1.14.4" = { -+ "follow-redirects-1.14.8" = { - name = "follow-redirects"; - packageName = "follow-redirects"; -- version = "1.14.4"; -+ version = "1.14.8"; - src = fetchurl { -- url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz"; -- sha512 = "zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g=="; -+ url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz"; -+ sha512 = "1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA=="; - }; - }; - "forever-agent-0.6.1" = { -@@ -4771,7 +4771,7 @@ let - args = { - name = "matrix-appservice-slack"; - packageName = "matrix-appservice-slack"; -- version = "1.10.0"; -+ version = "1.11.0"; - src = ./.; - dependencies = [ - sources."@alloc/quick-lru-5.2.0" -@@ -4895,7 +4895,7 @@ let - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" -- sources."axios-0.24.0" -+ sources."axios-0.26.0" - sources."balanced-match-1.0.2" - sources."base-x-3.0.9" - sources."base64-js-1.5.1" -@@ -5059,7 +5059,7 @@ let - sources."flat-cache-3.0.4" - sources."flatted-3.1.1" - sources."fn.name-1.1.0" -- sources."follow-redirects-1.14.4" -+ sources."follow-redirects-1.14.8" - sources."forever-agent-0.6.1" - sources."form-data-2.5.1" - sources."forwarded-0.1.2"