Commit graph

17010 commits

Author SHA1 Message Date
github-actions[bot] 7495684853
Merge master into staging-next 2021-11-20 00:01:21 +00:00
Artturi dd4ce550b3
Merge pull request #146456 from Artturin/misc-updates1 2021-11-20 01:14:44 +02:00
Jonathan Ringer 6ede9cd761
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  pkgs/applications/audio/hybridreverb2/default.nix
2021-11-19 08:44:33 -08:00
TredwellGit 170255c3a3 linux/hardened/patches/5.4: 5.4.159-hardened1 -> 5.4.160-hardened1 2021-11-18 21:12:07 +00:00
TredwellGit 6383327644 linux/hardened/patches/5.15: 5.15.2-hardened1 -> 5.15.3-hardened1 2021-11-18 21:11:59 +00:00
TredwellGit cc0a75815d linux/hardened/patches/5.14: 5.14.18-hardened1 -> 5.14.20-hardened1 2021-11-18 21:11:53 +00:00
TredwellGit 51bd34b742 linux/hardened/patches/5.10: 5.10.78-hardened1 -> 5.10.80-hardened1 2021-11-18 21:11:46 +00:00
TredwellGit c871adc77c linux_latest-libre: 18452 -> 18473 2021-11-18 21:11:23 +00:00
TredwellGit 83c1df7574 linux: 5.4.159 -> 5.4.160 2021-11-18 21:11:12 +00:00
TredwellGit be5a54e952 linux: 5.15.2 -> 5.15.3 2021-11-18 21:11:05 +00:00
TredwellGit 654052abbb linux: 5.14.18 -> 5.14.20 2021-11-18 21:11:00 +00:00
TredwellGit 8cf6618d0c linux: 5.10.79 -> 5.10.80 2021-11-18 21:10:52 +00:00
github-actions[bot] c20c52d15c
Merge master into staging-next 2021-11-18 12:01:15 +00:00
Bernardo Meurer 1384c851de
linuxPackages_5_15.ddcci-driver: fix build
We apply the patch from this MR: https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux/-/merge_requests/8
2021-11-17 22:33:39 -08:00
Artturin 48a4db63e6 crda: 3.18 -> 4.14 2021-11-18 03:20:56 +02:00
github-actions[bot] c77daf4da1
Merge master into staging-next 2021-11-17 18:00:59 +00:00
Maximilian Bosch 61870bd811
Merge pull request #144409 from mitchmindtree/xps-9310-kernel-config
linux: Add kernel config required for QCA6390 bluetooth (XPS 9310)
2021-11-17 18:30:35 +01:00
Artturin 64b4af5296 kmod-blacklist-ubuntu: 22-1.1ubuntu1 -> 28-1ubuntu4 2021-11-17 18:50:41 +02:00
Bobby Rong 12fc0f19fe
Merge pull request #145431 from trofi/update-i7z
i7z: 0.27.3 -> 0.27.4
2021-11-17 21:48:20 +08:00
github-actions[bot] cf671bd5e9
Merge master into staging-next 2021-11-17 12:01:23 +00:00
Artturi add0eb818b
Merge pull request #144429 from anund/nixos-rebuild-fix-install-bootloader
nixos-rebuild: fix --install-bootloader
2021-11-17 09:57:30 +02:00
Anund bc5a610cb7 nixos-rebuild: fix --install-bootloader
nixos-rebuild relies on setting an environment variable to change
behaviour during nixos-rebuild boot/switch between calling update or
install via systemd bootctl. Adding sudo -- as a prefix to various exec
calls does not preserve the environment breaking this mechanism.

This is a some what ugly fix that works.

