Commit graph

25061 commits

Author SHA1 Message Date
Jaka Hudoklin
d919184fad Merge pull request #17953 from juliendehos/cppdb
cppdb: init at 0.3.1
2016-08-24 23:35:24 +02:00
Robin Gloster
423e67b299 automake110x: remove unused package 2016-08-24 21:07:59 +00:00
J Phani Mahesh
f26edb5257 python-pkgs:deluge: pin dependency libtorrent-rasterbar to 1.0.9
See https://github.com/NixOS/nixpkgs/issues/17924 for context
2016-08-25 00:00:26 +05:30
Lancelot SIX
3614e950e4
pythonPackages.pyparsing: 2.1.4 -> 2.1.8 2016-08-24 17:47:15 +02:00
Shea Levy
8b9b9fad31 Revert "Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs""
Revert a revert of a merge that shouldn't have been in master but was intentionally in staging.

Next time I'll do this right after the revert instead of so far down the line...

This reverts commit 9adad8612b.
2016-08-24 07:35:30 -04:00
obadz
78b7529ee3 Merge branch 'master' into staging 2016-08-24 11:57:44 +01:00
zimbatm
4d4980d9f8 Merge pull request #17805 from avnik/update/golang-1.7
go: add 1.7 compiler
2016-08-24 11:28:25 +01:00
Daniel Peebles
3f337a2b23 Merge pull request #17685 from matthewbauer/darwin-misc2
Darwin misc. fixes
2016-08-24 11:52:27 +02:00
Julien Dehos
c35ce47143 cppdb: init at 0.3.1 2016-08-24 10:47:56 +02:00
Mikael Brockman
ffb3f0396c unclutter-xfixes: init at 1.2 2016-08-24 11:24:00 +03:00
Julien Dehos
eac69059fc cppcms: init at 1.0.5 2016-08-24 09:36:17 +02:00
Michiel Leenaars
378c7a26af argus-clients: init at 3.0.8.2 2016-08-24 00:13:38 +02:00
Stefan Junker
4f812be509 manuskript: init at 0.3.0 2016-08-23 21:29:07 +02:00
Stefan Junker
c963b9e47f rust registry: 2016-08-10 -> 2016-08-23 2016-08-23 21:25:27 +02:00
obadz
8da8aa7ddb Merge branch 'hardened-stdenv' into staging 2016-08-23 18:50:10 +01:00
obadz
0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Robin Gloster
7413278f9b Revert "Remove lsh, broken & unmaintained"
This reverts commit 73f4c2bdf8.
2016-08-23 15:32:41 +00:00
Robin Gloster
3a18f06eab Revert "lsh: remove last references"
This reverts commit 8329066d5e.
2016-08-23 15:31:33 +00:00
José Romildo Malaquias
b3974f9914 python-efl: 1.17.0 -> 1.18.0 2016-08-23 11:50:44 -03:00
Joachim F
56bfc0240e Merge pull request #17766 from NeQuissimus/gradle30
gradle: 2.14.1 -> 3.0, keep 2.14.1
2016-08-23 16:22:05 +02:00
Lluís Batlle i Rossell
9ef3a51379 Adding vlc plugin for firefox.
I really wanted it to substitute the html5 player, or at least the direct
player for mp4/webm files in firefox, but I couldn't make it work. The
formats recognized by the firefox internal player were used in all cases. The
plugin worked for formats unknown by firefox.

https://support.mozilla.org/ca/questions/1089501

