mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-21 03:25:36 +00:00
Merge: linux_4_19: drop (#343283)
This commit is contained in:
Maximilian Bosch
GitHub
commit
179b6bce21
@ -517,6 +517,8 @@
|
||||
The derivation now installs "impl" headers selectively instead of by a wildcard.
|
||||
Use `imgui.src` if you just want to access the unpacked sources.
|
||||
|
||||
- Linux 4.19 has been removed because it will reach its end of life within the lifespan of 24.11
|
||||
|
||||
- Unprivileged access to the kernel syslog via `dmesg` is now restricted by default. Users wanting to keep an
|
||||
unrestricted access to it can set `boot.kernel.sysctl."kernel.dmesg_restrict" = false`.
|
||||
|
||||
|
||||
@ -25,7 +25,6 @@ let
|
||||
}) args);
|
||||
kernels = pkgs.linuxKernel.vanillaPackages // {
|
||||
inherit (pkgs.linuxKernel.packages)
|
||||
linux_4_19_hardened
|
||||
linux_5_4_hardened
|
||||
linux_5_10_hardened
|
||||
linux_5_15_hardened
|
||||
|
||||
@ -33,15 +33,12 @@ let
|
||||
|
||||
debug = {
|
||||
# Necessary for BTF
|
||||
DEBUG_INFO = lib.mkMerge [
|
||||
(whenOlder "5.2" (if (features.debug or false) then yes else no))
|
||||
(whenBetween "5.2" "5.18" yes)
|
||||
];
|
||||
DEBUG_INFO = whenOlder "5.18" yes;
|
||||
DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT = whenAtLeast "5.18" yes;
|
||||
# Reduced debug info conflict with BTF and have been enabled in
|
||||
# aarch64 defconfig since 5.13
|
||||
DEBUG_INFO_REDUCED = whenAtLeast "5.13" (option no);
|
||||
DEBUG_INFO_BTF = whenAtLeast "5.2" (option yes);
|
||||
DEBUG_INFO_BTF = option yes;
|
||||
# Allow loading modules with mismatched BTFs
|
||||
# FIXME: figure out how to actually make BTFs reproducible instead
|
||||
# See https://github.com/NixOS/nixpkgs/pull/181456 for details.
|
||||
@ -86,7 +83,7 @@ let
|
||||
# ACPI Firmware Performance Data Table Support
|
||||
ACPI_FPDT = whenAtLeast "5.12" (option yes);
|
||||
# ACPI Heterogeneous Memory Attribute Table Support
|
||||
ACPI_HMAT = whenAtLeast "5.2" (option yes);
|
||||
ACPI_HMAT = option yes;
|
||||
# ACPI Platform Error Interface
|
||||
ACPI_APEI = (option yes);
|
||||
# APEI Generic Hardware Error Source
|
||||
@ -128,7 +125,7 @@ let
|
||||
PWM = yes;
|
||||
} // lib.optionalAttrs (stdenv.hostPlatform.isx86) {
|
||||
INTEL_IDLE = yes;
|
||||
INTEL_RAPL = whenAtLeast "5.3" module;
|
||||
INTEL_RAPL = module;
|
||||
X86_INTEL_LPSS = yes;
|
||||
X86_INTEL_PSTATE = yes;
|
||||
X86_AMD_PSTATE = whenAtLeast "5.17" yes;
|
||||
@ -202,15 +199,15 @@ let
|
||||
IOSCHED_CFQ = whenOlder "5.0" yes; # Removed in 5.0-RC1
|
||||
BLK_CGROUP = yes; # required by CFQ"
|
||||
BLK_CGROUP_IOLATENCY = yes;
|
||||
BLK_CGROUP_IOCOST = whenAtLeast "5.4" yes;
|
||||
BLK_CGROUP_IOCOST = yes;
|
||||
IOSCHED_DEADLINE = whenOlder "5.0" yes; # Removed in 5.0-RC1
|
||||
MQ_IOSCHED_DEADLINE = yes;
|
||||
BFQ_GROUP_IOSCHED = yes;
|
||||
MQ_IOSCHED_KYBER = yes;
|
||||
IOSCHED_BFQ = module;
|
||||
# Enable CPU utilization clamping for RT tasks
|
||||
UCLAMP_TASK = whenAtLeast "5.3" yes;
|
||||
UCLAMP_TASK_GROUP = whenAtLeast "5.4" yes;
|
||||
UCLAMP_TASK = yes;
|
||||
UCLAMP_TASK_GROUP = yes;
|
||||
};
|
||||
|
||||
|
||||
@ -244,7 +241,7 @@ let
|
||||
HAVE_EBPF_JIT = whenPlatformHasEBPFJit yes;
|
||||
BPF_STREAM_PARSER = yes;
|
||||
XDP_SOCKETS = yes;
|
||||
XDP_SOCKETS_DIAG = whenAtLeast "5.1" yes;
|
||||
XDP_SOCKETS_DIAG = yes;
|
||||
WAN = yes;
|
||||
TCP_CONG_ADVANCED = yes;
|
||||
TCP_CONG_CUBIC = yes; # This is the default congestion control algorithm since 2.6.19
|
||||
@ -306,8 +303,7 @@ let
|
||||
# IPv6: Netfilter Configuration
|
||||
NF_TABLES_IPV6 = yes;
|
||||
# Bridge Netfilter Configuration
|
||||
NF_TABLES_BRIDGE = lib.mkMerge [ (whenOlder "5.3" yes)
|
||||
(whenAtLeast "5.3" module) ];
|
||||
NF_TABLES_BRIDGE = module;
|
||||
# Expose some debug info
|
||||
NF_CONNTRACK_PROCFS = yes;
|
||||
NF_FLOW_TABLE_PROCFS = whenAtLeast "6.0" yes;
|
||||
@ -377,9 +373,9 @@ let
|
||||
ATH10K_DFS_CERTIFIED = option yes;
|
||||
B43_PHY_HT = option yes;
|
||||
BCMA_HOST_PCI = option yes;
|
||||
RTW88 = whenAtLeast "5.2" module;
|
||||
RTW88_8822BE = lib.mkMerge [ (whenBetween "5.2" "5.8" yes) (whenAtLeast "5.8" module) ];
|
||||
RTW88_8822CE = lib.mkMerge [ (whenBetween "5.2" "5.8" yes) (whenAtLeast "5.8" module) ];
|
||||
RTW88 = module;
|
||||
RTW88_8822BE = lib.mkMerge [ (whenOlder "5.8" yes) (whenAtLeast "5.8" module) ];
|
||||
RTW88_8822CE = lib.mkMerge [ (whenOlder "5.8" yes) (whenAtLeast "5.8" module) ];
|
||||
};
|
||||
|
||||
fb = {
|
||||
@ -415,7 +411,7 @@ let
|
||||
};
|
||||
|
||||
video = let
|
||||
whenHasDevicePrivate = lib.mkIf (!stdenv.isx86_32 && lib.versionAtLeast version "5.1");
|
||||
whenHasDevicePrivate = lib.mkIf (!stdenv.isx86_32);
|
||||
in {
|
||||
# compile in DRM so simpledrm can load before initrd if necessary
|
||||
AGP = yes;
|
||||
@ -423,7 +419,7 @@ let
|
||||
|
||||
DRM_LEGACY = whenOlder "6.8" no;
|
||||
|
||||
NOUVEAU_LEGACY_CTX_SUPPORT = whenBetween "5.2" "6.3" no;
|
||||
NOUVEAU_LEGACY_CTX_SUPPORT = whenOlder "6.3" no;
|
||||
|
||||
# Enable simpledrm and use it for generic framebuffer
|
||||
# Technically added in 5.14, but adding more complex configuration is not worth it
|
||||
@ -446,8 +442,8 @@ let
|
||||
DRM_DISPLAY_DP_AUX_CHARDEV = whenAtLeast "6.10" yes;
|
||||
# amdgpu display core (DC) support
|
||||
DRM_AMD_DC_DCN1_0 = whenOlder "5.6" yes;
|
||||
DRM_AMD_DC_DCN2_0 = whenBetween "5.3" "5.6" yes;
|
||||
DRM_AMD_DC_DCN2_1 = whenBetween "5.4" "5.6" yes;
|
||||
DRM_AMD_DC_DCN2_0 = whenOlder "5.6" yes;
|
||||
DRM_AMD_DC_DCN2_1 = whenOlder "5.6" yes;
|
||||
DRM_AMD_DC_DCN3_0 = whenBetween "5.9" "5.11" yes;
|
||||
DRM_AMD_DC_DCN = whenBetween "5.11" "6.4" yes;
|
||||
DRM_AMD_DC_FP = whenAtLeast "6.4" yes;
|
||||
@ -578,7 +574,7 @@ let
|
||||
|
||||
TMPFS = yes;
|
||||
TMPFS_POSIX_ACL = yes;
|
||||
FS_ENCRYPTION = if (lib.versionAtLeast version "5.1") then yes else option module;
|
||||
FS_ENCRYPTION = yes;
|
||||
|
||||
EXT2_FS_XATTR = yes;
|
||||
EXT2_FS_POSIX_ACL = yes;
|
||||
@ -589,7 +585,6 @@ let
|
||||
|
||||
EXT4_FS_POSIX_ACL = yes;
|
||||
EXT4_FS_SECURITY = yes;
|
||||
EXT4_ENCRYPTION = whenOlder "5.1" yes;
|
||||
|
||||
NTFS_FS = whenBetween "5.15" "6.9" no;
|
||||
NTFS3_LZX_XPRESS = whenAtLeast "5.15" yes;
|
||||
@ -618,7 +613,6 @@ let
|
||||
|
||||
F2FS_FS = module;
|
||||
F2FS_FS_SECURITY = option yes;
|
||||
F2FS_FS_ENCRYPTION = whenOlder "5.1" yes;
|
||||
F2FS_FS_COMPRESSION = whenAtLeast "5.6" yes;
|
||||
UDF_FS = module;
|
||||
|
||||
@ -640,7 +634,6 @@ let
|
||||
CIFS_FSCACHE = yes;
|
||||
CIFS_WEAK_PW_HASH = whenOlder "5.15" yes;
|
||||
CIFS_UPCALL = yes;
|
||||
CIFS_ACL = whenOlder "5.3" yes;
|
||||
CIFS_DFS_UPCALL = yes;
|
||||
|
||||
CEPH_FSCACHE = yes;
|
||||
@ -668,7 +661,7 @@ let
|
||||
|
||||
DEVTMPFS = yes;
|
||||
|
||||
UNICODE = whenAtLeast "5.2" yes; # Casefolding support for filesystems
|
||||
UNICODE = yes; # Casefolding support for filesystems
|
||||
};
|
||||
|
||||
security = {
|
||||
@ -687,7 +680,6 @@ let
|
||||
STRICT_MODULE_RWX = yes;
|
||||
STRICT_DEVMEM = lib.mkDefault yes; # Filter access to /dev/mem
|
||||
IO_STRICT_DEVMEM = lib.mkDefault yes;
|
||||
SECURITY_SELINUX_BOOTPARAM_VALUE = whenOlder "5.1" (freeform "0"); # Disable SELinux by default
|
||||
|
||||
# Prevent processes from ptracing non-children processes
|
||||
SECURITY_YAMA = option yes;
|
||||
@ -705,17 +697,17 @@ let
|
||||
SECURITY_DMESG_RESTRICT = yes;
|
||||
|
||||
RANDOM_TRUST_CPU = whenOlder "6.2" yes; # allow RDRAND to seed the RNG
|
||||
RANDOM_TRUST_BOOTLOADER = whenOlder "6.2" (whenAtLeast "5.4" yes); # allow the bootloader to seed the RNG
|
||||
RANDOM_TRUST_BOOTLOADER = whenOlder "6.2" yes; # allow the bootloader to seed the RNG
|
||||
|
||||
MODULE_SIG = no; # r13y, generates a random key during build and bakes it in
|
||||
# Depends on MODULE_SIG and only really helps when you sign your modules
|
||||
# and enforce signatures which we don't do by default.
|
||||
SECURITY_LOCKDOWN_LSM = whenAtLeast "5.4" no;
|
||||
SECURITY_LOCKDOWN_LSM = no;
|
||||
|
||||
# provides a register of persistent per-UID keyrings, useful for encrypting storage pools in stratis
|
||||
PERSISTENT_KEYRINGS = yes;
|
||||
# enable temporary caching of the last request_key() result
|
||||
KEYS_REQUEST_CACHE = whenAtLeast "5.3" yes;
|
||||
KEYS_REQUEST_CACHE = yes;
|
||||
# randomized slab caches
|
||||
RANDOM_KMALLOC_CACHES = whenAtLeast "6.6" yes;
|
||||
|
||||
@ -732,9 +724,9 @@ let
|
||||
# Enable support for page poisoning. Still needs to be enabled on the command line to actually work.
|
||||
PAGE_POISONING = yes;
|
||||
# Randomize page allocator when page_alloc.shuffle=1
|
||||
SHUFFLE_PAGE_ALLOCATOR = whenAtLeast "5.2" yes;
|
||||
SHUFFLE_PAGE_ALLOCATOR = yes;
|
||||
|
||||
INIT_ON_ALLOC_DEFAULT_ON = whenAtLeast "5.3" yes;
|
||||
INIT_ON_ALLOC_DEFAULT_ON = yes;
|
||||
|
||||
# Enable stack smashing protections in schedule()
|
||||
# See: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v4.8&id=0d9e26329b0c9263d4d9e0422d80a0e73268c52f
|
||||
@ -848,7 +840,7 @@ let
|
||||
|
||||
VFIO_PCI_VGA = lib.mkIf stdenv.is64bit yes;
|
||||
|
||||
UDMABUF = whenAtLeast "4.20" yes;
|
||||
UDMABUF = yes;
|
||||
|
||||
# VirtualBox guest drivers in the kernel conflict with the ones in the
|
||||
# official additions package and prevent the vboxsf module from loading,
|
||||
@ -872,7 +864,6 @@ let
|
||||
XEN_PVH = option yes;
|
||||
XEN_PVHVM = option yes;
|
||||
XEN_SAVE_RESTORE = option yes;
|
||||
XEN_SELFBALLOONING = whenOlder "5.3" yes;
|
||||
|
||||
# Enable device detection on virtio-mmio hypervisors
|
||||
VIRTIO_MMIO_CMDLINE_DEVICES = yes;
|
||||
@ -1034,7 +1025,7 @@ let
|
||||
SERIAL_DEV_BUS = yes; # enables support for serial devices
|
||||
SERIAL_DEV_CTRL_TTYPORT = yes; # enables support for TTY serial devices
|
||||
|
||||
BT_HCIBTUSB_MTK = whenAtLeast "5.3" yes; # MediaTek protocol support
|
||||
BT_HCIBTUSB_MTK = yes; # MediaTek protocol support
|
||||
|
||||
BT_HCIUART = module; # required for BT devices with serial port interface (QCA6390)
|
||||
BT_HCIUART_BCM = option yes; # Broadcom Bluetooth support
|
||||
@ -1074,12 +1065,10 @@ let
|
||||
IDE = whenOlder "5.14" no; # deprecated IDE support, removed in 5.14
|
||||
IDLE_PAGE_TRACKING = yes;
|
||||
|
||||
JOYSTICK_IFORCE_232 = { optional = true; tristate = whenOlder "5.3" "y"; }; # I-Force Serial joysticks and wheels
|
||||
JOYSTICK_IFORCE_USB = { optional = true; tristate = whenOlder "5.3" "y"; }; # I-Force USB joysticks and wheels
|
||||
JOYSTICK_XPAD_FF = option yes; # X-Box gamepad rumble support
|
||||
JOYSTICK_XPAD_LEDS = option yes; # LED Support for Xbox360 controller 'BigX' LED
|
||||
|
||||
KEYBOARD_APPLESPI = whenAtLeast "5.3" module;
|
||||
KEYBOARD_APPLESPI = module;
|
||||
|
||||
KEXEC_FILE = option yes;
|
||||
KEXEC_JUMP = option yes;
|
||||
@ -1109,9 +1098,9 @@ let
|
||||
NVME_TARGET_AUTH = whenAtLeast "6.0" yes;
|
||||
NVME_TARGET_TCP_TLS = whenAtLeast "6.7" yes;
|
||||
|
||||
PCI_P2PDMA = lib.mkIf (stdenv.hostPlatform.is64bit && lib.versionAtLeast version "4.20") yes;
|
||||
PCI_P2PDMA = lib.mkIf (stdenv.hostPlatform.is64bit) yes;
|
||||
|
||||
PSI = whenAtLeast "4.20" yes;
|
||||
PSI = yes;
|
||||
|
||||
MOUSE_ELAN_I2C_SMBUS = yes;
|
||||
MOUSE_PS2_ELANTECH = yes; # Elantech PS/2 protocol extension
|
||||
@ -1168,17 +1157,17 @@ let
|
||||
# Disable the firmware helper fallback, udev doesn't implement it any more
|
||||
FW_LOADER_USER_HELPER_FALLBACK = option no;
|
||||
|
||||
FW_LOADER_COMPRESS = whenAtLeast "5.3" yes;
|
||||
FW_LOADER_COMPRESS = yes;
|
||||
FW_LOADER_COMPRESS_ZSTD = whenAtLeast "5.19" yes;
|
||||
|
||||
HOTPLUG_PCI_ACPI = yes; # PCI hotplug using ACPI
|
||||
HOTPLUG_PCI_PCIE = yes; # PCI-Expresscard hotplug support
|
||||
|
||||
# Enable AMD's ROCm GPU compute stack
|
||||
HSA_AMD = lib.mkIf stdenv.hostPlatform.is64bit (whenAtLeast "4.20" yes);
|
||||
ZONE_DEVICE = lib.mkIf stdenv.hostPlatform.is64bit (whenAtLeast "5.3" yes);
|
||||
HMM_MIRROR = whenAtLeast "5.3" yes;
|
||||
DRM_AMDGPU_USERPTR = whenAtLeast "5.3" yes;
|
||||
HSA_AMD = lib.mkIf stdenv.hostPlatform.is64bit (yes);
|
||||
ZONE_DEVICE = lib.mkIf stdenv.hostPlatform.is64bit (yes);
|
||||
HMM_MIRROR = yes;
|
||||
DRM_AMDGPU_USERPTR = yes;
|
||||
|
||||
PREEMPT = no;
|
||||
PREEMPT_VOLUNTARY = yes;
|
||||
@ -1239,13 +1228,13 @@ let
|
||||
NR_CPUS = freeform "384";
|
||||
|
||||
# Enable LEDS to display link-state status of PHY devices (i.e. eth lan/wan interfaces)
|
||||
LED_TRIGGER_PHY = whenAtLeast "4.10" yes;
|
||||
LED_TRIGGER_PHY = yes;
|
||||
} // lib.optionalAttrs (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.hostPlatform.system == "aarch64-linux") {
|
||||
# Enables support for the Allwinner Display Engine 2.0
|
||||
SUN8I_DE2_CCU = yes;
|
||||
|
||||
# See comments on https://github.com/NixOS/nixpkgs/commit/9b67ea9106102d882f53d62890468071900b9647
|
||||
CRYPTO_AEGIS128_SIMD = whenAtLeast "5.4" no;
|
||||
CRYPTO_AEGIS128_SIMD = no;
|
||||
|
||||
# Distros should configure the default as a kernel option.
|
||||
# We previously defined it on the kernel command line as cma=
|
||||
@ -1279,7 +1268,7 @@ let
|
||||
# differently when run under aarch64 kernels compared to when
|
||||
# it is run under an aarch32 kernel.
|
||||
COMPAT_ALIGNMENT_FIXUPS = lib.mkIf (stdenv.hostPlatform.system == "aarch64-linux") (whenAtLeast "6.1" yes);
|
||||
} // lib.optionalAttrs (lib.versionAtLeast version "5.4" && (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux")) {
|
||||
} // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") {
|
||||
# Required for various hardware features on Chrome OS devices
|
||||
CHROME_PLATFORMS = yes;
|
||||
CHROMEOS_TBMC = module;
|
||||
@ -1294,10 +1283,10 @@ let
|
||||
CROS_KBD_LED_BACKLIGHT = module;
|
||||
|
||||
TCG_TIS_SPI_CR50 = whenAtLeast "5.5" yes;
|
||||
} // lib.optionalAttrs (lib.versionAtLeast version "5.4" && stdenv.hostPlatform.system == "x86_64-linux") {
|
||||
} // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") {
|
||||
CHROMEOS_LAPTOP = module;
|
||||
CHROMEOS_PSTORE = module;
|
||||
} // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") {
|
||||
|
||||
# Enable x86 resource control
|
||||
X86_CPU_RESCTRL = whenAtLeast "5.0" yes;
|
||||
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst
|
||||
index 07650ee..934a7a8 100644
|
||||
--- a/scripts/Makefile.modinst
|
||||
+++ b/scripts/Makefile.modinst
|
||||
@@ -9,7 +9,8 @@ include scripts/Kbuild.include
|
||||
|
||||
#
|
||||
|
||||
-__modules := $(sort $(shell grep -h '\.ko$$' /dev/null $(wildcard $(MODVERDIR)/*.mod)))
|
||||
+__modules := $(sort $(foreach f,$(wildcard $(MODVERDIR)/*.mod),$(shell \
|
||||
+ grep -h '\.ko$$' '$f')))
|
||||
modules := $(patsubst %.o,%.ko,$(wildcard $(__modules:.ko=.o)))
|
||||
|
||||
PHONY += $(modules)
|
||||
@ -39,11 +39,6 @@
|
||||
patch = ./request-key-helper-updated.patch;
|
||||
};
|
||||
|
||||
modinst_arg_list_too_long =
|
||||
{ name = "modinst-arglist-too-long";
|
||||
patch = ./modinst-arg-list-too-long.patch;
|
||||
};
|
||||
|
||||
hardened = let
|
||||
mkPatch = kernelVersion: { version, sha256, patch }: let src = patch; in {
|
||||
name = lib.removeSuffix ".patch" src.name;
|
||||
|
||||
@ -858,16 +858,10 @@ mapAliases {
|
||||
linux-rt_6_1 = linuxKernel.kernels.linux_rt_6_1;
|
||||
linuxPackages_4_14 = linuxKernel.packages.linux_4_14;
|
||||
linuxPackages_4_19 = linuxKernel.packages.linux_4_19;
|
||||
linuxPackages_4_9 = linuxKernel.packages.linux_4_9;
|
||||
linuxPackages_5_4 = linuxKernel.packages.linux_5_4;
|
||||
linuxPackages_5_10 = linuxKernel.packages.linux_5_10;
|
||||
linuxPackages_5_15 = linuxKernel.packages.linux_5_15;
|
||||
linuxPackages_5_18 = linuxKernel.packages.linux_5_18;
|
||||
linuxPackages_5_19 = linuxKernel.packages.linux_5_19;
|
||||
linuxPackages_5_4 = linuxKernel.packages.linux_5_4;
|
||||
linuxPackages_6_0 = linuxKernel.packages.linux_6_0;
|
||||
linuxPackages_6_1 = linuxKernel.packages.linux_6_1;
|
||||
linuxPackages_6_2 = linuxKernel.packages.linux_6_2;
|
||||
linuxPackages_6_3 = linuxKernel.packages.linux_6_3;
|
||||
linuxPackages_6_4 = linuxKernel.packages.linux_6_4;
|
||||
linuxPackages_6_5 = linuxKernel.packages.linux_6_5;
|
||||
linuxPackages_6_6 = linuxKernel.packages.linux_6_6;
|
||||
@ -888,16 +882,10 @@ mapAliases {
|
||||
linuxPackages_rt_6_1 = linuxKernel.packages.linux_rt_6_1;
|
||||
linux_4_14 = linuxKernel.kernels.linux_4_14;
|
||||
linux_4_19 = linuxKernel.kernels.linux_4_19;
|
||||
linux_4_9 = linuxKernel.kernels.linux_4_9;
|
||||
linux_5_4 = linuxKernel.kernels.linux_5_4;
|
||||
linux_5_10 = linuxKernel.kernels.linux_5_10;
|
||||
linux_5_15 = linuxKernel.kernels.linux_5_15;
|
||||
linux_5_18 = linuxKernel.kernels.linux_5_18;
|
||||
linux_5_19 = linuxKernel.kernels.linux_5_19;
|
||||
linux_5_4 = linuxKernel.kernels.linux_5_4;
|
||||
linux_6_0 = linuxKernel.kernels.linux_6_0;
|
||||
linux_6_1 = linuxKernel.kernels.linux_6_1;
|
||||
linux_6_2 = linuxKernel.kernels.linux_6_2;
|
||||
linux_6_3 = linuxKernel.kernels.linux_6_3;
|
||||
linux_6_4 = linuxKernel.kernels.linux_6_4;
|
||||
linux_6_5 = linuxKernel.kernels.linux_6_5;
|
||||
linux_6_6 = linuxKernel.kernels.linux_6_6;
|
||||
|
||||
@ -26170,8 +26170,6 @@ with pkgs;
|
||||
# hardened kernels
|
||||
linuxPackages_hardened = linuxKernel.packages.linux_hardened;
|
||||
linux_hardened = linuxPackages_hardened.kernel;
|
||||
linuxPackages_4_19_hardened = linuxKernel.packages.linux_4_19_hardened;
|
||||
linux_4_19_hardened = linuxPackages_4_19_hardened.kernel;
|
||||
linuxPackages_5_4_hardened = linuxKernel.packages.linux_5_4_hardened;
|
||||
linux_5_4_hardened = linuxKernel.kernels.linux_5_4_hardened;
|
||||
linuxPackages_5_10_hardened = linuxKernel.packages.linux_5_10_hardened;
|
||||
|
||||
@ -97,15 +97,6 @@ in {
|
||||
rpiVersion = 4;
|
||||
};
|
||||
|
||||
linux_4_19 = callPackage ../os-specific/linux/kernel/mainline.nix {
|
||||
branch = "4.19";
|
||||
kernelPatches =
|
||||
[ kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
kernelPatches.modinst_arg_list_too_long
|
||||
];
|
||||
};
|
||||
|
||||
linux_5_4 = callPackage ../os-specific/linux/kernel/mainline.nix {
|
||||
branch = "5.4";
|
||||
kernelPatches = [
|
||||
@ -268,10 +259,6 @@ in {
|
||||
|
||||
linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { };
|
||||
|
||||
linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 {
|
||||
stdenv = gcc10Stdenv;
|
||||
buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; };
|
||||
};
|
||||
linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 {
|
||||
stdenv = gcc10Stdenv;
|
||||
buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; };
|
||||
@ -282,13 +269,8 @@ in {
|
||||
linux_6_6_hardened = hardenedKernelFor kernels.linux_6_6 { };
|
||||
|
||||
} // lib.optionalAttrs config.allowAliases {
|
||||
linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11";
|
||||
linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11";
|
||||
linux_5_18 = throw "linux 5.18 was removed because it has reached its end of life upstream";
|
||||
linux_5_19 = throw "linux 5.19 was removed because it has reached its end of life upstream";
|
||||
linux_6_0 = throw "linux 6.0 was removed because it has reached its end of life upstream";
|
||||
linux_6_2 = throw "linux 6.2 was removed because it has reached its end of life upstream";
|
||||
linux_6_3 = throw "linux 6.3 was removed because it has reached its end of life upstream";
|
||||
linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11";
|
||||
linux_6_4 = throw "linux 6.4 was removed because it has reached its end of life upstream";
|
||||
linux_6_5 = throw "linux 6.5 was removed because it has reached its end of life upstream";
|
||||
linux_6_7 = throw "linux 6.7 was removed because it has reached its end of life upstream";
|
||||
@ -297,9 +279,10 @@ in {
|
||||
|
||||
linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option";
|
||||
|
||||
linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream";
|
||||
linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream";
|
||||
linux_6_0_hardened = throw "linux 6.0 was removed because it has reached its end of life upstream";
|
||||
linux_4_14_hardened = throw "linux 4.14 was removed because it will reach its end of life within 23.11";
|
||||
linux_4_19_hardened = throw "linux 4.19 was removed because it will reach its end of life within 24.11";
|
||||
linux_6_4_hardened = throw "linux 6.4 was removed because it has reached its end of life upstream";
|
||||
linux_6_5_hardened = throw "linux 6.5 was removed because it has reached its end of life upstream";
|
||||
linux_6_7_hardened = throw "linux 6.7 was removed because it has reached its end of life upstream";
|
||||
linux_6_8_hardened = throw "linux 6.8 was removed because it has reached its end of life upstream";
|
||||
linux_6_9_hardened = throw "linux 6.9 was removed because it has reached its end of life upstream";
|
||||
@ -630,7 +613,6 @@ in {
|
||||
|
||||
vanillaPackages = {
|
||||
# recurse to build modules for the kernels
|
||||
linux_4_19 = recurseIntoAttrs (packagesFor kernels.linux_4_19);
|
||||
linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4);
|
||||
linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10);
|
||||
linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);
|
||||
@ -639,13 +621,8 @@ in {
|
||||
linux_6_10 = recurseIntoAttrs (packagesFor kernels.linux_6_10);
|
||||
linux_6_11 = recurseIntoAttrs (packagesFor kernels.linux_6_11);
|
||||
} // lib.optionalAttrs config.allowAliases {
|
||||
linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08
|
||||
linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; # Added 2023-10-11
|
||||
linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17
|
||||
linux_5_19 = throw "linux 5.19 was removed because it reached its end of life upstream"; # Added 2022-11-01
|
||||
linux_6_0 = throw "linux 6.0 was removed because it reached its end of life upstream"; # Added 2023-01-20
|
||||
linux_6_2 = throw "linux 6.2 was removed because it reached its end of life upstream"; # Added 2023-05-26
|
||||
linux_6_3 = throw "linux 6.3 was removed because it reached its end of life upstream"; # Added 2023-07-22
|
||||
linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-21
|
||||
linux_6_4 = throw "linux 6.4 was removed because it reached its end of life upstream"; # Added 2023-10-02
|
||||
linux_6_5 = throw "linux 6.5 was removed because it reached its end of life upstream"; # Added 2024-02-28
|
||||
linux_6_7 = throw "linux 6.7 was removed because it reached its end of life upstream"; # Added 2024-04-04
|
||||
@ -676,7 +653,6 @@ in {
|
||||
|
||||
linux_hardened = recurseIntoAttrs (packagesFor kernels.linux_hardened);
|
||||
|
||||
linux_4_19_hardened = recurseIntoAttrs (packagesFor kernels.linux_4_19_hardened);
|
||||
linux_5_4_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_4_hardened);
|
||||
linux_5_10_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_10_hardened);
|
||||
linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened);
|
||||
@ -694,9 +670,10 @@ in {
|
||||
linux_latest_libre = recurseIntoAttrs (packagesFor kernels.linux_latest_libre);
|
||||
__recurseIntoDerivationForReleaseJobs = true;
|
||||
} // lib.optionalAttrs config.allowAliases {
|
||||
linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream";
|
||||
linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream";
|
||||
linux_6_0_hardened = throw "linux 6.0 was removed because it has reached its end of life upstream";
|
||||
linux_4_14_hardened = throw "linux 4.14 was removed because it will reach its end of life within 23.11";
|
||||
linux_4_19_hardened = throw "linux 4.19 was removed because it will reach its end of life within 24.11";
|
||||
linux_6_4_hardened = throw "linux 6.4 was removed because it has reached its end of life upstream";
|
||||
linux_6_5_hardened = throw "linux 6.5 was removed because it has reached its end of life upstream";
|
||||
linux_6_7_hardened = throw "linux 6.7 was removed because it has reached its end of life upstream";
|
||||
linux_6_8_hardened = throw "linux 6.8 was removed because it has reached its end of life upstream";
|
||||
linux_6_9_hardened = throw "linux 6.9 was removed because it has reached its end of life upstream";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user