Merge pull request #237039 from boozedog/matomo-4.14.2

matomo: 4.10.1 -> 4.14.2

maintainers/maintainer-list.nix

@@ -2222,6 +2222,13 @@
     githubId = 68566724;
     name = "bootstrap-prime";
   };
+  boozedog = {
+    email = "code@booze.dog";
+    github = "boozedog";
+    githubId = 1410808;
+    matrix = "@boozedog:matrix.org";
+    name = "David A. Buser";
+  };
   borisbabic = {
     email = "boris.ivan.babic@gmail.com";
     github = "borisbabic";

nixos/tests/matomo.nix

@@ -41,10 +41,10 @@ let
 in {
   matomo = matomoTest pkgs.matomo // {
     name = "matomo";
-    meta.maintainers = with maintainers; [ florianjacob kiwi mmilata ];
+    meta.maintainers = with maintainers; [ florianjacob kiwi mmilata twey boozedog ];
   };
   matomo-beta = matomoTest pkgs.matomo-beta // {
     name = "matomo-beta";
-    meta.maintainers = with maintainers; [ florianjacob kiwi mmilata ];
+    meta.maintainers = with maintainers; [ florianjacob kiwi mmilata twey boozedog ];
   };
 }

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

@@ -1,10 +1,11 @@
 --- a/plugins/GeoIp2/config/config.php
 +++ b/plugins/GeoIp2/config/config.php
-@@ -1,5 +1,5 @@
+@@ -1,6 +1,6 @@
  <?php
  
  return [
 -    'path.geoip2' => DI\string('{path.root}/misc/'),
 +    'path.geoip2' => PIWIK_USER_PATH . '/misc/',
+     'geopip2.ispEnabled' => true
  ];
 \ Pas de fin de ligne à la fin du fichier

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

@@ -3,19 +3,18 @@
 let
   versions = {
     matomo = {
-      version = "4.10.1";
-      sha256 = "sha256-TN2xy3YHhtuewmi7h9vtMKElRI8uWOvnYzG1RlIGT3U=";
+      version = "4.14.2";
+      hash = "sha256-jPs/4bgt7VqeSoeLnwHr+FI426hAhwiP8RciQDNwCpo=";
     };
-
     matomo-beta = {
-      version = "4.11.0";
+      version = "4.14.3";
       # `beta` examples: "b1", "rc1", null
       # when updating: use null if stable version is >= latest beta or release candidate
-      beta = "rc2";
-      sha256 = "sha256-PYzv4OJYI4Zf7LMXQvX7fhvXryS6XPbmA0pTesF1vQ8=";
+      beta = "b6";
+      hash = "sha256-WGyGoTugxHgB2by1F57PQhyqQRjoKBCvwFBZvpsHwZg=";
     };
   };
-  common = pname: { version, sha256, beta ? null }:
+  common = pname: { version, hash, beta ? null }:
     let
       fullVersion = version + lib.optionalString (beta != null) "-${toString beta}";
       name = "${pname}-${fullVersion}";
@@ -27,7 +26,7 @@ let
 
         src = fetchurl {
           url = "https://builds.matomo.org/matomo-${version}.tar.gz";
-          inherit sha256;
+          inherit hash;
         };
 
         nativeBuildInputs = [ makeWrapper ];
@@ -109,7 +108,7 @@ let
           license = licenses.gpl3Plus;
           homepage = "https://matomo.org/";
           platforms = platforms.all;
-          maintainers = with maintainers; [ florianjacob kiwi sebbel ];
+          maintainers = with maintainers; [ florianjacob kiwi sebbel twey boozedog ];
         };
       };
 in