diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2023-10-06 08:52:28 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-06 08:52:28 -0500 |
commit | 7b6e907b805e50935d82a36d6f85f15be2dba602 (patch) | |
tree | 36f9adfdaf7e08649f2a4f8e94e608b37730499b /pkgs/servers/web-apps | |
parent | 3ebb2e666567f56b41cf0715b2547e88f9468d2d (diff) | |
parent | d5fc54291fd5040e567c251f8e11ebecebc15be0 (diff) |
Merge pull request #259143 from flyingcircusio/matomo-4.15.1
matomo: 4.14.2 -> 4.15.1, matomo-beta: 4.14.3-b6 -> 5.0.0-rc3
Diffstat (limited to 'pkgs/servers/web-apps')
-rw-r--r-- | pkgs/servers/web-apps/matomo/change-path-geoip2-4.x.patch (renamed from pkgs/servers/web-apps/matomo/change-path-geoip2.patch) | 1 | ||||
-rw-r--r-- | pkgs/servers/web-apps/matomo/change-path-geoip2-5.x.patch | 10 | ||||
-rw-r--r-- | pkgs/servers/web-apps/matomo/default.nix | 23 |
3 files changed, 24 insertions, 10 deletions
diff --git a/pkgs/servers/web-apps/matomo/change-path-geoip2.patch b/pkgs/servers/web-apps/matomo/change-path-geoip2-4.x.patch index 0731e64fefd0c..5e3b32f2ef8c8 100644 --- a/pkgs/servers/web-apps/matomo/change-path-geoip2.patch +++ b/pkgs/servers/web-apps/matomo/change-path-geoip2-4.x.patch @@ -8,4 +8,3 @@ + 'path.geoip2' => PIWIK_USER_PATH . '/misc/', 'geopip2.ispEnabled' => true ]; -\ Pas de fin de ligne à la fin du fichier diff --git a/pkgs/servers/web-apps/matomo/change-path-geoip2-5.x.patch b/pkgs/servers/web-apps/matomo/change-path-geoip2-5.x.patch new file mode 100644 index 0000000000000..601e0815cb6e3 --- /dev/null +++ b/pkgs/servers/web-apps/matomo/change-path-geoip2-5.x.patch @@ -0,0 +1,10 @@ +--- a/plugins/GeoIp2/config/config.php ++++ b/plugins/GeoIp2/config/config.php +@@ -1,6 +1,6 @@ + <?php + + return [ +- 'path.geoip2' => Piwik\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 fbf16151ef106..4f0d02b670053 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchurl, makeWrapper, php }: +{ lib, stdenv, fetchurl, makeWrapper, php, nixosTests }: let versions = { matomo = { - version = "4.14.2"; - hash = "sha256-jPs/4bgt7VqeSoeLnwHr+FI426hAhwiP8RciQDNwCpo="; + version = "4.15.1"; + hash = "sha256-XnfiprGLqFQqPk30gcAVLdBZ3pYMSdBPfnicm7V1PSc="; }; matomo-beta = { - version = "4.14.3"; + version = "5.0.0"; # `beta` examples: "b1", "rc1", null # when updating: use null if stable version is >= latest beta or release candidate - beta = "b6"; - hash = "sha256-WGyGoTugxHgB2by1F57PQhyqQRjoKBCvwFBZvpsHwZg="; + beta = "rc3"; + hash = "sha256-Q5GB4i0ew6+tr8Bsm9PYkzJ8U6DmVPwG2QCi8CTge5E="; }; }; common = pname: { version, hash, beta ? null }: @@ -39,10 +39,11 @@ let # TODO: is upstream interested in this? # -> discussion at https://github.com/matomo-org/matomo/issues/12646 ./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.patch + (if lib.versionOlder 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 @@ -103,12 +104,16 @@ let popd > /dev/null ''; + passthru = { + tests = nixosTests.matomo."${pname}"; + }; + meta = with lib; { description = "A real-time web analytics application"; license = licenses.gpl3Plus; homepage = "https://matomo.org/"; platforms = platforms.all; - maintainers = with maintainers; [ florianjacob kiwi sebbel twey boozedog ]; + maintainers = with maintainers; [ florianjacob kiwi sebbel twey boozedog ] ++ teams.flyingcircus.members; }; }; in |