From 04e8e1010434c02f59dbf5be5ec35764c5fa8ed7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Apr 2023 12:29:18 +0200 Subject: [PATCH 1/2] mediawiki: 1.39.2 -> 1.39.3 https://lists.wikimedia.org/hyperkitty/list/mediawiki-announce@lists.wikimedia.org/message/6UQBHI5FWLATD7QO7DI4YS54U7XSSLAN/ Fixes: CVE-2020-36649, CVE-2023-29141 --- pkgs/servers/web-apps/mediawiki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/mediawiki/default.nix b/pkgs/servers/web-apps/mediawiki/default.nix index 7994d81f97a7..2570562ccc5a 100644 --- a/pkgs/servers/web-apps/mediawiki/default.nix +++ b/pkgs/servers/web-apps/mediawiki/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mediawiki"; - version = "1.39.2"; + version = "1.39.3"; src = fetchurl { url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz"; - sha256 = "sha256-3bUdIooZymjNiHHYUBdfa+9Gh0R27RRm8BXPmEbZx6U="; + hash = "sha256-41dpNDh2r0JJbaQ64vRyJPuMd5uPRXBcQUfG/zUizB0="; }; postPatch = '' From 47428f1a16d4c35ab712c67529110412ca97a556 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Apr 2023 12:38:31 +0200 Subject: [PATCH 2/2] mediawiki: Expose test variants individually This fixes `nix-build -A mediawiki.tests`, which does not seem to recurse into nested attribute sets, but instead returns. --- pkgs/servers/web-apps/mediawiki/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/mediawiki/default.nix b/pkgs/servers/web-apps/mediawiki/default.nix index 2570562ccc5a..b90dffb0be1d 100644 --- a/pkgs/servers/web-apps/mediawiki/default.nix +++ b/pkgs/servers/web-apps/mediawiki/default.nix @@ -29,7 +29,9 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.tests.mediawiki = nixosTests.mediawiki; + passthru.tests = { + inherit (nixosTests.mediawiki) mysql postgresql; + }; meta = with lib; { description = "The collaborative editing software that runs Wikipedia";