diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-02-26 06:53:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-26 06:53:58 +0000 |
| commit | 37c009ca74c872ca099bbdecafab8a3a31b073e3 (patch) | |
| tree | dacbce69a383d6e6a1dacbc3b29a7d42fe7255f4 /pkgs/top-level | |
| parent | 095260a1c9b3d566bf7c2c2a7b56a39b8b0bd413 (diff) | |
| parent | 885e762d471e0733e5da72ddf10f486893624483 (diff) | |
| download | nixlib-37c009ca74c872ca099bbdecafab8a3a31b073e3.tar nixlib-37c009ca74c872ca099bbdecafab8a3a31b073e3.tar.gz nixlib-37c009ca74c872ca099bbdecafab8a3a31b073e3.tar.bz2 nixlib-37c009ca74c872ca099bbdecafab8a3a31b073e3.tar.lz nixlib-37c009ca74c872ca099bbdecafab8a3a31b073e3.tar.xz nixlib-37c009ca74c872ca099bbdecafab8a3a31b073e3.tar.zst nixlib-37c009ca74c872ca099bbdecafab8a3a31b073e3.zip | |
Merge pull request #34028 from florianjacob/matomo
piwik is now matomo
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ee2e0ad9e2ff..06da21813ae3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -132,6 +132,7 @@ mapAliases (rec { m3d-linux = m33-linux; # added 2016-08-13 manpages = man-pages; # added 2015-12-06 man_db = man-db; # added 2016-05 + piwik = matomo; # added 2018-01-16 midoriWrapper = midori; # added 2015-01 minc_tools = minc-tools; # 2017-12 mlt-qt5 = libsForQt5.mlt; # added 2015-12-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da8f9bbb1224..81f48f203a74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12672,7 +12672,7 @@ with pkgs; shaarli-material = callPackage ../servers/web-apps/shaarli/material-theme.nix { }; - piwik = callPackage ../servers/web-apps/piwik { }; + matomo = callPackage ../servers/web-apps/matomo { }; axis2 = callPackage ../servers/http/tomcat/axis2 { }; |