summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJoachim F <joachifm@users.noreply.github.com>2017-09-13 16:25:45 +0000
committerGitHub <noreply@github.com>2017-09-13 16:25:45 +0000
commit34b4935850bfcb60b5c2e0e06683abd58ff700ce (patch)
tree2ad5a765195eaf2071e9926808c12e0d696b504c /pkgs
parent35f38bfc4609af20ca6e95543b4743335551c815 (diff)
parent556dfedda7561b7f425ffe6e47622a673e5cac8f (diff)
downloadnixlib-34b4935850bfcb60b5c2e0e06683abd58ff700ce.tar
nixlib-34b4935850bfcb60b5c2e0e06683abd58ff700ce.tar.gz
nixlib-34b4935850bfcb60b5c2e0e06683abd58ff700ce.tar.bz2
nixlib-34b4935850bfcb60b5c2e0e06683abd58ff700ce.tar.lz
nixlib-34b4935850bfcb60b5c2e0e06683abd58ff700ce.tar.xz
nixlib-34b4935850bfcb60b5c2e0e06683abd58ff700ce.tar.zst
nixlib-34b4935850bfcb60b5c2e0e06683abd58ff700ce.zip
Merge pull request #29288 from florianjacob/piwik-3.1.0
piwik: 3.0.4 -> 3.1.0
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/servers/web-apps/piwik/default.nix13
1 files changed, 2 insertions, 11 deletions
diff --git a/pkgs/servers/web-apps/piwik/default.nix b/pkgs/servers/web-apps/piwik/default.nix
index 22d87d670645..3981a5eeb14c 100644
--- a/pkgs/servers/web-apps/piwik/default.nix
+++ b/pkgs/servers/web-apps/piwik/default.nix
@@ -2,29 +2,20 @@
 
 stdenv.mkDerivation rec {
   name = "piwik-${version}";
-  version = "3.0.4";
+  version = "3.1.0";
 
   src = fetchurl {
     url = "https://builds.piwik.org/${name}.tar.gz";
-    sha512 = "2i0vydr073ynv7wcn078zxhvywdv85c648hympkzicdd746g995878py9006m96iwkmk4q664wn3f8jnfqsl1jd9f26alz1nssizbn9";
+    sha512 = "175300ibf0lg4xnyn5v47czi3vd6i7yqf1im3br4975f6k7w8q22m2mk2mi006795js5q52x48g4sc7wb47wac7wbla8wp98al48gfb";
   };
 
   nativeBuildInputs = [ makeWrapper ];
 
-  # regarding the PIWIK_USER_PATH substitutes:
-  #   looks like this is just a bug / confusion of the directories, and nobody has tested this.
-  #   PR at https://github.com/piwik/piwik/pull/11661
   # regarding the 127.0.0.1 substitute:
   #   This replaces the default value of the database server field.
   #   unix socket authentication only works with localhost,
   #   but password-based SQL authentication works with both.
   postPatch = ''
-    substituteInPlace core/AssetManager/UIAssetFetcher.php \
-      --replace "return PIWIK_USER_PATH;" "return PIWIK_DOCUMENT_ROOT;"
-    substituteInPlace core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php \
-      --replace "setImportDir(PIWIK_USER_PATH);" "setImportDir(PIWIK_DOCUMENT_ROOT);"
-    substituteInPlace core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php \
-      --replace "\$absolutePath = PIWIK_USER_PATH" "\$absolutePath = PIWIK_DOCUMENT_ROOT"
     substituteInPlace plugins/Installation/FormDatabaseSetup.php \
       --replace "=> '127.0.0.1'," "=> 'localhost',"
     cp ${./bootstrap.php} bootstrap.php