Commit graph

14785 commits

Author SHA1 Message Date
Dmitry Kalinkin
219590673c
Merge branch 'staging-next' into staging
Conflicts:
	pkgs/development/python-modules/panel/default.nix
	pkgs/os-specific/linux/kernel/generic.nix
	pkgs/servers/home-assistant/default.nix
2021-04-08 22:42:26 -04:00
github-actions[bot]
85b57e4446
Merge master into staging-next 2021-04-08 18:14:17 +00:00
Jan Tojnar
625ce6c7f6 Merge branch 'staging-next' into staging
In python-packages.nix, resolve conflict between 50d604314e and 187d0371ab.
2021-04-08 17:14:31 +02:00
Sandro
a5fa1a5d87
Merge pull request #117217 from midchildan/feat/sshfs/darwin
sshfs: add darwin build
2021-04-08 15:51:03 +02:00
Tim Steinbach
d3d40b09fd kernel: Add test for RC kernels 2021-04-08 09:00:15 -04:00
Tim Steinbach
491f0a677b kernel: Add test for 4.4 2021-04-08 09:00:15 -04:00
Tim Steinbach
00c364a929 kernel: Add test for 4.9 2021-04-08 09:00:15 -04:00
Tim Steinbach
8c82c8a11c kernel: Add test for 4.14 2021-04-08 09:00:15 -04:00
Tim Steinbach
621a979bfe kernel: Add test for 4.19 2021-04-08 09:00:15 -04:00
Tim Steinbach
060e94136f kernel: Add test for 5.4 2021-04-08 09:00:15 -04:00
Tim Steinbach
1dc38fbbc2 kernel: Add test for 5.10 2021-04-08 09:00:15 -04:00
Tim Steinbach
bd7fed9a2f kernel: Add tests to passthru.tests 2021-04-08 09:00:15 -04:00
github-actions[bot]
bf6abedefb
Merge master into staging-next 2021-04-08 12:06:16 +00:00
Sandro
61b8c50e4d
Merge pull request #103816 from wedens/vendor-reset 2021-04-08 09:45:33 +02:00
Sandro
e4d3ea862a
Merge pull request #118762 from fortuneteller2k/update-xanmod
linux_xanmod: 5.11.10 -> 5.11.12
2021-04-08 09:43:45 +02:00
github-actions[bot]
0ba1008684
Merge master into staging-next 2021-04-08 06:05:39 +00:00
Orivej Desh
90691042af libcap: fix static build
It supports static build with SHARED=no; the patch no longer applies.

Tested by building pkgsStatic.libcap.
2021-04-08 05:51:56 +00:00
fortuneteller2k
9c529802fa linux_xanmod: 5.11.10 -> 5.11.12 2021-04-08 05:39:30 +08:00
github-actions[bot]
1bd1969867
Merge staging-next into staging 2021-04-06 18:15:33 +00:00
github-actions[bot]
44d53d308b
Merge master into staging-next 2021-04-06 18:15:29 +00:00
Doron Behar
873991697f
Merge pull request #112715 from fortuneteller2k/add-xanmod-kernel
linux_xanmod: init at 5.11.10
2021-04-06 15:09:26 +00:00
Jan Tojnar
70babe5bcf Merge branch 'staging-next' into staging 2021-04-06 16:25:41 +02:00
Jan Tojnar
c04a14edd6 Merge branch 'master' into staging-next 2021-04-06 16:01:14 +02:00
Alyssa Ross
52cd3538ff linux: remove remnants of grsecurity
Nixpkgs hasn't supported grsecurity kernels since 2017, so unless
anybody is manually enabling the grsecurity feature to make these
small kernel tweaks this is dead code.

