matomo: default to 5.x, drop 4.x, 5.1.2 -> 5.2.0 (#364627)

nixos/doc/manual/release-notes/rl-2505.section.md

@@ -158,6 +158,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.

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
+    ];
+  };
 }

pkgs/servers/web-apps/matomo/change-path-geoip2-4.x.patch

@@ -1,10 +0,0 @@
---- a/plugins/GeoIp2/config/config.php
-+++ b/plugins/GeoIp2/config/config.php
-@@ -1,6 +1,6 @@
- <?php
- 
- return [
--    'path.geoip2' => DI\string('{path.root}/misc/'),
-+    'path.geoip2' => PIWIK_USER_PATH . '/misc/',
-     'geopip2.ispEnabled' => true
- ];

pkgs/servers/web-apps/matomo/default.nix

@@ -10,19 +10,15 @@
 let
   versions = {
     matomo = {
-      version = "4.16.1";
+      version = "5.2.0";
-      hash = "sha256-cGnsxfpvt7FyhxFcA2/gWWe7CyanVGZVKtCDES3XLdI=";
+      hash = "sha256-0hMbcvntoOWFJ00DytkFfcP7/giqtrhmxawVNzMP2KA=";
-    };
-    matomo_5 = {
-      version = "5.1.2";
-      hash = "sha256-6kR6OOyqwQfV+pRqHO+VMLM1eZQb0om65EilAnIlW9U=";
     };
     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";
+      beta = null;
-      hash = "sha256-heAd01p8QHkrxQY2MEf//YXNplgL19Opw/WhA2cwZ+c=";
+      hash = "sha256-0hMbcvntoOWFJ00DytkFfcP7/giqtrhmxawVNzMP2KA=";
     };
   };
   common =
@@ -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.
-        (
+        ./change-path-geoip2-5.x.patch
-          if lib.versionOlder finalAttrs.version "5.0" then
-            ./change-path-geoip2-4.x.patch
-          else
-            ./change-path-geoip2-5.x.patch
-        )
       ];
 
       # this bootstrap.php adds support for getting PIWIK_USER_PATH

pkgs/top-level/aliases.nix

@@ -802,6 +802,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

pkgs/top-level/all-packages.nix

@@ -12111,7 +12111,6 @@ with pkgs;
   tt-rss = callPackage ../servers/tt-rss { };
   inherit (callPackages ../servers/web-apps/matomo {})
     matomo
-    matomo_5
     matomo-beta;
 
   unpackerr = callPackage ../servers/unpackerr {