diff options
author | boozedog <code@booze.dog> | 2023-06-10 08:46:41 -0400 |
---|---|---|
committer | boozedog <code@booze.dog> | 2023-06-13 07:36:07 -0400 |
commit | d1aab88879f8f723ad9392fc4785906715911521 (patch) | |
tree | 8bb9d7118abf2b18c86e36415b2349031f809356 /pkgs | |
parent | a30520bf8eabf8a5c37889d661e67a2dbcaa59e6 (diff) | |
download | nixpkgs-d1aab88879f8f723ad9392fc4785906715911521.tar nixpkgs-d1aab88879f8f723ad9392fc4785906715911521.tar.gz nixpkgs-d1aab88879f8f723ad9392fc4785906715911521.tar.bz2 nixpkgs-d1aab88879f8f723ad9392fc4785906715911521.tar.lz nixpkgs-d1aab88879f8f723ad9392fc4785906715911521.tar.xz nixpkgs-d1aab88879f8f723ad9392fc4785906715911521.tar.zst nixpkgs-d1aab88879f8f723ad9392fc4785906715911521.zip |
matomo: 4.10.1 -> 4.14.2
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/servers/web-apps/matomo/change-path-geoip2.patch | 3 | ||||
-rw-r--r-- | pkgs/servers/web-apps/matomo/default.nix | 17 |
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/servers/web-apps/matomo/change-path-geoip2.patch b/pkgs/servers/web-apps/matomo/change-path-geoip2.patch index c8840db42e7..0731e64fefd 100644 --- a/pkgs/servers/web-apps/matomo/change-path-geoip2.patch +++ b/pkgs/servers/web-apps/matomo/change-path-geoip2.patch @@ -1,10 +1,11 @@ --- a/plugins/GeoIp2/config/config.php +++ b/plugins/GeoIp2/config/config.php -@@ -1,5 +1,5 @@ +@@ -1,6 +1,6 @@ <?php return [ - 'path.geoip2' => DI\string('{path.root}/misc/'), + '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/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 57b70abe466..fbf16151ef1 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -3,19 +3,18 @@ let versions = { matomo = { - version = "4.10.1"; - sha256 = "sha256-TN2xy3YHhtuewmi7h9vtMKElRI8uWOvnYzG1RlIGT3U="; + version = "4.14.2"; + hash = "sha256-jPs/4bgt7VqeSoeLnwHr+FI426hAhwiP8RciQDNwCpo="; }; - matomo-beta = { - version = "4.11.0"; + version = "4.14.3"; # `beta` examples: "b1", "rc1", null # when updating: use null if stable version is >= latest beta or release candidate - beta = "rc2"; - sha256 = "sha256-PYzv4OJYI4Zf7LMXQvX7fhvXryS6XPbmA0pTesF1vQ8="; + beta = "b6"; + hash = "sha256-WGyGoTugxHgB2by1F57PQhyqQRjoKBCvwFBZvpsHwZg="; }; }; - common = pname: { version, sha256, beta ? null }: + common = pname: { version, hash, beta ? null }: let fullVersion = version + lib.optionalString (beta != null) "-${toString beta}"; name = "${pname}-${fullVersion}"; @@ -27,7 +26,7 @@ let src = fetchurl { url = "https://builds.matomo.org/matomo-${version}.tar.gz"; - inherit sha256; + inherit hash; }; nativeBuildInputs = [ makeWrapper ]; @@ -109,7 +108,7 @@ let license = licenses.gpl3Plus; homepage = "https://matomo.org/"; platforms = platforms.all; - maintainers = with maintainers; [ florianjacob kiwi sebbel ]; + maintainers = with maintainers; [ florianjacob kiwi sebbel twey boozedog ]; }; }; in |