Update dependencies

This commit is contained in:
Charlotte Van Petegem 2023-03-16 10:21:55 +01:00
parent 1c0f8f3ca1
commit 5357326e55
No known key found for this signature in database
GPG key ID: 019E764B7184435A
2 changed files with 18 additions and 86 deletions

36
flake.lock generated
View file

@ -45,11 +45,11 @@
]
},
"locked": {
"lastModified": 1678905791,
"narHash": "sha256-h1rR/Ygdp4mPsYF+ePpqhJthwmK3SFufVIPvY3imFYc=",
"lastModified": 1678956388,
"narHash": "sha256-hUOdOsCmup4BE8wV/dj8Yj3O03VQolnC0hvtH7Lq63A=",
"owner": "accentor",
"repo": "api",
"rev": "c5049096af5143432ce5a6231811fe5130c80b32",
"rev": "0c04ddbaee1a17ba441f567420c25b884ab531b7",
"type": "github"
},
"original": {
@ -71,11 +71,11 @@
]
},
"locked": {
"lastModified": 1678905890,
"narHash": "sha256-sa292kGFo2bIDO2axElFVwN7zdJv2NfX2zqfzFD6Ma0=",
"lastModified": 1678956390,
"narHash": "sha256-fJxqhZK0ZPhdRaNNTomPkUZ9y8/gWz9HoMrjpzGaiA4=",
"owner": "accentor",
"repo": "web",
"rev": "30a738a1fd335f9c06be738936f4464d29a85994",
"rev": "7f23edcba4c344488cf796265cd8b1420b5b1b28",
"type": "github"
},
"original": {
@ -230,11 +230,11 @@
]
},
"locked": {
"lastModified": 1678916824,
"narHash": "sha256-YPQAQ0x0wLvbQ/vaEj8o+0hRfbBNR0teTJ6QsG0yzw4=",
"lastModified": 1678957507,
"narHash": "sha256-t1yAoxlfhSjgeDGoQ1WJ0LBwVReL6y3QkAfJ3H+mOSs=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c8cb60b8a15c90b2bbc416c182532620602edb48",
"rev": "5e94669f8ea8d697b1a00b916b2a86909f8c4ff5",
"type": "github"
},
"original": {
@ -291,11 +291,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1678819893,
"narHash": "sha256-lfA6WGdxPsPkBK5Y19ltr5Sn7v7MlT+jpZ4nUgco0Xs=",
"lastModified": 1678898370,
"narHash": "sha256-xTICr1j+uat5hk9FyuPOFGxpWHdJRibwZC+ATi0RbtE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "7067edc68c035e21780259ed2d26e1f164addaa2",
"rev": "ac718d02867a84b42522a0ece52d841188208f2c",
"type": "github"
},
"original": {
@ -322,11 +322,11 @@
},
"nur": {
"locked": {
"lastModified": 1678939859,
"narHash": "sha256-vmf0/ApR0XEnLJq1aU3OuzBV1pQUD9Z0IN2nnb4beZc=",
"lastModified": 1678955011,
"narHash": "sha256-dlN+8TR5cgrALQBDnEBHRatLfkp7cnml7ggtR02Dd0Y=",
"owner": "nix-community",
"repo": "NUR",
"rev": "d366314098013524969589cc393dd0622a168eb1",
"rev": "2e50ae6dbdda3a310d96da11e47fd56f3ff51e12",
"type": "github"
},
"original": {
@ -367,11 +367,11 @@
]
},
"locked": {
"lastModified": 1678901808,
"narHash": "sha256-JdUjmBANWFwSx4EIiPJhnjvLyKIVJXJYx0SqrmMsdmI=",
"lastModified": 1678952191,
"narHash": "sha256-LhPKB8+8r2v3R8NxxxCzWY4BHuOdMx1xhYSsqVtOhWU=",
"owner": "chvp",
"repo": "tetris",
"rev": "ea6e25529bb5488dda8fb07b7cda7fc5b633b7b8",
"rev": "d1d0d35a6bbb4bba4db286e84bf6013a9fff8747",
"type": "github"
},
"original": {

View file

@ -1,68 +0,0 @@
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;
};
}