From b6f4b380a696787de56135c19e890a4d60a8ad99 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Thu, 12 Dec 2024 16:18:47 +0100 Subject: [PATCH 1/2] matomo: default to 5.x, drop 4.x --- .../manual/release-notes/rl-2505.section.md | 2 ++ nixos/tests/matomo.nix | 27 +++++++------------ .../matomo/change-path-geoip2-4.x.patch | 10 ------- pkgs/servers/web-apps/matomo/default.nix | 11 +------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 6 files changed, 13 insertions(+), 39 deletions(-) delete mode 100644 pkgs/servers/web-apps/matomo/change-path-geoip2-4.x.patch diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index a24092c84d6b..b58656432a2e 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -110,6 +110,8 @@ - `virtualisation.azure.agent` option provided by `azure-agent.nix` is replaced by `services.waagent`, and will be removed in a future release. +- `matomo` now defaults to version 5 (previously available as `matomo_5`). Version 4 has been removed as it reached EOL on December 19, 2024. + - `containerd` has been updated to v2, which contains breaking changes. See the [containerd 2.0](https://github.com/containerd/containerd/blob/main/docs/containerd-2.0.md) documentation for more details. diff --git a/nixos/tests/matomo.nix b/nixos/tests/matomo.nix index f4097db6805d..35c71aa08853 100644 --- a/nixos/tests/matomo.nix +++ b/nixos/tests/matomo.nix @@ -48,24 +48,6 @@ in { matomo = matomoTest pkgs.matomo // { name = "matomo"; - meta.maintainers = with maintainers; [ - florianjacob - mmilata - twey - boozedog - ]; - }; - matomo-beta = matomoTest pkgs.matomo-beta // { - name = "matomo-beta"; - meta.maintainers = with maintainers; [ - florianjacob - mmilata - twey - boozedog - ]; - }; - matomo_5 = matomoTest pkgs.matomo_5 // { - name = "matomo-5"; meta.maintainers = with maintainers; [ @@ -76,4 +58,13 @@ in ] ++ lib.teams.flyingcircus.members; }; + matomo-beta = matomoTest pkgs.matomo-beta // { + name = "matomo-beta"; + meta.maintainers = with maintainers; [ + florianjacob + mmilata + twey + boozedog + ]; + }; } diff --git a/pkgs/servers/web-apps/matomo/change-path-geoip2-4.x.patch b/pkgs/servers/web-apps/matomo/change-path-geoip2-4.x.patch deleted file mode 100644 index 5e3b32f2ef8c..000000000000 --- a/pkgs/servers/web-apps/matomo/change-path-geoip2-4.x.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/plugins/GeoIp2/config/config.php -+++ b/plugins/GeoIp2/config/config.php -@@ -1,6 +1,6 @@ - DI\string('{path.root}/misc/'), -+ 'path.geoip2' => PIWIK_USER_PATH . '/misc/', - 'geopip2.ispEnabled' => true - ]; diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 36c1aeef90d1..516afd99cadb 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -10,10 +10,6 @@ let versions = { matomo = { - version = "4.16.1"; - hash = "sha256-cGnsxfpvt7FyhxFcA2/gWWe7CyanVGZVKtCDES3XLdI="; - }; - matomo_5 = { version = "5.1.2"; hash = "sha256-6kR6OOyqwQfV+pRqHO+VMLM1eZQb0om65EilAnIlW9U="; }; @@ -53,12 +49,7 @@ let ./make-localhost-default-database-host.patch # This changes the default config for path.geoip2 so that it doesn't point # to the nix store. - ( - if lib.versionOlder finalAttrs.version "5.0" then - ./change-path-geoip2-4.x.patch - else - ./change-path-geoip2-5.x.patch - ) + ./change-path-geoip2-5.x.patch ]; # this bootstrap.php adds support for getting PIWIK_USER_PATH diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b54542048572..9360913a9a5b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -796,6 +796,7 @@ mapAliases { mathematica9 = throw "mathematica9 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20 mathematica10 = throw "mathematica10 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20 mathematica11 = throw "mathematica11 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20 + matomo_5 = matomo; # Added 2024-12-12 matrique = throw "'matrique' has been renamed to/replaced by 'spectral'"; # Converted to throw 2024-10-17 matrix-sliding-sync = throw "matrix-sliding-sync has been removed as matrix-synapse 114.0 and later covers its functionality"; # Added 2024-10-20 maui-nota = libsForQt5.mauiPackages.nota; # added 2022-05-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0734f779f0aa..e4992a8e6723 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12134,7 +12134,6 @@ with pkgs; tt-rss = callPackage ../servers/tt-rss { }; inherit (callPackages ../servers/web-apps/matomo {}) matomo - matomo_5 matomo-beta; unpackerr = callPackage ../servers/unpackerr { From 37ccca21163ade037b4e9fffa3dfe585f78535e7 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Thu, 12 Dec 2024 16:26:54 +0100 Subject: [PATCH 2/2] matomo: 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 516afd99cadb..3eb4c2a8113a 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -10,15 +10,15 @@ let versions = { matomo = { - 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 =