summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2024-04-16 12:25:11 +0200
committerMartin Weinelt <hexa@darmstadt.ccc.de>2024-04-16 22:23:53 +0200
commit2f355318abfc5c437e014e005d98b2f3b902fca7 (patch)
treec6889dcaf4211ef0eebea12155576fb27e025145
parentMerge pull request #304468 from mweinelt/23.11/putty-0.81 (diff)
downloadnixpkgs-2f355318abfc5c437e014e005d98b2f3b902fca7.tar.gz
matrix-appservice-irc: 1.0.1 -> 2.0.0
https://github.com/matrix-org/matrix-appservice-irc/releases/tag/2.0.0 https://github.com/matrix-org/matrix-appservice-irc/compare/refs/tags/1.0.1...2.0.0 https://github.com/matrix-org/matrix-appservice-irc/security/advisories/GHSA-wm4w-7h2q-3pf7 Fixes: CVE-2024-32000 (cherry picked from commit 156c869524e2f184b17667aee0ce066fbb47a533)
-rw-r--r--pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix17
1 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix
index 753118528bdd..ffad0d9b8b49 100644
--- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix
+++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix
@@ -3,8 +3,8 @@
, fetchFromGitHub
, fetchYarnDeps
, prefetch-yarn-deps
-, nodejs
-, nodejs-slim
+, nodejs_20
+, nodejs-slim_20
, matrix-sdk-crypto-nodejs
, nixosTests
, nix-update-script
@@ -12,19 +12,19 @@
let
pname = "matrix-appservice-irc";
- version = "1.0.1";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "matrix-org";
repo = pname;
rev = "refs/tags/${version}";
- hash = "sha256-wUbWvCa9xvot73nXZjF3/RawM98ffBCW5YR2+ZKzmEo=";
+ hash = "sha256-voZJVBggsuwmGw/imt2HYmqiYBkRYMpppt/Nemh6fsM=";
};
yarnOfflineCache = fetchYarnDeps {
name = "${pname}-${version}-offline-cache";
yarnLock = "${src}/yarn.lock";
- hash = "sha256-P9u5sK9rIHWRE8kFMj05fVjv26jwsawvHBZgSn7j5BE=";
+ hash = "sha256-hapEbdjvvzeZHfrpYRW9W3vXkQVNyGZ0qydO34+mQqQ=";
};
in
@@ -35,9 +35,9 @@ stdenv.mkDerivation {
nativeBuildInputs = [
prefetch-yarn-deps
- nodejs-slim
- nodejs.pkgs.yarn
- nodejs.pkgs.node-gyp-build
+ nodejs-slim_20
+ nodejs_20.pkgs.yarn
+ nodejs_20.pkgs.node-gyp-build
];
configurePhase = ''
@@ -83,6 +83,7 @@ stdenv.mkDerivation {
passthru.updateScript = nix-update-script { };
meta = with lib; {
+ changelog = "https://github.com/matrix-org/matrix-appservice-irc/releases/tag/${version}";
description = "Node.js IRC bridge for Matrix";
maintainers = with maintainers; [ rhysmdnz ];
homepage = "https://github.com/matrix-org/matrix-appservice-irc";