Commit Graph

6396 Commits

Author SHA1 Message Date
leo60228 f97a152d44 idevicerestore: 2019-02-14 -> 2019-12-26 2020-01-26 16:37:18 -05:00
Maximilian Bosch 5e9d926fa3
termtosvg: 1.0.0 -> 1.1.0 2020-01-26 19:33:26 +01:00
Mario Rodas 8d44794961
Merge pull request #78550 from r-ryantm/auto-update/z-lua
z-lua: 1.7.3 -> 1.7.4
2020-01-26 10:13:02 -05:00
R. RyanTM 2b11759d89 z-lua: 1.7.3 -> 1.7.4 2020-01-26 14:12:28 +00:00
zimbatm 61c9405d4c
direnv: 2.21.0 -> 2.21.1 2020-01-26 14:23:32 +01:00
Austin Seipp 20bbe6cba6
vector: 0.6.0 -> 0.7.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2020-01-25 15:35:25 -06:00
zimbatm 55250aae72
direnv: 2.20.1 -> 2.21.0 2020-01-25 16:09:45 +01:00
Niklas Hambüchen f56ca2599d
Merge pull request #78433 from arcnmx/pr-ytdl-update
youtube-dl: 2020.01.15 -> 2020.01.24
2020-01-25 04:03:06 +01:00
Mario Rodas 4dbdc31330
Merge pull request #78262 from r-ryantm/auto-update/plantuml
plantuml: 1.2019.13 -> 1.2020.0
2020-01-24 18:37:59 -05:00
Alyssa Ross 5e4c494636 execline: wrap unconditionally; strip
I don't think there's any situation in which an unwrapped execlineb is
useful -- if you want to use different versions of the execlineb tool
it'll still prefer ones in PATH.  At the same time, implementing the
wrapper in this way, as a series of two derivations, meant that we
didn't get stdenv goodness for the wrapper.  This meant that, for
example, the wrapper was not stripped, and so execline ended up with
runtime dependencies on gcc and the Linux headers.  I don't want to
have to reimplement this sort of stuff when it's already in stdenv,
and so it makes much more sense to create the wrapper in the
mkDerivation call, where all of stdenv's normal magic will find it.
2020-01-24 21:04:32 +01:00
arcnmx e0e2fd849a youtube-dl: 2020.01.15 -> 2020.01.24 2020-01-24 11:32:19 -08:00
Mario Rodas c4b458fa53 mutagen: 0.10.2 -> 0.10.3
Changelog: https://github.com/mutagen-io/mutagen/releases/tag/v0.10.3
2020-01-24 02:05:08 -08:00
Maximilian Bosch eddfcc32b4
Merge branch 'staging' into glibc230 2020-01-23 11:31:13 +01:00
Mario Rodas dfaae48381
broot: 0.11.9 -> 0.12.0 2020-01-23 04:20:00 -05:00
Peter Hoeg e527dc62d7 mc: /bin/rm does not exist 2020-01-23 17:08:35 +08:00
Maximilian Bosch 9646fafc5d
expect: remove hack for aarch64 build
Not sure if I missed something or the issue got fixed later, but it's
not needed anymore to pass a `--build` flag to the configure script on
aarch64.

The autoreconfHooks are still needed for expect and bzip2.
2020-01-23 00:21:21 +01:00
Rakesh Gupta f82528a92b updated version to 1.20.1 2020-01-22 17:46:42 +01:00
Patrick Hilhorst 593e11fd94
treewide: fix redirected urls
According to https://repology.org/repository/nix_unstable/problems, we have a
lot of packages that have http links that redirect to https as their homepage.
This commit updates all these packages to use the https links as their
homepage.

The following script was used to make these updates:

