Merge pull request #237039 from boozedog/matomo-4.14.2
matomo: 4.10.1 -> 4.14.2
This commit is contained in:
commit
6dfc82118f
|
@ -2222,6 +2222,13 @@
|
||||||
githubId = 68566724;
|
githubId = 68566724;
|
||||||
name = "bootstrap-prime";
|
name = "bootstrap-prime";
|
||||||
};
|
};
|
||||||
|
boozedog = {
|
||||||
|
email = "code@booze.dog";
|
||||||
|
github = "boozedog";
|
||||||
|
githubId = 1410808;
|
||||||
|
matrix = "@boozedog:matrix.org";
|
||||||
|
name = "David A. Buser";
|
||||||
|
};
|
||||||
borisbabic = {
|
borisbabic = {
|
||||||
email = "boris.ivan.babic@gmail.com";
|
email = "boris.ivan.babic@gmail.com";
|
||||||
github = "borisbabic";
|
github = "borisbabic";
|
||||||
|
|
|
@ -41,10 +41,10 @@ let
|
||||||
in {
|
in {
|
||||||
matomo = matomoTest pkgs.matomo // {
|
matomo = matomoTest pkgs.matomo // {
|
||||||
name = "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 // {
|
matomo-beta = matomoTest pkgs.matomo-beta // {
|
||||||
name = "matomo-beta";
|
name = "matomo-beta";
|
||||||
meta.maintainers = with maintainers; [ florianjacob kiwi mmilata ];
|
meta.maintainers = with maintainers; [ florianjacob kiwi mmilata twey boozedog ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,10 +1,11 @@
|
||||||
--- a/plugins/GeoIp2/config/config.php
|
--- a/plugins/GeoIp2/config/config.php
|
||||||
+++ b/plugins/GeoIp2/config/config.php
|
+++ b/plugins/GeoIp2/config/config.php
|
||||||
@@ -1,5 +1,5 @@
|
@@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
return [
|
return [
|
||||||
- 'path.geoip2' => DI\string('{path.root}/misc/'),
|
- 'path.geoip2' => DI\string('{path.root}/misc/'),
|
||||||
+ 'path.geoip2' => PIWIK_USER_PATH . '/misc/',
|
+ 'path.geoip2' => PIWIK_USER_PATH . '/misc/',
|
||||||
|
'geopip2.ispEnabled' => true
|
||||||
];
|
];
|
||||||
\ Pas de fin de ligne à la fin du fichier
|
\ Pas de fin de ligne à la fin du fichier
|
||||||
|
|
|
@ -3,19 +3,18 @@
|
||||||
let
|
let
|
||||||
versions = {
|
versions = {
|
||||||
matomo = {
|
matomo = {
|
||||||
version = "4.10.1";
|
version = "4.14.2";
|
||||||
sha256 = "sha256-TN2xy3YHhtuewmi7h9vtMKElRI8uWOvnYzG1RlIGT3U=";
|
hash = "sha256-jPs/4bgt7VqeSoeLnwHr+FI426hAhwiP8RciQDNwCpo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
matomo-beta = {
|
matomo-beta = {
|
||||||
version = "4.11.0";
|
version = "4.14.3";
|
||||||
# `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 = "rc2";
|
beta = "b6";
|
||||||
sha256 = "sha256-PYzv4OJYI4Zf7LMXQvX7fhvXryS6XPbmA0pTesF1vQ8=";
|
hash = "sha256-WGyGoTugxHgB2by1F57PQhyqQRjoKBCvwFBZvpsHwZg=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
common = pname: { version, sha256, beta ? null }:
|
common = pname: { version, hash, beta ? null }:
|
||||||
let
|
let
|
||||||
fullVersion = version + lib.optionalString (beta != null) "-${toString beta}";
|
fullVersion = version + lib.optionalString (beta != null) "-${toString beta}";
|
||||||
name = "${pname}-${fullVersion}";
|
name = "${pname}-${fullVersion}";
|
||||||
|
@ -27,7 +26,7 @@ let
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://builds.matomo.org/matomo-${version}.tar.gz";
|
url = "https://builds.matomo.org/matomo-${version}.tar.gz";
|
||||||
inherit sha256;
|
inherit hash;
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
@ -109,7 +108,7 @@ let
|
||||||
license = licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
homepage = "https://matomo.org/";
|
homepage = "https://matomo.org/";
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
maintainers = with maintainers; [ florianjacob kiwi sebbel ];
|
maintainers = with maintainers; [ florianjacob kiwi sebbel twey boozedog ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
|
Loading…
Reference in a new issue