Commit Graph

17136 Commits

Author SHA1 Message Date
github-actions[bot]
956b399ffa
Merge master into staging-next 2021-11-26 12:01:30 +00:00
Sandro
a94fa956d2
Merge pull request #147280 from lovesegfault/linux_xanmod-5.15.4 2021-11-26 12:59:54 +01:00
github-actions[bot]
fa1a61b8a2
Merge master into staging-next 2021-11-25 06:01:06 +00:00
Bernardo Meurer
333b97926e
linuxKernel.kernels.linux_xanmod: 5.15.2 -> 5.15.4 2021-11-24 10:15:37 -08:00
Bjørn Forsman
162546972b radeontop: 1.3 -> 1.4
It installs itself to $out/bin/ instead of $out/sbin/ now.
2021-11-24 17:17:23 +01:00
Vincent Haupert
6820158305 sgx-sdk: fix typo 2021-11-24 00:11:19 +01:00
Vincent Haupert
406fb9b14d sgx-sdk: use sgx_ippcp.h from prebuilt optimized libraries 2021-11-23 18:42:18 +01:00
Vincent Haupert
4d46899289 sgx-sdk: use SRI hash
$ rnix-hashes 1cr2mkk459s270ng0yddgcryi0zc3dfmg9rmdrdh9mhy2mc1kx0g
SRI     sha256-D/QZWBUe1gRbbjWnV10b7IPoM3utefAsOEKnQuasIrM=
base16  0ff41958151ed6045b6e35a7575d1bec83e8337bad79f02c3842a742e6ac22b3
base32  1cr2mkk459s270ng0yddgcryi0zc3dfmg9rmdrdh9mhy2mc1kx0g
base64  D/QZWBUe1gRbbjWnV10b7IPoM3utefAsOEKnQuasIrM
2021-11-23 17:13:43 +01:00
Jonathan Ringer
4b73049ccc
Merge remote-tracking branch 'origin/staging' into staging-next
Conflicts:
	nixos/tests/custom-ca.nix
