diff options
| author | Tobias Stenzel <ts@flyingcircus.io> | 2023-08-20 21:04:08 +0200 |
|---|---|---|
| committer | Your Name <you@example.com> | 2023-10-05 10:10:35 +0200 |
| commit | d5fc54291fd5040e567c251f8e11ebecebc15be0 (patch) | |
| tree | 3e8a4f9e8ff0dd47ab1fcea7129fed2c500a6be9 | |
| parent | ffbf8e46861c433d151edac8301226534f5170cd (diff) | |
| download | nixlib-d5fc54291fd5040e567c251f8e11ebecebc15be0.tar nixlib-d5fc54291fd5040e567c251f8e11ebecebc15be0.tar.gz nixlib-d5fc54291fd5040e567c251f8e11ebecebc15be0.tar.bz2 nixlib-d5fc54291fd5040e567c251f8e11ebecebc15be0.tar.lz nixlib-d5fc54291fd5040e567c251f8e11ebecebc15be0.tar.xz nixlib-d5fc54291fd5040e567c251f8e11ebecebc15be0.tar.zst nixlib-d5fc54291fd5040e567c251f8e11ebecebc15be0.zip | |
matomo-beta: 4.14.3-b6 -> 5.0.0-rc3
* https://matomo.org/changelog/matomo-5-0-0-rc/
| -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 | 11 |
3 files changed, 16 insertions, 6 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 0731e64fefd0..5e3b32f2ef8c 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 000000000000..601e0815cb6e --- /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 43ba042eb37a..4f0d02b67005 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -7,11 +7,11 @@ let 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 |