Commit graph

31380 commits

Author SHA1 Message Date
Samuel Leathers 0f0aeed803 python pies: remove packages 2017-09-16 21:36:12 -04:00
Matt McHenry 987867474c client-ip-echo: init at 0.1.0.1 2017-09-16 21:16:53 -04:00
Samuel Leathers dce4276d5e logilab_common: 0.63.2 -> 1.4.1 2017-09-16 21:14:11 -04:00
Samuel Leathers 4db4f70be6 logilab-constraint: move to python-modules 2017-09-16 21:13:48 -04:00
Samuel Leathers 80625b6012 internetarchive: 0.8.3 -> 1.7.2 2017-09-16 19:24:29 -04:00
Samuel Leathers d8848c0202 backports.csv: init at 1.0.5 2017-09-16 19:23:05 -04:00
Samuel Leathers c8f55331df schema: init at 0.6.6 2017-09-16 17:25:21 -04:00
Eelco Dolstra afc0218ecd blender: Fix CUDA support
CUDA toolkit 8 doesn't support gcc 6, so we have to build opensubdiv
and blender with gcc 5.
2017-09-16 22:45:22 +02:00
Jan Malakhovski 701db44ab9 palemoon: just use the default gcc 2017-09-16 18:18:26 +03:00
Jaka Hudoklin 4dc3551397 Merge pull request #29315 from xtruder/pkgs/telepresence/init
pkgs/telepresence: init at 0.65
2017-09-16 15:51:15 +02:00
Samuel Leathers eb125adf24 aiohttp-cors: 0.5.1 -> 0.5.3 2017-09-16 13:56:00 +01:00
Joachim F c0616a3234 Merge pull request #28892 from ryantm/matterbridge2
matterbridge, modules/matterbridge: init at 1.1.0
2017-09-16 12:43:35 +00:00
Jörg Thalheim a5ed2f141c Merge pull request #29456 from disassembler/hglib
hglib: 1.7 -> 2.4
2017-09-16 13:27:02 +01:00
Jörg Thalheim 97b66c8f5f Merge pull request #29447 from disassembler/hcs_utils
hcs_utils: 1.5 -> 2.0
2017-09-16 13:07:23 +01:00
Frederik Rietdijk 03fa6965ad Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-16 12:34:32 +02:00
Frederik Rietdijk 6712e0111a Merge pull request #29422 from disassembler/gensim
moto: 0.4.25 -> 0.4.31
2017-09-16 12:32:48 +02:00
Frederik Rietdijk bb57df26dd python.pkgs.PyXAPI: remove old package
url of source and homepage is dead as well.
2017-09-16 12:22:15 +02:00
Joachim F 2d3886262e Merge pull request #29439 from oxij/pkgs/notmuch-gmime-3
gmime3: init; notmuch: use gmime3
2017-09-16 10:15:55 +00:00
Frederik Rietdijk f351ee7e9b Merge pull request #29461 from FRidh/pitz
python.pkgs.{pitz, clepy}: remove old packages
2017-09-16 11:46:11 +02:00
Frederik Rietdijk fd3ddfb95b python.pkgs.{pitz, clepy}: remove old packages
These were added in 2013 by @bjornfor but haven't been touched since.
They seem to be unmaintained, both in Nixpkgs and by upstream.
2017-09-16 11:41:27 +02:00
Frederik Rietdijk e8f873671f Merge pull request #29334 from rvl/python-textacy
pythonPackages.textacy: init at 0.4.1
2017-09-16 11:29:44 +02:00
Jan Malakhovski ae86fddd95 notmuch: switch to gmime3, make all tests pass with gmime3 2017-09-16 09:20:05 +00:00
Servilio Afre Puentes 9785fc73a0 gmime: init at 3.0.1, leave 2.6.23 as is
This needs to be added as a separate package because API changed in 3.0, see:

