From b454739b7af3edc8af28d2927c407cd2fa60a4af Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Thu, 12 Dec 2024 16:34:06 +0100 Subject: [PATCH 1/2] matomo: mark 4.x as EOL --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 ++ pkgs/servers/web-apps/matomo/default.nix | 1 + 2 files changed, 3 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index f08854d8cef29..66e606ae35fc4 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -360,6 +360,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `luarocks-packages-updater`'s .csv format, used to define lua packages to be updated, has changed: `src` (URL of a git repository) has now become `rockspec` (URL of a rockspec) to remove ambiguity regarding which rockspec to use and simplify implementation. +- `matomo` 4.x reached end of life on December 19, 2024. It is recommended to upgrade to `matomo_5`. + - `mkosi` was updated to v22. Parts of the user interface have changed. Consult the release notes of [v19](https://github.com/systemd/mkosi/releases/tag/v19), [v20](https://github.com/systemd/mkosi/releases/tag/v20), diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 4de267fd7797d..692a5e332151d 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -119,6 +119,7 @@ let homepage = "https://matomo.org/"; platforms = platforms.all; maintainers = with maintainers; [ florianjacob kiwi sebbel twey boozedog ] ++ teams.flyingcircus.members; + knownVulnerabilities = lib.optional (lib.versionOlder version "5.0") "Support for Matomo 4 ended on 2024-12-19. It is recommended to upgrade to `matomo_5` instead."; }; }; in From 26516ba99ee0ca48959b96a46596ff129f50aea7 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Thu, 12 Dec 2024 16:39:33 +0100 Subject: [PATCH 2/2] matomo_5: 5.1.2 -> 5.2.0 --- pkgs/servers/web-apps/matomo/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 692a5e332151d..6e34f1d19735e 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -7,15 +7,15 @@ let hash = "sha256-cGnsxfpvt7FyhxFcA2/gWWe7CyanVGZVKtCDES3XLdI="; }; matomo_5 = { - version = "5.1.2"; - hash = "sha256-6kR6OOyqwQfV+pRqHO+VMLM1eZQb0om65EilAnIlW9U="; + version = "5.2.0"; + hash = "sha256-0hMbcvntoOWFJ00DytkFfcP7/giqtrhmxawVNzMP2KA="; }; matomo-beta = { version = "5.2.0"; # `beta` examples: "b1", "rc1", null # when updating: use null if stable version is >= latest beta or release candidate - beta = "rc1"; - hash = "sha256-heAd01p8QHkrxQY2MEf//YXNplgL19Opw/WhA2cwZ+c="; + beta = null; + hash = "sha256-0hMbcvntoOWFJ00DytkFfcP7/giqtrhmxawVNzMP2KA="; }; }; common = pname: { version, hash, beta ? null }: