Commit Graph

15509 Commits

Author SHA1 Message Date
github-actions[bot] 840f8cc3b2
Merge staging-next-21.05 into staging-21.05 2021-08-09 12:03:20 +00:00
TredwellGit 295b867eb7 linux/hardened/patches/5.4: 5.4.134-hardened1 -> 5.4.139-hardened1
(cherry picked from commit cbb5ca89ca473f09d8c1abf274f48b19700de57c)
2021-08-09 02:52:56 +00:00
TredwellGit bb8734ccd6 linux/hardened/patches/5.10: 5.10.52-hardened1 -> 5.10.57-hardened1
(cherry picked from commit 7aae6061b6e9879590e4f4315be2b6bdb3b90c09)
2021-08-09 02:52:55 +00:00
TredwellGit b96d4ac43a linux/hardened/patches/4.19: 4.19.198-hardened1 -> 4.19.202-hardened1
(cherry picked from commit 0a41183454eeed7ce105a08ecd8e2ba438bf858d)
2021-08-09 02:52:55 +00:00
TredwellGit e3c440a92b linux/hardened/patches/4.14: 4.14.240-hardened1 -> 4.14.243-hardened1
(cherry picked from commit b84eecf9fc114625f43f9d6cad035d61ad2c439c)
2021-08-09 02:52:54 +00:00
TredwellGit d6ebcc1109 linux-rt_5_10: 5.10.52-rt47 -> 5.10.56-rt48
(cherry picked from commit 8425e47a7416facee6cb0b8dce122715c152ed5b)
2021-08-09 02:52:54 +00:00
TredwellGit e80cfad9f9 linux: 5.4.134 -> 5.4.139
(cherry picked from commit b570def284bedd5821a5d8faf4fc7110b0c8b809)
2021-08-09 02:52:53 +00:00
TredwellGit 86cdede3f8 linux: 5.13.8 -> 5.13.9
(cherry picked from commit d416101b659c8bd8fd3cb224bce5803a0e70e6e8)
2021-08-09 02:52:53 +00:00
TredwellGit e9d400d134 linux: 5.10.52 -> 5.10.57
(cherry picked from commit cde6046992f56b51de41275340560283c5ae6c7d)
2021-08-09 02:52:52 +00:00
TredwellGit 9f9dc1688f linux: 4.9.278 -> 4.9.279
(cherry picked from commit a5713826c48b70b04b6963cd621f4e64a267fab3)
2021-08-09 02:52:52 +00:00
TredwellGit 59bacd23a6 linux: 4.4.278 -> 4.4.279
(cherry picked from commit 1adb289851291353b4062c7d0fe10598de804668)
2021-08-09 02:52:51 +00:00
TredwellGit 000622e70a linux: 4.19.198 -> 4.19.202
(cherry picked from commit 553c6ef12af489a7bd60d5ca9260246aca20a1fe)
2021-08-09 02:52:51 +00:00
TredwellGit 6f1bdd343d linux: 4.14.240 -> 4.14.243
(cherry picked from commit 26ec7c39bb796dd5122dbe60288f81741e91bd0a)
2021-08-09 02:52:50 +00:00
github-actions[bot] 8c47337f31
Merge staging-next-21.05 into staging-21.05 2021-08-08 06:02:59 +00:00
André Vitor de Lima Matos 6ae8e459f5 nvidia_x11: fix suspend script paths since 470.57.02 (#131838)
nvidia 470.57.02 changed the path of `nvidia-sleep.sh` and systemd
scripts, making `builder.sh` miss them and suspend-to-ram on systems
where `hardware.nvidia.powerManagement.enable = true` is set fail.

(cherry picked from commit 3f4bb8ff5a8da1d5b2407e0d6cfb2acfc5bb7f90)
2021-08-07 22:41:22 -07:00
Herman Fries 253365e354 nvidia_x11: 460.73.01 -> 470.57.02
(cherry picked from commit 03100da5a714a2b6c5210ceb6af092073ba4fce5)

Reason: Fixes driver build failures for the 5.13 kernel
2021-08-07 22:41:22 -07:00
github-actions[bot] eeaf5b3a23
Merge staging-next-21.05 into staging-21.05 2021-08-07 00:03:22 +00:00
Artturi e06ef38b52
Merge pull request #130470 from NixOS/backport-130397-to-release-21.05
[Backport release-21.05] firmwareLinuxNonfree: 2021-05-11 -> 2021-07-16
2021-08-07 01:49:56 +03:00
Artturi 29f76e65d0
Merge pull request #131730 from NixOS/backport-130851-to-staging-21.05
[Backport staging-21.05] kernel: enable MOUSE_PS2_VMMOUSE
2021-08-07 00:06:03 +03:00
Artturi c5111db64f
Merge pull request #125481 from NixOS/backport-124722-to-release-21.05
[Backport release-21.05] nvidia-x11: 465.27 -> 465.31
2021-08-07 00:00:24 +03:00
Artturi e76ea216ce
Merge pull request #125254 from NixOS/backport-125097-to-release-21.05
[Backport release-21.05] usbutils: 012 -> 013
2021-08-06 23:25:24 +03:00
Artturi 0cc1a01d6a
Merge pull request #126960 from NixOS/backport-123720-to-release-21.05
[Backport release-21.05] nixos-rebuild: fix creating ./result symlink for flakes
2021-08-06 16:59:35 +03:00
Maximilian Bosch cdc1d0f436
Merge pull request #132741 from NixOS/backport-132719-to-release-21.05
[Backport release-21.05] Kernels 2021-08-04
2021-08-06 13:36:55 +02:00
Artturi 178da37860
Merge pull request #132668 from Artturin/backport-132599-to-release-21.05
[Backport 21.05] linuxPackages.evdi: unstable-2021-06-11 -> unstable-2021-07-7
2021-08-06 01:38:51 +03:00
TredwellGit ab3104a98d linux: 5.13.7 -> 5.13.8
(cherry picked from commit ba2b85dbbb72f34dcdce87f1a1d8fe376d5a5e2b)
2021-08-05 07:16:13 +00:00
TredwellGit 44afd0cf9a linux: 4.9.277 -> 4.9.278
(cherry picked from commit aea5caaeab20f2991593c4ccde0bf5d540e8394b)
2021-08-05 07:16:13 +00:00
TredwellGit cee88fa02a linux: 4.4.277 -> 4.4.278
(cherry picked from commit 202b9e653658a7b77ebd41c7858cd57b8e8655dc)
2021-08-05 07:16:12 +00:00
Maximilian Bosch 0d70ff95e1
Merge pull request #132630 from NixOS/backport-132471-to-release-21.05
[Backport release-21.05] Kernels 2021-08-02
2021-08-04 22:24:30 +02:00
Artturin 2989536017 linuxPackages.evdi: unstable-2021-06-11 -> unstable-2021-07-7
(cherry picked from commit 335632575cef3182d8beee6d96bf76d4cd059898)
2021-08-04 17:24:51 +03:00
TredwellGit f8aab36f81 linux_latest-libre: 18191 -> 18210
(cherry picked from commit e56d304d73b5415b8b08a91e04dc6807160bc84b)
2021-08-04 07:50:01 +00:00
TredwellGit 31b4f817e8 linux: 5.13.6 -> 5.13.7
(cherry picked from commit b4aa8884d19a3a10a57b836a089d0000188f284c)
2021-08-04 07:50:01 +00:00
TredwellGit 2c47a4e052 linux: 4.9.276 -> 4.9.277
(cherry picked from commit 32c78c9e12cfe3fed66c81ba47d575f365e25fd7)
2021-08-04 07:50:00 +00:00
TredwellGit 8829f5bf2b linux: 4.4.276 -> 4.4.277
(cherry picked from commit 7d0b3f65aa1eb7500e4638ceaa9770e86c07788c)
2021-08-04 07:50:00 +00:00
Anbang Wen b13df33199 nixos/apple-sdk: 11.0 -> 11.1
The previous URL is a dead link. This commit updates it and bump the
SDK version to 11.1.

(cherry picked from commit 2565e3bba62d8d2f57a975c7ecce97d7c557dfa6)
2021-08-03 15:59:45 -07:00
Jörg Thalheim c0e25740a5 linux_zen: actually enable patchset
(cherry picked from commit 604d0dd0d68daf696a9ba5494b63500e9db36874)
2021-08-01 13:32:42 +00:00
Jörg Thalheim cb52ea7042 linux_zen: 5.13.5 -> 5.13.7
(cherry picked from commit 6e9195f6687d05d4225521a34d1702dd9c0a4444)
2021-08-01 13:32:41 +00:00
Ben Wolsieffer cab8dfb6f6 linux/common-config.nix: disable LPAE on armv7l-linux
LPAE was enabled to support native armv7l builders running in QEMU on aarch64,
but this option disables support for processors which don't support LPAE, which
are still relatively common. In particular, Beaglebones use the Cortex-A8, which
doesn't support LPAE.

Also, if you attempt to boot an LPAE kernel on a CPU that doesn't support it,
it fails before even earlycon is initialized. This makes the problem difficult
to debug without enabling CONFIG_DEBUG_LL or using a hardware debugger.

(cherry picked from commit 988c12faed96159fd5902f3bc372739c111206ef)
2021-07-30 19:44:27 +00:00
github-actions[bot] 1785d7020c
Merge release-21.05 into staging-next-21.05 2021-07-29 12:02:32 +00:00
Vladimír Čunát f90d817036
linuxPackages_latest.perf: fix build
Broken by kernel updates; NixPkgs master fixed this in a128e443c,
but I decided to be more conservative.
2021-07-29 11:55:38 +02:00
Harrison Houghton 85924eaaa8 bpftools: fix
At some point the name of the doc-tool script changed and we stopped
patching up the shabang line. The new one is just scripts/bpf_doc.py.

(cherry picked from commit 8997f8cc709f6d1801a23de80a7954e48116d1b2)
2021-07-29 09:42:48 +00:00
github-actions[bot] e6c1d10f4b
Merge release-21.05 into staging-next-21.05 2021-07-29 00:03:09 +00:00
Eelco Dolstra 5092dae98d
Merge pull request #131837 from NixOS/backport-131831-to-release-21.05
[Backport release-21.05] nixos-rebuild: Set inherit_errexit
2021-07-28 22:53:44 +02:00
Florian Klink 5d432c2453 linux: 5.13.5 -> 5.13.6
(cherry picked from commit b167e087810dce6f0298f078b0ad621e4bdaaf7f)
2021-07-28 18:15:47 +00:00
github-actions[bot] 98530c2e9e
Merge release-21.05 into staging-next-21.05 2021-07-28 18:02:32 +00:00
Eelco Dolstra 8f5794cbda nixos-rebuild: Set inherit_errexit
Without this, failure of nixBuild() and nixFlakeBuild() was ignored
(since bash doesn't inherit 'set -e' in subshells by default), so the
script would proceed with a bogus ./result link, e.g.

  ++ readlink -f /tmp/nixos-rebuild.NfHKxx/result
  + pathToConfig='/nix/store/m7dvk6an18cpr95qn5wnig2600qhv6w7-nix-2.4pre20210727_706777a/bin/nix
  /tmp/nixos-rebuild.NfHKxx/result'
  + '[' test = switch -o test = boot ']'
  + copyToTarget '/nix/store/m7dvk6an18cpr95qn5wnig2600qhv6w7-nix-2.4pre20210727_706777a/bin/nix
  /tmp/nixos-rebuild.NfHKxx/result'
  + '[' '' = '' ']'
  + '[' test = switch -o test = boot -o test = test -o test = dry-activate ']'
  + targetHostCmd /nix/store/m7dvk6an18cpr95qn5wnig2600qhv6w7-nix-2.4pre20210727_706777a/bin/nix /tmp/nixos-rebuild.NfHKxx/result/bin/switch-to-configuration test
  + '[' -z '' ']'
  + sudo -- /nix/store/m7dvk6an18cpr95qn5wnig2600qhv6w7-nix-2.4pre20210727_706777a/bin/nix /tmp/nixos-rebuild.NfHKxx/result/bin/switch-to-configuration test
  error: '/tmp/nixos-rebuild.NfHKxx/result/bin/switch-to-configuration' is not a recognised command
  Try '/nix/store/m7dvk6an18cpr95qn5wnig2600qhv6w7-nix-2.4pre20210727_706777a/bin/nix --help' for more information.
  + echo 'warning: error(s) occurred while switching to the new configuration'
  warning: error(s) occurred while switching to the new configuration

(cherry picked from commit 0ad27c8653daaf59cf0fb2e0b30561a8d86303fa)
2021-07-28 16:32:56 +00:00
Atemu cd82f6616f linux_zen: 5.12.19 -> 5.13.5
(cherry picked from commit caa1c955c94564f9bdafc23f6315f88da1e0da46)
2021-07-28 13:50:45 +02:00
Atemu 55e768eefd linux_lqx: 5.12.17 -> 5.12.19
(cherry picked from commit b15b762d871e1cc4fd08fbea11261de5d78fcd71)
2021-07-28 13:50:30 +02:00
Atemu 4820c77a40 linux_zen: 5.12.14 -> 5.12.19
(cherry picked from commit 349ff1b29e9995b36799c215b475bbb0ba351a45)
2021-07-28 13:50:30 +02:00
Atemu 3650339f63 linux_lqx: 5.12.14 -> 5.12.17
(cherry picked from commit 85f28b5c4f258b3376aade809903132ed1d11f2f)
2021-07-28 13:49:17 +02:00
Jeremy Kolb a8a7b26adb kernel: enable MOUSE_PS2_VMMOUSE
Turns VMware guest mouse support on in the kernel. This is needed for running Wayland and non-root X in a VMWare guest. In a pre-Wayland world the `xf86-input-vmmouse` userspace driver would have handled this for us. This allows the mouse to properly work in a vmware guest (for example it can now leave the vmware window).

See: https://github.com/vmware/open-vm-tools/issues/528
(cherry picked from commit 1207e7581f7bb863d0789c980930464d92d221cb)
2021-07-27 20:36:15 +00:00