Closes https://github.com/NixOS/nixpkgs/pull/144429
2021-11-17 09:28:05 +02:00
github-actions[bot] f8cf67790e
Merge master into staging-next 2021-11-17 06:01:28 +00:00
Bernardo Meurer fc4ff32d20
Merge pull request #146304 from fortuneteller2k/xanmod-tt
linuxKernel.kernels.linux_xanmod: 5.14.16 -> 5.15.2
2021-11-16 21:28:20 -08:00
fortuneteller2k e8328148cd
linuxKernel.kernels.linux_xanmod: 5.14.16 -> 5.15.2 2021-11-16 20:42:37 -08:00
Sandro 7a9682ad12
Merge pull request #146223 from Mic92/bcc 2021-11-17 04:30:54 +01:00
github-actions[bot] 90829d83e5
Merge master into staging-next 2021-11-17 00:01:49 +00:00
Jörg Thalheim b8df591eb6 zfs: remove myself as maintainer 2021-11-16 23:29:49 +01:00
TredwellGit 28289f34ec Revert "zfs: unlock for 5.15"
This reverts commit 86e057aa5b.
2021-11-16 22:11:25 +00:00
Jonathan Ringer a2e621d20d
Merge remote-tracking branch 'origin/master' into staging-next 2021-11-16 07:50:20 -08:00
Artturi f8f4575030
Merge pull request #145742 from alyssais/selinux-python-cross 2021-11-16 15:05:21 +02:00
github-actions[bot] 617d1d1f17
Merge staging-next into staging 2021-11-16 12:02:01 +00:00
Maximilian Bosch 1e156e3b5d
Merge pull request #146178 from TredwellGit/linux
Kernels 2021-11-15
2021-11-16 12:02:04 +01:00
Thomas Gerbet 6abc7cd907 bluez: 5.61 -> 5.62
Fixes CVE-2021-43400.

http://www.bluez.org/release-of-bluez-5-62/
https://github.com/bluez/bluez/blob/5.62/ChangeLog
2021-11-16 11:34:55 +01:00
Jörg Thalheim 527ebd8530 linuxPackages.bcc: 0.22.0 -> 0.23.0 2021-11-16 11:00:14 +01:00
Jörg Thalheim b81e66efeb
Merge pull request #145458 from Mic92/zfs
zfs: unlock for 5.15
2021-11-16 09:57:25 +00:00
TredwellGit f726b6c476 linux-rt_5_11: remove 2021-11-15 19:38:09 +00:00
TredwellGit c783c8d859 linux/hardened/patches/5.15: init at 5.15.2-hardened1 2021-11-15 19:38:09 +00:00
TredwellGit db13d848fc linux/hardened/patches/5.4: 5.4.158-hardened1 -> 5.4.159-hardened1 2021-11-15 19:38:09 +00:00
TredwellGit b868e78282 linux/hardened/patches/5.14: 5.14.17-hardened1 -> 5.14.18-hardened1 2021-11-15 19:38:09 +00:00
TredwellGit 57d9fd1791 linux/hardened/patches/4.19: 4.19.216-hardened1 -> 4.19.217-hardened1 2021-11-15 19:38:09 +00:00
TredwellGit 9b6fb581af linux/hardened/patches/4.14: 4.14.254-hardened1 -> 4.14.255-hardened1 2021-11-15 19:38:09 +00:00
TredwellGit 38d1f15fe4 linux-rt_5_10: 5.10.73-rt54 -> 5.10.78-rt55 2021-11-15 19:38:09 +00:00
github-actions[bot] cfaff97318
Merge staging-next into staging 2021-11-15 18:01:43 +00:00
Thiago Kenji Okada 4aa774626a
Merge pull request #146114 from fabaff/bump-cpuid
cpuid: 20211031 -> 20211114
2021-11-15 09:08:36 -03:00
github-actions[bot] faf5da6aed
Merge staging-next into staging 2021-11-15 12:01:44 +00:00
Vladimír Čunát 64065d76f4
Merge #144730: branch 'staging-next' 2021-11-15 11:52:15 +01:00
Fabian Affolter 695241f2bc cpuid: 20211031 -> 20211114 2021-11-15 11:23:05 +01:00
Cole Mickens 4f0c8d0512
nvidia_x11: libPath: add libgbm/libGL libraries (#145439) 2021-11-14 23:43:35 +01:00
Alyssa Ross 4e1852096f
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/tools/parsing/flex/2.6.1.nix
2021-11-14 14:17:46 +00:00