https://mail.gnome.org/archives/gmime-devel-list/2017-April/msg00002.html
https://developer.gnome.org/gmime/3.0/gmime-changes-3-0.html
3fd646c955/PORTING
2017-09-16 09:20:05 +00:00
Rodney Lorrimar fdb90edc6c pythonPackages.pyphen: init at 0.9.4 2017-09-16 09:23:17 +01:00
Rodney Lorrimar c5d1218336 pythonPackages.ijson: init at 2.3 2017-09-16 09:23:17 +01:00
Rodney Lorrimar d851b95d63 pythonPackages.clld-cffi: init at 0.1.4 2017-09-16 09:23:17 +01:00
Rodney Lorrimar fad89eda77 pythonPackages.spacy: add models data attr set
Model                   Version
es_core_web_md          1.0.0
fr_depvec_web_lg        1.0.0
en_core_web_md          1.2.1
en_depent_web_md        1.2.1
en_core_web_sm          1.2.0
de_core_news_md         1.0.0
en_vectors_glove_md     1.0.0
2017-09-16 09:23:17 +01:00
Rodney Lorrimar 3b1877f4c0 pythonPackages.textacy: init at 0.4.1 2017-09-16 09:23:16 +01:00
Rodney Lorrimar 18161a5b6f pythonPackages.pyemd: init at 0.4.4
This module is a requirement of textacy.
2017-09-16 09:23:16 +01:00
Rodney Lorrimar 31037bab49 pythonPackages.cachetools: Add version 2.0.1
Textacy requires a later version.

v2.0.0 introduced breaking changes, so keep two versions for other
packages.
2017-09-16 09:23:15 +01:00
Rodney Lorrimar 151d0fde19 pythonPackages.unidecode: 0.04.18 -> 0.04.21
Higher version is a requirement of textacy.
2017-09-16 09:23:15 +01:00
Samuel Leathers c256a685e8 hglib: 1.7 -> 2.4 2017-09-16 00:46:27 -04:00
Samuel Leathers c29a721350 rpkg: 1.14 -> 1.50 2017-09-16 00:11:06 -04:00
Samuel Leathers e544c36dbe fedpkg: 1.14 -> 1.29 2017-09-16 00:11:06 -04:00
Samuel Leathers 1b9fd36581 fedora_cert: remove package 2017-09-16 00:11:06 -04:00
Samuel Leathers 3693aa6141 python_fedora: 0.5.5 -> 0.9.0 2017-09-16 00:11:06 -04:00
Samuel Leathers 5f6a20f291 urlgrabber: 3.9.1 -> 3.10.2 2017-09-16 00:11:06 -04:00
Samuel Leathers 673e8caab2 rpmfluff: init at 0.5.3 2017-09-16 00:11:05 -04:00
Samuel Leathers 06e2b99546 cccolutils: init at 1.5 2017-09-16 00:11:05 -04:00
Samuel Leathers dfa4a56d6c openidc-client: init at 0.2.0 2017-09-15 22:43:11 -04:00
Nikolay Amiantov eb2f321e11 python.pkgs.mxnet: init at 0.11.0 2017-09-16 04:40:55 +03:00
Nikolay Amiantov c71d8a1aeb mxnet: init at 0.11.0 2017-09-16 04:40:55 +03:00
Samuel Leathers 755e6eb22e hcs_utils: 1.5 -> 2.0 2017-09-15 21:03:51 -04:00
Samuel Leathers f8f62d5216 nilearn: 0.2.5 -> 0.3.1
fixes #29178
2017-09-16 00:25:11 +01:00
Peter Simons d2f206c061 Merge pull request #29328 from therealpxc/tldr-hs
haskellPackages.tldr: fix build, add as a top-level package
2017-09-15 20:51:22 +02:00
Cray Elliott 990ea8789d zandronum: 2.1.2 -> 3.0
remove sqlite-amalgamation and put it internal to the zandronum folder,
as it is only used by zandronum. Patches needed to avoid build impurities
and to get the correct protocol version to connect to public servers.

