Commit graph

14857 commits

Author SHA1 Message Date
github-actions[bot] 6ef7c23763
Merge master into staging-next 2021-04-19 18:11:51 +00:00
Sandro 2ef3a9fa87
Merge pull request #119873 from Atemu/update/zen-kernels
zen-kernels: 5.11.14 -> 5.11.15
2021-04-19 19:19:33 +02:00
Linus Heckemann 50d091cc65
Merge pull request #119770 from qzle/ramdisks
kernel: Remove CONFIG_BLK_DEV_RAM=y (remove /dev/ram* devices)
2021-04-19 14:17:42 +02:00
github-actions[bot] b57b2b362c
Merge master into staging-next 2021-04-18 18:10:37 +00:00
John Ericson 75d12e9ad4
Merge pull request #119799 from alyssais/netbsd-maint
netbsd: add myself as maintainer
2021-04-18 12:58:35 -04:00
Dmitry Kalinkin 6eeab63be4
Merge pull request #107431 from veprbl/pr/darling_src_fix
darwin.darling.src: fix build on case-sensitive filesystems
2021-04-18 09:55:45 -04:00
Alyssa Ross d8a6f55942
netbsd: add myself as maintainer 2021-04-18 12:30:22 +00:00
github-actions[bot] 9e804db1da
Merge master into staging-next 2021-04-18 12:06:01 +00:00
Daniël de Kok df7a12d567
Merge pull request #119601 from pimeys/nvidia-460.73.01
nvidia-x11: 460.67 -> 460.73.01
2021-04-18 10:23:30 +02:00
Robert Helgesson 831e64bad4
Drop maintainership for some packages 2021-04-18 09:00:18 +02:00
Jens Nolte 610d831a4b kernel: Remove CONFIG_BLK_DEV_RAM=y (remove /dev/ram* devices)
This option allows to use portions of the system RAM as block devices.
It was configured to 'y' (built-in, therefore not unloadable or
reconfigurable) and configured 16 4MB RAM disks which, to my knowledge,
currently have no purpose in NixOS.

