AndersonTorres
12c5cfda1d
libjson-rpc-cpp: 0.7.0 -> 1.3.0
2021-01-10 12:55:25 -03:00
AndersonTorres
bc838c8686
libmicrohttpd: init at 0.9.72
...
Being conservative, I included a new version instead of overwriting.
2021-01-10 12:43:48 -03:00
AndersonTorres
db27acb1c8
argtable: 3.0.1 -> 3.1.5
2021-01-10 12:43:48 -03:00
Michael Weiss
bfb627d78f
gpgme: 1.15.0 -> 1.15.1
2021-01-10 16:16:24 +01:00
Frederik Rietdijk
49f21e06d9
Merge staging-next into staging
2021-01-10 15:51:40 +01:00
Frederik Rietdijk
0c42bb5027
Merge master into staging-next
2021-01-10 15:50:49 +01:00
Matthieu Coudron
9f8b7cb4a8
Merge pull request #104658 from poscat0x04/add-fcitx5
...
Add fcitx5
2021-01-10 15:26:27 +01:00
Sandro Jäckel
445d1ee786
libgda: Fix compiling with mysql
2021-01-10 13:18:42 +01:00
Sandro Jäckel
74a1925972
libgda: Remove removed flag
2021-01-10 13:18:41 +01:00
Sandro
641cbc17b1
Merge pull request #108825 from TredwellGit/openjpeg
...
openjpeg: 2.3.1 -> 2.4.0
2021-01-10 12:08:00 +01:00
Daniël de Kok
677f868774
Revert "sentencepiece: 0.1.94 -> 0.1.95"
...
This reverts commit 24fb219e2c
.
2021-01-10 08:43:04 +01:00
Sandro
425f1533e4
Merge pull request #108882 from tfmoraes/libguestfs_xen
...
libguestfs: remove xen as dependency
2021-01-10 08:07:09 +01:00
github-actions[bot]
0cba5d2226
Merge staging-next into staging
2021-01-10 06:32:15 +00:00
github-actions[bot]
add2d89082
Merge master into staging-next
2021-01-10 06:32:12 +00:00
Poscat
ea1e46a232
libime: Init at 1.0.2
2021-01-10 14:31:04 +08:00
Poscat
f67f57e0f1
xcb-imdkit: Init at 1.0.1
2021-01-10 13:17:57 +08:00
Sandro
5b977aae1f
Merge pull request #108756 from danieldk/sentencepiece-0.1.95
2021-01-10 02:33:38 +01:00
github-actions[bot]
31f01e4bcc
Merge staging-next into staging
2021-01-10 01:03:39 +00:00
github-actions[bot]
433c7b069c
Merge master into staging-next
2021-01-10 01:03:35 +00:00
sternenseemann
eab35e481d
fcft: allow to enable and disable text shaping feature
...
May be interesting to get rid of the HarfBuzz dependency.
2021-01-09 20:55:24 +01:00
Thiago Franco de Moraes
dde3974afd
libguestfs: remove xen as dependency
2021-01-09 16:51:33 -03:00
Michael Weiss
ef125069f4
Merge pull request #108730 from baloo/baloo/libplacebo/path-upsteam-patch
...
libplacebo: use upstreamed patch
2021-01-09 20:12:46 +01:00
Daniël de Kok
d2e4f3c6d9
sentencepiece: move gperftools from nativeBuildInputs to buildInputs
2021-01-09 20:01:45 +01:00
Daniël de Kok
24fb219e2c
sentencepiece: 0.1.94 -> 0.1.95
...
Changelog:
https://github.com/google/sentencepiece/releases/tag/v0.1.95
2021-01-09 20:01:44 +01:00
Michael Weiss
ada4111334
Merge pull request #108004 from colemickens/libxkbcommon
...
libxkbcommon: 0.10.0 -> 1.0.3
2021-01-09 19:57:44 +01:00
Arthur Gautier
95b754cf42
libplacebo: use upstreamed patch
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
2021-01-09 19:47:02 +01:00
github-actions[bot]
34f5c8db0e
Merge staging-next into staging
2021-01-09 18:41:31 +00:00
github-actions[bot]
fcbe48c797
Merge master into staging-next
2021-01-09 18:41:27 +00:00
Michael Weiss
85b23ec5e5
Merge pull request #108155 from primeos/libplacebo
...
libplacebo: 2.72.2 -> 3.104.0
2021-01-09 18:32:28 +01:00
Pavol Rusnak
5468a0563f
Merge pull request #108820 from prusnak/xr-update
...
monado: Add serviceSupport option
2021-01-09 17:58:08 +01:00
Michael Weiss
7d8351f4d7
libplacebo: 2.72.2 -> 3.104.0
2021-01-09 17:56:35 +01:00
Sandro
5ec6c8e718
Merge pull request #108813 from sikmir/osmium
2021-01-09 17:46:26 +01:00
Michael Weiss
236384f0a1
libxkbcommon: 0.10.0 -> 1.0.3
...
Relevant changes:
- Add libxml2 as a required dependency
- Disable libxkbregistry for now (a new but optional library -> install
into a dedicated output when we need it)
- Set the lookup path for system data files to /etc/xkb
- Enable the tests
- Extend the meta attributes and minor code style changes
Co-Authored-By: Cole Mickens <cole.mickens@gmail.com>
2021-01-09 14:28:49 +01:00
Frederik Rietdijk
379ca4ddcf
Merge staging-next into staging
2021-01-09 13:29:53 +01:00
Michael Weiss
8ae8602bf7
Merge branch 'master' into staging-next
...
Manually resolved a conflict in
pkgs/development/libraries/libbladeRF/default.nix.
2021-01-09 12:16:11 +01:00
TredwellGit
9a4e098cc4
glibc: 2.32-24 -> 2.32-25
...
https://sourceware.org/bugzilla/show_bug.cgi?id=24973
2021-01-09 08:48:18 +01:00
Sandro
d1f716c6b4
Merge pull request #108595 from iblech/patch-libbladeRF
...
libbladeRF: unbreak the build
2021-01-09 06:44:46 +01:00
TredwellGit
6769eca5aa
openjpeg: 2.3.1 -> 2.4.0
...
https://github.com/uclouvain/openjpeg/blob/v2.4.0/CHANGELOG.md
Fixes CVE-2020-15389, CVE-2020-27841, CVE-2020-27842, CVE-2020-27843, CVE-2020-27844, and CVE-2020-27845.
2021-01-09 05:41:01 +00:00
Joe Hermaszewski
dff4009b35
libsurvive: add expipiplus1 to maintainers
2021-01-09 00:35:57 +01:00
Nikolay Korotkiy
452115781b
libosmium: 2.15.6 → 2.16.0
2021-01-09 00:51:32 +03:00
github-actions[bot]
f89e74dbcc
Merge master into staging-next
2021-01-08 18:37:56 +00:00
Linus Heckemann
c7e546aea1
Merge pull request #108748 from 3noch/eac/fix-vtk-png-aarch64
...
vtk: use system png on aarch
2021-01-08 17:09:51 +01:00
Elliot Cameron
26dedb8398
vtk: use system png
...
VTK doesn't seem produce png symbols on aarch64. We could probably
figure out how to fix that but we can also just tell it to use the
libpng we already have, which already works on aarch64.
2021-01-08 10:25:37 -05:00
Rob Ashton
0e061a8595
intel-media-driver: Fix runtime issues due to the libX11 dependency
...
X11 is an optional run-time and optional build-time dependency of iHD.
A patchelf is required to join these two worlds together, and a lot of
machines that'll run the intel-media-driver won't have X11 on them, so
make it optional.
Fix #73236 .
Co-Authored-By: Michael Weiss <dev.primeos@gmail.com>
2021-01-08 14:41:31 +01:00
github-actions[bot]
ecebf82121
Merge master into staging-next
2021-01-08 12:29:36 +00:00
Michael Weiss
bdc86af5ec
Merge pull request #108752 from marsam/fix-gpgme-darwin
...
gpgme: fix build on darwin
2021-01-08 12:37:08 +01:00
Gabriel Ebner
5000e5707b
Merge pull request #108717 from Dyazz/libqalculate
...
libqalculate: 3.14.0 -> 3.16.0
2021-01-08 11:23:31 +01:00
Mario Rodas
74c81a64f0
gpgme: fix build on darwin
2021-01-08 04:20:00 +00:00
Jan Tojnar
e6c0c98940
Merge branch 'master' into staging-next
...
zynaddsubfx conflict has been updated to 3.0.1, which conflicted with rewrite after 3.0.5 update on a different branch.
2021-01-08 02:07:34 +01:00
Arthur Gautier
f44ed8abd4
libplacebo: fixup glslang headers path
...
See: https://github.com/NixOS/nixpkgs/issues/108723
Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
2021-01-07 22:27:35 +00:00
Sandro
14121941b1
Merge pull request #108691 from B4dM4n/qmltermwidget-fix
...
qmltermwidget: fix build with gcc10
2021-01-07 22:58:57 +01:00
Mario Rodas
6c6dcf0785
libfprint: fix build
2021-01-07 16:05:00 -05:00
Dyazz
97e59eff83
libqalculate: 3.14.0 -> 3.16.0
2021-01-07 21:45:08 +01:00
Sandro
b5351cad24
Merge pull request #107285 from sternenseemann/libschrift-0.9.1
...
libschrift: init at 0.9.1
2021-01-07 21:37:48 +01:00
Ingo Blechschmidt
101e907d2e
libbladeRF: unbreak the build (closing #108585 )
2021-01-07 21:29:46 +01:00
David Wood
e2945ada13
doctest: 2.4.1 -> 2.4.4
2021-01-07 17:22:34 +00:00
Fabian Möller
d8306e18ea
qmltermwidget: fix build with gcc10
2021-01-07 18:20:34 +01:00
Jan Tojnar
f19eb635b4
Merge branch 'master' into staging-next
...
b04fc593e7
seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
2021-01-07 13:04:31 +01:00
Mario Rodas
4aa45aebe1
Merge pull request #108002 from marsam/update-libvmaf
...
libvmaf: 1.5.3 -> 2.1.0
2021-01-07 05:48:15 -05:00
Sandro
3f132c79ac
Merge pull request #108536 from SuperSandro2000/small-fixes
2021-01-07 10:38:49 +01:00
Pavol Rusnak
4a7d5be0c9
Merge pull request #108468 from prusnak/openhmd
...
openhmd: 0.3.0-rc1-20181218 -> 0.3.0
2021-01-07 10:36:39 +01:00
Sandro Jäckel
00d6056151
flatbuffers: Disable tests temporarily
2021-01-06 23:59:47 +01:00
Mario Rodas
44c443a7a6
Merge pull request #108574 from marsam/fix-aws-c-cal-darwin
...
nix: fix build on darwin
2021-01-06 10:01:21 -05:00
Sandro
fd0c2add78
Merge pull request #108555 from Enzime/remove/maintainer-status
...
treewide: stop maintaining most packages
2021-01-06 11:42:54 +01:00
Sandro
c5d75f4ea9
Merge pull request #108486 from prusnak/librealsense
...
librealsense: 2.40.0 -> 2.41.0
2021-01-06 10:16:50 +01:00
Mario Rodas
05e800dfee
aws-c-io: fix build on darwin
2021-01-06 08:20:00 +00:00
Mario Rodas
4cf06c9f8c
aws-c-cal: fix build on darwin
2021-01-06 08:20:00 +00:00
Michael Hoang
31f9051cf6
treewide: stop maintaining most packages
2021-01-06 17:06:03 +11:00
Orivej Desh
ff3f5bb60c
aws-sdk-cpp: 1.7.90 -> 1.8.113
2021-01-06 06:05:51 +00:00
Orivej Desh
41fee267fd
aws-c-event-stream: 0.1.1 -> 0.2.6
2021-01-06 06:05:51 +00:00
Orivej Desh
d899420b3d
aws-c-io: init at 0.7.0
2021-01-06 06:05:51 +00:00
Orivej Desh
6bb19efc82
aws-c-cal: init at 0.4.5
2021-01-06 06:05:51 +00:00
Orivej Desh
09fdc4553b
s2n: init at 0.10.23
2021-01-06 06:05:50 +00:00
Orivej Desh
b95a9663a0
aws-checksums: 0.1.7 -> 0.1.10
2021-01-06 06:05:50 +00:00
R. RyanTM
3619fa9065
aws-c-common: 0.3.11 -> 0.4.63
...
Closes #103613
2021-01-06 06:05:50 +00:00
Mario Rodas
b60acf29f1
mp4v2: fix build on darwin
2021-01-05 23:02:46 -05:00
Sandro
59c03dc616
Merge pull request #108490 from prusnak/libsurvive
...
libsurvive: init at 0.3
2021-01-06 01:29:11 +01:00
Sandro
acbdd4a2a2
Merge pull request #108415 from rmcgibbo/flatbuffers
...
flatbuffers: unbreak with gcc10
2021-01-05 22:39:49 +01:00
Orivej Desh
ff612c5e56
qt514.qtwebengine: fix build with gcc10
2021-01-05 17:27:41 +00:00
Pavol Rusnak
b3d4984938
libsurvive: init at 0.3
2021-01-05 17:34:19 +01:00
Pavol Rusnak
33170df871
librealsense: 2.40.0 -> 2.41.0
2021-01-05 16:31:35 +01:00
Anderson Torres
0972bbc12d
Merge pull request #108445 from AndersonTorres/updates
...
Misc updates
2021-01-05 11:54:15 -03:00
AndersonTorres
cd3271e5b9
libstrophe: 0.10.0 -> 0.10.1
2021-01-05 09:47:29 -03:00
Pavol Rusnak
586e08cc07
openhmd: 0.3.0-rc1-20181218 -> 0.3.0
2021-01-05 12:10:40 +01:00
Doron Behar
a334367ecd
Merge pull request #107286 from doronbehar/pkg/octave/sundials
2021-01-05 08:26:19 +02:00
John Ericson
4a6916aba3
Merge pull request #108350 from Ericson2314/no-static-overlay
...
treewide: Inline more of the static overlay
2021-01-04 22:30:00 -05:00
Sandro
f53c431645
Merge pull request #108379 from SuperSandro2000/cleanups
2021-01-05 02:19:24 +01:00
Doron Behar
442f1ec54d
sundials: reorder attributes
...
Per
https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/attribute-ordering.md
2021-01-04 23:00:20 +02:00
Doron Behar
12c9f363f4
sundials: Split outputs for examples
2021-01-04 22:59:13 +02:00
Doron Behar
da3f98c5c5
sundials: 5.3.0 -> 5.6.1
...
Update some cmake flags and be more explicit regarding index size.
2021-01-04 22:58:56 +02:00
Frederik Rietdijk
b20838eb4a
Merge staging-next into staging
2021-01-04 20:51:32 +01:00
Robert T. McGibbon
cb0b092f2b
flatbuffers: unbreak with gcc10
2021-01-04 13:42:18 -05:00
Christian Kampka
bb0fa750db
gdbm: 1.18.1 -> 1.19
2021-01-04 18:34:59 +01:00
Dmitry Bogatov
efb7e1b9db
xxHash: fix static build
...
Patch upstream Makefile to not attempt to build dynamic library if host
platform is static only (pkgsStatic).
2021-01-04 18:14:09 +01:00
Sandro
06c9dbcece
Merge pull request #108247 from symphorien/paperwork-next
2021-01-04 16:41:05 +01:00
Anderson Torres
a5c848382c
Merge pull request #108261 from AndersonTorres/updates
...
Misc updates
2021-01-04 10:17:22 -03:00
Sandro Jäckel
9932103ead
ngt: use stdenv.hostPlatform.avxSupport, cleanup
2021-01-04 11:02:15 +01:00
Jonathan Ringer
0137860077
openblas: 0.3.12 -> 0.3.13
2021-01-04 00:22:23 -08:00
AndersonTorres
cdad15e51a
slang: cleanup and minor changes
...
Also, adding myself to maintainers list
2021-01-03 23:16:17 -03:00
github-actions[bot]
581059aed4
Merge staging-next into staging
2021-01-04 00:57:38 +00:00
Bernardo Meurer
d14652cee3
Merge pull request #108317 from flokli/umockdev-0.15.4
...
umockdev: 0.15.2 -> 0.15.4
2021-01-03 23:39:10 +00:00
sternenseemann
792dacacd5
libschrift: init at 0.9.1
...
Building a shared object file is probably not necessary since libschrift
has no dependencies and is pretty small.
2021-01-03 23:48:08 +01:00
John Ericson
5c2965145f
treewide: Inline more of the static overlay
...
Picking up where #107238 left off. I think I'll have gotten all the easy
stuff with this.
2021-01-03 21:46:14 +00:00
Florian Klink
bdd15d2a55
umockdev: 0.15.2 -> 0.15.4
2021-01-03 21:51:47 +01:00
John Ericson
b3f29f3817
Merge pull request #107238 from Ericson2314/no-static-overlay
...
treewide: Start to break up static overlay
2021-01-03 15:15:49 -05:00
Thomas Tuegel
73a76de9d7
Merge pull request #107948 from eliasp/akonadi-kaccounts
...
akonadi: add missing kaccounts deps
2021-01-03 14:05:49 -06:00
Thomas Tuegel
c40e1d8c95
Merge pull request #108331 from Thra11/kirigami-qtgraphicaleffects
...
kirigami2: Add qtgraphicaleffects to buildInputs
2021-01-03 14:04:31 -06:00
John Ericson
f52263ced0
treewide: Start to break up static overlay
...
We can use use `stdenv.hostPlatform.isStatic` instead, and move the
logic per package. The least opionated benefit of this is that it makes
it much easier to replace packages with modified ones, as there is no
longer any issue of overlay order.
CC @FRidh @matthewbauer
2021-01-03 19:18:16 +00:00
github-actions[bot]
07165c7226
Merge staging-next into staging
2021-01-03 18:38:32 +00:00
John Ericson
b03fdcc7f9
Merge pull request #108300 from siraben/parallel-cmake
...
treewide: remove enableParallelBuilding = true if using cmake
2021-01-03 13:22:09 -05:00
Michael Weiss
108d9ec355
dav1d: 0.8.0 -> 0.8.1
2021-01-03 19:16:10 +01:00
Michael Weiss
6681661989
libmd: 1.0.1 -> 1.0.3
2021-01-03 18:58:43 +01:00
Tom Hall
6ae1689bdc
kirigami2: Add qtgraphicaleffects to buildInputs
...
Many of Kirigami's components require qtgraphicaleffects, so it doesn't
make sense to rely on the packages using kirigami supplying
the dependency.
2021-01-03 17:25:11 +00:00
github-actions[bot]
0649757570
Merge staging-next into staging
2021-01-03 12:24:59 +00:00
Pavol Rusnak
4d0e996b71
Merge pull request #108303 from siraben/codec2-darwin
...
codec2: enable build on unix
2021-01-03 13:24:52 +01:00
Ben Siraphob
3ae5e6ce03
treewide: remove enableParallelBuilding = true if using cmake
2021-01-03 18:37:40 +07:00
Joe Hermaszewski
cbc4bd9971
vulkan: 1.2.141 -> 1.2.162
...
Also improve metadata for vulkan-validation-layers
2021-01-03 11:03:42 +00:00
Ben Siraphob
c8f70e0e97
codec2: enable build on unix
2021-01-03 17:15:53 +07:00
Thomas Tuegel
9c04596480
qtlocation: backport upstream patch for recent GCC
2021-01-03 10:00:18 +01:00
zowoq
fb2311d430
Merge staging-next into staging
2021-01-03 16:33:28 +10:00
github-actions[bot]
bc30d1eb34
Merge master into staging-next
2021-01-03 00:56:46 +00:00
Lassulus
a460b167f4
Merge pull request #107058 from ShamrockLee/pslib
...
pslib: Init at 0.4.6
2021-01-02 21:17:17 +01:00
Guillaume Girol
d1d328882e
libinsane: 1.0.8 -> 1.0.9
2021-01-02 19:08:54 +01:00
Shamrock Lee
c5c2855647
pslib: Init at 0.4.6
...
pslib is a C-libreary to create PostScript files.
If applied, other nix package (e.g. the in-progress GNU Data Language)
with such dependency can be packaged easier.
2021-01-03 02:04:55 +08:00
github-actions[bot]
ec161d2240
Merge master into staging-next
2021-01-02 12:24:09 +00:00
Thomas Tuegel
ff47554518
Merge pull request #107472 from CertainLach/increase-kdeinit-environ-limit
...
kinit: increase environment limit
2021-01-02 05:42:00 -06:00
Thomas Tuegel
eed06a0da9
Merge pull request #107898 from SuperSandro2000/qtwebkit-darwin
...
qt514.qtwebkit: Fix patch applying
2021-01-02 05:40:09 -06:00
Florian Klink
6221782074
Merge pull request #108173 from flokli/cross-compile-nixos-sd
...
Fix NixOS cross-compilation SD Image
2021-01-02 11:03:45 +01:00
Sandro
56bb1b0f7a
Merge pull request #107863 from SuperSandro2000/properties-cpp-buildinputs
...
properties-cpp: move cmake, pkg-config to nativeBuildInputs, clean up
2021-01-02 10:49:41 +01:00
Frederik Rietdijk
e48db707e4
Merge master into staging-next
2021-01-02 08:49:09 +01:00
Florian Klink
4f087a608e
polkit: don't build with gobject-introspection when cross-compiling
...
gobject-introspection doesn't currently cross-compile (see
https://github.com/NixOS/nixpkgs/pull/88222 ), but polkit is somewhat
essential for many system components.
By disabling gobject-introspection when cross-compiling, we get it to
build.
2021-01-01 23:11:53 +01:00
Thomas Tuegel
43939ba8a8
Merge pull request #108115 from ttuegel/qt-5.12-darwin
...
qt512: fix darwin patches
2021-01-01 14:51:50 -06:00
Florian Klink
3050545e41
Merge pull request #107808 from flokli/dconf-fix-cross
...
dconf: fix cross compilation
2021-01-01 21:09:35 +01:00
Michael Weiss
16cf68dc7a
mesa: 20.3.1 -> 20.3.2 ( #108152 )
...
This also applies the macOS patch unconditionally to avoid breakages in
the future.
2021-01-01 20:08:54 +01:00
Sandro
988e83bfd7
Merge pull request #107632 from vs49688/fffix
2021-01-01 19:54:15 +01:00
Michael Weiss
33f91ea7b6
aml: 0.1.0 -> 0.2.0
2021-01-01 19:53:14 +01:00
github-actions[bot]
0eb369d907
Merge staging-next into staging
2021-01-01 18:39:12 +00:00
github-actions[bot]
c0a9361687
Merge master into staging-next
2021-01-01 18:39:09 +00:00
Ben Darwin
0fd1192132
itk: 5.1.1 -> 5.1.2 ( #107502 )
2021-01-01 12:59:14 -05:00
Dmitry Kalinkin
8bee208bf8
Merge pull request #107335 from veprbl/pr/root_6_20_08
...
root: 6.18.04 -> 6.22.06, don't build vendored LLVM
2021-01-01 12:28:37 -05:00
Thomas Tuegel
54fff8407b
qt512.qtwebengine: update darwin patches
2021-01-01 07:58:34 -06:00
github-actions[bot]
f1df516121
Merge staging-next into staging
2021-01-01 12:25:55 +00:00
github-actions[bot]
0fe33caad3
Merge master into staging-next
2021-01-01 12:25:52 +00:00
Robert Helgesson
9ce91be010
lombok: add bin output with lombok wrapper script
...
The wrapper can be used, e.g., to run the delombok command.
2021-01-01 13:13:10 +01:00
Lassulus
88439304c6
Merge pull request #107199 from mcbeth/qrcodegen
...
qrcodegen: init at 1.6.0
2021-01-01 12:32:40 +01:00
Thomas Tuegel
a61f20e418
qt512: fix build on darwin
2021-01-01 05:32:19 -06:00
Ben Siraphob
b04fc593e7
treewide: cmake buildInputs to nativeBuildInputs, minor cleanups
2021-01-01 11:52:33 +07:00
Zane van Iperen
6a4695b758
ffmpegthumbnailer: enable generation of thumbnailer file, misc cleanups
...
Passing "-DENABLE_THUMBNAILER=ON" to CMake causes it to install
"ffmpegthumbnailer.thumbnailer" into /share/thumbnailers, making it
actually usable with desktop environments.
Cleanups:
- remove trailing whitespace
- change pkgconfig -> pkg-config
- change license from gpl2 to gpl2Plus
2021-01-01 12:52:29 +10:00
github-actions[bot]
54ab07c1fe
Merge staging-next into staging
2021-01-01 00:56:17 +00:00
github-actions[bot]
999c670119
Merge master into staging-next
2021-01-01 00:56:14 +00:00