remove zandronum_bin as it is no longer needed
2017-09-15 11:26:11 -07:00
Patrick Callahan 8119e48c2d haskellPackages.tldr: fix build and add to top-level packages 2017-09-15 09:51:37 -07:00
Jörg Thalheim 1ecf3e862f zfsUnstable: init at 2017-09-12 2017-09-15 17:59:37 +02:00
Franz Pletz 3a4add5de1 Merge pull request #29322 from mguentner/move_emscripten_from_top_level
emscriptenfastcomp: move wrap magic to own file, use newScope
2017-09-15 17:46:25 +02:00
Samuel Leathers 49fac1f824 moto: 0.4.25 -> 0.4.31 2017-09-15 09:15:54 -04:00
Michael Fellinger 2edb7e9b2d ruby: 2.4.1 -> 2.4.2 (#29417) 2017-09-15 13:06:51 +01:00
Frederik Rietdijk 56f8b3626f Merge pull request #29353 from disassembler/pgpdump
pgpdump: disable tests
2017-09-15 12:34:23 +02:00
Frederik Rietdijk beaada6c2d Merge pull request #29407 from disassembler/cxfreeze
cx_Freeze: 4.3.4 -> 5.3.2
2017-09-15 12:31:13 +02:00
Samuel Leathers 140136ad95 mdp: disable tests 2017-09-15 12:29:16 +02:00
Frederik Rietdijk 47e1751fd0 Merge pull request #29388 from disassembler/arelle
arelle: add py3to2 as a buildInput
2017-09-15 12:26:01 +02:00
Frederik Rietdijk f5ea99f195 Merge pull request #29405 from disassembler/jedi
jedi: disable tests
2017-09-15 12:16:11 +02:00
Jörg Thalheim 419869269d Merge pull request #28635 from ThomasMader/ldc
Init ldc at 1.3.0, fix bootstrap dmd build, fix dtools test, run dmd-testsuite in checkPhase and fix Foundation framework
2017-09-15 10:32:10 +01:00
Robert Schütz 608045aed5
abcMIDI: init at 2017.06.10 2017-09-15 11:25:43 +02:00
romildo 17c3599ee3
clearlooks-phenix: 5.0.7 -> 7.0.1 2017-09-15 09:54:50 +02:00
Samuel Leathers e355e9cf03 ptpython: 0.35 -> 0.41 2017-09-14 20:48:36 -04:00
Samuel Leathers 799a70d623 cx_Freeze: 4.3.4 -> 5.3.2 2017-09-14 20:30:08 -04:00
Samuel Leathers 6ac283b185 arelle: add py3to2 as a buildInput 2017-09-14 16:54:28 -04:00
Samuel Leathers fad96f62d0 3to2: rename py3to2 to work with callPackage 2017-09-14 14:27:48 -04:00
Daiderd Jordan 3161790ed2 Merge pull request #27376 from matthewbauer/duti
duti: init at 1.5.4pre
2017-09-14 19:26:10 +02:00
John Ericson 12452178e8 Merge pull request #29381 from obsidiansystems/autoreconf-hook
autoreconfHook: Simplify by avoiding `findInputs`
2017-09-14 13:16:53 -04:00
John Ericson d242978671 autoreconfHook: Simplify by avoiding findInputs
`findInputs` is a stdenv/setup helper we should strive not to call
elsewhere. Using normal deps is more idiomatic anyways.
2017-09-14 13:16:12 -04:00
Jaka Hudoklin 18245fd222 pkgs/telepresence: init at 0.65 2017-09-14 17:32:32 +02:00
Thomas Tuegel 815135f31b Merge pull request #29369 from bkchr/remove_kde4_workspace_kde_telepathy
Remove kde4workspace and kdetelepathy
2017-09-14 10:13:15 -05:00
Jörg Thalheim 610eac1773 Merge pull request #29370 from mguentner/urltypofixes
fix src.url typos
2017-09-14 13:34:55 +01:00
Maximilian Güntner ec7b09ecd0
fix src.url typos 2017-09-14 13:54:14 +02:00
Frederik Rietdijk aff5ef6481 Merge pull request #29360 from disassembler/ws4py
ws4py: add git to checkInputs
2017-09-14 13:19:04 +02:00
Frederik Rietdijk 1e16bceb46 python.pkgs.mwlib: mark as broken 2017-09-14 13:07:15 +02:00
Bastian Köcher c01e064750 kdeTelepathy: Remove, because it is not maintained anymore 2017-09-14 13:00:53 +02:00
Jörg Thalheim 4addea54ae perlPackages.SCGI: init at 0.6 2017-09-14 11:20:12 +01:00
Jörg Thalheim 9b960686bf perlPackages.ProtocolHTTP2: init at 1.08 2017-09-14 11:18:45 +01:00
Jörg Thalheim 94dc132ff9 perlPackages.HTTPDAV: init at 0.44 2017-09-14 11:17:52 +01:00
Jörg Thalheim 068fd9fb8e perlPackages.TermReadKey: 2.31 -> 2.37 2017-09-14 11:17:43 +01:00
Joachim F 233fc0b360 Merge pull request #29333 from orivej/iwyu
include-what-you-use: 0.6 -> 0.8
2017-09-14 09:04:00 +00:00
Samuel Leathers 3f5f208d13 ws4py: add git to checkInputs 2017-09-14 04:45:45 -04:00
Frederik Rietdijk 693de5b8c6 Merge pull request #29340 from disassembler/credstash
credstash: 1.13.2 -> 1.13.3
2017-09-14 09:50:44 +02:00
Samuel Leathers dabf89fadd credstash: 1.13.2 -> 1.13.3 2017-09-14 03:47:04 -04:00
Samuel Leathers 746f20fc7f colanderalchemy: fixes tests 2017-09-14 03:22:00 -04:00
Samuel Leathers c3e7040d0e pgpdump: disable tests 2017-09-14 03:14:56 -04:00
Jörg Thalheim 0febf8d43c Merge pull request #29304 from woffs/oysttyer
oysttyer-2.9.1
2017-09-13 23:17:45 +01:00
Orivej Desh a4a187fe5f include-what-you-use: 0.6 -> 0.8 2017-09-13 22:07:23 +00:00
Tuomas Tynkkynen 0c368ef02f treewide: Escape backslash in strings properly
"\." is apparently the same as "." wheras the correct one is "\\."
2017-09-14 01:03:39 +03:00
Matthew Bauer 9111b53325 duti: init at 1.5.4pre
I would init at 1.5.4, but sadly it doesn’t work on OS X 10.11+.
2017-09-13 16:33:54 -05:00
Joachim F 9580bafbb1 Merge pull request #25525 from emanueleperuffo/alc1100
epson-alc1100: init at version 1.2-0
2017-09-13 21:12:34 +00:00
John Ericson 349a09228e Merge pull request #29246 from LnL7/clang-stdenv
clang-stdenv: move libstdcxxHook to cc-wrapper
2017-09-13 16:21:41 -04:00
Domen Kožar 4ffa9ace43
Add atom-beta 2017-09-13 21:08:32 +02:00
Daiderd Jordan 70c4ac12cd
nixpkgs-tests: add tests for llvm 3.9 2017-09-13 20:51:55 +02:00
Daiderd Jordan ac88515052
clang-stdenv: move libstdcxxHook to cc-wrapper 2017-09-13 20:51:41 +02:00
Joachim F d1f0affe33 Merge pull request #28869 from symphorien/bombono
bombono: init at 1.2.4
2017-09-13 18:46:13 +00:00
Maximilian Güntner 8550e4e520
emscriptenfastcomp: move wrap magic to own file, use newScope 2017-09-13 19:12:08 +02:00
Jörg Thalheim 13edd9765a Merge pull request #29125 from geistesk/firehol-3.1.4
firehol: init at 3.1.4, iprange: init at 1.0.3
2017-09-13 18:10:22 +01:00
Frederik Rietdijk 4871946c63 Merge pull request #29310 from Infinisil/s-tui
s-tui: init at 0.6.0
2017-09-13 17:51:52 +02:00
Silvan Mosberger 753d114b34
s-tui: init at 0.6.0 2017-09-13 17:48:56 +02:00
John Ericson 8fccaa284d Merge pull request #29282 from obsidiansystems/soext
lib, treewide: Add `*Platform.extensions` and use it where possible
2017-09-13 11:20:06 -04:00
John Ericson 5aec3f96a2 treewide: Use *Platform.extensions 2017-09-13 11:16:10 -04:00
Frank Doepper 9c4233f7b6 oysttyer: init at 2.9.1
A Perl Console Twitter Client
2017-09-13 16:38:15 +02:00
Tuomas Tynkkynen c78c565245 firebird: Fix build by using gcc5
https://hydra.nixos.org/build/59941948
2017-09-13 14:42:45 +03:00
Frederik Rietdijk 8d4e37710f python.pkgs.jupyter_console: 5.0.0 -> 5.2.0 2017-09-13 10:24:44 +02:00
Frederik Rietdijk 47dcf634bb python.pkgs.joblib: move expression 2017-09-13 09:34:39 +02:00
Klaas van Schelven 50d36558a4 PyBrain: Mark as broken
It's broken on all versions of Python (I've tried 2.7, 3.4, 3.5, 3.6)