Removing the option restores it to it's default value of 'm', which
enables it to be loaded at runtime (which is also required to be able to
change it's configuration without rebuilding the kernel).
2021-04-18 05:34:55 +02:00
Atemu 0036ccebc2 zen-kernels: 5.11.14 -> 5.11.15 2021-04-17 20:45:33 +02:00
github-actions[bot] 8156636ab9
Merge master into staging-next 2021-04-17 18:10:38 +00:00
Sandro ebcf1f92fe
Merge pull request #119650 from fortuneteller2k/update-xanmod
linux_xanmod: 5.11.14 -> 5.11.15
2021-04-17 18:10:48 +02:00
Pavol Rusnak 29bb19258a
treewide: use https for github URIs 2021-04-17 17:59:08 +02:00
fortuneteller2k 5476e46eb6 linux_xanmod: 5.11.14 -> 5.11.15 2021-04-17 02:09:01 +08:00
Julius de Bruijn 952d9a35d3 The driver download url has changed 2021-04-16 11:48:20 +02:00
Julius de Bruijn e4f3e9b009 nvidia-x11: 460.67 -> 460.73.01 2021-04-16 11:05:10 +02:00
Martin Weinelt cd7a519012
Merge branch 'master' into staging-next 2021-04-16 01:32:09 +02:00
Sandro 6de0cfabf9
Merge pull request #119533 from fortuneteller2k/update-xanmod
linux_xanmod: 5.11.13 -> 5.11.14
2021-04-15 23:19:35 +02:00
Sandro 47761b6aa8
Merge pull request #119520 from Atemu/update/zen-kernels
zen-kernels: 5.11.13 -> 5.11.14
2021-04-15 23:15:20 +02:00
github-actions[bot] dfd4f14303
Merge master into staging-next 2021-04-15 18:13:27 +00:00
fortuneteller2k fc0daf4bd3 linux_xanmod: 5.11.13 -> 5.11.14 2021-04-15 19:56:59 +08:00
Alyssa Ross ea50a8c811
netbsd.man: fix hash
This was identical to the hash for "misc" above, so was obviously just
a copy and paste error.
2021-04-15 09:24:14 +00:00
Atemu 87e667540a zen-kernels: 5.11.13 -> 5.11.14 2021-04-15 10:36:16 +02:00
Martin Weinelt 7cf67850c0
Merge branch 'master' into staging-next 2021-04-15 01:01:26 +02:00
Alyssa Ross 2dba1df37e
Revert "netbsd: take fetchcvs from buildPackages to fix eval"
This reverts commit 6dff63294a.

We have a more general fix now, so don't need this any more.
2021-04-14 21:38:23 +00:00
github-actions[bot] eb8e023674
Merge master into staging-next 2021-04-14 18:11:01 +00:00
sternenseemann 6dff63294a netbsd: take fetchcvs from buildPackages to fix eval
For some reason fetchcvs was taken from the cross package set when
cross compiling netbsd.* instead of from buildPackages. I suspect that
this was no issue previously because it just could be substituted as it
only ever produced fixed output derivations. However since
00a2084a40 the evaluation of fetchcvs
would depend on `stdenv.cc` (via its openssh dependency). Since
netbsd.libc is required to evaluate stdenv.cc this caused a infinite
recursion when staging the cross stdenv for pkgsCross.amd64-netbsd. The
fix for this is pretty easy: Just take fetchcvs from buildPackages
explicitly instead of hoping for mkDerivation to get it right.

Resolves #119323.
2021-04-14 14:58:08 +00:00
Vladimír Čunát d2eb7a7887
Merge branch 'staging' into staging-next
A few conflicts but relatively clear ones (I think).
2021-04-14 10:08:25 +02:00
Ninjatrappeur be07f22e46
Merge pull request #119347 from mweinelt/wpa_supplicant 2021-04-13 20:14:25 +02:00
Martin Weinelt 4480a056c9
hostapd: add patch for CVE-2021-30004
In wpa_supplicant and hostapd 2.9, forging attacks may occur because
AlgorithmIdentifier parameters are mishandled in tls/pkcs1.c and
tls/x509v3.c.

Fixes: CVE-2021-30004
2021-04-13 19:32:22 +02:00
Tim Steinbach b9446623dc linux/hardened/patches/5.4: 5.4.109-hardened1 -> 5.4.111-hardened1 2021-04-13 12:46:15 -04:00
Tim Steinbach cafd9c382d linux/hardened/patches/5.11: 5.11.11-hardened1 -> 5.11.13-hardened1 2021-04-13 12:46:15 -04:00
Tim Steinbach e52ba0e7b6 linux/hardened/patches/5.10: 5.10.27-hardened1 -> 5.10.29-hardened1 2021-04-13 12:46:15 -04:00
Tim Steinbach 517f128cc7 linux/hardened/patches/4.19: 4.19.184-hardened1 -> 4.19.186-hardened1 2021-04-13 12:46:15 -04:00
Tim Steinbach bb6534f61c linux/hardened/patches/4.14: 4.14.228-hardened1 -> 4.14.230-hardened1 2021-04-13 12:46:15 -04:00
Tim Steinbach 5a28ce6480 linux_latest-libre: 17920 -> 17990 2021-04-13 12:46:15 -04:00
Tim Steinbach c0a9755988 linux-rt_5_10: 5.10.25-rt35 -> 5.10.27-rt36 2021-04-13 12:46:15 -04:00
Tim Steinbach 82c70ee99a linux: 5.4.109 -> 5.4.111 2021-04-13 12:46:15 -04:00
Tim Steinbach 1c797af547 linux: 5.11.11 -> 5.11.13 2021-04-13 12:46:15 -04:00
Tim Steinbach 72fb1c7a91 linux: 5.10.27 -> 5.10.29 2021-04-13 12:46:15 -04:00
Tim Steinbach 643d4c3e4b linux: 4.9.264 -> 4.9.266 2021-04-13 12:46:15 -04:00
Tim Steinbach de1c135d6c linux: 4.4.264 -> 4.4.266 2021-04-13 12:46:15 -04:00
Tim Steinbach 1a15aabb7e linux: 4.19.184 -> 4.19.186 2021-04-13 12:46:15 -04:00
Martin Weinelt 9f9ab6fffc wpa_supplicant: add patch for CVE-2021-30004
In wpa_supplicant and hostapd 2.9, forging attacks may occur because
AlgorithmIdentifier parameters are mishandled in tls/pkcs1.c and
tls/x509v3.c.

Fixes: CVE-2021-30004
2021-04-13 18:45:44 +02:00
Sandro 0177881cbe
Merge pull request #119119 from Atemu/update/zen-kernels
zen-kernels: 5.11.11 -> 5.11.13
2021-04-13 01:12:48 +02:00
Luke Granger-Brown 08b22e605b Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging 2021-04-12 18:49:01 +00:00
John Ericson 82ca81cd62
Merge pull request #111988 from thefloweringash/darwin-platform-versions
Darwin platform versions
2021-04-12 11:40:16 -04:00
Michael Weiss 4e90ff6e61
fuse3: 3.10.2 -> 3.10.3 2021-04-12 13:45:51 +02:00