This means we don't actually support any "features" in the kernel
common-config any more, but I've left the argument there because it's
conceivable we could have some again in future.
2021-04-06 09:48:56 +00:00
Sandro
8eb5e1647d
Merge pull request #118632 from MetaDark/linuxPackages.xpadneo 2021-04-06 10:32:16 +02:00
Sandro
ef9c0cb113
Merge pull request #115960 from grahamc/multipath-fixup
multipath-tools: fix the service path to multipathd
2021-04-06 10:28:15 +02:00
Sandro
ee6279bb68
Merge pull request #115925 from wentasah/kernelshark-1.2 2021-04-06 10:20:14 +02:00
wedens
0968946551 vendor-reset: init at unstable-2021-02-16 2021-04-06 10:49:58 +07:00
fortuneteller2k
6ce986c934 linux_xanmod: init at 5.11.10 2021-04-06 10:47:28 +08:00
midchildan
87f578a36f
sshfs: add darwin build 2021-04-06 10:37:53 +09:00
Sandro
004f305383
Merge pull request #118161 from Atemu/update/zen-kernels
zen-kernels: 5.11.8 -> 5.11.11
2021-04-06 03:15:37 +02:00
Martin Weinelt
7b6416657d
Merge pull request #118548 from mweinelt/raspberrypi 2021-04-06 01:51:05 +02:00
Kira Bruneau
a19d6e6dcd linuxPackages.xpadneo: 0.9 -> 0.9.1 2021-04-05 18:32:47 -04:00
John Ericson
741f7fa7c8
Merge pull request #118613 from obsidiansystems/aa/linux-5.12rc6
linux-testing: 5.12-rc4 -> 5.12-rc6
2021-04-05 13:46:37 -04:00
Ali Abrar
3b11170112 linux-testing: 5.12-rc4 -> 5.12-rc6 2021-04-05 13:10:37 -04:00
Sandro
56b8c368d8
Merge pull request #107099 from IvarWithoutBones/joycond-init
joycond: init at unstable-2021-03-27
2021-04-05 18:59:17 +02:00
Tim Steinbach
b60a941186 linux/hardened/patches/5.4: 5.4.108-hardened1 -> 5.4.109-hardened1 2021-04-05 10:02:50 -04:00
Tim Steinbach
feafbb7603 linux/hardened/patches/5.11: 5.11.10-hardened1 -> 5.11.11-hardened1 2021-04-05 10:02:50 -04:00
Tim Steinbach
3c47939956 linux/hardened/patches/5.10: 5.10.26-hardened1 -> 5.10.27-hardened1 2021-04-05 10:02:50 -04:00
Tim Steinbach
114cb322ac linux/hardened/patches/4.19: 4.19.183-hardened1 -> 4.19.184-hardened1 2021-04-05 10:02:50 -04:00
Tim Steinbach
fcd5f88906 linux/hardened/patches/4.14: 4.14.227-hardened1 -> 4.14.228-hardened1 2021-04-05 10:02:50 -04:00
Tim Steinbach
41d954afb5 linux: 5.4.108 -> 5.4.109 2021-04-05 10:02:50 -04:00
Tim Steinbach
8d0a705894 linux: 5.11.10 -> 5.11.11 2021-04-05 10:02:50 -04:00
Tim Steinbach
ccff62d486 linux: 5.10.26 -> 5.10.27 2021-04-05 10:02:50 -04:00
Tim Steinbach
69da7b41ae linux: 4.9.263 -> 4.9.264 2021-04-05 10:02:50 -04:00
Tim Steinbach
e1dda91015 linux: 4.4.263 -> 4.4.264 2021-04-05 10:02:50 -04:00
Tim Steinbach
94c5559e27 linux: 4.19.183 -> 4.19.184 2021-04-05 10:02:50 -04:00
Tim Steinbach
5538128395 linux: 4.14.227 -> 4.14.228 2021-04-05 10:02:50 -04:00
Alyssa Ross
25208eeaba linux: remove xen_dom0 feature entirely
Xen is now enabled unconditionally on kernels that support it, so the
xen_dom0 feature doesn't do anything.  The isXen attribute will now
produce a deprecation warning and unconditionally return true.
Passing in a custom value for isXen is no longer supported.
2021-04-05 09:25:39 +00:00
Jan Tojnar
7a772a476d
Merge pull request #118065 from benneti/update-power-profiles-daemon
power-profiles-daemon: 0.1 -> 0.8
2021-04-05 10:46:14 +02:00