I think the root cause is that PyBrain is not working with numpy >= 1.12.0 as I reported here:
https://github.com/pybrain/pybrain/issues/217

(The relevant release notes may be found here):
https://docs.scipy.org/doc/numpy-1.12.0/release.html#compatibility-notes

The PyBrain github repo does not seem very active (last commit 18 months ago, last release 3 years),
so I have some doubts as to whether this will be fixed any time soon.

I suppose an alternative solution could be to reintroduce the explicit dependency to numpy 1.11. But,
this is not entirely trivial: in c9b4a2f319, the versions 1.10, 1.11, 1.12 were folded into a single version.
Also, the numpy dependency is not a direct one, but is implied via scipy
2017-09-13 09:08:34 +02:00
Joachim F ddd8dc072e Merge pull request #29255 from orivej/aseprite
aseprite: 0.9.5 -> 1.1.7
2017-09-12 22:37:22 +00:00
Robert Helgesson 3c14ef0c4a Merge pull request #29184 from Ma27/yabar/install-hooks
yabar: minor derivation improvements
2017-09-12 22:27:05 +02:00
Maximilian Bosch 178251001a
yabar: add unstable package 2017-09-12 22:05:13 +02:00
Josef Kemetmueller 6d760d970f
pythonPackages.audiotools: Fix darwin build 2017-09-12 19:33:17 +02:00
Vladimír Čunát 422adc3063
Merge branch 'staging'
10k staging builds are not yet finished on Hydra (mostly darwin),
but we now have a 20k jobs rebuilding directly on master, so we would
never get to merge this way...
2017-09-12 19:17:52 +02:00
Tuomas Tynkkynen 8f566f4bde pythonPackages.audiotools: Disable on Darwin
Last successful build 2015-09-20 07:44:17

