From 326c87902e2c7e92a0a5050c32ace9b09a175588 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 30 Jul 2024 18:00:12 +0200 Subject: [PATCH 1/2] discourse: 3.2.4 -> 3.2.5 https://meta.discourse.org/t/3-2-5-security-and-bug-fix-release/316349/1 Fixes: CVE-2024-37165, CVE-2024-39320, CVE-2024-37299 --- pkgs/servers/web-apps/discourse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 5ad3209fd56c..73810fa1395e 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -47,13 +47,13 @@ }@args: let - version = "3.2.4"; + version = "3.2.5"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-bwYMLkBtdfgfAX8vKpsFRg5tpBtoaURKGF0rs/CtJ2U="; + sha256 = "sha256-+at4IiJ0yRPq9XyvAwa2Kuc0wYQOB5hw7E1jmQAAkc4="; }; ruby = ruby_3_2; From 12bf120747c39ad19cfdd7e3c31fba833cb77532 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 30 Jul 2024 18:29:13 +0200 Subject: [PATCH 2/2] discourse: update plugins --- .../web-apps/discourse/plugins/discourse-voting/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix index 3ddbc37cf7e9..f479e16cfd92 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-voting"; - rev = "ba41633e0abe0535fd358a0809e0b4e0c79be128"; - sha256 = "sha256-Ni+g9mWftvYsknIoSFBRoq7IMIWPbj4mgGM+k8fjOuI="; + rev = "fdb1f98a963adac049ffe9cd4fc506d77dd38cca"; + sha256 = "sha256-H1rTWfWlq1Hdo7UpcAgAz/zMFwick0nPSn4k1aUyYe0="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-voting";