piwik 3.2.1 -> matomo 3.3.0 minor release, mainly rename

+14 -10
pkgs/servers/web-apps/piwik/bootstrap.php pkgs/servers/web-apps/matomo/bootstrap.php
+12 -9
pkgs/servers/web-apps/piwik/default.nix pkgs/servers/web-apps/matomo/default.nix
··· 1 { stdenv, fetchurl, makeWrapper, php }: 2 3 stdenv.mkDerivation rec { 4 - name = "piwik-${version}"; 5 - version = "3.2.1"; 6 7 src = fetchurl { 8 - url = "https://builds.piwik.org/${name}.tar.gz"; 9 - sha512 = "1yisgywz7dm6kygh9mc207xnqpvdxbw4pa2l9gjh495a6979x3chi7z5rf410z4dmrg0kbj8wqm8mmmslfn276xvw37l2d4h73ij1h2"; 10 }; 11 12 nativeBuildInputs = [ makeWrapper ]; ··· 21 cp ${./bootstrap.php} bootstrap.php 22 ''; 23 24 # TODO: Move more unnecessary files from share/, especially using PIWIK_INCLUDE_PATH. 25 - # See https://forum.piwik.org/t/bootstrap-php/5926/10 and 26 - # https://github.com/piwik/piwik/issues/11654#issuecomment-297730843 27 installPhase = '' 28 runHook preInstall 29 30 # copy evertything to share/, used as webroot folder, and then remove what's known to be not needed 31 mkdir -p $out/share 32 cp -ra * $out/share/ 33 - # tmp/ is created by piwik in PIWIK_USER_PATH 34 rmdir $out/share/tmp 35 # config/ needs to be copied to PIWIK_USER_PATH anyway 36 mv $out/share/config $out/ 37 38 - makeWrapper ${php}/bin/php $out/bin/piwik-console \ 39 --add-flags "$out/share/console" 40 41 runHook postInstall ··· 44 meta = with stdenv.lib; { 45 description = "A real-time web analytics application"; 46 license = licenses.gpl3Plus; 47 - homepage = https://piwik.org/; 48 platforms = platforms.all; 49 maintainers = [ maintainers.florianjacob ]; 50 };
··· 1 { stdenv, fetchurl, makeWrapper, php }: 2 3 stdenv.mkDerivation rec { 4 + name = "matomo-${version}"; 5 + version = "3.3.0"; 6 7 src = fetchurl { 8 + # TODO: As soon as the tarballs are renamed as well on future releases, this should be enabled again 9 + # url = "https://builds.matomo.org/${name}.tar.gz"; 10 + url = "https://builds.matomo.org/piwik-${version}.tar.gz"; 11 + sha256 = "1ybzj3kk0x29nv8c6xnhir5d9dr0q0fl1vnm4i7zvhml73ryqk0f"; 12 }; 13 14 nativeBuildInputs = [ makeWrapper ]; ··· 23 cp ${./bootstrap.php} bootstrap.php 24 ''; 25 26 + # TODO: future versions might rename the PIWIK_… variables to MATOMO_… 27 # TODO: Move more unnecessary files from share/, especially using PIWIK_INCLUDE_PATH. 28 + # See https://forum.matomo.org/t/bootstrap-php/5926/10 and 29 + # https://github.com/matomo-org/matomo/issues/11654#issuecomment-297730843 30 installPhase = '' 31 runHook preInstall 32 33 # copy evertything to share/, used as webroot folder, and then remove what's known to be not needed 34 mkdir -p $out/share 35 cp -ra * $out/share/ 36 + # tmp/ is created by matomo in PIWIK_USER_PATH 37 rmdir $out/share/tmp 38 # config/ needs to be copied to PIWIK_USER_PATH anyway 39 mv $out/share/config $out/ 40 41 + makeWrapper ${php}/bin/php $out/bin/matomo-console \ 42 --add-flags "$out/share/console" 43 44 runHook postInstall ··· 47 meta = with stdenv.lib; { 48 description = "A real-time web analytics application"; 49 license = licenses.gpl3Plus; 50 + homepage = https://matomo.org/; 51 platforms = platforms.all; 52 maintainers = [ maintainers.florianjacob ]; 53 };
+1
pkgs/top-level/aliases.nix
··· 110 m3d-linux = m33-linux; # added 2016-08-13 111 manpages = man-pages; # added 2015-12-06 112 man_db = man-db; # added 2016-05 113 midoriWrapper = midori; # added 2015-01 114 minc_tools = minc-tools; # 2017-12 115 mlt-qt5 = libsForQt5.mlt; # added 2015-12-19
··· 110 m3d-linux = m33-linux; # added 2016-08-13 111 manpages = man-pages; # added 2015-12-06 112 man_db = man-db; # added 2016-05 113 + piwik = matomo; # added 2018-01-16 114 midoriWrapper = midori; # added 2015-01 115 minc_tools = minc-tools; # 2017-12 116 mlt-qt5 = libsForQt5.mlt; # added 2015-12-19
+1 -1
pkgs/top-level/all-packages.nix
··· 12632 12633 shaarli-material = callPackage ../servers/web-apps/shaarli/material-theme.nix { }; 12634 12635 - piwik = callPackage ../servers/web-apps/piwik { }; 12636 12637 axis2 = callPackage ../servers/http/tomcat/axis2 { }; 12638
··· 12632 12633 shaarli-material = callPackage ../servers/web-apps/shaarli/material-theme.nix { }; 12634 12635 + matomo = callPackage ../servers/web-apps/matomo { }; 12636 12637 axis2 = callPackage ../servers/http/tomcat/axis2 { }; 12638