https://hydra.nixos.org/build/60587519
2017-09-12 14:58:46 +03:00
Tuomas Tynkkynen 8d85d279f2 pythonPackages.alot: Disable on Darwin
Last successful build 2015-12-31 19:17:08

https://hydra.nixos.org/build/60775312
2017-09-12 14:58:46 +03:00
Domen Kožar 8081505173
pyopenssl: 17.0.0 -> 17.2.0
An attempt to fix tests under 32bit linux to unblock nix build

(cherry picked from commit 3418e734698793e1272769a6cac2efe1498a0de1)
Signed-off-by: Domen Kožar <domen@dev.si>
2017-09-12 13:38:51 +02:00
Jörg Thalheim 2d77958271 Merge pull request #29007 from mguentner/avrclean
avr-*: split avr-gcc-libc into separate packages
2017-09-12 10:28:56 +01:00
Jörg Thalheim 63523aaaf6 Merge pull request #29168 from orivej/gopherclient
gopherclient: init at 2016-10-02
2017-09-12 08:34:12 +01:00
Jörg Thalheim 6844b1375b buildbot-full: also include wsgi-dashboards 2017-09-12 08:17:02 +01:00
Jörg Thalheim ca449e93ea Merge pull request #29248 from Lassulus/altcoins
Altcoins: remove obsolete override, update some altcoins
2017-09-12 07:16:33 +01:00
Orivej Desh 05eb7ba6e4 aseprite: 0.9.5 -> 1.1.7 2017-09-11 23:44:33 +00:00
Frederik Rietdijk 628b6c0e9d Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-11 22:52:53 +02:00
lassulus 077dd9fca3 altcoins: remove obsolete boost override 2017-09-11 21:45:22 +02:00
Jörg Thalheim f3ecd570ed Merge pull request #29114 from AndersonTorres/upload/moe
Moe: init at 1.9
2017-09-11 19:59:25 +01:00
Klaas van Schelven bdb120c21e python.pkgs.recaptcha-client: disable broken versions
It seems that the recaptcha-client package is no longer maintained.

* The latest released version (1.0.6) is from the year 2011;
* The project page does not mention which Python versions are supported
* The project is hosted on google code, which is discontinued