Nevertheless, as I wrote the nix recipe, I commit it. It may be of interest to
someone else.
2016-08-23 10:16:37 +02:00
Tuomas Tynkkynen
6d68178693 treewide: Make explicit that 'dev' output of imagemagick is used 2016-08-23 03:52:06 +03:00
Michiel Leenaars
4d2ef926b5 argus: init at 3.0.8.2 2016-08-22 22:17:14 +02:00
Bjørn Forsman
abc43b0545 cifs-utils: align attrname with pkgname
Keep backwards compat alias.
2016-08-22 17:20:28 +02:00
Eelco Dolstra
5db200e839 jre: Set valid value for meta.outputsToInstall
Fixes #17866.
2016-08-22 17:04:22 +02:00
Rok Garbas
a241639bcf
pythonPackages.trollius: skip one test from tests/test_subprocess.py (only on darwin) 2016-08-22 13:18:49 +02:00
Nikolay Amiantov
7bf7f19765 SDL2: cleanup and add patch to discover extensions 2016-08-22 06:30:01 +03:00
Nikolay Amiantov
b47327ebd5 SDL: cleanup and add patch to discover extensions 2016-08-22 06:30:00 +03:00
Nikolay Amiantov
18d7366418 openal: fix alias 2016-08-22 04:14:49 +03:00
obadz
24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
obadz
ba50fd7170 Merge branch 'master' into staging 2016-08-22 01:18:11 +01:00
Bjørn Forsman
ae567cda11 owncloud-client: align attrname with pkgname
Also, it seems the official binary distributions of the owncloud client
for the various Linux distros all use the dashed name [1]. Add backwards
compat alias for the old name.

[1] https://owncloud.org/install/#install-clients
2016-08-21 21:55:33 +02:00
Domen Kožar
76dca3d0e0 Merge pull request #17837 from MostAwesomeDude/fossil
build-support: Add fetchfossil function.
2016-08-21 21:47:00 +02:00
Luca Bruno
4916c11ec2 Merge pull request #17898 from RamKromberg/fix/vala_namespace
remove vala namespace
2016-08-21 20:31:44 +01:00
schneefux
509f24f240
pflogsumm: init at 1.1.3 2016-08-21 21:18:28 +02:00
Joachim F
b374239e20 Merge pull request #17874 from acowley/with
with: init at 0.0.1
2016-08-21 20:57:08 +02:00
Alexander V. Nikolaev
800775e221 go: add 1.7 compiler 2016-08-21 21:20:07 +03:00
Ram Kromberg
cfe27ddf90 vala: remove default vala namespace 2016-08-21 20:21:53 +03:00
Ram Kromberg
98b087e413 font-manager: vala -> vala_0_32 2016-08-21 20:02:06 +03:00
Ram Kromberg
49bd29ae57 vanubi: vala -> vala_0_26 2016-08-21 20:02:05 +03:00
Ram Kromberg
a57cd70a11 pdfpc: vala -> vala_0_26 2016-08-21 20:02:05 +03:00
Ram Kromberg
672cf9455d valum: vala -> vala_0_28 2016-08-21 20:02:05 +03:00
Ram Kromberg
2acfb62caa shotwell: vala -> vala_0_28 2016-08-21 20:02:04 +03:00
Ram Kromberg
aa163eb8d8 vala: default.nix -> 0.23.nix & add vala_0_23 2016-08-21 20:02:04 +03:00
Luca Bruno
cccdbf0bfd crunch: init at 3.6 2016-08-21 17:58:56 +01:00
obadz
68936edfb3 Merge branch 'master' into staging 2016-08-21 12:03:41 +01:00
Rickard Nilsson
7a3260c590 libvirt and pythonPackages.libvirt: 2.0.0 -> 2.1.0 2016-08-21 09:51:24 +02:00
Michael Raskin
a28ca06298 ao: init at 0.0pre20160820 2016-08-21 00:55:49 +02:00
Michiel Leenaars
a45f203366 pythonPackages.BlinkStick: fix brokenness 2016-08-20 23:43:15 +02:00
Michael Raskin
3581a00d69 torch: init at 0.0-pre20160820 2016-08-20 23:41:34 +02:00
Anthony Cowley
30f8a050ae with: init at 2016-08-20
Adds the "with" shell helper application.
2016-08-20 17:09:56 -04:00
Michiel Leenaars
53b618105d pythonPackages.pyfantom: init at unstable-2013-12-18 2016-08-20 21:56:51 +02:00
Michiel Leenaars
c7b800a6bf pythonPackages.pybluez: init at unstable-20160819 2016-08-20 21:52:45 +02:00
Michiel Leenaars
4d7cc55344 pythonPackages.pyusb: add propagatedBuildInput libusb 2016-08-20 21:52:45 +02:00
Michiel Leenaars
b06b865dcc pythonPackages.nxt_python: init at unstable-20160819 2016-08-20 21:50:48 +02:00
Michiel Leenaars
52592e1132 pythonPackages.lightblue: init at 0.4 2016-08-20 21:50:48 +02:00
Domen Kožar
2e9a3c3636 Merge pull request #17673 from k0001/fix-16074
Fix perl package CatalystXScriptServerStarman (and indirectly, hydra)
2016-08-20 19:36:02 +02:00
Robert Helgesson
2095c5947d
perl-DateTime-Format-SQLite: add meta section 2016-08-20 18:29:38 +02:00
Robert Helgesson
306083f7d2
perl-Sub-Name: 0.15 -> 0.19 2016-08-20 18:23:51 +02:00
Vladimír Čunát
d515cd8cdd Merge #17868: treewide: switch sourceforge to mirror:// 2016-08-20 18:10:55 +02:00
Vladimír Čunát
cdb44a4ada Merge branch 'master' into staging 2016-08-20 18:01:36 +02:00
Joachim Schiele
af15e057f4 leaps v0.5.0 init 2016-08-20 16:03:14 +02:00
J Phani Mahesh
dda6c4d5f4 python:cgkit: switch sf downloads to mirror://
This allows fallback to all configured mirrors for sourceforge
to download, instead of relying on just downloads.sourceforge.net
2016-08-20 19:14:29 +05:30
Joachim Fasting
ba0f9cfa49
Revert "Merge pull request #16980 from phanimahesh/sf-use-mirrors"
This reverts commit 217594fd1d, reversing
changes made to 8e8a89d8a8.

