commit e0c970c0e28483bd1f0ae3e924a7c41077cd8723 · pyrox.dev/nixpkgs

+18

pkgs/os-specific/linux/kernel/linux-5.7.nix

···

       1
       1
       +
       { stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:

     

       2
       2
       +
       

     

       3
       3
       +
       with stdenv.lib;

     

       4
       4
       +
       

     

       5
       5
       +
       buildLinux (args // rec {

     

       6
       6
       +
         version = "5.7.1";

     

       7
       7
       +
       

     

       8
       8
       +
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
       +
         modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;

     

       10
       10
       +
       

     

       11
       11
       +
         # branchVersion needs to be x.y

     

       12
       12
       +
         extraMeta.branch = versions.majorMinor version;

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchurl {

     

       15
       15
       +
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       16
       +
           sha256 = "1vcxrrb2i4366iciw0mfahwbdrzmhrrsr7gi4vdkzznfv2niils0";

     

       17
       17
       +
         };

     

       18
       18
       +
       } // (args.argsOverride or {}))

+30 -16

pkgs/top-level/all-packages.nix

···

       16908
       16908
        
           ];

     

       16909
       16909
        
         };

     

       16910
       16910
        
       

     

       16911
       16911
       +
         linux_5_7 = callPackage ../os-specific/linux/kernel/linux-5.7.nix {

     

       16912
       16912
       +
           kernelPatches = [

     

       16913
       16913
       +
             kernelPatches.bridge_stp_helper

     

       16914
       16914
       +
             kernelPatches.request_key_helper

     

       16915
       16915
       +
             kernelPatches.export_kernel_fpu_functions."5.3"

     

       16916
       16916
       +
           ];

     

       16917
       16917
       +
         };

     

       16918
       16918
       +
       

     

       16911
       16919
        
         linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {

     

       16912
       16920
        
           kernelPatches = [

     

       16913
       16921
        
             kernelPatches.bridge_stp_helper

     
···

       17120
       17128
        
         linux = linuxPackages.kernel;

     

       17121
       17129
        
       

     

       17122
       17130
        
         # Update this when adding the newest kernel major version!

     

       17123
       17123
       -
         linuxPackages_latest = linuxPackages_5_6;

     

       17131
       17131
       +
         # And update linux_latest_for_hardened below if the patches are already available

     

       17132
       17132
       +
         linuxPackages_latest = linuxPackages_5_7;

     

       17124
       17133
        
         linux_latest = linuxPackages_latest.kernel;

     

       17125
       17134
        
       

     

       17126
       17135
        
         # Build the kernel modules for the some of the kernels.

     
···

       17135
       17144
        
         linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);

     

       17136
       17145
        
         linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4);

     

       17137
       17146
        
         linuxPackages_5_6 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_6);

     

       17147
       17147
       +
         linuxPackages_5_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_7);

     

       17138
       17148
        
       

     

       17139
       17149
        
         # When adding to this list:

     

       17140
       17150
        
         # - Update linuxPackages_latest to the latest version

     
···

       17169
       17179
        
       

     

       17170
       17180
        
         linuxPackages_latest_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; }));

     

       17171
       17181
        
       

     

       17172
       17172
       -
         # Hardened linux

     

       17173
       17173
       -
         hardenedLinuxPackagesFor = kernel: linuxPackagesFor (kernel.override {

     

       17174
       17174
       -
           structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix {

     

       17175
       17175
       -
             inherit stdenv;

     

       17176
       17176
       -
             inherit (kernel) version;

     

       17177
       17177
       -
           };

     

       17178
       17178
       -
           kernelPatches = kernel.kernelPatches ++ [

     

       17179
       17179
       -
             kernelPatches.tag_hardened

     

       17180
       17180
       -
             kernelPatches.hardened.${kernel.meta.branch}

     

       17181
       17181
       -
           ];

     

       17182
       17182
       -
           modDirVersionArg = kernel.modDirVersion + "-hardened";

     

       17182
       17182
       +
         # Hardened Linux

     

       17183
       17183
       +
         hardenedLinuxPackagesFor = kernel': overrides:

     

       17184
       17184
       +
           let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates:

     

       17185
       17185
       +
             linux_latest_for_hardened = pkgs.linux_5_6; # TODO: Update to linux_latest

     

       17186
       17186
       +
             kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides;

     

       17187
       17187
       +
           in linuxPackagesFor (kernel.override {

     

       17188
       17188
       +
             structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix {

     

       17189
       17189
       +
               inherit stdenv;

     

       17190
       17190
       +
               inherit (kernel) version;

     

       17191
       17191
       +
             };

     

       17192
       17192
       +
             kernelPatches = kernel.kernelPatches ++ [

     

       17193
       17193
       +
               kernelPatches.tag_hardened

     

       17194
       17194
       +
               kernelPatches.hardened.${kernel.meta.branch}

     

       17195
       17195
       +
             ];

     

       17196
       17196
       +
             modDirVersionArg = kernel.modDirVersion + "-hardened";

     

       17183
       17197
        
         });

     

       17184
       17198
        
       

     

       17185
       17185
       -
         linuxPackages_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux);

     

       17199
       17199
       +
         linuxPackages_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux { });

     

       17186
       17200
        
         linux_hardened = linuxPackages_hardened.kernel;

     

       17187
       17201
        
       

     

       17188
       17188
       -
         linuxPackages_latest_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest);

     

       17202
       17202
       +
         linuxPackages_latest_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest { });

     

       17189
       17203
        
         linux_latest_hardened = linuxPackages_latest_hardened.kernel;

     

       17190
       17204
        
       

     

       17191
       17191
       -
         linuxPackages_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux.override { features.xen_dom0=true; }));

     

       17205
       17205
       +
         linuxPackages_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux { features.xen_dom0=true; });

     

       17192
       17206
        
       

     

       17193
       17193
       -
         linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; }));

     

       17207
       17207
       +
         linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest { features.xen_dom0=true; });

     

       17194
       17208
        
       

     

       17195
       17209
        
         # Hardkernel (Odroid) kernels.

     

       17196
       17210
        
         linuxPackages_hardkernel_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_hardkernel_4_14);