git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #89820 from primeos/linux_5_7

linux_5_7: init at 5.7.1

commite0c970c0e28483bd1f0ae3e924a7c41077cd8723 authorMichael Weiss <dev.primeos@gmail.com> dateTue 9 Jun 2020, 15:56 (6 years ago) parent90c533d551a988
2 files changed+48−16
pkgs/os-specific/linux/kernel/linux-5.7.nix+18 pkgs/top-level/all-packages.nix+30−16
pkgs/os-specific/linux/kernel/linux-5.7.nixnew file+18
@@ -0,0 +1,18 @@
1+{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
2+
3+with stdenv.lib;
4+
5+buildLinux (args // rec {
6+ version = "5.7.1";
7+
8+ # modDirVersion needs to be x.y.z, will automatically add .0 if needed
9+ modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
10+
11+ # branchVersion needs to be x.y
12+ extraMeta.branch = versions.majorMinor version;
13+
14+ src = fetchurl {
15+ url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
16+ sha256 = "1vcxrrb2i4366iciw0mfahwbdrzmhrrsr7gi4vdkzznfv2niils0";
17+ };
18+} // (args.argsOverride or {}))
pkgs/top-level/all-packages.nix+30−16
@@ -16908,6 +16908,14 @@ in
1690816908 ];
1690916909 };
1691016910
16911+ linux_5_7 = callPackage ../os-specific/linux/kernel/linux-5.7.nix {
16912+ kernelPatches = [
16913+ kernelPatches.bridge_stp_helper
16914+ kernelPatches.request_key_helper
16915+ kernelPatches.export_kernel_fpu_functions."5.3"
16916+ ];
16917+ };
16918+
1691116919 linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
1691216920 kernelPatches = [
1691316921 kernelPatches.bridge_stp_helper
@@ -17120,7 +17128,8 @@ in
1712017128 linux = linuxPackages.kernel;
1712117129
1712217130 # Update this when adding the newest kernel major version!
17123− linuxPackages_latest = linuxPackages_5_6;
17131+ # And update linux_latest_for_hardened below if the patches are already available
17132+ linuxPackages_latest = linuxPackages_5_7;
1712417133 linux_latest = linuxPackages_latest.kernel;
1712517134
1712617135 # Build the kernel modules for the some of the kernels.
@@ -17135,6 +17144,7 @@ in
1713517144 linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
1713617145 linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4);
1713717146 linuxPackages_5_6 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_6);
17147+ linuxPackages_5_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_7);
1713817148
1713917149 # When adding to this list:
1714017150 # - Update linuxPackages_latest to the latest version
@@ -17169,28 +17179,32 @@ in
1716917179
1717017180 linuxPackages_latest_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; }));
1717117181
17172− # Hardened linux
17173− hardenedLinuxPackagesFor = kernel: linuxPackagesFor (kernel.override {
17174− structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix {
17175− inherit stdenv;
17176− inherit (kernel) version;
17177− };
17178− kernelPatches = kernel.kernelPatches ++ [
17179− kernelPatches.tag_hardened
17180− kernelPatches.hardened.${kernel.meta.branch}
17181− ];
17182− modDirVersionArg = kernel.modDirVersion + "-hardened";
17182+ # Hardened Linux
17183+ hardenedLinuxPackagesFor = kernel': overrides:
17184+ let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates:
17185+ linux_latest_for_hardened = pkgs.linux_5_6; # TODO: Update to linux_latest
17186+ kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides;
17187+ in linuxPackagesFor (kernel.override {
17188+ structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix {
17189+ inherit stdenv;
17190+ inherit (kernel) version;
17191+ };
17192+ kernelPatches = kernel.kernelPatches ++ [
17193+ kernelPatches.tag_hardened
17194+ kernelPatches.hardened.${kernel.meta.branch}
17195+ ];
17196+ modDirVersionArg = kernel.modDirVersion + "-hardened";
1718317197 });
1718417198
17185− linuxPackages_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux);
17199+ linuxPackages_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux { });
1718617200 linux_hardened = linuxPackages_hardened.kernel;
1718717201
17188− linuxPackages_latest_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest);
17202+ linuxPackages_latest_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest { });
1718917203 linux_latest_hardened = linuxPackages_latest_hardened.kernel;
1719017204
17191− linuxPackages_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux.override { features.xen_dom0=true; }));
17205+ linuxPackages_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux { features.xen_dom0=true; });
1719217206
17193− linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; }));
17207+ linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest { features.xen_dom0=true; });
1719417208
1719517209 # Hardkernel (Odroid) kernels.
1719617210 linuxPackages_hardkernel_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_hardkernel_4_14);