```

curl https://repology.org/api/v1/repository/nix_unstable/problems \
    | jq '.[] | .problem' -r \
    | rg 'Homepage link "(.+)" is a permanent redirect to "(.+)" and should be updated' --replace 's@$1@$2@' \
    | sort | uniq > script.sed

find -name '*.nix' | xargs -P4 -- sed -f script.sed -i
```
2020-01-22 11:26:22 +01:00
R. RyanTM c9c3b9d602 plantuml: 1.2019.13 -> 1.2020.0 2020-01-22 10:15:38 +00:00
Mario Rodas 9613cc8104
Merge pull request #78230 from r-ryantm/auto-update/mcfly
mcfly: 0.3.1 -> 0.3.6
2020-01-22 05:04:30 -05:00
zimbatm 546fe02875
h: init at 1.0.0 (#78017)
Co-Authored-By: Jon <jonringer@users.noreply.github.com>
2020-01-22 09:49:54 +00:00
Mario Rodas a06cbffd16
mcfly: enable on darwin 2020-01-21 23:00:00 -05:00
R. RyanTM 10b05a9b77
mcfly: 0.3.1 -> 0.3.6 2020-01-21 23:05:22 -05:00
Mario Rodas 8500d560a4
Merge pull request #76367 from r-ryantm/auto-update/pspg
pspg: 2.6.0 -> 2.6.4
2020-01-21 20:01:54 -05:00
Mario Rodas 9e6868b782
Merge pull request #78071 from r-ryantm/auto-update/diffoscope
diffoscope: 133 -> 135
2020-01-21 18:30:26 -05:00
Mario Rodas e4ba0822a5
Merge pull request #78064 from marsam/init-mutagen
mutagen: init at 0.10.2
2020-01-21 18:27:37 -05:00
Mario Rodas 8af54fcfae
pspg: enable on darwin 2020-01-21 04:20:00 -05:00
Mario Rodas 64699cadea
pspg: 2.6.4 -> 2.6.6 2020-01-21 04:20:00 -05:00
lewo 5c50fe54a6
Merge pull request #78114 from cust0dian/tmuxinator-1.1.4
tmuxinator: 1.1.0 -> 1.1.4
2020-01-21 08:40:33 +01:00
Michael Weiss 4a7f07e2b9
html-proofer: 3.15.0 -> 3.15.1 2020-01-20 21:50:19 +01:00
Serg Nesterov d1e502ba7e
tmuxinator: 1.1.0 -> 1.1.4 2020-01-20 19:59:53 +03:00
Mario Rodas 7c2a51cdf1 du-dust: 0.4.2 -> 0.4.4 2020-01-20 16:06:37 +01:00
Noah Loomans 79cf2c25fb hakuneko: 5.0.8 -> 6.1.7 2020-01-20 15:40:50 +01:00
Maximilian Bosch d06b5daac1
Merge pull request #78086 from r-ryantm/auto-update/graylog
graylog: 3.1.3 -> 3.1.4
2020-01-20 13:53:18 +01:00
R. RyanTM 0928c40c29 graylog: 3.1.3 -> 3.1.4 2020-01-20 08:51:55 +00:00
R. RyanTM cc1bed5919 diffoscope: 133 -> 135 2020-01-20 03:48:35 +00:00
Mario Rodas 5b55493939
Merge pull request #77895 from r-ryantm/auto-update/pipreqs
pipreqs: 0.4.9 -> 0.4.10
2020-01-19 08:43:11 -05:00
Mario Rodas ee3458392b
Merge pull request #77916 from r-ryantm/auto-update/wakatime
wakatime: 13.0.2 -> 13.0.3
2020-01-17 17:06:18 -05:00
worldofpeace d165c28984
Merge pull request #77923 from Synthetica9/version-formats
various: fix version formatting
2020-01-17 14:04:19 -05:00
worldofpeace a1628d9805
Merge pull request #77811 from jluttine/fix-yle-dl-setuptools
yle-dl: add setuptools dependency
2020-01-17 13:43:07 -05:00
Frederik Rietdijk bcd8c6b8dc Merge master into staging-next 2020-01-17 17:08:16 +01:00
Will Dietz f0ce34634a
Merge pull request #77862 from dtzWill/update/broot-0.11.9
broot: 0.11.8 -> 0.11.9, verifyCargoDeps
2020-01-17 09:34:38 -06:00
R. RyanTM 9584607d52 wakatime: 13.0.2 -> 13.0.3 2020-01-17 12:23:54 +00:00
Marek Mahut e62408bbff
Merge pull request #77873 from r-ryantm/auto-update/fsmon
fsmon: 1.5 -> 1.6.1
2020-01-17 10:55:28 +01:00
R. RyanTM 702dd2573b pipreqs: 0.4.9 -> 0.4.10 2020-01-17 09:52:29 +00:00
R. RyanTM 9d35bc0cdf fsmon: 1.5 -> 1.6.1 2020-01-17 06:01:30 +00:00
Will Dietz afdfd68afa
lcdf-typetools: init at 2.108 2020-01-16 22:44:30 -06:00
Will Dietz 567655c200
broot: 0.11.8 -> 0.11.9, verifyCargoDeps
https://github.com/Canop/broot/releases/tag/v0.11.9
2020-01-16 22:38:12 -06:00
Wael Nasreddine 2628f20267
topgrade: fix, add darwin Foundation framework (#77700)
topgrade: fix, add darwin Foundation framework
2020-01-16 18:25:16 -08:00
Will Dietz 81aafb22ff
Merge pull request #77697 from dtzWill/fix/pfetch-minor-dontbuild-touchup
pfetch: dontbuild -> dontBuild, installPhase touchup, stdenvNoCC
2020-01-16 17:43:47 -06:00
Will Dietz e2cf972dd9 vmtouch: 1.3.0 -> 1.3.1
Also fixup pname/name, and drop '-git-' in the middle of the two.
(missed when moving off git revisions)
2020-01-16 21:38:47 +00:00
Patrick Hilhorst f8eb39bc3b
mcfly: correctly format version 2020-01-16 20:33:13 +01:00
Hugo Reeves 212e7ea2f1
topgrade: add maintainer, hugoreeves 2020-01-17 07:08:43 +13:00
Hugo Reeves 8bef4113ce
topgrade: fix, add darwin Foundation framework 2020-01-17 07:07:29 +13:00
Renaud 404d9529e1 jdupes: 1.13.2 -> 1.14.0 2020-01-16 16:55:50 +00:00
Will Dietz 6daba66152 txr: 230 -> 231
Drop header fixup, release notes indicate this was fixed.
2020-01-16 16:54:04 +00:00
Mario Rodas a2f1215b2b
Merge pull request #77809 from davidtwco/starship-0.33.1
starship: 0.33.0 -> 0.33.1
2020-01-16 08:03:44 -05:00
Bjørn Forsman acca4bcbe5
Merge pull request #77775 from dtzWill/fix/fpart-musl-fts
fpart: fts (fix w/musl)
2020-01-16 13:15:03 +01:00
Jaakko Luttinen 080da6a65f
yle-dl: add setuptools dependency
yle-dl was failing with the following error:

  ImportError: No module named pkg_resources

Adding setuptools to propagatedBuildInputs fixes this issue.
2020-01-16 13:09:01 +02:00
David Wood ab648a8955
starship: 0.33.0 -> 0.33.1 2020-01-16 10:09:44 +00:00
Maximilian Bosch d5e9b7d5a7
Merge pull request #77713 from xrelkd/update/youtube-dl
youtube-dl: 2019.12.25 -> 2020.01.15
2020-01-16 03:59:00 +01:00
Mario Rodas 588e1c61cb
Merge pull request #77717 from marsam/update-fluent-bit
fluent-bit: 1.3.5 -> 1.3.6
2020-01-15 20:00:10 -05:00
Mario Rodas 6d24724adc
Merge pull request #77728 from dywedir/skim
skim: 0.6.9 -> 0.7.0
2020-01-15 19:30:00 -05:00
Silvan Mosberger fbbe3f9b7e
Merge pull request #75172 from ivan/libimobiledevice-bump
libimobiledevice: 2019-04-04 -> 2019-11-29, usbmuxd: 2019-03-05 -> 2019-11-11
2020-01-15 18:31:41 +01:00
Will Dietz 5c4bebfd66
fpart: fts (fix w/musl) 2020-01-15 11:12:42 -06:00
R. RyanTM 4851555ea0 fpart: 1.1.0 -> 1.2.0 2020-01-15 17:19:39 +01:00
Oleksii Filonenko 611b8ca7d2
pg_flame: 1.1 -> 1.2 2020-01-15 12:10:50 +02:00
Bastian Köcher 320a4c1526 coreutils: Fix cross compilation for Android 2020-01-15 09:44:10 +01:00
Will Dietz 61f12eb907 ethtool: 5.3 -> 5.4 2020-01-15 09:26:10 +01:00
Frederik Rietdijk 2a88c3c302 Merge staging-next into staging 2020-01-15 09:23:28 +01:00
Vladyslav M 3c6a559406
skim: 0.6.9 -> 0.7.0 2020-01-15 08:51:32 +02:00
Mario Rodas dd7b9846a7
fluent-bit: 1.3.5 -> 1.3.6 2020-01-14 22:22:22 -05:00
xrelkd 2f6687d02e youtube-dl: 2019.12.25 -> 2020.01.15 2020-01-15 09:56:18 +08:00
Matthieu Coudron ece829033b
Merge pull request #77666 from LnL7/darwin-diffoscope
diffoscope: enable on darwin
2020-01-14 22:08:42 +01:00
Will Dietz 1ff48dce3a
pfetch: use stdenvNoCC for smaller build-time closure 2020-01-14 14:27:23 -06:00
Will Dietz 8e48bafca1
pfetch: fix 'dontbuild' attribute (-> "dontBuild"), touchup installPhase 2020-01-14 14:18:04 -06:00
Daiderd Jordan ef09cebc96
diffoscope: enable on darwin 2020-01-14 10:56:52 +01:00
Maximilian Bosch 2476d6deca expect: fix aarch64 build 2020-01-14 08:52:25 +00:00
Markus Kowalewski e664a142bf
snapper: 0.8.7 -> 8.8.8 2020-01-13 22:42:56 +01:00
Noah Loomans 60d72d12de hakuneko: 1.4.2 -> 5.0.8
HakuNeko switched to electron. Since this is the latest release the
broken status can be dropped. The original maintainer (Ruben Astudillo)
dropped support for the package so I decided to pick it up.

I based this on the simplenote package, and implemented the setuid fix
from the slack package.

Closes #45332
2020-01-13 20:11:53 +01:00
Evan Stoll ba820a4f77 broot: 0.10.2 -> 0.11.8 2020-01-12 16:10:42 -05:00
Evan Stoll 68a5f9f073 broot: install newly-added shell completions
- add installShellFiles dependency
2020-01-12 16:09:55 -05:00
Evan Stoll 22674e9b43 broot: fix hardlinks during postPatch phase
- add coreutils dependency
2020-01-12 15:55:56 -05:00
Frederik Rietdijk b3245241d8 Merge staging-next into staging 2020-01-12 09:47:43 +01:00
Niklas Hambüchen 2ddf7c0a6f
Merge pull request #77096 from raboof/ms-sys-reproducibility
ms-sys: avoid leaking the build timestamp into the manpage
2020-01-12 04:55:51 +01:00
Arnout Engelen b0ec8d6d2a ms-sys: avoid the build timestamp from leaking into the manpage
Also proposed upstream as https://sourceforge.net/p/ms-sys/patches/8/
2020-01-12 04:52:34 +01:00
Florian Klink f5f06128b4 mongodb-tools: use default openssl
https://github.com/NixOS/nixpkgs/issues/77503
2020-01-11 13:01:21 -08:00
jD91mZM2 884cbc5d5d powerline-rs: 0.1.9 -> 0.2.0
Now *finally* uses crate2nix because it's awesome!

----------------

Squashed with:

Apply suggestions from code review

Co-Authored-By: Jon <jonringer@users.noreply.github.com>
2020-01-11 02:53:25 -08:00
Frederik Rietdijk 263bc67bda Merge staging-next into staging 2020-01-11 09:33:08 +01:00
Ryan Mulligan 25e45c77dd
Merge pull request #76236 from r-ryantm/auto-update/calamares
calamares: 3.2.16 -> 3.2.17.1
2020-01-10 06:07:21 -08:00
Florian Klink fe414f371f
Merge pull request #77380 from curiousleo/lorri-unstable-2020-01-09
lorri: unstable-2019-10-30 -> unstable-2020-01-09
2020-01-10 11:45:22 +01:00
Leonhard Markert c976dc165b lorri: unstable-2019-10-30 -> unstable-2020-01-09
`rustfmt` is now a compile time dependency because the varlink generated
code is formatted with it.
2020-01-10 11:26:38 +01:00
markuskowa 4c1e1bba84
Merge pull request #77085 from r-ryantm/auto-update/geekbench
geekbench: 5.0.4 -> 5.1.0
2020-01-09 21:57:41 +01:00
Doron Behar d9935b1f71
Add checkPhase
Co-Authored-By: Jon <jonringer@users.noreply.github.com>
2020-01-09 17:29:59 +02:00
Mario Rodas b8f7bb5c16
Merge pull request #76366 from r-ryantm/auto-update/phoronix-test-suite
phoronix-test-suite: 9.2.0 -> 9.2.1
2020-01-09 05:49:02 -05:00
Mario Rodas 3769f88a2a
Merge pull request #76352 from r-ryantm/auto-update/osm2pgsql
osm2pgsql: 1.2.0 -> 1.2.1
2020-01-09 05:37:55 -05:00
Jaka Hudoklin 139daee494
Merge pull request #77073 from plumelo/auto-update/elasticsearch
elk stack: 7.3.1 -> 7.5.1
2020-01-09 09:48:24 +00:00
markuskowa 2d277c933d
Merge pull request #77075 from r-ryantm/auto-update/hdf5
hdf5: 1.10.5 -> 1.10.6
2020-01-08 21:44:24 +01:00
Doron Behar 052c103725 brotab: init at 1.1.0 2020-01-08 14:22:59 +02:00
Mario Rodas 77a6737b7a
Merge pull request #77250 from filalex77/topgrade-3.7.0
topgrade: 3.6.0 -> 3.7.1
2020-01-08 06:19:02 -05:00
Mario Rodas dcdde33302
Merge pull request #77172 from r-ryantm/auto-update/parallel
parallel: 20191122 -> 20191222
2020-01-08 05:25:02 -05:00
Oleksii Filonenko cbdffb082a
topgrade: 3.7.0 -> 3.7.1 2020-01-08 10:50:17 +02:00
Mario Rodas 992ef89f9a
Merge pull request #77207 from jD91mZM2/termplay
termplay: 2.0.4 -> 2.0.6
2020-01-07 21:06:38 -05:00
Oleksii Filonenko 94ff938c33 fselect: 0.6.7 -> 0.6.8 2020-01-07 20:43:35 +01:00
Oleksii Filonenko 1275f939d2
topgrade: 3.6.0 -> 3.7.0 2020-01-07 20:05:18 +02:00
jD91mZM2 089c734c38
termplay: 2.0.4 -> 2.0.6 2020-01-07 18:34:07 +01:00
Mario Rodas f7c7317e64
Merge pull request #77115 from bbigras/starship
starship: 0.32.2 -> 0.33.0
2020-01-07 07:03:41 -05:00
Michael Weiss e1eedf29e5
wob: 0.5 -> 0.6 2020-01-07 12:32:18 +01:00
markuskowa 9a805e9b4f
Merge pull request #76941 from Pamplemousse/bash_unit
bash_unit: init at 1.6.1
2020-01-07 09:31:53 +01:00
R. RyanTM f829159932 parallel: 20191122 -> 20191222 2020-01-06 20:04:50 -08:00
Pamplemousse 34441168b3 bash_unit: init at 1.6.1 2020-01-06 11:35:24 -07:00
Bruno Bigras c96aec2b26 starship: 0.32.2 -> 0.33.0 2020-01-06 13:27:44 -05:00
R. RyanTM cbd8c276b9 geekbench: 5.0.4 -> 5.1.0 2020-01-06 06:43:36 -08:00
R. RyanTM 7f8fb20f57 hdf5: 1.10.5 -> 1.10.6 2020-01-06 05:59:41 -08:00
vasile luta f8a9d48d7d logstash7: 7.3.1 -> 7.5.1 2020-01-06 15:22:28 +02:00
Mario Rodas a3579637bc
Merge pull request #75883 from filalex77/neo-cowsay-1.0.0
neo-cowsay: init at 1.0.0
2020-01-06 08:13:33 -05:00
adisbladis 87592031a3
Merge pull request #77029 from r-ryantm/auto-update/entr
entr: 4.3 -> 4.4
2020-01-06 11:27:21 +00:00
Mario Rodas e443d946bf
Merge pull request #77022 from r-ryantm/auto-update/chezmoi
chezmoi: 1.7.9 -> 1.7.10
2020-01-06 05:31:24 -05:00
Frederik Rietdijk 17ab5f9d88 Merge master into staging-next 2020-01-06 10:38:20 +01:00
R. RyanTM 2aff2262e0 entr: 4.3 -> 4.4 2020-01-06 01:32:56 -08:00
R. RyanTM 9ce10a177c chezmoi: 1.7.9 -> 1.7.10 2020-01-06 00:45:44 -08:00
markuskowa 7ee6c6ad6d
Merge pull request #76948 from marsam/fix-heimdall-darwin
heimdall: fix build on darwin
2020-01-05 16:23:07 +01:00
Frederik Rietdijk 828f93a326 Merge master into staging-next 2020-01-05 16:00:21 +01:00
Mario Rodas cb53d49559
onefetch: 2.1.0 -> 2.2.0
Changelog: https://github.com/o2sh/onefetch/releases/tag/v2.2.0
2020-01-04 14:00:00 -05:00
Léo Gaspard 8440abe7e6
Merge pull request #60262 from kierdavis/ckb-next-0.4.0
ckb-next: 0.3.2 -> 0.4.2
2020-01-05 02:27:22 +01:00
Ryan Mulligan ceb515d438
Merge pull request #60390 from monsieurp/new-tmux-panes
tmux-xpanes: init at 4.1.0
2020-01-04 07:47:09 -08:00
midchildan bc213d09e2
fzf: fix unstable vim plugin path
exclude version number from vim plugin path
2020-01-04 23:37:06 +09:00
Mario Rodas a18e65f6a8
heimdall: fix build on darwin 2020-01-04 04:20:00 -05:00
jakobrs 4de6c4dac7 os-prober: add missing dmraid dependency
If this is not done, dmraid is likely to not find OSes on RAID.
2020-01-03 07:31:43 +01:00
Kier Davis 7fb2103196
ckb-next: 0.3.2 -> 0.4.2 2020-01-02 22:53:32 +00:00
jakobrs f5728ad5e7 os-prober: add missing lvm2 dependency
Otherwise, os-prober may fail to see LVM partitions.
2020-01-02 22:04:35 +01:00
Frederik Rietdijk 62bfa88763 Merge staging-next into staging 2020-01-02 21:41:48 +01:00
Frederik Rietdijk f08e3e38d4 Merge master into staging-next 2020-01-02 21:41:13 +01:00
Mario Rodas 184d0e7018
mutagen: init at 0.10.2 2020-01-01 04:20:00 -05:00
Will Dietz 2dd40bf158
txr: add include to fix w/musl 2020-01-01 01:56:00 -06:00
Will Dietz 68d725d0fd
txr: 225 -> 230 2020-01-01 01:55:49 -06:00
R. RyanTM c93355bb4a man: 2.8.7 -> 2.9.0 2019-12-31 09:30:06 +01:00
zowoq 25fb1a02a3 file: 5.37 -> 5.38 2019-12-31 09:27:18 +01:00
Jan Tojnar 0c2adc0fb1
Merge branch 'staging' into staging-next 2019-12-31 03:59:58 +01:00
Robin Gloster 006242fd5a
treewide: fix types for mkDerivation params 2019-12-31 01:23:19 +01:00
Robin Gloster 755db0b689
treewide: installTargets is a list 2019-12-31 00:25:26 +01:00
Robin Gloster 313da176d3
treewide: NIX_*_FLAGS -> string 2019-12-31 00:16:46 +01:00
Robin Gloster f9f46dc327
treewide: NIX_*_FLAGS -> string 2019-12-31 00:15:46 +01:00
Robin Gloster 981ae25113
treewide: NIX_*_COMPILE -> string 2019-12-31 00:07:21 +01:00
Robin Gloster e5ded57aab
treewide: NIX_CFLAGS_COMPILE -> string 2019-12-31 00:05:53 +01:00
Jonathan Ringer 446fec8c2d
Merge branch 'master' of github.com:NixOS/nixpkgs into staging-next 2019-12-30 10:14:18 -08:00
Oleksii Filonenko 31fffc6a69 topgrade: 3.5.0 -> 3.6.0 2019-12-30 09:02:45 -08:00
Jonathan Ringer 128d6068cb pythonPackages.bonfire: mark broken
arrow package now only allows for time attributes
to be in the singular form (minute vs minutes).
bonfire also does not seem to be actively maintained
2019-12-30 16:46:51 +01:00
Frederik Rietdijk 6d059becd3 Merge gcc-9 into staging (#68029) 2019-12-30 16:38:38 +01:00
Frederik Rietdijk bfa5af85b7 Merge staging-next into staging 2019-12-30 16:25:56 +01:00