Commit Graph

31447 Commits

Author SHA1 Message Date
Sandro
dbb7804073
Merge pull request #109736 from ymarkus/rpi-imager
rpi-imager: init at 1.5
2021-01-19 16:32:24 +01:00
Thiago Kenji Okada
98873022d4 opentabletdriver: improve update.sh script
Allow it to update deb package sha256 automatically.
2021-01-19 11:41:17 -03:00
R. RyanTM
8605813232 kcollectd: 0.11.99.0 -> 0.12.0 2021-01-19 14:33:36 +00:00
Sandro
28ba03ae72
Merge pull request #109912 from fabaff/bump-gandi
gandi-cli: 1.5 -> 1.6
2021-01-19 15:16:54 +01:00
Sandro
f920653ba0
Merge pull request #109905 from r-ryantm/auto-update/angle-grinder 2021-01-19 15:01:05 +01:00
Sandro
a68cdb525e
Merge pull request #109888 from zakame/updates/bpytop-1.0.59
bpytop: 1.0.50 -> 1.0.59
2021-01-19 14:47:37 +01:00
Sandro
ec3c0d8360
Merge pull request #109865 from r-ryantm/auto-update/igmpproxy
igmpproxy: 0.2.1 -> 0.3
2021-01-19 14:42:18 +01:00
Sandro
abcd2c1cda
Merge pull request #109858 from r-ryantm/auto-update/hebcal
hebcal: 4.22 -> 4.24
2021-01-19 14:38:01 +01:00
Yannick Markus
956f1a8e71
rpi-imager: init at 1.5 2021-01-19 14:35:45 +01:00
Sandro
a0e6e14c44
Merge pull request #109091 from fabaff/enum
enum4linux-ng: init at 1.0.0
2021-01-19 14:16:43 +01:00
José Romildo Malaquias
6bc77f6fd4
Merge pull request #109900 from r-ryantm/auto-update/blueberry
blueberry: 1.4.0 -> 1.4.2
2021-01-19 10:13:12 -03:00
Sandro
7de82fbe61
Merge pull request #94097 from svend/dual-function-keys 2021-01-19 13:41:19 +01:00
Mario Rodas
31df8e4353
Merge pull request #109933 from r-ryantm/auto-update/cargo-release
cargo-release: 0.13.8 -> 0.13.10
2021-01-19 06:53:19 -05:00
Mario Rodas
93171dde69
Merge pull request #109886 from r-ryantm/auto-update/2fa
go-2fa: 1.1.0 -> 1.2.0
2021-01-19 06:41:22 -05:00
Mario Rodas
6725a72a3c
Merge pull request #109936 from r-ryantm/auto-update/eksctl
eksctl: 0.35.0 -> 0.36.0
2021-01-19 06:39:35 -05:00
Sandro
6898046c31
Merge pull request #109667 from fabaff/censys 2021-01-19 12:32:45 +01:00
Potato Hatsue
a6123808cc
fcitx5-with-addons: remove unnecessary qtbase from buildInputs 2021-01-19 19:30:04 +08:00
Potato Hatsue
9e58c856a0
fcitx5-with-addons: symlink .desktop to autostart
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-01-19 19:30:04 +08:00
Potato Hatsue
61615cc4ea
fcitx5-with-addons: patch .desktop files 2021-01-19 19:30:04 +08:00
Potato Hatsue
9509da46e7
fcitx5-qt: fix missing libfcitx5platforminputcontextplugin.so 2021-01-19 19:30:03 +08:00
R. RyanTM
a196b0c291 diffstat: 1.63 -> 1.64 2021-01-19 11:24:55 +00:00
Sandro
1b3176b659
Merge pull request #107054 from SFrijters/xdg-utils-unstable
xdg_utils: 1.1.3 -> unstable-2020-10-21
2021-01-19 12:07:19 +01:00
Sandro
aef7b0b560
Merge pull request #109851 from r-ryantm/auto-update/govc
govc: 0.23.1 -> 0.24.0
2021-01-19 11:58:30 +01:00
Sandro
8f27bfc66f
Merge pull request #109852 from fabaff/sshchecker
sshchecker: init at 1.0
2021-01-19 11:58:14 +01:00
R. RyanTM
1771e8810e dpic: 2020.09.15 -> 2021.01.01 2021-01-19 10:44:27 +00:00
R. RyanTM
3d4bd8b8c5 eksctl: 0.35.0 -> 0.36.0 2021-01-19 10:40:19 +00:00
R. RyanTM
c37e8d19e3 cargo-release: 0.13.8 -> 0.13.10 2021-01-19 10:21:47 +00:00
Sandro
a9d9130b7d
Merge pull request #109854 from r-ryantm/auto-update/grpcurl
grpcurl: 1.7.0 -> 1.8.0
2021-01-19 11:20:42 +01:00
R. RyanTM
1510391b92 chkrootkit: 0.53 -> 0.54 2021-01-19 09:23:00 +00:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
R. RyanTM
f020af824d bup: 0.31 -> 0.32 2021-01-19 08:25:00 +00:00
Fabian Affolter
2f9d71e05c gandi-cli: 1.5 -> 1.6 2021-01-19 08:11:04 +01:00
R. RyanTM
1b0e552fad angle-grinder: 0.15.0 -> 0.16 2021-01-19 06:35:38 +00:00
R. RyanTM
1e2cd67fe9 blueberry: 1.4.0 -> 1.4.2 2021-01-19 05:45:26 +00:00
Svend Sorensen
ea7e4b3486
Apply suggestions from code review
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-01-18 19:30:22 -08:00
Zak B. Elep
cbff1ad157 bpytop: 1.0.50 -> 1.0.59 2021-01-19 11:18:23 +08:00
Mario Rodas
cf07f8d15d
Merge pull request #109668 from marsam/update-mcfly
mcfly: 0.5.2 -> 0.5.3
2021-01-18 22:06:08 -05:00
R. RyanTM
a27f0df8dc go-2fa: 1.1.0 -> 1.2.0 2021-01-19 02:57:51 +00:00
Ryan Mulligan
694cadc3c2
Merge pull request #109862 from r-ryantm/auto-update/htop
htop: 3.0.4 -> 3.0.5
2021-01-18 18:23:33 -08:00
Ryan Mulligan
66552e6b3c
Merge pull request #109743 from r-ryantm/auto-update/cassowary
cassowary: 0.11.0 -> 0.12.0
2021-01-18 17:08:44 -08:00
R. RyanTM
a404cf946e ior: 3.2.1 -> 3.3.0 2021-01-19 00:57:49 +00:00
R. RyanTM
83370b5920 igmpproxy: 0.2.1 -> 0.3 2021-01-19 00:39:30 +00:00
R. RyanTM
69a7b210b0 htop: 3.0.4 -> 3.0.5 2021-01-19 00:16:59 +00:00
R. RyanTM
0e1dedba4b hebcal: 4.22 -> 4.24 2021-01-19 00:01:27 +00:00
R. RyanTM
992e993555 grpcurl: 1.7.0 -> 1.8.0 2021-01-18 23:38:47 +00:00
Ryan Mulligan
fa69132803
Merge pull request #109846 from r-ryantm/auto-update/gospider
gospider: 1.1.4 -> 1.1.5
2021-01-18 15:30:23 -08:00
R. RyanTM
a3f323bab7 govc: 0.23.1 -> 0.24.0 2021-01-18 23:24:21 +00:00
Fabian Affolter
f9b4fd0ec5 sshchecker: init at 1.0 2021-01-19 00:19:57 +01:00
R. RyanTM
c8f43281d1 gospider: 1.1.4 -> 1.1.5 2021-01-18 22:53:47 +00:00
R. RyanTM
126463c378 goreleaser: 0.149.0 -> 0.155.0 2021-01-18 22:45:54 +00:00
Oleksii Filonenko
c3016f226a
Merge pull request #109790 from r-ryantm/auto-update/emplace
emplace: 0.3.9 -> 0.4.1
2021-01-19 00:36:39 +02:00
Sandro
55e030a895
Merge pull request #109827 from fabaff/corsmisc 2021-01-18 23:20:38 +01:00
Sandro
4773a2675b
Merge pull request #109820 from fabaff/bypass403
bypass403: init at 1.4.0
2021-01-18 23:20:22 +01:00
Sandro
835e90eb1b
Merge pull request #109828 from r-ryantm/auto-update/gifski
gifski: 1.2.4 -> 1.2.6
2021-01-18 22:58:21 +01:00
Sandro
b68e28e4a7
Merge pull request #109823 from r-ryantm/auto-update/gammy
gammy: 0.9.59 -> 0.9.62
2021-01-18 22:55:44 +01:00
R. RyanTM
1baed4e015 gifski: 1.2.4 -> 1.2.6 2021-01-18 21:16:28 +00:00
Fabian Affolter
fa13bc320a corsmisc: init at 1.3.0 2021-01-18 22:09:15 +01:00
Timo Kaufmann
e8d4683909 home-manager: 2020-09-06 -> 2020-01-16
It has been a while since the last update. This includes some new
features [1] and at least one compatibility fix [2].

