Yegor Timoshenko
eaf1c07836
Merge pull request #40626 from dtzWill/update/sqlite-2.23.1
...
sqlite: 3.22.0 -> 3.23.1
2018-05-23 01:27:20 +03:00
worldofpeace
b9bdd7d4a3
pythonPackages.asyncssh: init at 1.13.0 ( #40527 )
2018-05-23 00:09:33 +02:00
Yegor Timoshenko
0928b2a033
nodejs: update to nodejs-8_x
2018-05-22 23:48:35 +03:00
Yegor Timoshenko
57200f58f4
sqlite3_analyzer: assert, rename to sqlite-analyzer, clean up
2018-05-22 23:43:04 +03:00
jD91mZM2
71da438f21
cargo-tree: init at 0.18.0 ( #40924 )
2018-05-22 22:04:50 +02:00
Sebastian Jordan
aca3198c70
nix-prefetch-github: init -> 1.3
2018-05-22 20:55:07 +02:00
Dmitry Kalinkin
65c3273250
form: init at 4.2.0 ( #40693 )
2018-05-22 20:17:32 +02:00
Vincent Laporte
571a1e19e9
coqPackages.iris: init at 3.1.0 ( #40909 )
2018-05-22 19:26:32 +02:00
Michael Brantley
11b3435345
perlPackages.ParsePlainConfig: init at 3.05 ( #40624 )
2018-05-22 18:42:41 +02:00
Kevin Liu
b77277fcdc
helmfile: init at 0.16.0 ( #40814 )
2018-05-22 18:38:05 +02:00
Pascal Wittmann
eadb87d36d
Merge pull request #40726 from dbohdan/s2png
...
s2png: init at 0.7.2
2018-05-22 18:06:59 +02:00
Josef Kemetmüller
020957716e
heimdal: Fix darwin build
2018-05-22 18:19:28 +03:00
Tuomas Tynkkynen
f9feacfc7c
Merge remote-tracking branch 'upstream/master' into staging
2018-05-22 17:48:29 +03:00
Jörg Thalheim
c8a4562f59
Merge pull request #40896 from symphorien/nix-du
...
nix-du: init at 0.1.1
2018-05-22 15:46:21 +01:00
Symphorien Gibol
87125d6d08
nix-du: init at 0.1.1
2018-05-22 16:24:00 +02:00
Robin Gloster
72f293aa50
python3Packages.pyairvisual: init at 1.0.0
2018-05-22 14:29:57 +02:00
Lancelot SIX
05db1a11a9
pythonPackages.timeout-decorator: 0.3.2 -> 0.4.0 ( #40914 )
2018-05-22 11:40:26 +02:00
Robert Schütz
57d591ec7f
youtube-dl: use toPythonApplication ( #40831 )
2018-05-22 11:01:55 +02:00
xeji
41344b8d62
Merge pull request #40886 from Synthetica9/atom-1-27-1
...
atom: 1.27.0 -> 1.27.1, atom-beta: 1.24.0-beta3 -> 1.28.0-beta1
2018-05-22 10:38:33 +02:00
Frederik Rietdijk
9f87abded9
Merge pull request #40885 from plapadoo/pyogg-init
...
pyogg: init at 0.6.2a1
2018-05-22 10:28:20 +02:00
Patrick Hilhorst
2ad8e9a978
atom, atom-beta: 1.27.0 -> 1.27.1, 1.24.0-beta3 -> 1.28.0-beta1
...
Also rewrote the derivation for easier maintencence.
(And added @ysndr as maintainer for atom-beta, kind of an implicit
result of joining the two. If you're not okay with that, I'll patch
you out, but I'll presume consent.)
2018-05-22 09:40:00 +02:00
Philipp Middendorf
131228c29d
pyogg: init at 0.6.2a1
2018-05-22 09:26:26 +02:00
Jörg Thalheim
5a7e42f6a3
Merge pull request #40908 from emmanuelrosa/purple-xmpp-http-upload
...
purple-xmpp-http-upload: init at 178096c
2018-05-22 08:12:53 +01:00
Matthew Bauer
04bc0bd2b7
freeciv: cleanup overrides
...
This is how we do overrides elsewhere. The "name" suffix makes things
a little bit complicated IMO. Other input welcome.
2018-05-21 19:55:37 -05:00
Matthew Bauer
f2dc19703a
spidermonkey_38: add darwin support
2018-05-21 19:55:37 -05:00
Matthew Bauer
3dc8328b1f
sfml: support darwin
2018-05-21 19:55:37 -05:00
John Ericson
db4d77779c
Merge remote-tracking branch 'upstream/master' into staging
2018-05-21 20:21:48 -04:00
Emmanuel Rosa
2a09ee7a4a
purple-xmpp-http-upload: init at 178096c
2018-05-21 16:09:30 -04:00
Vincent Laporte
19f768a978
ocamlPackages.earley_ocaml: init at 1.0.2
2018-05-21 16:10:12 +00:00
Jörg Thalheim
fc1ccb361b
Merge pull request #36506 from plapadoo/pysdl2-init
...
pythonPackages.pysdl2: init at 0.9.6
2018-05-21 13:02:36 +01:00
Matthieu Coudron
d9dadce758
libnl: 3.3.0 -> 3.4.0
2018-05-21 18:51:34 +09:00
Uli Baum
d9bdd77eb5
vimNox: pin to lua 5.1
...
vimNox is currently built from a patched vim 7.3 source from 2012
that requires lua 5.1. Temporary fix, see discussion in #40749 .
2018-05-21 11:46:44 +02:00
Philipp Middendorf
ad399afd6f
pythonPackages.pysdl2: init at 0.9.6
2018-05-21 09:50:08 +02:00
Peter Hoeg
80bfd2f371
musescore: 2.1.0 -> 2.2.1
...
Fixes #29519
2018-05-21 15:45:37 +08:00
Orivej Desh
66002a0e07
spdk: init at 18.04
...
Closes #39138 .
2018-05-21 02:00:07 +00:00
Orivej Desh
345f4639d6
odp-dpdk, ofp, pktgen: move from linuxPackages
...
These packages do not depend on the kernel.
ofp is not aliased because it is marked as broken.
2018-05-21 01:18:25 +00:00
Orivej Desh
2287c5f6a5
dpdk: extract from linuxPackages.dpdk
...
DPDK kernel modules are optional and its libraries do not reference them.
This allows to move the packages that depend on DPDK out of linuxPackages,
since they do not depend on kernel version.
2018-05-21 01:05:43 +00:00
Mario Rodas
f5ca57b6d9
powerline-rs: Fix darwin build ( #40840 )
2018-05-21 00:55:21 +02:00
Emmanuel Rosa
3dadae4cd2
purple-lurch: init at 0.6.7
...
Adds XEP-0384: OMEMO Encryption for libpurple
2018-05-20 22:11:15 +00:00
leenaars
bc309f5c57
webmetro: init => unstable-20180426 ( #39673 )
2018-05-20 23:27:34 +02:00
Matthew Justin Bauer
130e5f6548
Merge pull request #40169 from leenaars/kcgi
...
kcgi: init -> 0.10.5
2018-05-20 16:22:55 -05:00
Michiel Leenaars
1a611d4f4e
kcgi: init -> 0.10.5
2018-05-20 22:37:36 +02:00
Benjamin Hipple
65f58cfaf8
vim_configurable: unpin from old lua 5.1 ( #40749 )
...
This pin was added in 2014 during a lua upgrade, but it appears vim today builds
fine with lua 5.2, so we can have it just depend on the `lua` package.
2018-05-20 22:11:43 +02:00
averelld
e92d68e3ab
x2goclient: qt4 -> qt5 ( #40811 )
2018-05-20 21:53:45 +02:00
Peter Hoeg
d7679fb2b5
0ad: 0.0.22 -> 0.0.23 ( #40807 )
2018-05-20 21:32:03 +02:00
Orivej Desh
75e66b5581
swift-im: init at 4.0.2
...
(cherry picked from commit d7117945f5a3edf44b3c71432a8a6a4f94e1d75b)
2018-05-20 11:51:17 +00:00
Orivej Desh
5188ef371f
libnatpmp: init at 20150609
2018-05-20 11:51:17 +00:00
Vladimír Čunát
392e6de7d0
Merge branch 'master' into staging
2018-05-20 13:20:53 +02:00
Samuel Leathers
be5e8faafc
Merge pull request #40742 from worldofpeace/antibody
...
antibody: init at 3.4.6
2018-05-19 21:39:40 -04:00
Samuel Leathers
caa1414482
Merge pull request #40770 from mnacamura/gauche
...
gauche: init at 0.9.5
2018-05-19 21:38:39 -04:00
Jörg Thalheim
8bcec815bd
Merge pull request #40744 from kirelagin/wireguard-darwin
...
WireGuard: Make tools available on other platforms
2018-05-19 22:49:54 +01:00
Silvan Mosberger
c8a8ecb5b3
blockhash: init at 0.3 ( #40737 )
2018-05-19 23:33:09 +02:00
Silvan Mosberger
bf629981a6
nms: init at 0.3.3 ( #40707 )
2018-05-19 23:26:06 +02:00
Vincent Laporte
0d319657ef
ocamlPackages.earley: init at 1.0.2 ( #40755 )
2018-05-19 23:01:40 +02:00
Daiderd Jordan
41f3ceded8
Merge pull request #40724 from yurrriq/init/m-cli
...
m-cli: init at 0.2.5
2018-05-19 21:32:33 +02:00
Eric Bailey
84919cd3ef
m-cli: init at 0.2.5
2018-05-19 13:52:42 -05:00
worldofpeace
f434c71def
antibody: init at 3.4.6
2018-05-19 13:45:50 -04:00
Michael Weiss
142b65f088
html-proofer: init at 3.8.0 ( #40772 )
2018-05-19 16:10:32 +02:00
Mitsuhiro Nakamura
ae89ef24aa
gauche: init at 0.9.5
2018-05-19 22:29:29 +09:00
Jörg Thalheim
4c132c40bd
Merge pull request #40752 from TravisWhitaker/alacritty-darwin
...
alacritty: Fix darwin.
2018-05-19 14:25:13 +01:00
Jörg Thalheim
d0d9f49057
Merge pull request #40758 from kirelagin/wireguard-go
...
wireguard-go: init at 0.0.20180514
2018-05-19 12:27:50 +01:00
geistesk
2db356feb5
pythonPackages.geojson: init at 2.3.0
2018-05-19 12:14:16 +02:00
Yegor Timoshenko
60d96d7786
top-level/aliases: add wireguard -> wireguard-tools alias
2018-05-19 12:28:38 +03:00
Yegor Timoshenko
a9defaefab
top-level: remove wireguard attr
2018-05-19 12:27:21 +03:00
Robert Schütz
90c0100139
Merge branch 'master' into staging
2018-05-19 11:12:19 +02:00
Kirill Elagin
b599f672e4
wireguard-go: init at 0.0.20180514
2018-05-19 11:19:33 +03:00
Travis Whitaker
b739397ae4
alacritty: Fix darwin.
2018-05-19 00:01:47 -07:00
Matthew Justin Bauer
93a5152c82
Merge pull request #40606 from udono/fix/tryton-update
...
Fix/tryton update
2018-05-18 21:50:12 -05:00
Matthew Justin Bauer
d1605c559b
Merge pull request #40166 from akru/yrd-init
...
yrd: init at 0.5.3
2018-05-18 21:49:55 -05:00
Matthew Justin Bauer
da72ac2092
Merge pull request #40571 from vbgl/coq-stdpp
...
coqPackages.stdpp: init at 1.1
2018-05-18 21:48:35 -05:00
Matthew Justin Bauer
bc35f54a64
Merge pull request #40510 from tilpner/gomuks-init
...
gomuks: init at 2018-05-16
2018-05-18 21:46:20 -05:00
Matthew Justin Bauer
05ff6862c8
Merge pull request #40199 from jarjee/newpkg/mongodb-compass
...
mongodb-compass: init at 1.13.1
2018-05-18 21:43:38 -05:00
Kirill Elagin
865abfa609
wireguard: Enable tools on other platforms
...
Wireguard is now split into two pretty much independent packages:
`wireguard` (Linux-specific kernel module) and `wireguard-tools`,
which is cross-platform.
2018-05-19 01:17:26 +03:00
John Ericson
5ccb99e372
Merge remote-tracking branch 'upstream/master' into staging
2018-05-18 17:48:37 -04:00
Will Dietz
0c30d6597e
xbps: init at 0.52
2018-05-18 12:42:34 -05:00
Udo Spallek
5a3ccf19c4
pythonPackages cdecimal: init at 2.3
2018-05-18 17:17:44 +00:00
Udo Spallek
31ebb53b12
pythonPackages goocalendar: init at 0.3
2018-05-18 17:17:44 +00:00
dbohdan
1d2eeec16c
s2png: init at 0.7.2
2018-05-18 17:19:31 +03:00
Uli Baum
cab0bd00e1
staging: fix eval error (undefined 'ncursesReal')
...
broken by an apparently faulty merge
in ddbe9191ef
2018-05-18 16:13:19 +02:00
Yurii Rashkovskii
63f2c2f73f
ape: init at 6.7-131003
2018-05-17 21:47:43 -07:00
Tuomas Tynkkynen
003473613a
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/top-level/all-packages.nix
2018-05-18 03:54:38 +03:00
Will Dietz
3432fa3fd5
bashplotlib: init at 2017-10-11 ( #40685 )
2018-05-17 23:16:26 +02:00
Will Dietz
26f06ddb16
Merge pull request #40702 from dtzWill/feature/sqlar
...
sqlar: init at 2018-01-07
2018-05-17 16:00:15 -05:00
Will Dietz
0f7eaddc50
sqlar: init at 2018-01-07
2018-05-17 14:58:41 -05:00
Will Dietz
ee57b14c04
Merge pull request #40680 from dtzWill/update/st-1.1.4
...
App::St: 1.1.2 -> 1.1.4
2018-05-17 14:42:53 -05:00
Pascal Wittmann
97ab2d40cb
Merge pull request #40614 from symphorien/ries
...
ries: init at 2018-04-11
2018-05-17 21:30:47 +02:00
Tobias Happ
93fedb03fe
cargo-release: Init at 0.10.0
2018-05-17 14:20:28 -05:00
Peter Simons
b5cef2ea66
Merge pull request #40392 from ElvishJerricco/ghcjs-8.2
...
Ghcjs 8.2 & 8.4
2018-05-17 17:55:59 +02:00
Will Dietz
a5c9b87d78
App::St: no need for fixup anymore
...
FWIW the fixup is the update 1.1.2 -> 1.1.4 is reverted.
2018-05-17 10:12:34 -05:00
Will Dietz
0b4b3e648c
perlPackages.AppSt: 1.1.2 -> 1.1.4
2018-05-17 10:06:56 -05:00
Fritz Otlinghaus
9668a66948
gams: init at 25.02
2018-05-17 14:46:31 +02:00
Symphorien Gibol
ea7404dcd7
ries: init at 2018-04-11
2018-05-17 14:09:33 +02:00
Robert Schütz
2c91ab54c9
Merge pull request #40353 from Assassinkin/mail-parser
...
pythonPackages.mail-parser: init at 3.3.1
2018-05-17 12:24:30 +02:00
Assassinkin
fb7340d3e5
pythonPackages.mail-parser: init at 3.3.1
2018-05-17 12:22:22 +02:00
Yegor Timoshenko
910644ef50
Merge pull request #40620 from NixOS/yegortimoshenko-patch-4
...
top-level: build winePackages on Hydra
2018-05-17 11:52:49 +03:00
Frederik Rietdijk
de55b71e0b
Merge pull request #30833 from nyarly/jira_cli
...
(jira-cli) init at 2.2
2018-05-17 08:53:03 +02:00
Tim Steinbach
fe2deeb458
kafka: Add 1.1
2018-05-16 22:26:40 -04:00
Yegor Timoshenko
1b2b126f82
winePackages: move to pkgs/top-level/wine-packages.nix
2018-05-17 02:31:03 +03:00
Yegor Timoshenko
570b1e52c6
top-level: build winePackages on Hydra
2018-05-17 02:04:42 +03:00
Will Dietz
2efa96b6b8
Merge pull request #40607 from Infinisil/add/pacvim
...
pacvim: init at 2018-05-16
2018-05-16 16:27:57 -05:00
John Ericson
ddbe9191ef
Merge remote-tracking branch 'upstream/master' into staging
...
Keep the dontCheck because the test suite fails, get rid of the LDFLAGS
hack because we don't need it!
2018-05-16 15:16:08 -04:00
Silvan Mosberger
00c4ba1ea0
pacvim: init at 2018-05-16
2018-05-16 21:10:34 +02:00
John Ericson
f3fcf1b0a9
Merge pull request #40393 from ElvishJerricco/ios-prebuilt-dependency-fixes
...
Fix some GHC dependencies on iOS
2018-05-16 15:04:13 -04:00
tilpner
c1efa89126
gomuks: init at 2018-05-16
2018-05-16 20:47:35 +02:00
Ryan Trinkle
4f25cf5124
ncurses: when cross-compiling for iOS, use built-in ncurses
2018-05-16 14:28:25 -04:00
Will Dietz
1bbe4e9618
Merge pull request #40596 from dtzWill/feature/dyncall-1.0
...
dyncall: init at 1.0
2018-05-16 10:52:29 -05:00
Will Dietz
65eb3ec842
dyncall: init at 1.0
2018-05-16 10:29:40 -05:00
Andreas Rammhold
8a93595550
sysprof: 1.2.0 -> 3.28.1
2018-05-16 16:54:12 +02:00
worldofpeace
1edc7ae639
xbmcPlugins.osmc-skin: init at 17.0.4
2018-05-16 08:27:42 -04:00
Alexander Krupenkin
82550c639e
yrd: init at 0.5.3
2018-05-16 15:12:19 +03:00
Pascal Wittmann
ad31217cc4
Merge pull request #40584 from mnacamura/btops
...
btops: init at 0.1.0
2018-05-16 13:14:59 +02:00
Robert Schütz
40edf5eeed
Merge pull request #39120 from ktf/add-uproot
...
pythonPackages.uproot: init at 2.8.23.
2018-05-16 10:19:28 +02:00
Peter Hoeg
84ae5f1ee3
vcal: init at 2.7
2018-05-16 16:13:26 +08:00
Giulio Eulisse
54cf5d9358
pythonPackages.uproot: init at 2.8.23
2018-05-16 09:36:52 +02:00
Will Fancher
d86edd5161
Dont haddock ghcjs in either version
2018-05-16 03:11:32 -04:00
Mitsuhiro Nakamura
0910be8327
btops: init at 0.1.0
2018-05-16 16:05:49 +09:00
adisbladis
374a18fcb6
Merge pull request #40583 from adisbladis/emacsPackages.emacs-libvterm
...
emacsPackages.emacs-libvterm: init at unstable-2017-11-24
2018-05-16 14:20:34 +08:00
adisbladis
149a0dc1ff
emacsPackages.emacs-libvterm: init at unstable-2017-11-24
2018-05-16 14:02:49 +08:00
adisbladis
3290800d67
libvterm-neovim: init at 2017-11-05
2018-05-16 14:02:48 +08:00
Matthew Bauer
4592ed6e43
qtchan: fix on macos
2018-05-16 01:02:31 -05:00
Okina Matara
8419c347ca
qtchan: init at v0.100
2018-05-16 01:02:31 -05:00
Matthew Bauer
bb831b7946
redshift: support macosx
2018-05-16 01:02:31 -05:00
Matthew Bauer
d6c9efa223
watchman: add fsevents support
...
macOS needs apple sdks for fsevents support
Fixes #14309
2018-05-16 01:02:31 -05:00
Matthew Justin Bauer
0e2dd13f43
Merge pull request #40506 from mmlb/flent
...
flent: init at 1.2.2
2018-05-16 01:00:11 -05:00
Peter Hoeg
7f27566efd
Merge pull request #40581 from peterhoeg/p/sedutil
...
sedutil: init at 1.15.1 and corresponding nixos module
2018-05-16 12:39:06 +08:00
Tuomas Tynkkynen
6b6a575748
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/tools/networking/telnet/default.nix
pkgs/top-level/aliases.nix
2018-05-16 03:09:33 +03:00
Moritz Ulrich
977c207f22
pythonPackages.podcats: Init at 0.5.0
2018-05-15 23:23:57 +02:00
Vincent Laporte
42462d7b66
coqPackages.stdpp: init at 1.1
2018-05-15 20:55:53 +00:00
Matthew Justin Bauer
0b1a0e3330
Merge pull request #40184 from jD91mZM2/multibootusb
...
multibootusb: init at 9.2.0
2018-05-15 12:15:10 -05:00
Matthew Bauer
1d9d1fa780
telnet: use inetutils
...
Inetutils provides a cross-platform version of telnet. Normally I
would try to contact the old maintainer, but none is listed.
2018-05-15 10:43:00 -05:00
Sebastian Jordan
101d1d118d
pythonPackages.effect: init -> 0.11.0
2018-05-15 14:35:10 +02:00
Jan Tojnar
d5060ac3a7
Merge pull request #33371 from jtojnar/flatpak
...
Flatpak
2018-05-15 14:19:33 +02:00
Jan Tojnar
843bc0f73a
flatpak-builder: init add 0.10.10
2018-05-15 13:28:30 +02:00
lewo
640b6359ae
Merge pull request #40453 from andersk/pytorch
...
pytorch: 0.3.1 -> 0.4.0
2018-05-15 08:40:51 +02:00
John Ericson
f2017c40ae
Merge remote-tracking branch 'upstream/master' into staging
2018-05-14 22:53:10 -04:00
John Ericson
232bc24b56
Merge pull request #40530 from obsidiansystems/mingw-cleanup
...
MinGW, Hurd: Clean ups and crossConfig removal
2018-05-14 21:05:44 -04:00
John Ericson
9be118223b
misc mingw: Get rid of crossConfig and clean up
...
Style of dual implementation and headers derivations is take from
bb7067f882
.
2018-05-14 20:32:42 -04:00
Matthew Justin Bauer
e5274eb60e
Merge pull request #40391 from bhipple/truffleHog-gitpython-gitdb2-smmap2
...
truffleHog: init at 2.0.91
2018-05-14 18:10:07 -05:00
Matthew Justin Bauer
8dfecefd97
Merge pull request #40245 from bcdarwin/bicgl
...
bicgl: init at 2017-09-10
2018-05-14 18:09:27 -05:00
Pascal Wittmann
4e7d08cd97
Merge pull request #40523 from arcadio/minimap2
...
minimap2: init at 2.10
2018-05-14 23:34:26 +02:00
Arcadio Rubio García
e4a2b70f91
minimap2: init at 2.10
2018-05-14 21:26:07 +01:00
Robert Schütz
3189704549
Merge pull request #36426 from couchemar/isort-4.3.4
...
pythonPackages.isort: 4.2.5 -> 4.3.4
2018-05-14 22:05:49 +02:00
Manuel Mendez
b14f809bb1
flent: init at 1.2.2
2018-05-14 12:46:33 -04:00
John Ericson
8e891e6ed4
Merge remote-tracking branch 'upstream/master' into staging
2018-05-14 10:57:33 -04:00
Matthew Justin Bauer
09204fe806
Merge pull request #40440 from ruuda/libressl
...
libressl: init at 2.7, change url to https
2018-05-13 18:21:26 -05:00
Judson
51f4a46af2
jira_cli: init at 2.2
2018-05-13 14:35:42 -07:00
Ruud van Asseldonk
5bd19cfceb
libressl: 2.5.5 -> 2.7.3
2018-05-13 23:05:04 +02:00
Tuomas Tynkkynen
f2ea9e0ebf
U-Boot: Add Pine64 build
...
(cherry picked from commit 4b77663edf
)
(cherry picked from commit 1896fcff609d7b99b4be1781a5c9523193c33e4f)
2018-05-13 16:12:11 -04:00
Samuel Dionne-Riel
566d3feb4e
U-Boot: Add SOPINE Baseboard build
...
This build is compatible with PINE A64-LTS.
[dezgeg changed the original device tree patch to v4 of the patch series
"sunxi: sync H3, H5, A64 DTs from mainline Linux" submitted to the
upstream mailing list by Andre Przywara. Also install the
u-boot-sunxi-with-spl.bin binary similar to 32-bit boards
since it's now being built by the upstream build system.]
(cherry picked from commit 2ff31f71ae
)
(cherry picked from commit 176d151f4d98d54adf293ee58427da649f28452c)
2018-05-13 16:12:10 -04:00
Tuomas Tynkkynen
7dffe0d38c
U-Boot: Add AArch64 QEMU build
...
See
https://github.com/u-boot/u-boot/blob/master/doc/README.qemu-arm
on how to use it.
(cherry picked from commit 6b069c656a
)
(cherry picked from commit eff6d9628c9e0bae2096251f8e97789c0b9afe6f)
2018-05-13 16:12:10 -04:00