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

authored by Leona Maroni and committed by GitHub f244d656 a5077889

+17 -43
+2
nixos/doc/manual/release-notes/rl-2505.section.md
··· 158 158 159 159 - `virtualisation.azure.agent` option provided by `azure-agent.nix` is replaced by `services.waagent`, and will be removed in a future release. 160 160 161 + - `matomo` now defaults to version 5 (previously available as `matomo_5`). Version 4 has been removed as it reached EOL on December 19, 2024. 162 + 161 163 - `containerd` has been updated to v2, which contains breaking changes. See the [containerd 162 164 2.0](https://github.com/containerd/containerd/blob/main/docs/containerd-2.0.md) documentation for more 163 165 details.
+9 -18
nixos/tests/matomo.nix
··· 48 48 { 49 49 matomo = matomoTest pkgs.matomo // { 50 50 name = "matomo"; 51 - meta.maintainers = with maintainers; [ 52 - florianjacob 53 - mmilata 54 - twey 55 - boozedog 56 - ]; 51 + meta.maintainers = 52 + with maintainers; 53 + [ 54 + florianjacob 55 + mmilata 56 + twey 57 + boozedog 58 + ] 59 + ++ lib.teams.flyingcircus.members; 57 60 }; 58 61 matomo-beta = matomoTest pkgs.matomo-beta // { 59 62 name = "matomo-beta"; ··· 63 66 twey 64 67 boozedog 65 68 ]; 66 - }; 67 - matomo_5 = matomoTest pkgs.matomo_5 // { 68 - name = "matomo-5"; 69 - meta.maintainers = 70 - with maintainers; 71 - [ 72 - florianjacob 73 - mmilata 74 - twey 75 - boozedog 76 - ] 77 - ++ lib.teams.flyingcircus.members; 78 69 }; 79 70 }
-10
pkgs/servers/web-apps/matomo/change-path-geoip2-4.x.patch
··· 1 - --- a/plugins/GeoIp2/config/config.php 2 - +++ b/plugins/GeoIp2/config/config.php 3 - @@ -1,6 +1,6 @@ 4 - <?php 5 - 6 - return [ 7 - - 'path.geoip2' => DI\string('{path.root}/misc/'), 8 - + 'path.geoip2' => PIWIK_USER_PATH . '/misc/', 9 - 'geopip2.ispEnabled' => true 10 - ];
+5 -14
pkgs/servers/web-apps/matomo/default.nix
··· 10 10 let 11 11 versions = { 12 12 matomo = { 13 - version = "4.16.1"; 14 - hash = "sha256-cGnsxfpvt7FyhxFcA2/gWWe7CyanVGZVKtCDES3XLdI="; 15 - }; 16 - matomo_5 = { 17 - version = "5.1.2"; 18 - hash = "sha256-6kR6OOyqwQfV+pRqHO+VMLM1eZQb0om65EilAnIlW9U="; 13 + version = "5.2.0"; 14 + hash = "sha256-0hMbcvntoOWFJ00DytkFfcP7/giqtrhmxawVNzMP2KA="; 19 15 }; 20 16 matomo-beta = { 21 17 version = "5.2.0"; 22 18 # `beta` examples: "b1", "rc1", null 23 19 # when updating: use null if stable version is >= latest beta or release candidate 24 - beta = "rc1"; 25 - hash = "sha256-heAd01p8QHkrxQY2MEf//YXNplgL19Opw/WhA2cwZ+c="; 20 + beta = null; 21 + hash = "sha256-0hMbcvntoOWFJ00DytkFfcP7/giqtrhmxawVNzMP2KA="; 26 22 }; 27 23 }; 28 24 common = ··· 53 49 ./make-localhost-default-database-host.patch 54 50 # This changes the default config for path.geoip2 so that it doesn't point 55 51 # to the nix store. 56 - ( 57 - if lib.versionOlder finalAttrs.version "5.0" then 58 - ./change-path-geoip2-4.x.patch 59 - else 60 - ./change-path-geoip2-5.x.patch 61 - ) 52 + ./change-path-geoip2-5.x.patch 62 53 ]; 63 54 64 55 # this bootstrap.php adds support for getting PIWIK_USER_PATH
+1
pkgs/top-level/aliases.nix
··· 802 802 mathematica9 = throw "mathematica9 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20 803 803 mathematica10 = throw "mathematica10 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20 804 804 mathematica11 = throw "mathematica11 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20 805 + matomo_5 = matomo; # Added 2024-12-12 805 806 matrique = throw "'matrique' has been renamed to/replaced by 'spectral'"; # Converted to throw 2024-10-17 806 807 matrix-sliding-sync = throw "matrix-sliding-sync has been removed as matrix-synapse 114.0 and later covers its functionality"; # Added 2024-10-20 807 808 maui-nota = libsForQt5.mauiPackages.nota; # added 2022-05-17
-1
pkgs/top-level/all-packages.nix
··· 12111 12111 tt-rss = callPackage ../servers/tt-rss { }; 12112 12112 inherit (callPackages ../servers/web-apps/matomo {}) 12113 12113 matomo 12114 - matomo_5 12115 12114 matomo-beta; 12116 12115 12117 12116 unpackerr = callPackage ../servers/unpackerr {