68 lines
2.8 KiB
Diff
68 lines
2.8 KiB
Diff
From bd7bc857e3da164df6686be04a3cefa6a2a67cc0 Mon Sep 17 00:00:00 2001
|
|
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
|
|
Date: Tue, 7 Mar 2023 20:01:24 +0100
|
|
Subject: [PATCH 1/2] matrix-appservice-slack: 2.1.0 -> 2.1.1
|
|
|
|
https://github.com/matrix-org/matrix-appservice-slack/releases/tag/2.1.1
|
|
---
|
|
.../matrix-synapse/matrix-appservice-slack/package.json | 4 ++--
|
|
.../servers/matrix-synapse/matrix-appservice-slack/pin.json | 6 +++---
|
|
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json b/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json
|
|
index dd5c93989c8dd..aa3225725df3f 100644
|
|
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json
|
|
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json
|
|
@@ -1,6 +1,6 @@
|
|
{
|
|
"name": "matrix-appservice-slack",
|
|
- "version": "2.1.0",
|
|
+ "version": "2.1.1",
|
|
"description": "A Matrix <--> Slack bridge",
|
|
"engines": {
|
|
"node": ">=16 <=18"
|
|
@@ -42,7 +42,7 @@
|
|
"axios": "^0.27.2",
|
|
"classnames": "^2.3.2",
|
|
"escape-string-regexp": "^4.0.0",
|
|
- "matrix-appservice-bridge": "^8.1.0",
|
|
+ "matrix-appservice-bridge": "^8.1.1",
|
|
"matrix-widget-api": "^1.1.1",
|
|
"minimist": "^1.2.6",
|
|
"nedb": "^1.8.0",
|
|
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json b/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json
|
|
index 06d4e4b142665..7a9f4b44e263b 100644
|
|
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json
|
|
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/pin.json
|
|
@@ -1,5 +1,5 @@
|
|
{
|
|
- "version": "2.1.0",
|
|
- "srcHash": "qAmbW/aDeBWTi1czQtrsb6d5TEYw9gYJ4lpJbaX9nb0=",
|
|
- "yarnHash": "1r5fqw7y8fzgjnl5xlr8djfmmkm8kqw5p3w12ffll6irwz90wajx"
|
|
+ "version": "2.1.1",
|
|
+ "srcHash": "+NO/V3EyqdxavnSTBU7weJnueL6+aCH3UWkqclpsId0=",
|
|
+ "yarnHash": "1pqv7g3xbfs4zhmyxy5p216kq2jwjfjzxw2dv2a7hl0qwk6igyki"
|
|
}
|
|
|
|
From bc3335af8b5aff0c20551b7b5c932ecf83b9e17f Mon Sep 17 00:00:00 2001
|
|
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
|
|
Date: Tue, 7 Mar 2023 20:02:00 +0100
|
|
Subject: [PATCH 2/2] matrix-appservice-slack: add chvp to maintainers
|
|
|
|
---
|
|
pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix
|
|
index 19ddce8cc855d..21e49c9b1e04e 100644
|
|
--- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix
|
|
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix
|
|
@@ -47,7 +47,7 @@ mkYarnPackage rec {
|
|
|
|
meta = with lib; {
|
|
description = "A Matrix <--> Slack bridge";
|
|
- maintainers = with maintainers; [ beardhatcode ];
|
|
+ maintainers = with maintainers; [ beardhatcode chvp ];
|
|
license = licenses.asl20;
|
|
};
|
|
}
|