Turns out it wasn't ready afterall ...
2016-08-20 15:14:23 +02:00
Joachim F
217594fd1d Merge pull request #16980 from phanimahesh/sf-use-mirrors
Cleanup of sourceforge download links
2016-08-20 14:58:55 +02:00
J Phani Mahesh
78714df165 python:cgkit: switch sf downloads to mirror://
This allows fallback to all configured mirrors for sourceforge
to download, instead of relying on just downloads.sourceforge.net
2016-08-20 17:19:56 +05:30
Joachim F
8e8a89d8a8 Merge pull request #17775 from juliendehos/wt
wt: init at 3.3.6
2016-08-20 13:02:51 +02:00
Josef Kemetmueller
b954322b0f cxx-prettyprint: init at 2016-04-30 2016-08-20 10:19:40 +02:00
Nikolay Amiantov
826c398318 pythonPackages.scfbuild: remove workaround 2016-08-20 00:42:49 +03:00
Nikolay Amiantov
837cf416ce wrapPythonProgram: exclude Python itself from PYTHONPATH 2016-08-20 00:42:49 +03:00
Nikolay Amiantov
adafdb88f5 wrapPythonProgram: fix magical sed expression
* Treat #! as all other comments;
* Treat comma at the end as a multi-line marker;
* Skip lines with a space at start (they are continuing previous lines);
* Don't allow spaces in front of quotes or the first real statement.
2016-08-20 00:42:49 +03:00
Nikolay Amiantov
01624e1ac2 wrapPythonProgram: use site.addsitedir instead of PYTHONPATH 2016-08-20 00:42:49 +03:00
Nikolay Amiantov
edb9416228 Merge pull request #17819 from abbradar/printing-updates
Printing and PDF-related updates
2016-08-20 01:41:55 +04:00
Thomas Tuegel
64ba7b53f1 Revert "Merge pull request #17806 from matthewbauer/emacs-wrapper"
This reverts commit da68127737, reversing
changes made to 2ba494b728.