2021-11-22 21:33:23 -08:00
Maximilian Bosch
ea55e013f0
Merge pull request #146868 from TredwellGit/linux
Kernels 2021-11-21
2021-11-22 22:34:49 +01:00
Izorkin
8bcc413092 linux: enable kTLS 2021-11-22 21:01:01 +00:00
Luiz Ribeiro
890632420d
linuxPackages.rtl88xxau-aircrack: enable for aarch64-linux 2021-11-22 12:33:02 -06:00
github-actions[bot]
28641f51dc
Merge master into staging-next 2021-11-22 18:01:08 +00:00
Sandro
dae20ac9ef
Merge pull request #144334 from cyounkins/undmg_param 2021-11-22 16:37:37 +01:00
Sandro
4cb61178d0
Merge pull request #146427 from IvarWithoutBones/fix/rtl8821ce-5.15 2021-11-22 14:49:48 +01:00
github-actions[bot]
9e1911e222
Merge master into staging-next 2021-11-22 12:01:27 +00:00
sterni
108f913823
Merge pull request #146134 from sternenseemann/netbsd-man-fix
netbsd.man: fix build
2021-11-22 12:14:49 +01:00
Maciej Krüger
51839886b3
nvidia_x11: add production alias
As described on https://www.nvidia.com/en-us/drivers/unix/ this refers to the production branch
2021-11-22 07:53:16 +01:00
github-actions[bot]
cbcbfb4901
Merge master into staging-next 2021-11-22 06:01:10 +00:00
Atemu
8d0f1c1725 kernel: compare version against the base version
This makes it so that 5.10.1 > 5.10-rc5
2021-11-22 02:11:16 +00:00
Atemu
712db36fa2 kernel/generic: remove redundant kernelOlder/kernelAtLeast 2021-11-22 02:11:16 +00:00
IvarWithoutBones
d00b852a90 linuxPackages.rtl8821ce: unstable-2021-05-28 -> unstable-2021-11-19
This fixes https://github.com/tomaspinho/rtl8821ce/issues/244, making compilation with Linux kernel 5.15+ succeed.
2021-11-21 20:49:26 +01:00
github-actions[bot]
18ad263272
Merge master into staging-next 2021-11-21 18:01:07 +00:00
Alyssa Ross
28625f7861 selinux: 2.9, 3.0 -> 3.3
These are all released together, so I'm updating them all in a single
commit.
2021-11-21 13:51:54 +00:00
Alyssa Ross
20fd3b1002 setools: 4.3.0 -> 4.4.0 2021-11-21 13:51:54 +00:00
TredwellGit
ef17d66328 linux_zen: 5.15.2-zen1 -> 5.15.3-zen1 2021-11-21 13:39:59 +00:00
TredwellGit
541a3a7332 linux_latest-libre: 18473 -> 18484 2021-11-21 13:38:16 +00:00
TredwellGit
392ccc5431 linux: 5.4.160 -> 5.4.161 2021-11-21 13:38:04 +00:00
TredwellGit
d789aebb56 linux: 5.15.3 -> 5.15.4 2021-11-21 13:37:56 +00:00
TredwellGit
df8b7f5d06 linux: 5.14.20 -> 5.14.21 2021-11-21 13:37:50 +00:00
TredwellGit
06629bb117 linux: 5.10.80 -> 5.10.81 2021-11-21 13:37:41 +00:00
Ryan Burns
2175b157ac treewide: refactor isi686 && isx86_64 -> isx86 2021-11-20 17:50:41 -08:00
github-actions[bot]
197135904f
Merge staging-next into staging 2021-11-21 00:02:25 +00:00
github-actions[bot]
43d088886e
Merge master into staging-next 2021-11-21 00:01:46 +00:00
Vincent Haupert
d6a0da1e5d sgx-sdk: use full version
Actually, 2.14 isn't the full version the Makefile uses for the Debian
and RPM packages. Also, pkg-config files contain the version 2.14.100.2.
2021-11-21 01:01:44 +01:00
Thiago Kenji Okada
4700fda2c0
Merge pull request #145395 from thiagokokada/bump-plymouth
plymouth: unstable-2020-12-07 -> unstable-2021-10-18
2021-11-20 18:00:50 -03:00
Sandro
d72f3fe764
Merge pull request #146553 from trofi/fix/powertop-for-ncurses-6.3 2021-11-20 19:46:05 +01:00
Sandro
8dfdd0e468
Merge pull request #146594 from trofi/fix-tiptop-for-ncurses-6.3 2021-11-20 19:39:47 +01:00
github-actions[bot]
578939f5e2
Merge staging-next into staging 2021-11-20 18:01:43 +00:00
github-actions[bot]
f515d91189
Merge master into staging-next 2021-11-20 18:01:07 +00:00
Bobby Rong
7611e53fcd
Merge pull request #146474 from trofi/update-nmon
nmon: 16m -> 16n
2021-11-20 22:16:24 +08:00
github-actions[bot]
580f371380
Merge staging-next into staging 2021-11-20 00:01:57 +00:00
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
ajs124
0117551f46
Merge pull request #146485 from helsinki-systems/upd/nftables
nftables: 1.0.0 -> 1.0.1
2021-11-19 19:23:09 +01:00
github-actions[bot]
e9cc89e77e
Merge staging-next into staging 2021-11-19 18:01:56 +00: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
Sergei Trofimovich
eafed17eff tiptop: pull upstream patch for ncurses-6.3 support
Without the patch build fails on ncurses-6.3 as:

    helpwin.c:64:3: error: format not a string literal and no format arguments [-Werror=format-security]
       64 |   mvwprintw(win, 2, 1, screen->desc);
          |   ^~~~~~~~~
2021-11-19 08:42:00 +00:00
Sergei Trofimovich
51b4f7aebc powertop: pull upstream fix for ncurses-6.3
Without the fix build on ncurses-6.3 fails as:

    lib.cpp:586:24: error: format not a string literal and no format arguments [Werror=format-security]
      586 |         mvprintw(1, 0, notify);
          |                        ^~~~~~
2021-11-18 22:16:38 +00: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
Sergei Trofimovich
f7e03a6a4e nmon: 16m -> 16n 2021-11-18 17:36:34 +00:00
ajs124
740155f9e4 nftables: 1.0.0 -> 1.0.1 2021-11-18 15:11:30 +01:00
github-actions[bot]
6ed7100e47
Merge staging-next into staging 2021-11-18 12:01:54 +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
Artturi
f57a2a6cf1
Merge pull request #144227 from humancalico/bpf-lsm 2021-11-18 03:00:28 +02:00
Robert Hensing
9005cb8835
Merge pull request #145841 from l0b0/fix-indentation
Fix indentation
2021-11-18 00:38:59 +01: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
Jan Tojnar
b8c07facaa Fix eval with nix-env -qas
At least on NixOS, it fails to evaluate as follows:

	$ nix-env -qaPs -f .
	error: attribute '__propagatedImpureHostDeps' missing
2021-11-17 16:28:55 +01: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
Vincent Haupert
a25482ffa7 sgxsdk: use samples as passthru tests 2021-11-15 22:05:22 +01: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
Vincent Haupert
007b606892 sgxsdk: add setup hook 2021-11-15 18:56:28 +01:00
Vincent Haupert
91cd666010 sgx-sdk: nits 2021-11-15 15:08:23 +01:00
Vincent Haupert
e74ffcd366 sgx-sdk: rework installCheckPhase 2021-11-15 15:08:22 +01:00