alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
224993 commits 217 branches 121 tags 4.5 GiB
Commit graph

1775 commits

Author SHA1 Message Date
Tobias Mayer 3a39ea06d2 ninja: 1.9.0 -> 1.10.0 2020-02-09 16:57:56 -06:00
Andrew Childs 03ffda3d1e wafHoook: fix whitespace 2020-02-09 16:13:43 +09:00
Andrew Childs 032d5e7e83 wafHook: make crossFlags optional 
The convention of `--cross-compile` and `--cross-execute` is common
enough that it seems like a reasonable default. However there are
projects like mpv which do not use these flags, and rightfully fails
to configure when passed unexpected flags.
 2020-02-09 16:03:02 +09:00
Andrew Childs c6791b2117 wafHook: allow overriding phases 
This makes the wafHook a lot closer to the structure of standard hooks
like cmake and ninja.
 2020-02-09 16:03:02 +09:00
R. RyanTM 2357a15348 sbt: 1.3.7 -> 1.3.8 2020-02-07 18:35:39 +00:00
Frederik Rietdijk 76a439239e Merge master into staging-next 2020-02-05 10:28:52 +01:00
Uri Baghin 10d1a04b02 bazel-deps: remove 2020-02-04 12:35:47 +11:00
Uri Baghin 3dc9c1b885 bazel-remote: 2019-01-12 -> 2020-01-29 2020-02-04 02:26:15 +01:00
Benjamin Hipple e73fa05f30 waf: 2.0.18 -> 2.0.19 
The patch for sorting files in `tar` is no longer needed, as it has been fixed
upstream: https://gitlab.com/ita1024/waf/-/merge_requests/2227
 2020-02-02 20:07:38 +01:00
Daiderd Jordan 68513e4071
cmake: move CMAKE_OSX_ARCHITECTURES out of the stdenv 
This was initially introduced in 92188d9d17,
not clear how relevant this still is but i686 isn't supported anymore so
disable it explicitly.
 2020-01-31 21:52:13 +01:00
Daiderd Jordan b984c227d2
cmake: remove CMAKE_OSX_DEPLOYMENT_TARGET overrides 
We _do_ want minimum versions in our packages.
 2020-01-31 21:52:12 +01:00
