gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Linux kernel updates 2025-03-23 (#392238)

Browse Source
This commit is contained in:
K900
2025-03-24 18:57:38 +03:00
committed by GitHub
parent aa1d7edca2 a187f23b4f
commit 97dc21f791
9 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/tests/kernel-generic.nix
-1
View File
@@ -40,7 +40,6 @@ let
linux_5_15_hardened
linux_6_1_hardened
linux_6_6_hardened
linux_6_11_hardened
linux_6_12_hardened
linux_6_13_hardened
linux_rt_5_4
pkgs/os-specific/linux/kernel/common-config.nix
+5
View File
@@ -872,6 +872,7 @@ let
CGROUP_HUGETLB = yes;
CGROUP_PERF = yes;
CGROUP_RDMA = yes;
CGROUP_DMEM = whenAtLeast "6.14" yes;
MEMCG = yes;
MEMCG_SWAP = whenOlder "6.1" yes;
@@ -1099,6 +1100,10 @@ let
MD = yes; # Device mapper (RAID, LVM, etc.)
# enable support for device trees and overlays
OF = option yes;
OF_OVERLAY = option yes;
# Enable initrd support.
BLK_DEV_INITRD = yes;
pkgs/os-specific/linux/kernel/kernels-org.json
+10 -10
View File
@@ -20,19 +20,19 @@
"hash": "sha256:0vpgb3lmhgv5iw9b1z0kqr6vdv44if49marfp5858z3a8yj69bdk"
},
"6.6": {
"version": "6.6.83",
"hash": "sha256:0262q81mwhy8plql8hnnfvagp460vfl127kaayya113l7gkbnjw9"
},
"6.11": {
"version": "6.11.11",
"hash": "sha256:1z2913y38clnlmhvwj49h7p4pic24s4d8np7nmd4lk7m2xz8w532"
"version": "6.6.84",
"hash": "sha256:19vvq558vs2ivj4l6kmyha30a94fh42wmijsghsdnq8salhhglkz"
},
"6.12": {
"version": "6.12.19",
"hash": "sha256:0cb5ri6xsd9fyf0s48xrrsbhqzbgjd0iddnid6qk8i60prbz0fyp"
"version": "6.12.20",
"hash": "sha256:1ivakcj0gi191687zagl1qfsip0567p1pk3yy1s2xf0agfq8j3i3"
},
"6.13": {
"version": "6.13.7",
"hash": "sha256:07c08x68fgcsgriss5z8w427h69y52s887vas91jzb5p70hbcf9s"
"version": "6.13.8",
"hash": "sha256:1fqsfnam0ca2lyqgi9vh7x6xa24yjk6ym6z85bn6nrrxsxczm6i5"
},
"6.14": {
"version": "6.14",
"hash": "sha256:0w3nqh02vl8f2wsx3fmsvw1pdsnjs5zfqcmv2w2vnqdiwy1vd552"
}
}
pkgs/os-specific/linux/kernel/linux-libre.nix
+2 -2
View File
@@ -5,8 +5,8 @@
linux,
scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
rev = "19729";
sha256 = "0w7bhb0ybvvx28gqrhk81wzhqxkrfbhzwr3hv1mpr3cjgldfppr9";
rev = "19746";
sha256 = "07kzanf61ja2jw6rac8jd0w2bs4i41wqclr59m2h6c8j0dc7w4as";
},
...
}@args:
pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
+3 -3
View File
@@ -10,7 +10,7 @@
}@args:
let
version = "5.10.233-rt125"; # updated by ./update-rt.sh
version = "5.10.234-rt127"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in
@@ -25,7 +25,7 @@ buildLinux (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "0lkz2g8r032f027j3gih3f7crx991mrpng9qgqc5k4cc1wl5g7i3";
sha256 = "1rgb4v6dvqlw1mgzsli0hxaj2d5d4m1nylgcrwm4bkpiwbzc95wm";
};
kernelPatches =
@@ -34,7 +34,7 @@ buildLinux (
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "1cx91p88h169v69lxz7vbjjnxdzdz9v28liypz099xghibwhcwfh";
sha256 = "1pmfba5sjmhai2hbzgbwhak46jhc45rcxf7zdgx5hbhbpgbl9d49";
};
};
in
pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
+3 -3
View File
@@ -10,7 +10,7 @@
}@args:
let
version = "5.4.288-rt94"; # updated by ./update-rt.sh
version = "5.4.290-rt96"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in
@@ -22,7 +22,7 @@ buildLinux (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "1zhsb6gwhb6cvijzh7s8rnm4b06klyhb2mxb06gcyfvj0givlvw7";
sha256 = "0mm4q8f6kbqddy4zaxjf5xyqpnla5qprvsf7v3vq01gmlzr3rivc";
};
kernelPatches =
@@ -31,7 +31,7 @@ buildLinux (
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "0gn290fyc37jq6ii78nzd0yfzf111mssghwhgj9mjfja89zy197m";
sha256 = "1vcyz46n6yznbil5lqiqrn9vrdf0cpva7br9fj7lrr958yjv7101";
};
};
in
pkgs/top-level/aliases.nix
+2
View File
@@ -853,6 +853,7 @@ mapAliases {
linuxPackages_6_11 = linuxKernel.packages.linux_6_11;
linuxPackages_6_12 = linuxKernel.packages.linux_6_12;
linuxPackages_6_13 = linuxKernel.packages.linux_6_13;
linuxPackages_6_14 = linuxKernel.packages.linux_6_14;
linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;
linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3;
linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1;
@@ -879,6 +880,7 @@ mapAliases {
linux_6_11 = linuxKernel.kernels.linux_6_11;
linux_6_12 = linuxKernel.kernels.linux_6_12;
linux_6_13 = linuxKernel.kernels.linux_6_13;
linux_6_14 = linuxKernel.kernels.linux_6_14;
linux_rpi0 = linuxKernel.kernels.linux_rpi1;
linux_rpi02w = linuxKernel.kernels.linux_rpi3;
linux_rpi1 = linuxKernel.kernels.linux_rpi1;
pkgs/top-level/all-packages.nix
-2
View File
@@ -11983,8 +11983,6 @@ with pkgs;
linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened;
linuxPackages_6_6_hardened = linuxKernel.packages.linux_6_6_hardened;
linux_6_6_hardened = linuxKernel.kernels.linux_6_6_hardened;
linuxPackages_6_11_hardened = linuxKernel.packages.linux_6_11_hardened;
linux_6_11_hardened = linuxKernel.kernels.linux_6_11_hardened;
linuxPackages_6_12_hardened = linuxKernel.packages.linux_6_12_hardened;
linux_6_12_hardened = linuxKernel.kernels.linux_6_12_hardened;
linuxPackages_6_13_hardened = linuxKernel.packages.linux_6_13_hardened;
pkgs/top-level/linux-kernels.nix
+14 -12
View File
@@ -197,14 +197,6 @@ in {
];
};
linux_6_11 = callPackage ../os-specific/linux/kernel/mainline.nix {
branch = "6.11";
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
};
linux_6_12 = callPackage ../os-specific/linux/kernel/mainline.nix {
branch = "6.12";
kernelPatches = [
@@ -221,6 +213,14 @@ in {
];
};
linux_6_14 = callPackage ../os-specific/linux/kernel/mainline.nix {
branch = "6.14";
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
};
linux_testing = let
testing = callPackage ../os-specific/linux/kernel/mainline.nix {
# A special branch that tracks the kernel under the release process
@@ -299,7 +299,6 @@ in {
linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };
linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { };
linux_6_6_hardened = hardenedKernelFor kernels.linux_6_6 { };
linux_6_11_hardened = hardenedKernelFor kernels.linux_6_11 { };
linux_6_12_hardened = hardenedKernelFor kernels.linux_6_12 { };
linux_6_13_hardened = hardenedKernelFor kernels.linux_6_13 { };
@@ -312,6 +311,7 @@ in {
linux_6_8 = throw "linux 6.8 was removed because it has reached its end of life upstream";
linux_6_9 = throw "linux 6.9 was removed because it has reached its end of life upstream";
linux_6_10 = throw "linux 6.10 was removed because it has reached its end of life upstream";
linux_6_11 = throw "linux 6.11 was removed because it has reached its end of life upstream";
linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option";
@@ -323,6 +323,7 @@ in {
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";
linux_6_10_hardened = throw "linux 6.10 was removed because it has reached its end of life upstream";
linux_6_11_hardened = throw "linux 6.11 was removed because it has reached its end of life upstream";
}));
/* Linux kernel modules are inherently tied to a specific kernel. So
rather than provide specific instances of those packages for a
@@ -677,9 +678,9 @@ in {
linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);
linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1);
linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);
linux_6_11 = recurseIntoAttrs (packagesFor kernels.linux_6_11);
linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12);
linux_6_13 = recurseIntoAttrs (packagesFor kernels.linux_6_13);
linux_6_14 = recurseIntoAttrs (packagesFor kernels.linux_6_14);
} // lib.optionalAttrs config.allowAliases {
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_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-21
@@ -689,6 +690,7 @@ in {
linux_6_8 = throw "linux 6.8 was removed because it reached its end of life upstream"; # Added 2024-08-02
linux_6_9 = throw "linux 6.9 was removed because it reached its end of life upstream"; # Added 2024-08-02
linux_6_10 = throw "linux 6.10 was removed because it reached its end of life upstream"; # Added 2024-10-23
linux_6_11 = throw "linux 6.11 was removed because it reached its end of life upstream"; # Added 2025-03-23
};
rtPackages = {
@@ -719,7 +721,6 @@ in {
linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened);
linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened);
linux_6_6_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_6_hardened);
linux_6_11_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_11_hardened);
linux_6_12_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_12_hardened);
linux_6_13_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_13_hardened);
@@ -743,13 +744,14 @@ in {
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";
linux_6_11_hardened = throw "linux 6.11 was removed because it has reached its end of life upstream";
linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option";
});
packageAliases = {
linux_default = packages.linux_6_12;
# Update this when adding the newest kernel major version!
linux_latest = packages.linux_6_13;
linux_latest = packages.linux_6_14;
linux_rt_default = packages.linux_rt_5_15;
linux_rt_latest = packages.linux_rt_6_6;
} // lib.optionalAttrs config.allowAliases {