Commit Graph

87950 Commits

Author SHA1 Message Date
Vincent Laporte
5664601fa2 ocamlPackages.fdkaac: init at 0.3.2 2020-09-05 10:44:12 +02:00
R. RyanTM
813be97db2 lyra: 1.4 -> 1.5.1 2020-09-05 06:55:28 +00:00
R. RyanTM
3d2fb57be6 liblouis: 3.14.0 -> 3.15.0 2020-09-05 04:52:18 +00:00
Mario Rodas
d98de3f82e gotestsum: add subPackages 2020-09-05 04:20:00 +00:00
R. RyanTM
e9945fc57a libcint: 3.0.20 -> 3.1.1 2020-09-05 04:16:46 +00:00
R. RyanTM
2f3abc07d9 lazygit: 0.20.9 -> 0.22.1 2020-09-05 03:45:47 +00:00
R. RyanTM
e732e1a045 hpx: 1.4.1 -> 1.5.0 2020-09-05 01:39:41 +00:00
R. RyanTM
84eef0f2af heaptrack: 1.1.0 -> 1.2.0 2020-09-05 00:41:34 +00:00
R. RyanTM
659c971e3b hcloud: 1.17.0 -> 1.19.1 2020-09-05 00:23:57 +00:00
R. RyanTM
39a380cac2 gotestsum: 0.5.2 -> 0.5.3 2020-09-04 23:16:41 +00:00
R. RyanTM
7a2b1554fa go-migrate: 4.11.0 -> 4.12.2 2020-09-04 22:46:40 +00:00
Jan Tojnar
b89f1226cc
Merge branch 'staging-next' into staging 2020-09-05 00:32:01 +02:00
Jan Tojnar
346dee1a96
Merge branch 'master' into staging-next 2020-09-05 00:31:19 +02:00
Jan Tojnar
e2a89f8cf2
Merge pull request #96648 from paperdigits/exiv2-0.27.3
exiv2: 0.27.2 -> 0.27.3
2020-09-05 00:23:14 +02:00
Jan Tojnar
4f0f26771e
Merge pull request #95358 from jtojnar/global-fontconfig 2020-09-05 00:19:38 +02:00
Mica Semrick
b181edb322 exiv2: 0.27.2 -> 0.27.3 2020-09-04 14:56:35 -07:00
Sascha Grunert
f55650be0c ginkgo: 1.14.0 -> 1.14.1
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-09-04 13:27:06 -07:00
Peter Simons
efc5084e51
Merge pull request #96560 from NixOS/haskell-updates
Update Haskell package set to LTS 16.12 (plus other fixes)
2020-09-04 22:03:16 +02:00
Jonathan Ringer
e3c26f8c0d python3Packages.zope_i18n: remove due to prolonged breakage 2020-09-04 12:38:45 -07:00
Jonathan Ringer
bd0b0d653c python3Packages.maildir-deduplicate: remove due to prolonged breakage 2020-09-04 12:38:38 -07:00
Jonathan Ringer
8833467efc python3Packages.libarchive: remove due to prolonged breakage 2020-09-04 12:38:38 -07:00
Jonathan Ringer
bbeab7d50e python3Packages.qutip: remove due to prolonged breakage 2020-09-04 12:38:38 -07:00
Jonathan Ringer
95996a837d python3Packages.pip2nix: remove 2020-09-04 12:38:38 -07:00
Peter Simons
8065407b63 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.15.5-15-g1073700 from Hackage revision
18ef8de8fa.
2020-09-04 21:29:21 +02:00
nyanloutre
ca7b509dff
pythonPackages.yeelight: init at 0.5.3 2020-09-04 12:26:28 -07:00
nyanloutre
14de1392aa
pythonPackages.pysqueezebox: init at 0.4.0 2020-09-04 12:25:43 -07:00
Peter Simons
c7f24ae3e7 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.15.5-15-g1073700 from Hackage revision
85155b55bc.
2020-09-04 21:14:56 +02:00
Tom Repetti
e3e39aa84e svls: init at 0.1.17 2020-09-04 12:10:14 -07:00
Peter Simons
85cef2f373 hackage2nix: disable failing builds to avoid evaluation errors on Hydra 2020-09-04 21:08:05 +02:00
Peter Simons
059a7a4419 haskell-neat-interpolation: update the override for the latest version 2020-09-04 21:00:09 +02:00
Peter Simons
4f42007ef9 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.15.5-15-g1073700 from Hackage revision
037ebc86aa.
2020-09-04 20:51:05 +02:00
Peter Simons
688d248e3d liquidhaskell and friends don't compile with ghc-8.8.x. 2020-09-04 20:27:58 +02:00
Jonathan Ringer
3157bf1db7 python3Packages.hypothesis: 5.11.0 -> 5.30.0 2020-09-04 20:21:15 +02:00
R. RyanTM
d6bb2d23da libmpc: 1.1.0 -> 1.2.0 2020-09-04 20:11:10 +02:00
Matthew Bauer
b3d5272ff0 numpy: set runtime_library_dirs too
This appears to be needed in some Python distutils for the library to
get on RPATH correctly. I’m not sure why this worked before, but I
needed this value set for Python 3.8 numpy to work correctly.
2020-09-04 20:10:53 +02:00
Peter Simons
2126263e9d hackage2nix: disable failing builds to avoid evaluation errors on Hydra 2020-09-04 20:10:03 +02:00
Doron Behar
fbaa330937 libpfm: 4.10.1 -> 4.11.0 2020-09-04 20:04:48 +02:00
Frederik Rietdijk
af81d39b87 Merge staging-next into staging 2020-09-04 20:03:30 +02:00
Christian Kampka
07703d13ad intltool: add perl to propagatedBuildInputs 2020-09-04 20:02:18 +02:00
Michael Weiss
5f29a2b2ee mesa: 20.1.6 -> 20.1.7 2020-09-04 20:00:58 +02:00
Jonathan Ringer
b23f1442c5 python3Packages.ftputil: fix tests 2020-09-04 11:00:54 -07:00
Frederik Rietdijk
60258be0f4
Merge pull request #87200 from B4dM4n/libusb-no-systemd
libusb1: fix enableSystemd=false build
2020-09-04 19:59:35 +02:00
Peter Simons
5512354eef Merge remote-tracking branch 'origin/master' into haskell-updates. 2020-09-04 19:45:22 +02:00
R. RyanTM
aeab6ca61e gleam: 0.10.1 -> 0.11.2 2020-09-04 17:33:19 +00:00
R. RyanTM
3e65293809 dapper: 0.5.1 -> 0.5.3 2020-09-04 09:49:42 -07:00
R. RyanTM
ea14b3aa53 python27Packages.dominate: 2.5.1 -> 2.5.2 2020-09-04 09:48:09 -07:00
R. RyanTM
d1e19e7028 python27Packages.josepy: 1.3.0 -> 1.4.0 2020-09-04 09:47:01 -07:00
Jonathan Ringer
bd3afd631c python3Packages.sqlalchemy-citext: fix tests 2020-09-04 09:46:10 -07:00
Vladyslav Burzakovskyy
a24cac67bd django-maintenance-mode: init at 0.14.0 2020-09-04 09:44:54 -07:00
Michael Lingelbach
2a13231544 pythonPackages.apsw: 3.32.2-r1 -> 3.33.0-r1 2020-09-04 09:20:54 -07:00
R. RyanTM
49b2bc632c asls: 0.4.2 -> 0.5.0 2020-09-04 09:05:32 -07:00
R. RyanTM
505c4b4065 gauge: 1.1.1 -> 1.1.3 2020-09-04 15:56:27 +00:00
Jan Tojnar
5079e1cd3b
Merge pull request #96939 from jtojnar/drop-gst-010 2020-09-04 17:13:43 +02:00
Jan Tojnar
7ecabdc22b
Merge pull request #96992 from jtojnar/fc-dtd-urn
treewide: use URN for fontconfig DTD
2020-09-04 17:12:29 +02:00
Mario Rodas
adcb00e739 ocamlPackages.merlin: 3.3.8 -> 3.3.9
https://github.com/ocaml/merlin/releases/tag/v3.3.9
2020-09-04 16:33:58 +02:00
R. RyanTM
96e6957440 fly: 6.5.0 -> 6.5.1 2020-09-04 14:24:55 +00:00
R. RyanTM
27b1dd93c9 enchant: 2.2.9 -> 2.2.10 2020-09-04 16:19:05 +02:00
Peter Simons
fcbf5bf857 Merge remote-tracking branch 'origin/master' into haskell-updates. 2020-09-04 15:56:33 +02:00
Peter Simons
adad7ff232 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.15.5-14-g12d3fb3 from Hackage revision
43aab36e8f.
2020-09-04 15:55:37 +02:00
Niklas Hambüchen
5829744d44
Merge pull request #97084 from bbigras/hotspot
hotspot: 1.2.0 -> 1.3.0
2020-09-04 15:41:40 +02:00
Mario Rodas
c7e8da6225 dune_2: 2.7.0 -> 2.7.1
https://github.com/ocaml/dune/releases/tag/2.7.1
2020-09-04 15:27:26 +02:00
Mario Rodas
cadc15222f ocamlPackages.csexp: init at 1.3.1 2020-09-04 15:27:26 +02:00
R. RyanTM
fd457ecb6c
codeql: 2.2.4 -> 2.2.5 (#97097) 2020-09-04 08:49:48 -04:00
R. RyanTM
dc1cadadb5 clojure-lsp: 20200819T134828 -> 20200828T065654 2020-09-04 08:16:31 +00:00
Jörg Thalheim
4bdcea4634
radare2: 4.5.0 -> 4.5.1 2020-09-04 10:15:39 +02:00
markuskowa
f3bf0f173e
Merge pull request #97043 from markuskowa/upd-openmpi
openmpi: 4.0.4 -> 4.0.5
2020-09-04 09:17:04 +02:00
Jonathan Ringer
762434fb02 python39: 3.9.0b5 -> 3.9.0rc1 2020-09-03 23:36:28 -07:00
Jonathan Ringer
3a3077ae24 python3Packages.azure-mgmt-keyvault: fix overridden package 2020-09-03 23:35:08 -07:00
Jonathan Ringer
fd45756014 python3Packages.azure-synapse-spark: init at 0.2.0 2020-09-03 23:35:08 -07:00
Jonathan Ringer
23ebed860a python3Packages.azure-synapse-accesscontrol: init at 0.2.0 2020-09-03 23:35:08 -07:00
Jonathan Ringer
b346c10aec python3Packages.azure-mgmt-storage: 11.1.0 -> 11.2.0 2020-09-03 23:35:08 -07:00
Jonathan Ringer
3d29275673 python3Packages.azure-mgmt-reservations: 0.7.0 -> 0.8.0 2020-09-03 23:35:08 -07:00
Jonathan Ringer
c7e7a3c909 python3Packages.azure-mgmt-containerservice: 9.2.0 -> 9.3.0 2020-09-03 23:35:08 -07:00
Jonathan Ringer
81fcdbb6f7 python3Packages.azure-mgmt-appconfiguration: 0.5.0 -> 0.6.0 2020-09-03 23:35:08 -07:00
Jonathan Ringer
781b32ab4e python3Packages.azure-multiapi-storage: 0.3.5 -> 0.4.1 2020-09-03 23:35:08 -07:00
Jonathan Ringer
e8306e3be9 python3Packages.azure-mgmt-synapse: init at 0.3.0 2020-09-03 23:35:08 -07:00
Bruno Bigras
678e9184ef hotspot: 1.2.0 -> 1.3.0 2020-09-04 02:13:30 -04:00
Doron Behar
a92005bc9d python.pkgs.catalogue: Remove dubplicate argument pytestCheckHook
Fixes staging evaluation.
2020-09-04 08:02:57 +02:00
R. RyanTM
8741611e58 cargo-udeps: 0.1.13 -> 0.1.14 2020-09-04 05:35:42 +00:00
R. RyanTM
ae724e8f76 cargo-tarpaulin: 0.14.2 -> 0.14.3 2020-09-04 05:27:16 +00:00
Michael Raskin
7a76b1c26d
Merge pull request #96959 from kampka/intltool
intltool: fix cross-platform build
2020-09-04 05:22:53 +00:00
Mario Rodas
219b7f7355
Merge pull request #97059 from r-ryantm/auto-update/yarn
yarn: 1.22.4 -> 1.22.5
2020-09-03 23:08:04 -05:00
Malte Brandy
89cfe01679
haskellPackages.haskell-language-server: 0.3.0 -> 0.4.0 2020-09-04 03:24:17 +02:00
worldofpeace
1a5f54c404 appstream: 0.12.6 -> 0.12.11 2020-09-03 21:08:18 -04:00
maralorn
037e178a43
haskellPackages.ghcide: Fix build (#97052) 2020-09-04 02:58:04 +02:00
Peter Simons
cca4dcd2b7 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.15.5-14-g12d3fb3 from Hackage revision
f491652f2c.
2020-09-04 02:30:23 +02:00
R. RyanTM
9ac15bd5c9 yarn: 1.22.4 -> 1.22.5 2020-09-03 23:49:41 +00:00
WORLDofPEACE
8f43f32af9
Merge pull request #97046 from Ma27/hydra-fix
hydra-unstable: 2020-08-04 -> 2020-09-02
2020-09-03 18:49:31 -04:00
Sascha Grunert
0fdc832be5 buildah: 1.15.1 -> 1.15.2
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2020-09-04 08:24:28 +10:00
Tom Repetti
4e7728ea71 svlint: init at 0.4.7 2020-09-03 14:40:25 -07:00
Silvan Mosberger
8272eff97a
Merge pull request #96269 from deviant/remove-quilt-series
treewide: convert patch series files to Nix expressions
2020-09-03 23:19:26 +02:00
Maximilian Bosch
1c55613cd7
hydra-unstable: 2020-08-04 -> 2020-09-02
Needed to fix Hydra with latest `nixUnstable`.
2020-09-03 22:34:13 +02:00
JesusMtnez
c6b0978fc6
bloop: 1.4.3 -> 1.4.4 2020-09-03 22:19:07 +02:00
Ariel Nunez
a29ed35bc7 hasura: 1.2.1 -> 1.3.1-beta.1 2020-09-03 14:59:08 -05:00
Joël Perras
653d9258f5 black-macchiato: init at 1.3.0
Adds the Python package `black-macchiato`, which allows the usage of
`black` for subsets of an entire file.
2020-09-03 12:32:43 -07:00
Markus Kowalewski
e0aea88d58
openmpi: 4.0.4 -> 4.0.5 2020-09-03 21:25:48 +02:00
Malte Brandy
ad7f8917fd
haskellPackages.monoidal-containers: Remove patch 2020-09-03 21:01:42 +02:00
Frederik Rietdijk
377242d587 Merge staging-next into staging 2020-09-03 19:21:10 +02:00
Frederik Rietdijk
7a4e3e5762 pythonPackages.dnspython_1: add missing file, fixes eval 2020-09-03 19:17:20 +02:00
V
79921889a0 treewide: convert patch series files to Nix expressions
Nix expressions provide all the features that Quilt series files have,
so using those instead is pointless. Also, lib.readPathsFromFile
(the function used to read series files) has the following warning:

> NOTE: This function is not performant and should be avoided.

This also removes some orphaned series files, and unused references to
copyPathsToStore (which were probably missed in previous commits
where calls to lib.readPathsFromFile were removed)
2020-09-03 19:15:05 +02:00
Timo Kaufmann
c25a7cd846
Merge pull request #97006 from timokau/fpc-3.2.0-aarch64
fpc: 3.0.4 -> 3.2.0, add support for aarch64-linux
2020-09-03 18:44:17 +02:00
Robert Hensing
c643d58349
Merge pull request #95760 from janders223/master
Add vscode-json-languageserver-bin node package
2020-09-03 17:46:11 +02:00
Christian Kampka
e7208291d2
intltool: fix cross-platform build 2020-09-03 15:59:38 +02:00
Daniël de Kok
405f49dc4a mkl: 2020.2.254 -> 2020.3.279
Release notes:

https://software.intel.com/content/www/us/en/develop/articles/intel-math-kernel-library-release-notes-and-new-features.html
2020-09-03 15:29:10 +02:00
Vincent Laporte
53bce4da36 ocamlPackages.piqi-ocaml: 0.7.5 → 0.7.7 2020-09-03 15:27:29 +02:00
Timo Kaufmann
6ff5c406eb fpc: add support for aarch64-linux
Supported since fpc 3.2.0.
2020-09-03 14:52:26 +02:00
Timo Kaufmann
f928b91f34 fpc: 3.0.4 -> 3.2.0
There was no 3.1 for some reason. The old sed-based path patching was
broken and resulted in syntax errors since it was a bit over-eager.
Instead of fixing it, I decided to replace it with a patch file which is
easier to inspect and will fail in a more obvious way next time.

The patch is now applied unconditionally, since it actually applies to
all linux platforms. The changes are localized to linux-specific code,
so it does not hurt to apply it on non-linux platforms as well.

Hedgewars needs a small fix to work with the new version. Done in the
same commit to avoid a broken commit.
2020-09-03 14:52:18 +02:00
kon8522
d217a00e87 Update node packages nix expression 2020-09-03 08:02:14 -04:00
kon8522
a213818661 Add vscode json language server 2020-09-03 07:38:09 -04:00
Doron Behar
e30287c590 gst_all_1.gst-rtsp-server: fix pkgconfig includedir and libdir 2020-09-03 13:04:55 +02:00
Jan Tojnar
6f96063804
makeFontsConf: clean up
The use of the argument was removed in 2016 but its definition was left behind.

cd2948a72e
2020-09-03 09:42:58 +02:00
Jörg Thalheim
7a0a9a59d3
Merge pull request #95910 from kampka/texinfo 2020-09-03 07:42:28 +01:00
Michael Raskin
742c7340d2
Merge pull request #96494 from jitwit/j
j: j901e -> j901f
2020-09-03 05:22:07 +00:00
Jan Tojnar
6dd3b54ccc
treewide: use URN for fontconfig DTD
To match upstream change:

9c46ef4aac
2020-09-03 06:39:00 +02:00
Mario Rodas
f7100e698e flow: 0.132.0 -> 0.133.0
https://github.com/facebook/flow/releases/tag/v0.133.0
2020-09-03 04:20:00 +00:00
Robert Scott
55e8cbd263
Merge pull request #96501 from jonringer/fix-phonopy
python3Packages.phonopy: fix build and tests
2020-09-03 01:33:14 +01:00
Peter Simons
4ac1c225ed hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.15.5-14-g12d3fb3 from Hackage revision
99b594fbc8.
2020-09-03 02:30:24 +02:00
Jonathan Ringer
135a6f83ea
python3Packages.phonopy: fix build and tests 2020-09-02 16:20:57 -07:00
zowoq
e14d5a2cf1 leaps: regenerate deps.nix 2020-09-03 08:20:26 +10:00
zowoq
1b235b43bc dep2nix: regenerate deps.nix 2020-09-03 08:20:26 +10:00
Robert Scott
a2842c7440
Merge pull request #96561 from jonringer/fix-jupyterhub-ldapauthenticator
python3Packages.jupyterhub-ldapauthenticator: 1.3.1 -> 1.3.2, fix build
2020-09-02 23:11:38 +01:00
Robert Scott
f1b9dcde97 pythonPackages.datasette: 0.39 -> 0.46
enable more tests that now seem to work
2020-09-02 15:07:05 -07:00
Robert Scott
4e94600604 pythonPackages.mergedeep: init at 1.3.0 2020-09-02 15:07:05 -07:00
Robert Scott
ce47cdbeaf pythonPackages.asgi-csrf: init at 0.7 2020-09-02 15:07:05 -07:00
Robert Scott
4f612035e3 pythonPackages.starlette: 0.13.6 -> 0.13.8
remove outdated comment
2020-09-02 15:07:05 -07:00
Robert Scott
063692bb10 pythonPackages.httpx: 0.12.1 -> 0.14.2
slim down some no longer needed dependencies
2020-09-02 15:07:05 -07:00
Robert Scott
e98facbda3 pythonPackages.httpcore: init at 0.10.2 2020-09-02 15:07:05 -07:00
zowoq
eef56567c4 go_1_14: 1.14.7 -> 1.14.8 2020-09-03 07:54:09 +10:00
Symphorien Gibol
e1d6f7cfa4 python3Packages.matrix-nio: 0.14.1 -> 0.15.1
https://github.com/poljar/matrix-nio/blob/master/CHANGELOG.md

no obvious compatibility issue
2020-09-02 14:44:04 -07:00
Matthew Bauer
304de03193
Merge pull request #96402 from matthewbauer/bazel-jdk-headless
Fix Bazel on macOS
2020-09-02 16:29:47 -05:00
Matthew Bauer
8e6f466967
Merge pull request #96563 from obsidiansystems/skip-cudnn_cnn_infer-instead-of-removing
cudnn: skip libcudnn_cnn_infer.so, instead of removing
2020-09-02 16:29:28 -05:00
Robert Scott
3e687bf077
Merge pull request #96500 from r-ryantm/auto-update/python2.7-elasticsearch
python27Packages.elasticsearch: 7.8.1 -> 7.9.1
2020-09-02 22:14:46 +01:00
Malte Brandy
6be7f90931
haskellPackages.haskell-language-server: Fix eval 2020-09-02 20:46:00 +02:00
Tobias Happ
b2679e8b41 rustup: add zlib as runtime dependency
Fixes https://github.com/NixOS/nixpkgs/issues/92946.
2020-09-02 10:57:35 -07:00
Jan Tojnar
0d83d01dfe
Merge pull request #96911 from kampka/glibmm
glibmm: Add glib to nativeBuildInputs
2020-09-02 19:34:27 +02:00
adisbladis
6fc3562432
Merge pull request #94637 from antifuchs/gccemacs-on-darwin
emacs: Make gccemacs build on darwin
2020-09-02 18:30:58 +02:00
Drew Risinger
ab525faf05 python3Packages.cirq: unbreak
Remove unneeded test disables.
Add changelog.
Unpin most python dependencies.
2020-09-02 09:08:45 -07:00
WORLDofPEACE
31008a8f15
Merge pull request #96937 from jtojnar/drop-strigi
strigi: drop
2020-09-02 08:53:24 -04:00
Mario Rodas
403414522a
Merge pull request #96945 from endgame/chromedriver-bump
chromedriver: 83.0.4103.39 -> 85.0.4183.87
2020-09-02 07:28:39 -05:00
rnhmjoj
d9cd2ca21d
haskellPackages.pandoc-crossref: mark unbroken 2020-09-02 14:12:02 +02:00
Christian Kampka
7332051e27
glibmm: Add glib to nativeBuildInputs
While compiling, glibmm tries to execute glib-compile-schemas, which
requires glib to be in the nativeBuildInputs for cross-platform builds.
2020-09-02 10:39:03 +02:00
Vincent Laporte
910ac8645f ocamlPackages.ocp-index: 1.2 → 1.2.1 2020-09-02 10:30:34 +02:00
Vincent Laporte
745a86726a ocamlPackages.re: disable tests with OCaml < 4.04 2020-09-02 10:30:34 +02:00
Mario Rodas
df8eed0ccf ocaml-ng.ocamlPackages_4_11.ocaml: 4.11.0 -> 4.11.1 2020-09-02 09:30:20 +02:00
Jan Tojnar
84d0f3fa7d
pkgsMusl.libusb-compat-0_1: fix eval
e89e2edc73 did not move all files when moving the directory.

Fixes: https://github.com/NixOS/nixpkgs/issues/96947
2020-09-02 07:38:09 +02:00
Orivej Desh (NixOS)
de45bbe1b4
Merge pull request #96684 from magnetophon/LV2plugins
update some LV2 plugins
2020-09-02 05:12:54 +00:00
Jack Kelly
895f0ce810 chromedriver: 83.0.4103.39 -> 85.0.4183.87
New dependency: libxcb
2020-09-02 14:32:14 +10:00
John Ericson
1965a241fc
Merge pull request #61019 from volth/gcc.arch-amd
platform.gcc.arch: support for AMD CPUs
2020-09-01 22:31:16 -04:00
Jan Tojnar
4a4e642aba
gstreamer: drop legacy
It has been abandoned for ages, insecure, and now finally broken.
2020-09-02 04:01:07 +02:00
Thomas Tuegel
1c47df2617
Merge pull request #84542 from petabyteboy/feature/plasma-5-18
plasma5: 5.17.5 -> 5.18.5
2020-09-01 20:17:29 -05:00