I was able to succesfully build with Python versions 3.3, 3.4, but not
3.5, 3.6.
2017-09-11 19:43:08 +01:00
Michael Weiss 89ae07b05b iouyap: init at 0.97 2017-09-11 19:21:49 +02:00
Hamish Hutchings e0b81b9c3c Traefik init at 1.3.8 2017-09-11 18:19:49 +01:00
Michael Weiss 6373c9606d vpcs: init at 0.8 2017-09-11 18:54:30 +02:00
timor f717af03ad
perl-Class-Autouse: 1.99_02 -> 2.01 2017-09-11 18:46:04 +02:00
Jörg Thalheim 851c260014 Merge pull request #29239 from timor/perl-Devel-NYTprof
perl-Devel-NYTProf: init at 6.04
2017-09-11 17:42:50 +01:00
Jörg Thalheim 949cfe2dae Merge pull request #29240 from timor/perl-Devel-DProf
perl-Devel-DProf: deprecated, remove
2017-09-11 17:38:09 +01:00
Robert Helgesson 99b09a2006
perl-Data-Dumper-Concise: 2.022 -> 2.023 2017-09-11 18:27:29 +02:00
Robert Helgesson f6537dafe2
perl-Log-Contextual: 0.006003 -> 0.007001 2017-09-11 18:27:29 +02:00
timor dcdbe960f8
perl-Data-Dumper: 2.154 -> 2.161 + build fix 2017-09-11 18:06:16 +02:00
Jörg Thalheim ee9b549afe Merge pull request #29150 from Lassulus/mupen64-update
mupen64plus: 1.5 -> 2.5
2017-09-11 15:38:09 +01:00
timor 60bb058cf5 perl-Devel-DProf: deprecated, remove
does not build
2017-09-11 16:13:21 +02:00
timor fdaaaea31e perl-Devel-NYTProf: init at 6.04 2017-09-11 16:09:15 +02:00
Jörg Thalheim c7ab7b56c1 Merge pull request #29218 from dywedir/rustRegistry
rustRegistry: 2017-08-27 -> 2017-09-10
2017-09-11 14:34:12 +01:00
Jörg Thalheim 42dc882c65 Merge pull request #29215 from AndersonTorres/upload/jupp
jupp: init at 3.1
2017-09-11 14:33:51 +01:00
Michael Weiss 1011c76598 dynamips: init at 0.2.17 2017-09-11 15:17:56 +02:00
Tuomas Tynkkynen 373b2231be pythonPackages.ssdeep: Mark broken
https://hydra.nixos.org/build/59943791

This package is a library and has no reverse dependencies. (It was once
used by diffoscope, but it changed to use a different library).
2017-09-11 13:52:11 +03:00
Daiderd Jordan b91307c2e1
nixpkgs-tests: add basic test for buildInputs 2017-09-10 22:49:47 +02:00
Daiderd Jordan 19c4673310
nixpkgs-tests: add basic test for cc-wrapper 2017-09-10 22:49:39 +02:00
dywedir aea9ed4bcb rustRegistry: 2017-08-27 -> 2017-09-10 2017-09-10 22:47:46 +03:00
AndersonTorres 4f976bdd3e jupp: init at 3.1
jupp is a fork of joe's editor.
2017-09-10 13:41:49 -03:00
Sander van der Burg 397fc0daca fast-cli: fix build 2017-09-10 16:29:39 +00:00
Daiderd Jordan 259e73d678
perl-moose: fix darwin build 2017-09-10 18:04:22 +02:00
timor 274333e222 ParaView: 4.0.1 -> 5.4.0 2017-09-10 18:02:38 +02:00
Ryan Mulligan 9c786d82f2 matterbridge, modules/matterbridge: init at 1.1.0 2017-09-10 08:57:28 -07:00
Daiderd Jordan 92163ec65c
glslviewer: fix darwin build 2017-09-10 17:24:20 +02:00
Aristid Breitkreuz 628578f9f8 v8: fix v3 builds by switching to GCC 5 (mksnapshot segfaults with GCC 6) 2017-09-10 17:14:28 +02:00
Daiderd Jordan b310053c01
fox-1.6: add missing frameworks 2017-09-10 17:07:56 +02:00
Franz Pletz 4a810fb31d
borgbackup: fix build with python36
cffi fails to build with python34.
2017-09-10 16:27:12 +02:00
Rob Vermaas 2c056b1f28
mpich2: use gfortran 5
(cherry picked from commit 7f47214526278b08782ae12ef93a0948e4c314ff)
2017-09-10 14:14:53 +00:00