Merge pull request #178709 from Ma27/kernel-updates
Linux kernel updates 2022-06-23
This commit is contained in:
commit
046fcb0f8b
15 changed files with 53 additions and 90 deletions
|
@ -30,7 +30,6 @@ let
|
||||||
linux_5_4_hardened
|
linux_5_4_hardened
|
||||||
linux_5_10_hardened
|
linux_5_10_hardened
|
||||||
linux_5_15_hardened
|
linux_5_15_hardened
|
||||||
linux_5_17_hardened
|
|
||||||
linux_5_18_hardened
|
linux_5_18_hardened
|
||||||
|
|
||||||
linux_testing;
|
linux_testing;
|
||||||
|
|
|
@ -2,71 +2,61 @@
|
||||||
"4.14": {
|
"4.14": {
|
||||||
"patch": {
|
"patch": {
|
||||||
"extra": "-hardened1",
|
"extra": "-hardened1",
|
||||||
"name": "linux-hardened-4.14.283-hardened1.patch",
|
"name": "linux-hardened-4.14.284-hardened1.patch",
|
||||||
"sha256": "07827a7wigdp2wml770gc0mmzmcmqf9mnry9xbsxpkgbs91ng6lp",
|
"sha256": "0hj6hmkv3ikgps0jrwl5jgg9pdw6mxi3iblr20r4yp8anxcrvaws",
|
||||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.283-hardened1/linux-hardened-4.14.283-hardened1.patch"
|
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.284-hardened1/linux-hardened-4.14.284-hardened1.patch"
|
||||||
},
|
},
|
||||||
"sha256": "191gybhnck4mh9yjzwgv1crrbxjc90p12bcif721rbs6xzszmxzh",
|
"sha256": "1f7bidisa6b4ff0mgn66h1nmf94j5mcx4wnkwnd9f49im6hcqllq",
|
||||||
"version": "4.14.283"
|
"version": "4.14.284"
|
||||||
},
|
},
|
||||||
"4.19": {
|
"4.19": {
|
||||||
"patch": {
|
"patch": {
|
||||||
"extra": "-hardened1",
|
"extra": "-hardened1",
|
||||||
"name": "linux-hardened-4.19.247-hardened1.patch",
|
"name": "linux-hardened-4.19.248-hardened1.patch",
|
||||||
"sha256": "1m7289bljbki2wiy6458v13l8wvslqgqhajcp735j50psi6jr6dp",
|
"sha256": "09bnw0f8rd5hf4k4w4n4sb3ggsw48nkxsrnxd9b8vn6jyqhv9n3s",
|
||||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.247-hardened1/linux-hardened-4.19.247-hardened1.patch"
|
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.248-hardened1/linux-hardened-4.19.248-hardened1.patch"
|
||||||
},
|
},
|
||||||
"sha256": "136gmsmvgb2nid4by2ld003w06lsr7hgn9ajx0wfziag7pfnjsv2",
|
"sha256": "0cdflfk6l13slw1cawpkhpjzbbnffcbyffrh29p9jg73pdqx23y4",
|
||||||
"version": "4.19.247"
|
"version": "4.19.248"
|
||||||
},
|
},
|
||||||
"5.10": {
|
"5.10": {
|
||||||
"patch": {
|
"patch": {
|
||||||
"extra": "-hardened1",
|
"extra": "-hardened1",
|
||||||
"name": "linux-hardened-5.10.122-hardened1.patch",
|
"name": "linux-hardened-5.10.124-hardened1.patch",
|
||||||
"sha256": "1mb10f3kfncgpwlygvnlvjy3cjlgjzbc5lp73wgjz1nzqjfdjrlp",
|
"sha256": "1fjwi5al5i0qb7a7viljb755ylqj3m5qp10835a3q91ad6zkjjnf",
|
||||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.122-hardened1/linux-hardened-5.10.122-hardened1.patch"
|
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.124-hardened1/linux-hardened-5.10.124-hardened1.patch"
|
||||||
},
|
},
|
||||||
"sha256": "0h0gfi3p1dd4p8xxklrl8sc3rv4xd08q7nv0i4m166w8188v62wj",
|
"sha256": "0yz3yw02b6b1sq800r46x5b3dagswb6z4clrfq485c4669sb2ipc",
|
||||||
"version": "5.10.122"
|
"version": "5.10.124"
|
||||||
},
|
},
|
||||||
"5.15": {
|
"5.15": {
|
||||||
"patch": {
|
"patch": {
|
||||||
"extra": "-hardened1",
|
"extra": "-hardened1",
|
||||||
"name": "linux-hardened-5.15.47-hardened1.patch",
|
"name": "linux-hardened-5.15.49-hardened1.patch",
|
||||||
"sha256": "0bpzk0l4kcfhqinh3rpl6wv70lhw9c304zgw2qbw0fa76mqfwgs8",
|
"sha256": "0p14bhqk0a4xzr11cc6gqc0ncc1a3cmvwyvisbsp7b74ax9w5qbm",
|
||||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.47-hardened1/linux-hardened-5.15.47-hardened1.patch"
|
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.49-hardened1/linux-hardened-5.15.49-hardened1.patch"
|
||||||
},
|
},
|
||||||
"sha256": "1700js21yimx8rz4bsglszry564l2ycmmcr36rdqspzbmlx5w8wb",
|
"sha256": "1p2r02h2z0j34hpkp3kr4741pr15ii72b94zllravx27pa9phj9j",
|
||||||
"version": "5.15.47"
|
"version": "5.15.49"
|
||||||
},
|
|
||||||
"5.17": {
|
|
||||||
"patch": {
|
|
||||||
"extra": "-hardened1",
|
|
||||||
"name": "linux-hardened-5.17.15-hardened1.patch",
|
|
||||||
"sha256": "053zgg464rb8ca92hkzxqbffapmj0zs296af354b7jkgfpb5xzr1",
|
|
||||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.17.15-hardened1/linux-hardened-5.17.15-hardened1.patch"
|
|
||||||
},
|
|
||||||
"sha256": "0a5n1lb43nhnhwjwclkk3dqp2nxsx5ny7zfl8idvzshf94m9472a",
|
|
||||||
"version": "5.17.15"
|
|
||||||
},
|
},
|
||||||
"5.18": {
|
"5.18": {
|
||||||
"patch": {
|
"patch": {
|
||||||
"extra": "-hardened1",
|
"extra": "-hardened1",
|
||||||
"name": "linux-hardened-5.18.3-hardened1.patch",
|
"name": "linux-hardened-5.18.6-hardened1.patch",
|
||||||
"sha256": "1kfnknpw2g39j7gqy6mqjmkaxkmdigx617rz2vpqvjxddfv59764",
|
"sha256": "0y0s50z4qrkcd0s7rlsk8nw1xibwy2i5vigm6526ch77d61g231m",
|
||||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.18.3-hardened1/linux-hardened-5.18.3-hardened1.patch"
|
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.18.6-hardened1/linux-hardened-5.18.6-hardened1.patch"
|
||||||
},
|
},
|
||||||
"sha256": "1sngy576db1zl2284kd0j8ds4biln0q98wnywirzsg3c0w2v8367",
|
"sha256": "0y1l2cgn8rak1050fn65a9xnapqyfq2dv8bijl150y44g6g2l72f",
|
||||||
"version": "5.18.3"
|
"version": "5.18.6"
|
||||||
},
|
},
|
||||||
"5.4": {
|
"5.4": {
|
||||||
"patch": {
|
"patch": {
|
||||||
"extra": "-hardened1",
|
"extra": "-hardened1",
|
||||||
"name": "linux-hardened-5.4.198-hardened1.patch",
|
"name": "linux-hardened-5.4.200-hardened1.patch",
|
||||||
"sha256": "0srx8kfapa8ahbqajwd8dir49l4rs0ijz3k3nrgvb2jjlrg1m4dd",
|
"sha256": "1mpcvgri079v8js8y2angwmksyk07vhyi2b5b24bxxdbm1s5a58s",
|
||||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.198-hardened1/linux-hardened-5.4.198-hardened1.patch"
|
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.200-hardened1/linux-hardened-5.4.200-hardened1.patch"
|
||||||
},
|
},
|
||||||
"sha256": "0wvscr5wia2xdiqfxxdwl8kxf1s085qdj5h4423mraj7dh6l0ihh",
|
"sha256": "1f15al9g4cd17fm43im5rqqrbz1cqhz2hq5ycpqvwa02pydprsga",
|
||||||
"version": "5.4.198"
|
"version": "5.4.200"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
buildLinux (args // rec {
|
buildLinux (args // rec {
|
||||||
version = "4.14.283";
|
version = "4.14.284";
|
||||||
|
|
||||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||||
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||||
sha256 = "191gybhnck4mh9yjzwgv1crrbxjc90p12bcif721rbs6xzszmxzh";
|
sha256 = "1f7bidisa6b4ff0mgn66h1nmf94j5mcx4wnkwnd9f49im6hcqllq";
|
||||||
};
|
};
|
||||||
} // (args.argsOverride or {}))
|
} // (args.argsOverride or {}))
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
buildLinux (args // rec {
|
buildLinux (args // rec {
|
||||||
version = "4.19.247";
|
version = "4.19.248";
|
||||||
|
|
||||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||||
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||||
sha256 = "136gmsmvgb2nid4by2ld003w06lsr7hgn9ajx0wfziag7pfnjsv2";
|
sha256 = "0cdflfk6l13slw1cawpkhpjzbbnffcbyffrh29p9jg73pdqx23y4";
|
||||||
};
|
};
|
||||||
} // (args.argsOverride or {}))
|
} // (args.argsOverride or {}))
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
|
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
|
||||||
|
|
||||||
buildLinux (args // rec {
|
buildLinux (args // rec {
|
||||||
version = "4.9.318";
|
version = "4.9.319";
|
||||||
extraMeta.branch = "4.9";
|
extraMeta.branch = "4.9";
|
||||||
extraMeta.broken = stdenv.isAarch64;
|
extraMeta.broken = stdenv.isAarch64;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||||
sha256 = "09czsc0ynyw068yczs9qx4cliqmrh5hvz93c77lhh014wn02pba4";
|
sha256 = "11242bn95k51knm9da7xk7r10vk7iji06wix1cq4g5nzldrfp9sp";
|
||||||
};
|
};
|
||||||
} // (args.argsOverride or {}))
|
} // (args.argsOverride or {}))
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
buildLinux (args // rec {
|
buildLinux (args // rec {
|
||||||
version = "5.10.122";
|
version = "5.10.124";
|
||||||
|
|
||||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||||
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||||
sha256 = "0h0gfi3p1dd4p8xxklrl8sc3rv4xd08q7nv0i4m166w8188v62wj";
|
sha256 = "0yz3yw02b6b1sq800r46x5b3dagswb6z4clrfq485c4669sb2ipc";
|
||||||
};
|
};
|
||||||
} // (args.argsOverride or {}))
|
} // (args.argsOverride or {}))
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
buildLinux (args // rec {
|
buildLinux (args // rec {
|
||||||
version = "5.15.47";
|
version = "5.15.49";
|
||||||
|
|
||||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||||
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||||
sha256 = "1700js21yimx8rz4bsglszry564l2ycmmcr36rdqspzbmlx5w8wb";
|
sha256 = "1p2r02h2z0j34hpkp3kr4741pr15ii72b94zllravx27pa9phj9j";
|
||||||
};
|
};
|
||||||
} // (args.argsOverride or { }))
|
} // (args.argsOverride or { }))
|
||||||
|
|
|
@ -1,18 +0,0 @@
|
||||||
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
|
|
||||||
buildLinux (args // rec {
|
|
||||||
version = "5.17.15";
|
|
||||||
|
|
||||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
|
||||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
|
||||||
|
|
||||||
# branchVersion needs to be x.y
|
|
||||||
extraMeta.branch = versions.majorMinor version;
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
|
||||||
sha256 = "0a5n1lb43nhnhwjwclkk3dqp2nxsx5ny7zfl8idvzshf94m9472a";
|
|
||||||
};
|
|
||||||
} // (args.argsOverride or { }))
|
|
|
@ -3,7 +3,7 @@
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
buildLinux (args // rec {
|
buildLinux (args // rec {
|
||||||
version = "5.18.4";
|
version = "5.18.6";
|
||||||
|
|
||||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||||
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||||
sha256 = "1pcjjiwal8jr07n5bzg6clcmm20gvmvqgxl8k46npibrdx3r6wab";
|
sha256 = "0y1l2cgn8rak1050fn65a9xnapqyfq2dv8bijl150y44g6g2l72f";
|
||||||
};
|
};
|
||||||
} // (args.argsOverride or { }))
|
} // (args.argsOverride or { }))
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
buildLinux (args // rec {
|
buildLinux (args // rec {
|
||||||
version = "5.4.198";
|
version = "5.4.200";
|
||||||
|
|
||||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||||
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
|
||||||
|
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||||
sha256 = "0wvscr5wia2xdiqfxxdwl8kxf1s085qdj5h4423mraj7dh6l0ihh";
|
sha256 = "1f15al9g4cd17fm43im5rqqrbz1cqhz2hq5ycpqvwa02pydprsga";
|
||||||
};
|
};
|
||||||
} // (args.argsOverride or {}))
|
} // (args.argsOverride or {}))
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
{ stdenv, lib, fetchsvn, linux
|
{ stdenv, lib, fetchsvn, linux
|
||||||
, scripts ? fetchsvn {
|
, scripts ? fetchsvn {
|
||||||
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
|
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
|
||||||
rev = "18777";
|
rev = "18798";
|
||||||
sha256 = "0ycg799pdi3rarkdgrrxcfjl15n8i24d9zc54xhg79wpgxcv39n3";
|
sha256 = "04mxzf8k3g65yw73da9fgk27hraf69239m5757fsr5a6pj88z6lb";
|
||||||
}
|
}
|
||||||
, ...
|
, ...
|
||||||
}:
|
}:
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
extraMeta = {
|
extraMeta = {
|
||||||
branch = "master";
|
branch = "master";
|
||||||
maintainers = with lib.maintainers; [ davidak Madouura ];
|
maintainers = with lib.maintainers; [ davidak Madouura ];
|
||||||
|
broken = true;
|
||||||
};
|
};
|
||||||
} // argsOverride;
|
} // argsOverride;
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
, enablePython ? true
|
, enablePython ? true
|
||||||
|
|
||||||
# for determining the latest compatible linuxPackages
|
# for determining the latest compatible linuxPackages
|
||||||
, linuxPackages_5_17 ? pkgs.linuxKernel.packages.linux_5_17
|
, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -217,7 +217,7 @@ in {
|
||||||
zfsStable = common {
|
zfsStable = common {
|
||||||
# check the release notes for compatible kernels
|
# check the release notes for compatible kernels
|
||||||
kernelCompatible = kernel.kernelOlder "5.18";
|
kernelCompatible = kernel.kernelOlder "5.18";
|
||||||
latestCompatibleLinuxPackages = linuxPackages_5_17;
|
latestCompatibleLinuxPackages = linuxPackages_5_15;
|
||||||
|
|
||||||
# this package should point to the latest release.
|
# this package should point to the latest release.
|
||||||
version = "2.1.4";
|
version = "2.1.4";
|
||||||
|
@ -228,7 +228,7 @@ in {
|
||||||
zfsUnstable = common {
|
zfsUnstable = common {
|
||||||
# check the release notes for compatible kernels
|
# check the release notes for compatible kernels
|
||||||
kernelCompatible = kernel.kernelOlder "5.18";
|
kernelCompatible = kernel.kernelOlder "5.18";
|
||||||
latestCompatibleLinuxPackages = linuxPackages_5_17;
|
latestCompatibleLinuxPackages = linuxPackages_5_15;
|
||||||
|
|
||||||
# this package should point to a version / git revision compatible with the latest kernel release
|
# this package should point to a version / git revision compatible with the latest kernel release
|
||||||
# IMPORTANT: Always use a tagged release candidate or commits from the
|
# IMPORTANT: Always use a tagged release candidate or commits from the
|
||||||
|
|
|
@ -23450,8 +23450,6 @@ with pkgs;
|
||||||
linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened;
|
linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened;
|
||||||
linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened;
|
linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened;
|
||||||
linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened;
|
linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened;
|
||||||
linuxPackages_5_17_hardened = linuxKernel.packages.linux_5_17_hardened;
|
|
||||||
linux_5_17_hardened = linuxKernel.kernels.linux_5_17_hardened;
|
|
||||||
linuxPackages_5_18_hardened = linuxKernel.packages.linux_5_18_hardened;
|
linuxPackages_5_18_hardened = linuxKernel.packages.linux_5_18_hardened;
|
||||||
linux_5_18_hardened = linuxKernel.kernels.linux_5_18_hardened;
|
linux_5_18_hardened = linuxKernel.kernels.linux_5_18_hardened;
|
||||||
|
|
||||||
|
|
|
@ -162,12 +162,7 @@ in {
|
||||||
|
|
||||||
linux_5_16 = throw "linux 5.16 was removed because it has reached its end of life upstream";
|
linux_5_16 = throw "linux 5.16 was removed because it has reached its end of life upstream";
|
||||||
|
|
||||||
linux_5_17 = callPackage ../os-specific/linux/kernel/linux-5.17.nix {
|
linux_5_17 = throw "linux 5.17 was removed because it has reached its end of life upstream";
|
||||||
kernelPatches = [
|
|
||||||
kernelPatches.bridge_stp_helper
|
|
||||||
kernelPatches.request_key_helper
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
linux_5_18 = callPackage ../os-specific/linux/kernel/linux-5.18.nix {
|
linux_5_18 = callPackage ../os-specific/linux/kernel/linux-5.18.nix {
|
||||||
kernelPatches = [
|
kernelPatches = [
|
||||||
|
@ -189,7 +184,7 @@ in {
|
||||||
else testing;
|
else testing;
|
||||||
|
|
||||||
linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec {
|
linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec {
|
||||||
kernel = linux_5_17;
|
kernel = linux_5_18;
|
||||||
kernelPatches = kernel.kernelPatches;
|
kernelPatches = kernel.kernelPatches;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -243,7 +238,6 @@ in {
|
||||||
linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { };
|
linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { };
|
||||||
linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };
|
linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };
|
||||||
linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };
|
linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };
|
||||||
linux_5_17_hardened = hardenedKernelFor kernels.linux_5_17 { };
|
|
||||||
linux_5_18_hardened = hardenedKernelFor kernels.linux_5_18 { };
|
linux_5_18_hardened = hardenedKernelFor kernels.linux_5_18 { };
|
||||||
|
|
||||||
}));
|
}));
|
||||||
|
@ -517,7 +511,7 @@ in {
|
||||||
linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10);
|
linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10);
|
||||||
linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);
|
linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);
|
||||||
linux_5_16 = throw "linux 5.16 was removed because it reached its end of life upstream"; # Added 2022-04-23
|
linux_5_16 = throw "linux 5.16 was removed because it reached its end of life upstream"; # Added 2022-04-23
|
||||||
linux_5_17 = recurseIntoAttrs (packagesFor kernels.linux_5_17);
|
linux_5_17 = throw "linux 5.17 was removed because it reached its end of life upstream"; # Added 2022-06-23
|
||||||
linux_5_18 = recurseIntoAttrs (packagesFor kernels.linux_5_18);
|
linux_5_18 = recurseIntoAttrs (packagesFor kernels.linux_5_18);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -557,7 +551,6 @@ in {
|
||||||
});
|
});
|
||||||
linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { });
|
linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { });
|
||||||
linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { });
|
linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { });
|
||||||
linux_5_17_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_17 { });
|
|
||||||
linux_5_18_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_18 { });
|
linux_5_18_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_18 { });
|
||||||
|
|
||||||
linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
|
linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
|
||||||
|
|
Loading…
Reference in a new issue