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

Merge pull request #303136 from K900/kernels-20240410 

Kernel updates for 2024-04-10
This commit is contained in:
K900 2024-04-10 19:23:16 +03:00 committed by GitHub
parent ebdc52f921 a74181815c
commit 40705aba04
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/os-specific/linux/kernel/common-config.nix
View File

@ -615,8 +615,8 @@ let
F2FS_FS_COMPRESSION = whenAtLeast "5.6" yes;
UDF_FS = module;
NFSD_V2_ACL = whenOlder "6.1" yes;
NFSD_V3 = whenOlder "5.18" yes;
NFSD_V2_ACL = whenOlder "5.15" yes;
NFSD_V3 = whenOlder "5.15" yes;
NFSD_V3_ACL = yes;
NFSD_V4 = yes;
NFSD_V4_SECURITY_LABEL = yes;

20
pkgs/os-specific/linux/kernel/kernels-org.json
View File

@ -1,15 +1,15 @@
{
"testing": {
"version": "6.9-rc2",
"hash": "sha256:14yjrkd63qsd2hip53x146fsd42d261pxdh85fprcvsrg656c6gp"
"version": "6.9-rc3",
"hash": "sha256:0xavyh3xg23il3bm2x6fjji3s26z05cyv1lry6h5yd7jjj3qm7cc"
},
"6.1": {
"version": "6.1.84",
"hash": "sha256:0ykhl4i6yhryzgjkdbdz4pd3b1ghv84h6mpn7bdx0ra7w7mx55xg"
"version": "6.1.85",
"hash": "sha256:0x32p1c04q5d0yd4qncrmc064m3g1x7cvfia5cd04q3wb769pzik"
},
"5.15": {
"version": "5.15.153",
"hash": "sha256:1g44gjcwcdq5552vwinljqwiy90bxax72jjvdasp71x88khv3pfp"
"version": "5.15.154",
"hash": "sha256:16067mhf173kgs4mvlzix9qscwq5wy8817dyfyjx5g7jkykmxy0p"
},
"5.10": {
"version": "5.10.214",
@ -24,11 +24,11 @@
"hash": "sha256:10dww3cyazcf3wjzh8igpa0frb8gvl6amnksh42zfkji4mskh2r6"
},
"6.6": {
"version": "6.6.25",
"hash": "sha256:0i0zvqlj02rm6wpbidji0rn9559vrpfc1b8gbfjk70lhhyz11llr"
"version": "6.6.26",
"hash": "sha256:1nan0h95dkqpb55jr5mxfi8yks09fd518im3vblbi4zvyi4v8m5g"
},
"6.8": {
"version": "6.8.4",
"hash": "sha256:0qwywy89an1w0yvs5957kqyv74mwgxady521w2lmyq00zjaw9pnm"
"version": "6.8.5",
"hash": "sha256:12gsxxiwkildj8i94fkm2v69zb6z6s7hnnlvpsyv8j1pszjj728k"
}
}

6
pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
View File

@ -6,7 +6,7 @@
, ... } @ args:
let
version = "6.6.23-rt28"; # updated by ./update-rt.sh
version = "6.6.25-rt29"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@ -18,14 +18,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
sha256 = "1fd824ia3ngy65c5qaaln7m66ca4p80bwlnvvk76pw4yrccx23r0";
sha256 = "0i0zvqlj02rm6wpbidji0rn9559vrpfc1b8gbfjk70lhhyz11llr";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "0l9509qnv333fwjlxkr46rb23dhxs43bzj6iisk1r2lq69jhmyx4";
sha256 = "15mb4zycv86yp1cbs5svgs3pnmh8jihjhf4jxc4h4ywlzglkb1za";
};
}; in [ rt-patch ] ++ kernelPatches;

7
pkgs/os-specific/linux/kernel/update-mainline.py
View File

@ -130,6 +130,13 @@ def main():
continue
if old_version is None:
if kernel.eol:
print(
f"{kernel.branch} is EOL, not adding...",
file=sys.stderr
)
continue
message = f"linux_{nixpkgs_branch}: init at {kernel.version}"
else:
message = f"linux_{nixpkgs_branch}: {old_version} -> {kernel.version}"