[1] 73506f947c/modules/misc/news.nix (L1653)
[2] https://github.com/nix-community/home-manager/pull/1703
2021-01-18 22:05:50 +01:00
R. RyanTM
580dd1b6fb gammy: 0.9.59 -> 0.9.62 2021-01-18 20:57:33 +00:00
Sandro
6dfa72b172
Merge pull request #106910 from freezeboy/change-ssh-ident
ssh-ident: change PATH
2021-01-18 21:38:47 +01:00
Fabian Affolter
30cdf00e36 bypass403: init at 1.4.0 2021-01-18 21:35:01 +01:00
Christian Kampka
f0ec10a829
treewide: remove kampka as maintainer (#109813) 2021-01-18 21:23:49 +01:00
Sandro
4396baf04e
Merge pull request #106876 from antifuchs/fix-mosh-client-path
mosh: Hermeticize mosh-client path reference from mosh.pl
2021-01-18 20:47:11 +01:00
Sandro
3ddcd4144b
Merge pull request #106542 from r-ryantm/auto-update/bitwarden_rs-vault
bitwarden_rs-vault: 2.16.1 -> 2.17.1
2021-01-18 20:13:47 +01:00
Sandro
547956a240
Merge pull request #109803 from r-ryantm/auto-update/findomain
findomain: 2.1.4 -> 2.1.5
2021-01-18 19:02:17 +01:00
freezeboy
3cac3df724 ssh-ident: change PATH
The wrapper is not working anymore, so the ssh-agent is no more shared,
as the script removes the environment PATH variable, I pinned the
ssh-agent binary and removed the wrapper.

Also, as this script doesn't require a compiler, I switched from stdenv
to stdenvNoCC.
2021-01-18 18:33:48 +01:00
R. RyanTM
835e89a4cd findomain: 2.1.4 -> 2.1.5 2021-01-18 17:32:56 +00:00
Sandro
16ed288e28
Merge pull request #109778 from cpcloud/update-pulumi
pulumi-bin: 2.17.0 -> 2.17.2
2021-01-18 18:07:36 +01:00
Sandro
336fa74c2d
Merge pull request #109799 from r-ryantm/auto-update/exoscale-cli
exoscale-cli: 1.22.0 -> 1.22.2
2021-01-18 18:06:58 +01:00
Sandro
0dfe3152b6
Merge pull request #109782 from r-ryantm/auto-update/dua
dua: 2.10.5 -> 2.10.9
2021-01-18 17:44:03 +01:00
Sandro
d3836db370
Merge pull request #109777 from r-ryantm/auto-update/doppler
doppler: 3.19.0 -> 3.21.0
2021-01-18 17:42:08 +01:00
Sandro
1699750907
Merge pull request #109773 from r-ryantm/auto-update/dnscrypt-proxy2
dnscrypt-proxy2: 2.0.44 -> 2.0.45
2021-01-18 17:35:21 +01:00
Sandro
b387000c20
Merge pull request #109774 from r-ryantm/auto-update/dnsproxy
dnsproxy: 0.33.3 -> 0.33.8
2021-01-18 17:35:06 +01:00
Sandro
c3cd24e72d
Merge pull request #109763 from r-ryantm/auto-update/croc
croc: 8.6.6 -> 8.6.7
2021-01-18 17:32:15 +01:00
R. RyanTM
ddc68ebda5 exoscale-cli: 1.22.0 -> 1.22.2 2021-01-18 16:30:20 +00:00
Silvan Mosberger
40762d37a8
Merge pull request #109781 from r-ryantm/auto-update/du-dust
du-dust: 0.5.3 -> 0.5.4
2021-01-18 16:45:23 +01:00
R. RyanTM
f969aa0faa emplace: 0.3.9 -> 0.4.1 2021-01-18 15:44:28 +00:00
Stefan Frijters
e4e6537234
xdg_utils: 1.1.3 -> unstable-2020-10-21
There has not been an official release for a long time, but
new features and fixes are available
2021-01-18 16:22:51 +01:00
R. RyanTM
c514b2dc3c dua: 2.10.5 -> 2.10.9 2021-01-18 15:08:37 +00:00
R. RyanTM
d4fc41099e du-dust: 0.5.3 -> 0.5.4 2021-01-18 15:04:04 +00:00
Phillip Cloud
c42d935fb1 pulumi-bin: 2.17.0 -> 2.17.2 2021-01-18 09:51:36 -05:00
R. RyanTM
35d5f2ebed doppler: 3.19.0 -> 3.21.0 2021-01-18 14:51:06 +00:00
R. RyanTM
eb4bd5c119 dnsproxy: 0.33.3 -> 0.33.8 2021-01-18 14:39:35 +00:00
R. RyanTM
f3c23b78a3 dnscrypt-proxy2: 2.0.44 -> 2.0.45 2021-01-18 14:35:56 +00:00
Tim Steinbach
90b687e110
awscli: 1.18.215 -> 1.18.216 2021-01-18 09:23:58 -05:00
Ryan Mulligan
53624a884d
Merge pull request #109762 from r-ryantm/auto-update/cri-tools
cri-tools: 1.19.0 -> 1.20.0
2021-01-18 06:11:35 -08:00
R. RyanTM
d359c75336 croc: 8.6.6 -> 8.6.7 2021-01-18 13:56:58 +00:00
R. RyanTM
2049796e56 cri-tools: 1.19.0 -> 1.20.0 2021-01-18 13:51:13 +00:00
Sandro
1ab634ebdc
Merge pull request #109749 from r-ryantm/auto-update/chezmoi
chezmoi: 1.8.9 -> 1.8.10
2021-01-18 14:29:19 +01:00
Sandro
886953961e
Merge pull request #109751 from r-ryantm/auto-update/clash
clash: 1.3.0 -> 1.3.5
2021-01-18 14:28:37 +01:00
Sandro
baf9e277a4
Merge pull request #98545 from Flakebi/spirv-cross
spirv-cross: 2020-06-29 -> 2020-09-17
2021-01-18 14:17:15 +01:00
Sandro
43dbe13483
Merge pull request #98464 from mpoquet/i3nator-init-1.2.0
i3nator: init at 1.2.0
2021-01-18 14:15:15 +01:00
R. RyanTM
18be49957e clash: 1.3.0 -> 1.3.5 2021-01-18 13:07:06 +00:00
Sandro
0939b6d2e0
Merge pull request #96536 from SCOTT-HAMILTON/haste-client
haste-client: Init at 0.2.3
2021-01-18 14:04:31 +01:00
R. RyanTM
3f859fcec9 chezmoi: 1.8.9 -> 1.8.10 2021-01-18 12:57:06 +00:00
R. RyanTM
ac98736ee4 cassowary: 0.11.0 -> 0.12.0 2021-01-18 12:09:21 +00:00
Sandro
d636b259d6
Merge pull request #109726 from r-ryantm/auto-update/atomicparsley
atomicparsley: 20200701.154658.b0d6223 -> 20210114.184825.1dbe1be
2021-01-18 12:05:58 +01:00
Sandro
0bddeef882
Merge pull request #109727 from r-ryantm/auto-update/aws-okta
aws-okta: 1.0.8 -> 1.0.11
2021-01-18 11:56:30 +01:00
Sandro
b11e860030
Merge pull request #109728 from r-ryantm/auto-update/awsweeper
awsweeper: 0.10.2 -> 0.11.1
2021-01-18 11:56:14 +01:00
R. RyanTM
8cde8bb11d awsweeper: 0.10.2 -> 0.11.1 2021-01-18 10:34:01 +00:00
R. RyanTM
f7ecd2984b aws-okta: 1.0.8 -> 1.0.11 2021-01-18 10:28:24 +00:00
R. RyanTM
9af9718ccb atomicparsley: 20200701.154658.b0d6223 -> 20210114.184825.1dbe1be 2021-01-18 10:18:33 +00:00
Fabian Affolter
e29d45b44d scilla: init at 20210118-74dd814 2021-01-18 10:12:00 +01:00
Fabian Affolter
9df436f7a0 enum4linux-ng: init at 1.0.0 2021-01-18 09:50:26 +01:00
freezeboy
955e258c05 burpsuite: change derivtion to ease src overriding 2021-01-18 09:12:27 +01:00
Fabian Affolter
0bd552d791 theHarvester: 3.1 -> 3.2.2 2021-01-18 07:49:46 +01:00
github-actions[bot]
ef2abc20bc
Merge master into staging-next 2021-01-18 06:42:35 +00:00
Kai Harries
d27be236f1 nitrokey-app: 1.3.2 -> 1.4.2
The optional argument group was removed because it is no longer used
in the udev-rules that come with the libnitrokey.
2021-01-18 07:36:44 +01:00
zowoq
cd9256a288 gdu: 2.3.0 -> 3.0.0
https://github.com/dundee/gdu/releases/tag/v3.0.0
2021-01-18 13:44:19 +10:00
github-actions[bot]
b7f20dcd02
Merge master into staging-next 2021-01-18 01:16:03 +00:00
Brian Leung
dcfc3b1d22 graph-cli: init at 0.1.7
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-01-17 16:28:57 -08:00
Sandro
4a8e102b4f
Merge pull request #107921 from fabaff/evillimiter
evillimiter: init at 1.5.0
2021-01-18 01:16:39 +01:00
Sandro
3337ef145a
Merge pull request #107912 from fabaff/aiodnsbrute
aiodnsbrute: init at 0.3.2
2021-01-18 01:11:52 +01:00
eropleco
822e677f0a
smartmontools: 7.1 -> 7.2 and devicedb updated to latest (#109566)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-01-18 00:09:10 +01:00
github-actions[bot]
4bdb892722
Merge master into staging-next 2021-01-17 18:50:34 +00:00
Sandro
e53c43bebb
Merge pull request #109567 from dali99/add_metapixel
metapixel: init at 1.0.2
2021-01-17 19:49:11 +01:00
Sandro
d4d7440bcc
Merge pull request #108701 from fabaff/cantoolz 2021-01-17 19:46:21 +01:00
Sandro
9ecaa3ce76
Merge pull request #107227 from vq/add/lxi-tools
lxi-tools: init at 1.21
2021-01-17 19:45:47 +01:00
Jörg Thalheim
1279bf812c
Merge remote-tracking branch 'upstream/master' into HEAD 2021-01-17 18:08:59 +01:00
Ben Siraphob
d6aeae8f90 pkgs/tools: pkgconfig -> pkg-config (2) 2021-01-17 23:27:27 +07:00
Guillaume Girol
979e6e67d3
Merge pull request #96762 from kampka/source-highlight
source-highlight: Skip building docs when cross-compiling
2021-01-17 16:03:35 +00:00
Sandro
4e292b04af
Merge pull request #109632 from siraben/stdenv-lib-2 2021-01-17 16:29:40 +01:00
Sandro
d4682547f8
Merge pull request #109587 from LeSuisse/djvu2pdf-fix-broken-homepage-url
djvu2pdf: fix broken homepage URL
2021-01-17 16:27:09 +01:00
Daniel Olsen
a67d49dfef metapixel: init at 1.0.2 2021-01-17 15:44:27 +01:00
Ben Siraphob
d1852aca3c pkgs/tools, pkgs/applications: [sS]tdenv.*lib -> lib 2021-01-17 20:59:15 +07:00
Sandro
055fa3a647
Merge pull request #109606 from fabaff/bump-amass
amass: 3.10.5 -> 3.11.1
2021-01-17 14:14:43 +01:00
Sandro
17830a521a
Merge pull request #109593 from Wulfsta/psw
psw: 0.1.2 -> 0.2.0
2021-01-17 14:13:49 +01:00
Sandro
73f1ed5f4b
Merge pull request #109610 from raboof/reckon-0.4.4-to-0.6.0
reckon: 0.4.4 -> 0.6.0
2021-01-17 14:12:03 +01:00
Sandro
ff9a7c6dc1
Merge pull request #109549 from LeSuisse/bursuite-2020.12.1
burpsuite: 2020.1 -> 2020.12.1
2021-01-17 13:40:34 +01:00
github-actions[bot]
9541eb734d
Merge master into staging-next 2021-01-17 12:38:49 +00:00
Daniel Nilsson
143091fae6 lxi-tools: init at 1.21
Apply suggestions from code review

Co-authored-by: Ivar <41924494+IvarWithoutBones@users.noreply.github.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-01-17 12:27:36 +01:00
Sandro
4a2481f0c7
Merge pull request #109570 from marsam/update-peco
peco: 0.5.3 -> 0.5.8
2021-01-17 11:53:03 +01:00
Fabian Affolter
a79ef12d0b cantoolz: init at 3.7.0 2021-01-17 11:40:49 +01:00
Thomas Gerbet
7d886df96d djvu2pdf: fix broken homepage URL
Also updated to the appropriate license.
2021-01-17 11:12:52 +01:00
Sandro
e399e5fa8d
Merge pull request #109597 from austinbutler/extrafiles-lib-fix
beats: fix missing lib in extrafiles plugin
2021-01-17 10:27:04 +01:00
Mario Rodas
faed1fc0eb
Merge pull request #109601 from cole-h/age
age: 1.0.0-beta5 -> 1.0.0-beta6
2021-01-17 04:18:38 -05:00
Arnout Engelen
f60ce0313d
reckon: 0.4.4 -> 0.6.0 2021-01-17 10:03:10 +01:00
Fabian Affolter
6db50a0943 amass: 3.10.5 -> 3.11.1 2021-01-17 09:44:04 +01:00
Ben Siraphob
76f93cc731 pkgs/tools: pkgconfig -> pkg-config 2021-01-16 23:49:59 -08:00
Cole Helbling
a018f7c35d
age: 1.0.0-beta5 -> 1.0.0-beta6
https://github.com/FiloSottile/age/compare/v1.0.0-beta5...v1.0.0-beta6
2021-01-16 21:34:23 -08:00
Jan Tojnar
e6f926d910
Merge branch 'master' into staging-next 2021-01-17 05:52:23 +01:00
Mario Rodas
9483d11a4c mcfly: 0.5.2 -> 0.5.3 2021-01-17 04:20:00 +00:00
Mario Rodas
bdbbd013bd psw: enable on darwin 2021-01-17 04:20:00 +00:00
Austin Butler
1e72aa1feb beats: fix missing lib in extrafiles plugin 2021-01-16 19:15:03 -08:00
Wulfsta
727cb67dfb psw: 0.1.2 -> 0.2.0 2021-01-16 19:54:36 -05:00
Michael Weiss
a6d138c7ad
Merge pull request #109405 from primeos/ffmpeg-full-disable-rav1e
ffmpeg-full: disable rav1e by default (in favor of svt-av1)
2021-01-16 20:35:27 +01:00
Mario Rodas
2476f4aa21
Merge pull request #109558 from jojosch/mycli-1.23.2
mycli: 1.23.0 -> 1.23.2
2021-01-16 14:17:24 -05:00
Mario Rodas
b30f0e0ad4
Merge pull request #109524 from dotlambda/routino-3.3.3
routino: 3.3.2 -> 3.3.3
2021-01-16 14:16:38 -05:00
Sandro Jäckel
ea6ae87eed pythonPackages.swaglyrics: Fix dependencies 2021-01-16 10:56:42 -08:00
github-actions[bot]
f46cb85082
Merge master into staging-next 2021-01-16 18:51:05 +00:00