matomo-beta: 4.14.3-b6 -> 5.0.0-rc3
* https://matomo.org/changelog/matomo-5-0-0-rc/
This commit is contained in:
parent
ffbf8e4686
commit
d5fc54291f
|
@ -8,4 +8,3 @@
|
||||||
+ 'path.geoip2' => PIWIK_USER_PATH . '/misc/',
|
+ 'path.geoip2' => PIWIK_USER_PATH . '/misc/',
|
||||||
'geopip2.ispEnabled' => true
|
'geopip2.ispEnabled' => true
|
||||||
];
|
];
|
||||||
\ Pas de fin de ligne à la fin du fichier
|
|
10
pkgs/servers/web-apps/matomo/change-path-geoip2-5.x.patch
Normal file
10
pkgs/servers/web-apps/matomo/change-path-geoip2-5.x.patch
Normal file
|
@ -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
|
||||||
|
];
|
|
@ -7,11 +7,11 @@ let
|
||||||
hash = "sha256-XnfiprGLqFQqPk30gcAVLdBZ3pYMSdBPfnicm7V1PSc=";
|
hash = "sha256-XnfiprGLqFQqPk30gcAVLdBZ3pYMSdBPfnicm7V1PSc=";
|
||||||
};
|
};
|
||||||
matomo-beta = {
|
matomo-beta = {
|
||||||
version = "4.14.3";
|
version = "5.0.0";
|
||||||
# `beta` examples: "b1", "rc1", null
|
# `beta` examples: "b1", "rc1", null
|
||||||
# when updating: use null if stable version is >= latest beta or release candidate
|
# when updating: use null if stable version is >= latest beta or release candidate
|
||||||
beta = "b6";
|
beta = "rc3";
|
||||||
hash = "sha256-WGyGoTugxHgB2by1F57PQhyqQRjoKBCvwFBZvpsHwZg=";
|
hash = "sha256-Q5GB4i0ew6+tr8Bsm9PYkzJ8U6DmVPwG2QCi8CTge5E=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
common = pname: { version, hash, beta ? null }:
|
common = pname: { version, hash, beta ? null }:
|
||||||
|
@ -39,10 +39,11 @@ let
|
||||||
# TODO: is upstream interested in this?
|
# TODO: is upstream interested in this?
|
||||||
# -> discussion at https://github.com/matomo-org/matomo/issues/12646
|
# -> discussion at https://github.com/matomo-org/matomo/issues/12646
|
||||||
./make-localhost-default-database-host.patch
|
./make-localhost-default-database-host.patch
|
||||||
|
|
||||||
# This changes the default config for path.geoip2 so that it doesn't point
|
# This changes the default config for path.geoip2 so that it doesn't point
|
||||||
# to the nix store.
|
# 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
|
# this bootstrap.php adds support for getting PIWIK_USER_PATH
|
||||||
|
|
Loading…
Reference in a new issue