Commit Graph

10834 Commits

Author SHA1 Message Date
Maximilian Bosch
eac7f001ad
ell: 0.26 -> 0.27 2019-12-27 16:29:49 +01:00
Franz Pletz
2811645328
linuxPackages.usbip: gcc warnings fixed in linux>=5.4 2019-12-27 03:48:21 +01:00
Tim Steinbach
3e6bdc0600
linux_latest-libre: 17145 -> 17151 2019-12-26 20:06:27 -05:00
Maximilian Bosch
1ea4896ae9
bpftool: fix build
https://hydra.nixos.org/build/108688065
2019-12-26 21:07:51 +01:00
Maximilian Bosch
9842c4b107
treewide: update which packages I'm currently maintaining
Idea shamelessly stolen from 4e60b0efae.

I realized that I don't really know anymore where I'm listed as maintainer and what
I'm actually (co)-maintaining which means that I can't proactively take
care of packages I officially maintain.

As I don't have the time, energy and motivation to take care of stuff I
was interested in 1 or 2 years ago (or packaged for someone else in the
past), I decided that I make this explicit by removing myself from several
packages and adding myself in some other stuff I'm now interested in.

I've seen it several times now that people remove themselves from a
package without removing the package if it's unmaintained after that
which is why I figured that it's fine in my case as the affected pkgs
are rather low-prio and were pretty easy to maintain.
2019-12-26 15:27:47 +01:00
Franz Pletz
9f139fe7fe
Merge pull request #76394 from Enzime/update-nonfree-firmware
firmware-linux-nonfree: 2019-10-22 -> 2019-12-15
2019-12-26 13:53:53 +00:00
Franz Pletz
77b6c3cd06
Merge remote-tracking branch 'origin/master' into gcc-9 2019-12-26 14:17:36 +01:00
Daniel Schaefer
95710aa67e
multipath-tools: Fix prefix (#72917)
multipath-tools: Fix prefix
2019-12-26 02:31:37 +01:00
markuskowa
42b5c7e994
Merge pull request #76413 from r-ryantm/auto-update/rdma-core
rdma-core: 26.1 -> 27.0
2019-12-25 22:46:52 +01:00
Jan Tojnar
ca39dd3a8a
Merge branch 'master' into staging-next 2019-12-25 05:15:06 +01:00
Jan Tojnar
760be1f4b2
utillinux: no-rebuild clean up 2019-12-25 05:10:48 +01:00
R. RyanTM
be88068dab smemstat: 0.02.05 -> 0.02.06 2019-12-24 11:27:15 -08:00
R. RyanTM
3923fbd34b rdma-core: 26.1 -> 27.0 2019-12-24 07:34:36 -08:00
Michael Hoang
139c18dc66 firmware-linux-nonfree: 2019-10-22 -> 2019-12-15 2019-12-24 23:39:50 +11:00
R. RyanTM
a4ec22a44d power-calibrate: 0.01.28 -> 0.01.29 2019-12-23 23:55:39 -08:00
Tim Steinbach
da4ec2dd2d
linux_latest-libre: 17142 -> 17145 2019-12-23 19:24:07 -05:00
R. RyanTM
93190f745b mcelog: 166 -> 167 2019-12-23 14:51:23 -08:00
R. RyanTM
fbb1f6a482 libratbag: 0.11 -> 0.12 2019-12-23 13:32:25 -08:00
Mario Rodas
b203ceb0f5
Merge pull request #76258 from r-ryantm/auto-update/health-check
health-check: 0.03.03 -> 0.03.04
2019-12-23 08:34:41 -05:00
R. RyanTM
ca53ab77d2 health-check: 0.03.03 -> 0.03.04 2019-12-23 05:01:27 -08:00
Jörg Thalheim
7aa3d001b6
Merge pull request #76204 from r-ryantm/auto-update/alfred
alfred: 2019.3 -> 2019.5
2019-12-23 04:52:44 +00:00
R. RyanTM
f08df845fc alfred: 2019.3 -> 2019.5 2019-12-22 19:06:52 -08:00
Tim Steinbach
4afb87fe58
linux_latest-libre: 17119 -> 17142 2019-12-22 19:56:04 -05:00
Tim Steinbach
36997b3850
linux: 5.4.5 -> 5.4.6 2019-12-22 19:55:51 -05:00
Tim Steinbach
bb74e9cdeb
linux: 4.9.206 -> 4.9.207 2019-12-22 19:55:37 -05:00
Tim Steinbach
5bf13fcc2e
linux: 4.4.206 -> 4.4.207 2019-12-22 19:55:24 -05:00
Tim Steinbach
1e473389d4
linux: 4.19.90 -> 4.19.91 2019-12-22 19:55:15 -05:00
Tim Steinbach
78183b2e98
linux: 4.14.159 -> 4.14.160 2019-12-22 19:55:01 -05:00
Tim Steinbach
baa243d508
linux: Fix request-key for 4.4 and 4.9 2019-12-22 19:51:16 -05:00
Florian Klink
fef59ca3a8 systemd: v243.3 -> v243.4 2019-12-22 17:35:49 +01:00
Florian Klink
b3d99bf063 systemd: add flokli to maintainers 2019-12-22 17:35:49 +01:00
Jörg Thalheim
00915dcb63
sysdig: 0.26.4 -> 0.26.5 (#75933)
sysdig: 0.26.4 -> 0.26.5
2019-12-22 09:04:04 +00:00
Dmitry Kalinkin
3e5849adbb
Merge pull request #76075 from eadwu/nvidia_x11/2019-12.1
nvidia_x11: 440.36 -> 440.44
2019-12-19 23:41:15 -05:00
Jörg Thalheim
ae4071efd2
sysdig: 0.26.4 -> 0.26.5 2019-12-19 10:03:41 +00:00
Linus Heckemann
a69064eebc linux: run make install in parallel
This improves build times significantly, from 20min to 9min on the
aarch64 community box.
2019-12-19 09:24:20 +01:00
Frederik Rietdijk
f79e10061f Merge master into staging-next 2019-12-19 09:19:50 +01:00
Tim Steinbach
9b5b7220d8
linux_latest-libre: 17117 -> 17119 2019-12-18 16:13:14 -05:00
Tim Steinbach
a80cdb8bad
linux_latest-libre: 17112 -> 17117 2019-12-18 11:24:08 -05:00
Tim Steinbach
ae163fb867
linux: 5.4.3 -> 5.4.5 2019-12-18 11:23:51 -05:00
Tim Steinbach
0ea28ae456
linux: 5.3.16 -> 5.3.18 2019-12-18 11:23:39 -05:00
Tim Steinbach
819a164974
linux: 4.19.89 -> 4.19.90 2019-12-18 11:23:16 -05:00
Tim Steinbach
38e3b0e39f
linux: 4.14.158 -> 4.14.159 2019-12-18 11:22:59 -05:00
Edmund Wu
ed871ac5f3
nvidia_x11: 440.36 -> 440.44 2019-12-17 17:16:18 -05:00
Frederik Rietdijk
bf2877b9ab Merge master into staging-next 2019-12-17 17:16:52 +01:00
Michael Raskin
26df2f4e9e
Merge pull request #74862 from alyssais/fetchgittiles
fetchFromGitiles: init
2019-12-17 15:23:08 +00:00
Frederik Rietdijk
7aedd744d8 Merge master into staging-next 2019-12-16 20:28:10 +01:00
Alyssa Ross
d770ae1202
linux-libre.updateScript: fix attr in commit msg 2019-12-16 16:38:19 +00:00
Alyssa Ross
987a59e295 linux-libre_latest: 16794 -> 17112 2019-12-16 16:30:22 +00:00
Alyssa Ross
2d3e4088db linux-libre: set update-libre.sh as update script
This doesn't actually update the kernel, just the linux-libre
deblobbing scripts, but it should mean that automatic updaters keep
the deblobbing scripts up to date.  So even if deblobbing scripts for
a new kernel version are not available immediately after release, they
should be updated automatically soon enough once available.
2019-12-16 16:30:22 +00:00
Alyssa Ross
80a823eeca linux/update.sh: update linux-libre too
update-libre.sh doesn't commit by default so that it can be used as an
updateScript, where I don't think auto-committing is the norm.

The generated commit messages say "linux-libre_latest" rather than
"linux-libre", because even though linux-libre will also be rebuilt,
it's linux-libre_latest that is more likely to need it.
2019-12-16 16:30:22 +00:00
Tim Steinbach
821ff387da
linux-testing: 5.5-rc1 -> 5.5-rc2 2019-12-16 11:24:53 -05:00
Jan Tojnar
aa3cb8b00e
Merge branch 'staging-next' into staging 2019-12-14 23:09:23 +01:00
Jan Tojnar
429561978b
Merge branch 'master' into staging-next 2019-12-14 23:09:06 +01:00
Renaud
ee7ed8da31
procdump: 1.0.1 -> 1.1 (#75658) 2019-12-14 20:25:04 +01:00
Michael Weiss
e6b29634d2
fuse3: 3.8.0 -> 3.9.0 (#75655)
Changelog: https://github.com/libfuse/libfuse/blob/fuse-3.9.0/ChangeLog.rst
2019-12-14 20:16:36 +01:00
Tim Steinbach
4974c6fd23
linux: 5.4.2 -> 5.4.3 2019-12-13 08:29:19 -05:00
Tim Steinbach
b7c613e3e6
linux: 5.3.15 -> 5.3.16 2019-12-13 08:28:57 -05:00
Tim Steinbach
00875c0735
linux: 4.19.88 -> 4.19.89 2019-12-13 08:28:26 -05:00
Jörg Thalheim
e71bd33878
nfs-utils: link nfs tests 2019-12-13 11:24:48 +00:00
Frederik Rietdijk
dfdf1597a7 Merge master into staging-next 2019-12-13 11:43:39 +01:00
Kai Wohlfahrt
e0b9b5f7a6 keyutils: patch to allow symlinks in config dir 2019-12-12 15:42:44 +00:00
Kai Wohlfahrt
ea55a2d8a9 linux: patch request-key binary path
This is necessary for id mapping to work with NFS + Kerberos, and also
touches #68106 and 634638.
2019-12-12 12:23:30 +00:00
Kai Wohlfahrt
7b8388302d nfs-utils: build svcgssd
Necessary for nfs server with kerberos auth
2019-12-12 12:23:30 +00:00
Jörg Thalheim
ecbe18dd3b
bcc: 0.11.0 -> 0.12.0
- fix bash shebangs
- fix reference to $out/share/bcc/tools/lib when scripts are started from $out/bin
- use submodules to download libbpf
2019-12-11 05:50:56 +00:00
worldofpeace
fb390ed0b8
Merge pull request #75317 from worldofpeace/bluez-docheck
bluez: enable checkPhase on x86_64-linux
2019-12-10 20:33:28 -05:00
worldofpeace
b5a3336f57 bluez: enable checkPhase on x86_64-linux 2019-12-10 20:22:35 -05:00
Frederik Rietdijk
f3618342ec Merge staging-next into staging 2019-12-10 19:01:27 +01:00
Will Dietz
868972f294 ebtables: 2.0.10-4 -> 2.0.11 (legacy) 2019-12-10 18:50:04 +01:00
Will Dietz
1dac321dc3 iptables: 1.8.3 -> 1.8.4 2019-12-10 18:50:04 +01:00
Will Dietz
7d7c87d162 nftables: 0.9.2 -> 0.9.3 2019-12-10 18:50:04 +01:00
Austin Seipp
452efe57a9
linux_testing: 5.4-rc7 -> 5.5-rc1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-12-09 10:05:01 -06:00
Mario Rodas
d9367e1403
Merge pull request #75336 from arcnmx/nvidia-settings-parallel
linuxPackages.nvidia_x11.settings: enableParallelBuilding
2019-12-09 06:16:38 -05:00
Franz Pletz
8bad6c47c1
Merge pull request #75310 from c0bw3b/rem/mbed13-alienfx-coprthr-firestr
Remove mbedtls_1_3, alienfx, coprthr, firestr
2019-12-09 09:38:02 +00:00
arcnmx
964f622da8 linuxPackages.nvidia_x11.settings: enableParallelBuilding 2019-12-08 20:11:48 -08:00
worldofpeace
a83fa6410f
Merge pull request #74995 from Moredread/bluez
bluez: 5.50 -> 5.52
2019-12-08 19:10:31 -05:00
R. RyanTM
9af1a66535 mbpfan: 2.2.0 -> 2.2.1 (#75277) 2019-12-08 23:48:25 +01:00
c0bw3b
f85826a2ad alienfx: remove package
Upstream is gone
2019-12-08 23:27:41 +01:00
Anders Kaseorg
04577a28d6 kernel generate-config.pl: Show all errors, not just the first
This makes it less frustrating to add a large group of kernel options
via boot.kernelPatches.*.extraConfig.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2019-12-08 21:17:24 +01:00
André-Patrick Bubel
83655d6993
bluez: 5.51 -> 5.52, aliased bluezFull to bluez 2019-12-08 20:53:49 +01:00
Bastian Köcher
19f42620ef
bluez: 5.50 -> 5.51
Also add new configuration flag options and enable them for the bluezFull package by default.
2019-12-08 20:47:44 +01:00
Anthony Cowley
8a4603f9c4 linux: fix amdgpu memory mapping with kernel >= 5.3
These configuration options are needed for the ROCm GPU compute stack
on kernels >= 5.3.
2019-12-08 18:52:43 +01:00
markuskowa
f0d35f1466
Merge pull request #75122 from markuskowa/upd-rdma
rdma-core: 26.0 -> 26.1
2019-12-08 14:12:02 +01:00
Mario Rodas
478ea35973
Merge pull request #75232 from r-ryantm/auto-update/google-authenticator-libpam
google-authenticator: 1.06 -> 1.07
2019-12-08 06:02:45 -05:00
R. RyanTM
1ddcc0965c google-authenticator: 1.06 -> 1.07 2019-12-08 01:30:44 -08:00
Florian Klink
c36b8c57c2
Merge pull request #75140 from tomfitzhenry/hostapd-getrandom
hostapd: use getrandom(2)
2019-12-07 23:01:06 +01:00
Tim Steinbach
98045e752a
linux: 5.4.1 -> 5.4.2 2019-12-07 07:11:52 -05:00
Tim Steinbach
0e517dbb52
linux: 5.3.14 -> 5.3.15 2019-12-07 07:11:52 -05:00
Tim Steinbach
7e403ffcc2
linux: 4.9.205 -> 4.9.206 2019-12-07 07:11:51 -05:00
Tim Steinbach
d90b95f2f6
linux: 4.4.205 -> 4.4.206 2019-12-07 07:11:51 -05:00
Tim Steinbach
9ad3dbf43c
linux: 4.19.87 -> 4.19.88 2019-12-07 07:11:51 -05:00
Tim Steinbach
b80f9b6867
linux: 4.14.157 -> 4.14.158 2019-12-07 07:11:46 -05:00
Izorkin
928fdab4a1 linux: add in kernel 5.4 lockdown feature 2019-12-07 12:06:23 +01:00
Félix Baylac-Jacqué
abc9b32fc6 hostapd: 2.8 -> 2.9
Associated release note:
https://w1.fi/security/2019-6/sae-eap-pwd-side-channel-attack-update.txt

Note: we are building hostapd with the CONFIG_EAP_PWD=y flag by
default, we might be impacted by a EAP_PWD side-channel attach on
hostapd 2.8.
2019-12-07 12:02:10 +01:00
Tom Fitzhenry
fd1c0db18c hostapd: use getrandom(2)
Motivation: Devices with few entropy sources on boot hang/block if many services try to
read from /dev/random.

https://w1.fi/cgit/hostap/commit/?id=89a7cdd690b48a0c56380cf4609442ed13527f44
states getrandom() is recommended, but not enabled by default since it
relies on:

* Linux kernel 3.17 (NixOS 19.09 has 4.19; master presumably later)
* glibc 2.25 (NixOS master has 2.27
  https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/glibc/common.nix#L37 )
2019-12-07 19:31:35 +11:00
Markus Kowalewski
23059de767
rdma-core: 26.0 -> 26.1 2019-12-07 00:19:49 +01:00
Will Dietz
04cf547b2d
iw: 5.3 -> 5.4 2019-12-06 03:00:14 -06:00
Ben Wolsieffer
9461f783f1 reptyr: add patch to fix tests 2019-12-05 22:36:00 -05:00
Will Dietz
734132e55f shadow: 4.7 -> 4.8 2019-12-05 10:27:22 +01:00
Frederik Rietdijk
51ef7c3e49 Merge master into staging-next 2019-12-05 09:14:08 +01:00
Mateusz Kowalczyk
1451a52a38 Remove myself (fuuzetsu) from maintainer lists
I haven't been doing any maintenance for a long time now and not only
do I get notified, it also creates a fake impression that all these
packages had at least one maintainer when in practice they had none.
2019-12-05 16:29:48 +09:00
worldofpeace
b12aef05a4
Merge pull request #73968 from mat8913/upower-config-master
nixos/upower: Allow customization of UPower.conf
2019-12-05 05:25:00 +00:00
worldofpeace
b07e790963
Merge pull request #74969 from marsam/remove-empty-inherits
treewide: remove empty inherits
2019-12-04 23:17:08 +00:00
R. RyanTM
52950ee73f linuxPackages.bpftrace: 0.9.2 -> 0.9.3 2019-12-04 14:31:39 -06:00
Maximilian Bosch
af066ace5f
iwd: 1.1 -> 1.2
https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=8901ad39275bbd9d7bd868c8d7aac3f97d1131ad
2019-12-04 20:52:24 +01:00
Mario Rodas
e44d7c14f5
treewide: remove empty let blocks 2019-12-04 06:00:00 -05:00
Matthew Harm Bekkema
f83a83f964 upower: load config from /etc
In the process of making UPower.conf customizable (#73968), it came up
that UPower doesn't load its config from /etc by default.

The UPower derivation is modified to make it load its config from /etc
at runtime, but still install the default config to its nix store path
as before.

The UPower module is modified to put the config in /etc.
2019-12-04 12:26:30 +11:00
Jan Tojnar
30fae2883e
Merge branch 'master' into staging-next 2019-12-03 16:51:48 +01:00
Alyssa Ross
71f06ea757
linuxHeaders: fix typo in comment 2019-12-02 22:52:21 +00:00
Alyssa Ross
a8e63e4f74
treewide: fetchgit -> fetchFromGitiles
This is only the easy cases -- some fetchgit uses that point to
Gitiles instances are in generated code, where the generating code
would have to know in advance if it was fetching from Gitiles or not.
I don't think this is worth it.
2019-12-02 22:45:06 +00:00
Matthew Bauer
0505c5125c
Merge branch 'master' into static-fixes 2019-12-02 13:34:24 -05:00
Dominik Xaver Hörl
387b59d9cf cpupower: explicitly set CC and LD to allow compilation with clang 2019-12-02 00:43:40 +01:00
Frederik Rietdijk
6662f5be2d Merge master into staging-next 2019-12-01 18:55:44 +01:00
Jörg Thalheim
b7f504812b perf: build with python3 2019-12-01 18:53:03 +01:00
R. RyanTM
3370a1bebd mcelog: 165 -> 166 2019-12-01 18:45:39 +01:00
R. RyanTM
89c7e7d911 psmisc: 23.2 -> 23.3 2019-12-01 18:38:53 +01:00
R. RyanTM
50267fb095 intel-compute-runtime: 19.34.13959 -> 19.44.14658 (#74404) 2019-12-01 16:21:13 +01:00
markuskowa
5d4f22dc5e
Merge pull request #74405 from r-ryantm/auto-update/ipset
ipset: 7.3 -> 7.4
2019-12-01 14:47:16 +01:00
Tim Steinbach
c4dc27cfaf
linux: 4.19.86 -> 4.19.87 2019-12-01 07:26:02 -05:00
Tim Steinbach
9d38dd4a0a
linux: 4.14.156 -> 4.14.157 2019-12-01 07:25:59 -05:00
Dmitry Kalinkin
8d17a20f6a
Merge pull request #73167 from eadwu/nvidia_x11/2019-11.1
nvidia_x11: 2019-11.1
2019-11-30 22:47:47 -05:00
Edmund Wu
b05e2c0fb9
nvidia_x11: 435.21 -> 440.36 2019-11-30 22:28:08 -05:00
Jan Tojnar
55a72926e1
Merge branch 'staging-next' into staging 2019-11-30 19:45:46 +01:00
Jan Tojnar
a69ad18da9
Merge branch 'master' into staging-next 2019-11-30 19:44:51 +01:00
Ryan Mulligan
b76bea5c5b
Merge pull request #74440 from r-ryantm/auto-update/libratbag
libratbag: 0.10 -> 0.11
2019-11-30 06:20:06 -08:00
R. RyanTM
3c2a3bde28 tomb: 2.6 -> 2.7 (#74693) 2019-11-30 14:30:43 +01:00
Tim Steinbach
64f3388615
linux: 5.4 -> 5.4.1 2019-11-30 08:12:53 -05:00
Tim Steinbach
0e2e1afae8
linux: 5.3.13 -> 5.3.14 2019-11-30 08:12:09 -05:00
Tim Steinbach
77ce626d10
linux: 4.9.203 -> 4.9.205 2019-11-30 08:11:12 -05:00
Tim Steinbach
9d07976ab4
linux: 4.4.203 -> 4.4.205 2019-11-30 08:10:15 -05:00
Mario Rodas
6d9f4a5b3e
Merge pull request #74674 from r-ryantm/auto-update/usbguard
usbguard: 0.7.5 -> 0.7.6
2019-11-30 03:01:39 -05:00
Frederik Rietdijk
9f84415541 Merge staging-next into staging 2019-11-30 08:58:01 +01:00
Frederik Rietdijk
d14baf7747 Merge master into staging-next 2019-11-30 08:57:28 +01:00
R. RyanTM
afc1c4abe5 usbguard: 0.7.5 -> 0.7.6 2019-11-29 12:13:55 -08:00
markuskowa
882a826687
Merge pull request #74517 from r-ryantm/auto-update/open-iscsi
openiscsi: 2.0.878 -> 2.1.0
2019-11-29 11:41:09 +01:00
Markus Kowalewski
220b417e43
open-iscsi: fix path in iscsi_fw_login 2019-11-29 01:26:52 +01:00
R. RyanTM
84a59dc2f0 alsaPlugins: 1.1.9 -> 1.2.1 2019-11-28 11:59:02 -08:00
R. RyanTM
75deccbf61 openiscsi: 2.0.878 -> 2.1.0 2019-11-28 08:54:12 -08:00
Tim Steinbach
0e670a2e67
linux: Add CRYPTO_AEGIS128_SIMD for aarch64
See comments: 9b67ea9106
2019-11-28 09:21:06 -05:00
R. RyanTM
d7173c9425 libratbag: 0.10 -> 0.11 2019-11-27 23:49:34 -08:00
Jonathan Ringer
0c1c18ca44
Merge branch 'master' into staging-next 2019-11-27 22:57:50 -08:00
R. RyanTM
de978f92a0 ipset: 7.3 -> 7.4 2019-11-27 17:44:53 -08:00
Robin Gloster
3a9fd80b79
Merge pull request #74098 from r-ryantm/auto-update/alsa-firmware
alsa-firmware: 1.0.29 -> 1.2.1
2019-11-27 18:25:40 +01:00
Robin Gloster
665958073a
Merge pull request #74117 from r-ryantm/auto-update/alsa-utils
alsaUtils: 1.1.9 -> 1.2.1
2019-11-27 18:20:57 +01:00
Andreas Rammhold
2930ea5304
Merge pull request #73497 from dtzWill/update/intel-microcode-20191115
microcodeIntel: 20191113 -> 20191115
2019-11-27 16:25:31 +01:00
Andreas Rammhold
660e754074
microcodeIntel: add andir as maintainer 2019-11-27 16:23:16 +01:00
Fabian Möller
a03b7ebaa6 ati_drivers_x11: fix libGL and libGLU paths 2019-11-26 18:01:02 +01:00
Michael Weiss
cfb975495c
iproute: 5.3.0 -> 5.4.0
"Not a lot of changes in this release, most are related to fixing output
formatting and documentation." [0]

File changes (additions/removals):
+share/man/man8/devlink-trap.8.gz

nix path-info -S:
5.3.0 46078816
5.4.0 46095296

[0]: https://www.spinics.net/lists/netdev/msg615781.html
2019-11-26 14:31:47 +01:00
Tim Steinbach
ba80ebc1b3
linux: 4.4.202 -> 4.4.203 2019-11-26 07:58:49 -05:00
adisbladis
e5b32b9719
openrazer: Fix build with Linux 5.4 2019-11-26 11:05:02 +00:00
John Ericson
f191360ad0 Merge remote-tracking branch 'upstream/staging-next' into staging 2019-11-25 15:59:05 -05:00