These changes are reverted because they cause an incompatibility which
they should not.
2016-08-19 15:09:41 -05:00
obadz
b0e11652f4 dotnetPackages.GitVersionTree: init at 2013-10-01 2016-08-19 18:28:03 +01:00
Rok Garbas
ec918dac16 Merge pull request #17836 from vbgl/topkg_0.7.8
ocaml-uucd: 2.0.0 → 4.0.0
2016-08-19 13:48:33 +02:00
Ram Kromberg
db862d8271 unar: init at 1.10.1 (#17830) 2016-08-19 13:44:19 +02:00
Miguel Madrid
20c0fe4900 gthumb: init at 3.4.3 (#17826) 2016-08-19 13:32:27 +02:00
Nikolay Amiantov
9683444165 Merge pull request #17796 from jokogr/new/skrooge2-2.4.0
skrooge2: init at 2.4.0
2016-08-19 14:43:31 +04:00
Frederik Rietdijk
8c1a1a11bf asciinema: 20160520 -> 1.3.0
See https://github.com/NixOS/nixpkgs/pull/17807
2016-08-19 12:32:22 +02:00
Vincent Laporte
a99d7b1071 ocaml-topkg: init at 0.7.8 2016-08-19 08:14:36 +02:00
Corbin
20a0e2e3bf build-support: Add fetchfossil function.
This is a dead-simple fetcher which clones a Fossil repository, opens it
directly into $out, and then nicks out the single Fossil checkout marker.
2016-08-18 22:29:30 -07:00
Aneesh Agrawal
c167624b8d checkbashisms: rename from checkbashism
Also add a backwards-compatability alias.
2016-08-18 23:24:04 -04:00
Frederik Rietdijk
e8f7c5490d Merge pull request #17807 from KibaFox/asciinema
pythonPackages.asciinema: init at 1.3.0
2016-08-18 17:31:30 +02:00
Joachim F
409b53cba8 Merge pull request #17799 from robbinch/pkg-kiwix
kiwix: Fix broken build
2016-08-18 17:13:21 +02:00
Nikolay Amiantov
622b5ab72b pythonPackages.psutil: 3.4.2 -> 4.3.0 2016-08-18 18:02:32 +03:00
Kiba Fox
834543ab6e pythonPackages.asciinema: init at 1.3.0 2016-08-18 10:33:30 -04:00
Thomas Tuegel
da68127737 Merge pull request #17806 from matthewbauer/emacs-wrapper
emacs: add versatile "emacsWrapper"
2016-08-18 08:16:48 -05:00
Nikolay Amiantov
c998a76951 mupdf: cleanup, use system libraries 2016-08-18 16:12:28 +03:00
Frederik Rietdijk
3c5594c505 pythonPackages.python-etcd: fix build 2016-08-18 12:36:42 +02:00
Frederik Rietdijk
7395c29616 pythonPackages.libtmux: fix build 2016-08-18 12:36:42 +02:00
Frederik Rietdijk
904ee1bebc Merge pull request #17814 from juliendehos/tntdb
tntdb: init at 1.3
2016-08-18 11:25:47 +02:00
Frederik Rietdijk
a36fc3c845 pythonPackages.Werkzeug: fix build Python 3.x
that was broken by 7916a16c8e
2016-08-18 11:24:09 +02:00
Julien Dehos
5a2e256075 tntdb: init at 1.3 2016-08-18 11:11:43 +02:00
Frederik Rietdijk
3322f10a09 Merge pull request #17813 from juliendehos/tntnet
tntnet: init at 2.2.1
2016-08-18 10:59:57 +02:00
Ioannis Koutras
afa88f2dc2 skrooge2: init at 2.4.0 2016-08-18 11:41:43 +03:00
Lluís Batlle i Rossell
b8e215fb50 Making shotcut use qt5 (5.6), not qt55. 2016-08-18 10:22:19 +02:00
Julien Dehos
50ca8eb30a tntnet: init at 2.2.1 2016-08-18 09:54:46 +02:00
Lluís Batlle i Rossell
762a11a276 Updating and fixing shotcut. 2016-08-18 09:41:29 +02:00
Frederik Rietdijk
cff0389e41 Merge pull request #17773 from RamKromberg/fix/pillow
pillow: 3.2 -> 3.3
2016-08-18 08:57:51 +02:00
Robbin C
2a84cc856b kiwix: Fix broken build 2016-08-18 07:55:06 +08:00
Joachim F
a4bbb2d9a3 Merge pull request #17688 from nexusdev/solc
Add Solidity (Ethereum compiler)
2016-08-17 23:45:34 +02:00
Joachim F
c2bfce8de8 Merge pull request #16762 from matthewbauer/gnustep2
Add "gnustep" to nixpkgs
2016-08-17 23:38:56 +02:00
Frederik Rietdijk
379b2fab97 Merge pull request #17777 from juliendehos/cxxtools
cxxtools: init at 2.2.1
2016-08-17 22:37:37 +02:00
Frederik Rietdijk
80c98d76ca Merge pull request #17641 from matthewbauer/update-pyopenssl
pyopenssl: 0.15.1 -> 16.0.0
2016-08-17 22:23:14 +02:00
Matthew Bauer
6ceedaaee4 emacs: add versatile "emacsWrapper"
"emacsWrapper" replaces emacsWithPackages. In addition to "packagesFun",
emacsWrapper has an optional variable called "execStart". execStart can
be used to append elisp to the default site-start.el script. This is
useful for providing a way to load a user's .emacs.d/init.el
file. "emacsWithPackages" is implemented with emacsWrapper for
convenience and compatability.
2016-08-17 18:19:58 +00:00
Franz Pletz
b4cc9bd63a Merge remote-tracking branch 'origin/master' into hardened-stdenv
Fixes #17801 and #17802.
2016-08-17 19:43:43 +02:00
Nikolay Amiantov
3e5bf44aab sip: 4.14.7 -> 4.18.1, drop unused old version 2016-08-17 20:30:51 +03:00
Nikolay Amiantov
727678936d qt5.qtwebkit-plugins: init at 2015-05-09 2016-08-17 20:20:35 +03:00
Nikolay Amiantov
33cabd882f pythonPackages.pyqt5: 5.5.1 -> 5.6 2016-08-17 20:20:35 +03:00
obadz
e0f124a9f8 calamares/tarball test: fix eval error
See also acb4086

cc @ttuegel @globin
2016-08-17 18:06:00 +01:00
Lluís Batlle i Rossell
5b3c885b35 Shotcut builds, but wants jack1 libs on start. 2016-08-17 17:25:03 +02:00
Rommel M. Martinez
963d8cc3e0 translate-shell: init at 0.9.4 (#17780) 2016-08-17 16:20:55 +02:00
Tomas Hlavaty
e444532046 mlt: 0.9.6 -> 6.2.0 (#17725)
The old version with qt4 is kept around for kdenlive dependency.
2016-08-17 16:09:58 +02:00
Christine Koppelt
75bffa11d6 influxdb: add 1.0.0-beta3 (#17733) 2016-08-17 13:40:05 +02:00
Michal Rus
d965dfc00d bitwig-studio: init at 1.3.12 (#17756) 2016-08-17 13:23:48 +02:00
Langston Barrett
0cc89278a1 ympd: init at 1.3.0 2016-08-17 13:17:41 +02:00
Frederik Rietdijk
80b3a7b128 Revert "pythonPackages.psutil: 3.4.2 -> 4.3.0"
This reverts commit 86caec1be1.

In this commit tests were re-enabled, but without correctly testing whether it could.
When a package builds it doesn't mean the tests are actually run. This is often seen when it says that 0 tests were run.
Typically this is because the test runner was invoked incorrectly.

By re-enabling the tests, a false impression is generated that the package is tested while in fact it isn't. Furthermore, the Python 3.5
package broke because the tests are invoked incorrectly.

cc @abbradar
2016-08-17 10:52:22 +02:00
Franz Pletz
2104d28bcd linux: 4.1.27 -> 4.1.30
Fixes CVE-2016-5696.
2016-08-17 05:45:59 +02:00
Matthew Bauer
2e5edbfd99 gnustep: move to pkgs/desktops/gnustep 2016-08-16 21:53:45 +00:00
Matthew Bauer
4ebfc31388 gnustep: add alias for old gnustep-make 2016-08-16 21:11:05 +00:00
Matthew Bauer
c3974455eb gnustep: rescope everything into one folder
This should make merge conflicts easier to
handle. "gnustep" prefix has been removed to
make thing simpler. So "gnustep_make" is now
"make" within the gnustep scope.
2016-08-16 21:10:54 +00:00
Artyom Shalkhakov
d3d580ebbe gnustep: cleanup
Major clean-up. Everything builds fine.
2016-08-16 21:00:27 +00:00
Artyom Shalkhakov
15c5a533b5 gnustep: add gworkspace and systempreferences
Packaging some basic GNUstep apps: GWorkspace and SystemPreferences.

Unfortunately, GWorkspace doesn't work well, because gdomap, gdnc, gpbs
are not started. Also, there is some issue with fonts not being found.
2016-08-16 20:59:58 +00:00
Artyom Shalkhakov
ea3dcb3264 gnustep: add setup hook for make
Adding a setup-hook for gnustep-make.
2016-08-16 20:59:50 +00:00
Artyom Shalkhakov
d39e5372dc gnustep: cleanup
Cleaning up. Adding GNUstep package builder for abstracting out GNUstep
compilation specifics (with thanks to GitHub user lethalman).

The rules for using build_gnustep_package are as simple: any
GNUstep-based package that the package being compiled depends upon are
to be put in [deps] (this is used for setting up a buildEnv), while
other dependencies are put into [buildInputs] as usual.
2016-08-16 20:59:30 +00:00
Artyom Shalkhakov
5db3f3ee61 gnustep: remove gnustep-startup
Removing gnustep-startup (not needed anymore). Adding Gorm and
ProjectCenter applications (these mostly work, provided the environment
is set up manually).
2016-08-16 20:59:23 +00:00
Artyom Shalkhakov
52d17a5f41 gnustep: packageg libs separately
Packing gnustep libs separately, with no use of gnustep-startup. Also,
fixed a bug in WindowMaker package (some imaging dependencies were not supplied).
2016-08-16 20:59:08 +00:00
Artyom Shalkhakov
a28c729766 gnustep: init
Adding new library: gnustep-startup, which packages the core
libraries necessary for GNUstep: gnustep-make, gnustep-base,
gnustep-gui, gnustep-backend.
2016-08-16 20:58:57 +00:00
Frederik Rietdijk
5a501bd828 Remove top-level dbus_python and pythonDBus.
See #11567.

Furthermore, it renames pythonPackages.dbus to pythonPackages.dbus-
python as that's the name upstream uses.

There is a small rebuild but I couldn't figure out the actual cause.
2016-08-16 22:52:37 +02:00
Frederik Rietdijk
6b23bd99a3 Remove top-level pyatspi
See #11567.
2016-08-16 22:52:37 +02:00
Matthew Bauer
a2937ba293 searx: force to use new pyopenssl 2016-08-16 20:47:18 +00:00
Matthew Bauer
7d3bccdd7c service-identity: 14.0.0 -> 16.0.0
- adds attrs as input
2016-08-16 20:33:59 +00:00
Robert Helgesson
f396a0b4d0
hd-idle: init at 1.05 2016-08-16 21:59:14 +02:00
Matthew Bauer
c92227f5cc smartmontools: fix darwin build
needs IOKit
2016-08-16 19:25:46 +00:00
Matthew Bauer
5f0d155f5b rakudo: fix darwin build
needs:

- CoreServices
- ApplicationServices
2016-08-16 19:25:44 +00:00
Matthew Bauer
a79ff78ec4 nspr: fix darwin build
- needs CoreServices
2016-08-16 19:25:44 +00:00
Matthew Bauer
0acdc51d0e pcsclite: fix darwin build
needs IOKit
2016-08-16 19:25:43 +00:00
Matthew Bauer
3182e52fdd libstatgrab: fix darwin build
Darwin needs IOKit to work.
2016-08-16 19:25:43 +00:00
Matthew Bauer
122bac8f26 libfreefare: fix darwin build 2016-08-16 19:25:42 +00:00
Matthew Bauer
fe923c915d gkrellm: fix darwin build 2016-08-16 19:25:42 +00:00
Matthew Bauer
07ca8027d9 fontforge-gtk: fix darwin build 2016-08-16 19:25:41 +00:00
Matthew Bauer
0edb35ad78 glew110: fix darwin build 2016-08-16 19:25:40 +00:00
Matthew Bauer
5ba0165034 gegl: fix darwin build 2016-08-16 19:25:40 +00:00
Matthew Bauer
410fa4b427 fox: fix darwin build 2016-08-16 19:25:40 +00:00
Matthew Bauer
fa4b1ee68a erlangR16: fix darwin build 2016-08-16 19:25:39 +00:00
Matthew Bauer
554b06522e cd-discid: fix darwin build 2016-08-16 19:25:39 +00:00
Julien Dehos
1d6464003f wt: init at 3.3.6 2016-08-16 21:01:45 +02:00
Julien Dehos
703ca63b01 cxxtools: init at 2.2.1 2016-08-16 15:41:21 +02:00
Franz Pletz
35654b7fc1 Merge pull request #17743 from mayflower/service/mattermost 2016-08-16 14:54:25 +02:00