Frederik Rietdijk 5cc0468a20 Merge staging into staging-next 2020-01-31 00:16:31 +01:00
Jörg Thalheim 2dfc3e5254
build-rebar3: restore rebar3-nix-bootstrap path (#78418) 
build-rebar3: restore rebar3-nix-bootstrap path
 2020-01-30 14:21:29 +00:00
Yorick van Pelt e8889fe676
rebar3: restore bootstrapper attribute 
partially reverts 8de4654d4b
 2020-01-29 20:17:27 +01:00
R. RyanTM 6e6615dfcc cmake: 3.16.2 -> 3.16.3 2020-01-29 08:57:00 +01:00
Frederik Rietdijk dce0ca29d9 Merge master into staging-next 2020-01-28 10:46:13 +01:00
Maximilian Bosch 258d4b3ca4
Merge pull request #78487 from r-ryantm/auto-update/sbt 
sbt: 1.3.5 -> 1.3.7
 2020-01-26 00:26:10 +01:00
R. RyanTM 5d19c3525e sbt: 1.3.5 -> 1.3.7 2020-01-25 22:58:10 +00:00
scalavision de193e105d mill: 0.5.6 -> 0.6.0 2020-01-24 15:01:47 +01:00
Pascal Wittmann 00482247e1
Merge pull request #78200 from r-ryantm/auto-update/icmake 
icmake: 9.02.09 -> 9.03.01
 2020-01-22 08:55:37 +01:00
R. RyanTM aed4be2de3 icmake: 9.02.09 -> 9.03.01 2020-01-21 18:55:15 +00:00
R. RyanTM a98253f848 rebar: 2.5.1 -> 2.6.4 2020-01-17 10:22:22 +00:00
Frederik Rietdijk bc18cc72dd
Merge pull request #77610 from LnL7/darwin-stdenv-python3 
darwin-stdenv: bootstrap with python3
 2020-01-15 09:24:57 +01:00
Daiderd Jordan 587c66c877
ninja: python2 -> python3 2020-01-13 11:13:06 +01:00
Frederik Rietdijk 960f062825 Merge master into staging-next 2020-01-12 09:47:19 +01:00
Mario Rodas b19f27a785
Merge pull request #76328 from r-ryantm/auto-update/mill 
mill: 0.5.3 -> 0.5.6
 2020-01-11 05:20:24 -05:00
Frederik Rietdijk 348eaa280b Merge master into staging-next 2020-01-10 18:32:07 +01:00
Milan Pässler 8337bb607c gradle: remove old versions 2020-01-10 04:21:18 +01:00
Frederik Rietdijk a823616723 Merge master into staging-next 2020-01-07 20:06:22 +01:00
Danju Visvanathan 0a6551f48c bazel: 1.2.1 -> 2.0.0 (#76851) 
* bazel: 1.2.1 -> 2.0.0

* .
 2020-01-07 17:24:54 +01:00
Will Dietz 80f043b738
samurai: init at 1.0 2020-01-06 16:06:32 -06:00
Frederik Rietdijk 8fff915659
Merge pull request #76488 from jtojnar/more-python-cleanups 
Another batch of Python 2 clean-ups
 2020-01-06 12:00:36 +01:00
markuskowa bba84b607e
Merge pull request #76396 from r-ryantm/auto-update/qbs 
qbs: 1.14.1 -> 1.15.0
 2020-01-04 12:03:56 +01:00
Jonathan Ringer d72c4791bc Merge remote-tracking branch 'origin' into staging-next 2019-12-30 14:36:16 -08:00
Tim Steinbach d835f229f4
Merge pull request #76711 from ktor/master 
gradle: 5.6.1 -> 5.6.4
 2019-12-30 13:20:25 -05:00
Jonathan Ringer 446fec8c2d
Merge branch 'master' of github.com:NixOS/nixpkgs into staging-next 2019-12-30 10:14:18 -08:00
Pawel Kruszewski 5f182a9eed gradle: 5.6.1 -> 5.6.4 2019-12-30 18:33:21 +01:00
Andrew Childs 63c9e4ee9d meson: add armv5tel cpu family 2019-12-30 17:21:39 +01:00
Robin Gloster a8822b6ec2
gnumake: *Flags are lists 2019-12-30 11:13:41 +01:00
Jan Tojnar c72e388b7f
gn: switch to python 3 2019-12-29 11:21:08 +01:00
Jan Tojnar 4bbc6cc66f
Merge branch 'staging-next' into staging 2019-12-25 05:18:52 +01:00
Tim Steinbach ecbcdc8a4c
Merge pull request #76416 from r-ryantm/auto-update/sbt 
sbt: 1.3.4 -> 1.3.5
 2019-12-24 21:36:46 -05:00
R. RyanTM 23436b5529 sbt: 1.3.4 -> 1.3.5 2019-12-24 07:59:37 -08:00
R. RyanTM 5d33d676eb qbs: 1.14.1 -> 1.15.0 2019-12-24 05:08:43 -08:00
Pascal Wittmann 332dbf1e52
Merge pull request #76281 from r-ryantm/auto-update/icmake 
icmake: 9.02.08 -> 9.02.09
 2019-12-24 08:57:49 +01:00
R. RyanTM 0fa2ab2a74 mill: 0.5.3 -> 0.5.6 2019-12-23 15:31:52 -08:00
R. RyanTM d7cec21555 icmake: 9.02.08 -> 9.02.09 2019-12-23 08:46:51 -08:00
R. RyanTM 5fb48efd99 doit: 0.31.1 -> 0.32.0 2019-12-23 02:33:40 -08:00
Tobias Mayer dfee92cd2e cmake: 3.15.4 -> 3.16.2 2019-12-20 15:59:32 +01:00
Michael Weiss 832cf092c7
scons: 3.1.1 -> 3.1.2 
Announcement:
https://scons.org/scons-312-is-available.html

Changelog:
https://raw.githubusercontent.com/SConsProject/scons/rel_3.1.2/src/CHANGES.txt
 2019-12-18 16:10:11 +01:00
Frederik Rietdijk f3618342ec Merge staging-next into staging 2019-12-10 19:01:27 +01:00
scalavision 38c7aa05ef mill: 0.5.2 -> 0.5.3 (#75423) 2019-12-10 15:40:05 +01:00
Mario Rodas 6720955bab
Merge pull request #75262 from r-ryantm/auto-update/apache-maven 
maven: 3.6.2 -> 3.6.3
 2019-12-08 16:59:19 -05:00
R. RyanTM 2ed87cfcd0 maven: 3.6.2 -> 3.6.3 2019-12-08 08:09:07 -08:00
Guillaume Bouchard 4fdea7312e bazel: bazelRC path set by a patch 
In bazel source code change in the future, patch will fail and we'll
detect the regression sooner.
 2019-12-05 11:45:36 +01:00
Guillaume Bouchard 1ce0375b2f bazel: close #70911 by conditionally loading system wide configuration 
Some system may setup global informations (such as bazel cache location)
in /etc/bazel.bazelrc
 2019-12-05 11:17:13 +01:00
Guillaume Bouchard 0cffa85d57 bazel: remove wrapProgram and move it to system configuration 
This way, custom configurations are all at the same place. Also, user
may override these settings using the command line.
 2019-12-05 11:16:47 +01:00
Guillaume Bouchard 5b9e350fd4 bazel: move configuration file to a proper nix store entry 
Easier to read and maintain
 2019-12-05 11:02:37 +01:00
Frederik Rietdijk c9a19b5f7e Merge staging-next into staging 2019-12-05 10:19:54 +01:00
Frederik Rietdijk 51ef7c3e49 Merge master into staging-next 2019-12-05 09:14:08 +01:00
Guillaume Bouchard c0a6fc4a56 bazel: add file and zip in the test runner env 
`file` and `zip` are needed for some bazel test and by default the test
runner take these binaries from the current `PATH` which may not contain
them
 2019-12-04 12:59:32 +01:00
Guillaume Bouchard 20752ba4f7 bazel: improve strict action env context 
- Bazel strict action env set a default PATH to
`/bin/:/usr/bin:/usr/local/bin`. This was previously changed to disable
this behavior to improve hermeticity. However the previous change was
only removing `/bin:/usr/bin`, keeping `/usr/local/bin`, this commit
also remove this entry.
 2019-12-04 12:59:32 +01:00
Jan Tojnar daa676f1d1
Merge pull request #74282 from d-goldin/pango_update_split 
pango, pygtk: fixing up newer pango and pygtk
 2019-12-03 15:31:39 +01:00
Jan Tojnar 3a53ef08f1
Merge pull request #70650 from jtojnar/meson-0.52 
meson: 0.51.2 → 0.52.1
 2019-12-02 18:27:05 +01:00
Dima fea6b5f3e0 cmake: patching for harfbuzz location 
a patch to cmake to correctly locate harfbuzz:
https://gitlab.kitware.com/cmake/cmake/issues/19531,
needed for more recent pango.
 2019-12-02 02:30:04 +01:00
Jan Tojnar cb7da0944e
meson: 0.51.2 → 0.52.1 
https://mesonbuild.com/Release-notes-for-0-52-0.html
https://github.com/mesonbuild/meson/compare/0.52.0...0.52.1
 2019-12-02 00:23:09 +01:00
R. RyanTM 40a357a67e cmakeWithGui: 3.15.4 -> 3.15.5 2019-12-01 18:27:33 +01:00
Jan Tojnar a69ad18da9
Merge branch 'master' into staging-next 2019-11-30 19:44:51 +01:00
R. RyanTM 1509bf72c9 qbs: 1.14.0 -> 1.14.1 (#74617) 2019-11-30 15:53:54 +01:00
Mario Rodas 3ec8dcb495
Merge pull request #74643 from r-ryantm/auto-update/sbt 
sbt: 1.3.3 -> 1.3.4
 2019-11-30 03:24:57 -05:00
Frederik Rietdijk d14baf7747 Merge master into staging-next 2019-11-30 08:57:28 +01:00
Daniel Fullmer 228056c878 kati: 2017-05-23 -> 2019-09-23 (#69618) 2019-11-29 21:43:30 +01:00
R. RyanTM f5a2705cd7 sbt: 1.3.3 -> 1.3.4 2019-11-29 07:36:54 -08:00
Jonathan Ringer 0c1c18ca44
Merge branch 'master' into staging-next 2019-11-27 22:57:50 -08:00
Wael M. Nasreddine 97656e9589
bazel: 1.2.0 -> 1.2.1 2019-11-27 15:36:24 -08:00
Wael M. Nasreddine 48478a1b6e
bazel: 1.1.0 -> 1.2.0 2019-11-25 11:19:14 -08:00
Frederik Rietdijk 1d18c5a0fe Merge staging-next into staging 2019-11-24 10:13:31 +01:00
Kévin Rauscher 5d90f051b0 bloop: 1.3.2 -> v1.3.4 
(#70897)
 2019-11-21 23:25:03 +01:00
Frederik Rietdijk 10d0c68a9b Merge staging-next into staging 2019-11-20 10:02:21 +01:00
Frederik Rietdijk 65edeb8633 Merge master into staging-next 2019-11-20 10:01:49 +01:00
Jonathan Ringer 542af6df87 conan: 1.12.0 -> 1.12.3 
Remove PyYAML_3
 2019-11-19 09:05:12 -08:00
Frederik Rietdijk 5f8b0d7d99 Merge staging-next into staging 2019-11-19 14:53:29 +01:00
Frederik Rietdijk f6b39f852e Merge master into staging-next 2019-11-19 10:53:44 +01:00
Thomas Depierre 8de4654d4b beam-modules/hex-snapshot: remove 
The package set is not maintained. It is also not used by most of the
BEAM community. Removing it to allow a more useful set of tools fit to
the BEAM community in Nixpkgs.
 2019-11-17 13:45:57 +01:00
Frederik Rietdijk be7125dde7 Merge master into staging-next 2019-11-16 11:45:07 +01:00
c0bw3b 9367367dfd Treewide: fix URL permanent redirects 
Permanent redirects on homepages and/or source URLs
as reported by Repology
 2019-11-16 01:41:23 +01:00
Jan Tojnar 94d4fe8546
Merge branch 'staging-next' into staging 2019-11-14 23:25:55 +01:00
Jan Tojnar da76deffd1
Merge branch 'master' into staging-next 2019-11-14 23:25:36 +01:00
Jan Tojnar 3108c4dd15
meson: fix unknown compiler error 2019-11-14 22:54:37 +01:00
Jan Tojnar 21f3586b03
meson: fix patch URL 
Hopefully commits will be more stable.
 2019-11-14 22:39:34 +01:00
Jan Tojnar c846ede763
gstreamer 1.16.1 (#70690) 
gstreamer 1.16.1
 2019-11-14 21:33:25 +01:00
Jan Tojnar 071d25afc7
meson: fix darwin framework lookup 
Fixes building gst_all_1.gst-plugins-good.

Patch backported from 0.52.0.
 2019-11-14 12:22:46 +01:00
Frederik Rietdijk 73b88e17dd Merge staging-next into staging 2019-11-11 12:09:26 +01:00
Vladimír Čunát 457e94d900
Merge branch 'master' into staging-next 
~4k rebuilds on each Linux.
 2019-11-09 07:26:53 +01:00
John Ericson 5132cc822a
Merge pull request #72812 from NixOS/bash-no-undef-vars 
cc-wrapper, bintools-wrapper: Remove now unneeded `set {+,-}u`
 2019-11-08 15:26:14 -05:00
John Ericson f7fdc997bf Merge commit 'afa48f16f265fd3e88073bca7929e1e103bd3dc3' into bash-no-undef-vars 2019-11-08 13:58:27 -05:00
John Ericson 42ffaf5290 cmake: NIX_CFLAGS_COMPILE NIX_LDFLAG could be undefined 2019-11-08 13:24:20 -05:00
R. RyanTM 066e36f559 mill: 0.5.1 -> 0.5.2 (#71723) 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mill/versions
 2019-11-08 00:44:51 +01:00
John Ericson cdbbaa91ed cmake: CMAKE_*_PATH can be undefined 2019-11-05 14:21:27 -05:00
John Ericson acd2d19484
Merge pull request #72347 from NixOS/bash-no-undef-vars 
treewide: `set -u` everywhere
 2019-11-04 19:52:33 -05:00
R. RyanTM 60024b53d7 cmakeWithGui: 3.15.1 -> 3.15.4 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cmake-cursesui-qt5ui/versions
 2019-11-03 10:42:27 +01:00
John Ericson 373236ccff treewide: JAVA_HOME may not always be defined 2019-11-01 22:00:07 +00:00
John Ericson b7f4bda282 treewide: *Phase(s)? variables are optional 
If these aren't defined, the stdenv defaults are used in the `*Phase`
case, or no extra phases are done, in the `*Phases` case.
 2019-11-01 14:44:44 -04:00
John Ericson 1290e532ea treewide: Make more dont* variables OK to be undefined in setup hooks 2019-11-01 14:44:44 -04:00
Marek Mahut 4cac5a494a
Merge pull request #71861 from r-ryantm/auto-update/qbs 
qbs: 1.13.1 -> 1.14.0
 2019-11-01 09:02:29 +01:00
Florian Klink a484c07d84
Merge pull request #71612 from danjuv/master 
bazel: 1.0 -> 1.1
 2019-10-25 00:33:06 +02:00
Profpatsch fbd06addb3 bazel: exclude tests.shebang from running on darwin 2019-10-24 12:16:20 +02:00
R. RyanTM 6a29e3bf21 qbs: 1.13.1 -> 1.14.0 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/qbs/versions
 2019-10-23 14:02:04 -07:00
Frederik Rietdijk d7a921cad9
Merge pull request #71221 from NixOS/staging-next 
Staging next
 2019-10-22 09:15:19 +02:00
Danju Visvanathan 76af684141 bazel: 1.0 -> 1.1 2019-10-22 14:18:12 +11:00
Tim Steinbach cfe3c89300
sbt-extras: 2019-09-30 -> 2019-10-21 2019-10-21 08:01:13 -04:00
Frederik Rietdijk b6ba25ce95 Merge master into staging-next 2019-10-21 09:55:24 +02:00
R. RyanTM fef4ba0e5a buck: 2019.09.12.01 -> 2019.10.17.01 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/buck/versions
 2019-10-21 09:14:38 +02:00
Frederik Rietdijk ad8bd84fc9 Merge master into staging-next 2019-10-20 16:22:45 +02:00
Marek Mahut 05c771fe46
Merge pull request #69940 from r-ryantm/auto-update/rebar3 
rebar3: 3.11.1 -> 3.12.0
 2019-10-19 18:54:04 +02:00
Frederik Rietdijk 12441bdf9f Merge staging-next into staging 2019-10-16 11:17:12 +02:00
Filipe Regadas f416e8cc5e
sbt: 1.3.2 -> 1.3.3 2019-10-15 10:20:26 +01:00
Florian Klink 0fd1df74be bazel_0_4: remove 
bazel_0_4 fails to build since 2018-04-29, so clearly nobody is using
it.
 2019-10-14 18:33:17 +02:00
Dmitry Kalinkin 5d19c11efe
Merge pull request #70997 from veprbl/pr/cmake_iframework 
cmake: process -iframework in setup-hook
 2019-10-13 07:33:35 -04:00
Dmitry Kalinkin c8041d97a5
cmake: process -iframework in setup-hook 
This fixes a regression in #26197

Fixes: f496357585 ('cc-wrapper: use -iframework instead of -F')
 2019-10-11 18:48:16 -04:00
Andreas Herrmann 1f3187c1b2 bazel: Comment on python versions. 2019-10-11 21:44:28 +02:00
Andreas Herrmann 1987d86007 bazel: shebang-test: Test for all bin/env ... 
Fail on any form of `bin/env ...` shebang.
 2019-10-11 21:44:28 +02:00
Andreas Herrmann f6572b4e64 bazel: patch #!/usr/bin/env bash 
To point to the custom bash instead of `/nix/store.../bin/env bash`.
 2019-10-11 21:44:28 +02:00
Andreas Herrmann d132d47199 bazel: shebang-test: pass bazel dir in Nix 2019-10-11 21:44:28 +02:00
Andreas Herrmann 7429acdea1 bazel: Test that all shebangs are patched correctly 2019-10-11 21:44:28 +02:00
Florian Klink a0380cbfe9 bazel: fix build on macosx 2019-10-11 21:41:23 +02:00
Guillaume Bouchard 7e5b2e74b7 bazel: 0.29 -> 1.0 2019-10-11 21:41:23 +02:00
Tim Steinbach 85abd40bcb
sbt-extras: 2019-08-14 -> 2019-09-30 2019-10-01 17:47:59 -04:00
R. RyanTM b572ff9f09 rebar3: 3.11.1 -> 3.12.0 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/rebar3/versions
 2019-09-28 18:26:32 -07:00
markuskowa d30961c538
Merge pull request #69597 from r-ryantm/auto-update/jam 
jam: 2.6 -> 2.6.1
 2019-09-27 13:52:33 +02:00
Jörg Thalheim 7ec88c7b5d
sbt: 1.2.8 -> 1.3.2 (#69327) 
sbt: 1.2.8 -> 1.3.2
 2019-09-27 09:57:26 +01:00
R. RyanTM 6034acabd1 jam: 2.6 -> 2.6.1 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jam/versions
 2019-09-26 15:14:19 -07:00
Filipe Regadas 4e990b2ff5
fixup! Updated list of urls 2019-09-26 23:14:10 +01:00
R. RyanTM 7c93929d3d buck: 2019.06.17.01 -> 2019.09.12.01 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/buck/versions
 2019-09-26 04:32:44 -07:00
Filipe Regadas cf72659ca0
fixup! Updated list of urls 2019-09-25 20:08:50 +01:00
Filipe Regadas 5cd72ae5c4
Updated list of urls 2019-09-25 10:50:02 +01:00
Christine Koppelt e3dc1865d4 maven: 3.6.1 -> 3.6.2 2019-09-25 09:26:53 +02:00
Filipe Regadas fbd3e7b9e5
Update sbt to 1.3.2 2019-09-23 22:22:55 +01:00
Jörg Thalheim d217fce304
bazel-buildtools: 0.28.0 -> 0.29.0 (#68475) 
bazel-buildtools: 0.28.0 -> 0.29.0
 2019-09-22 14:45:17 +01:00
Pierre Bourdon ad4b97a233
redo-apenwarr: fix source URL 2019-09-20 22:31:08 +02:00
Vladimír Čunát c860babfe6
redo-apenwarr: fixup a hard evaluation error on Darwin 2019-09-15 13:17:37 +02:00
Robin Gloster ec64d881cb
Merge pull request #65457 from ck3d/redo-0.42 
redo-apenwarr: update to release 0.42 and added docs and checks
 2019-09-13 17:28:26 +02:00
Christian Kögler 9b7e7e726e redo-apenwarr: update to release 0.42 and added docs and checks 2019-09-13 15:43:50 +02:00
Uri Baghin b8ab4451b5 bazel-buildtools: 0.28.0 -> 0.29.0 2019-09-11 15:17:07 +10:00
Frederik Rietdijk e3f25191c4 Merge staging-next into staging 2019-09-09 08:11:34 +02:00
Frederik Rietdijk 731c82a447
Merge pull request #68244 from NixOS/staging-next 
Staging next that includes gcc8
 2019-09-09 08:09:36 +02:00
volth 7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Marek Mahut 8977ae2d90
Merge pull request #68254 from scalavision/mill-update-0.5.1 
mill: 0.5.0->0.5.1
 2019-09-08 21:34:52 +02:00
Frederik Rietdijk 9894a70299 Merge staging into staging-next 2019-09-06 22:47:40 +02:00
Frederik Rietdijk 66bc7fc1b3 Merge master into staging-next 2019-09-06 22:46:05 +02:00