commit 7d890267d1ec0b039c431287897d0b616f86ec45 · pyrox.dev/nixpkgs

-1

nixos/tests/kernel-generic.nix

···

       31
        
             linuxPackages_4_19

     

       32
        
             linuxPackages_5_4

     

       33
        
             linuxPackages_5_10

     

       34
       -
             linuxPackages_5_13

     

       35
        
             linuxPackages_5_14

     

       36
        
       

     

       37
        
             linuxPackages_4_14_hardened

···

       31
        
             linuxPackages_4_19

     

       32
        
             linuxPackages_5_4

     

       33
        
             linuxPackages_5_10

     

       0
        
       
     

       34
        
             linuxPackages_5_14

     

       35
        
       

     

       36
        
             linuxPackages_4_14_hardened

-6

pkgs/os-specific/linux/kernel/hardened/patches.json

···

       17
        
               "sha256": "11frhnprvxnqxm8yn1kay2jv2i473i9glnvsjnqz6kj8f0q2gl4v",

     

       18
        
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.69-hardened1/linux-hardened-5.10.69-hardened1.patch"

     

       19
        
           },

     

       20
       -
           "5.13": {

     

       21
       -
               "extra": "-hardened1",

     

       22
       -
               "name": "linux-hardened-5.13.19-hardened1.patch",

     

       23
       -
               "sha256": "1cj99y2xn7l89lf4mn7arp0r98r4nmvql3ffjpngzv8hsf79xgg7",

     

       24
       -
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.13.19-hardened1/linux-hardened-5.13.19-hardened1.patch"

     

       25
       -
           },

     

       26
        
           "5.14": {

     

       27
        
               "extra": "-hardened1",

     

       28
        
               "name": "linux-hardened-5.14.8-hardened1.patch",

···

       17
        
               "sha256": "11frhnprvxnqxm8yn1kay2jv2i473i9glnvsjnqz6kj8f0q2gl4v",

     

       18
        
               "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.69-hardened1/linux-hardened-5.10.69-hardened1.patch"

     

       19
        
           },

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       20
        
           "5.14": {

     

       21
        
               "extra": "-hardened1",

     

       22
        
               "name": "linux-hardened-5.14.8-hardened1.patch",

-18

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

···

       1
       -
       { lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:

     

       2
       -
       

     

       3
       -
       with lib;

     

       4
       -
       

     

       5
       -
       buildLinux (args // rec {

     

       6
       -
         version = "5.13.19";

     

       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 = "0yxbcd1k4l4cmdn0hzcck4s0yvhvq9fpwp120dv9cz4i9rrfqxz8";

     

       17
       -
         };

     

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

+2 -2

pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix

···

       9
        
       , ...

     

       10
        
       } @ args:

     

       11
        
       

     

       12
       -
       kernel.override ( args // {

     

       13
        
       

     

       14
        
         argsOverride = {

     

       15
        
           version = "${kernel.version}-bcachefs-unstable-${date}";

     
···

       30
        
             extraConfig = "BCACHEFS_FS m";

     

       31
        
           } ] ++ kernelPatches;

     

       32
        
       

     

       33
       -
       })

···

       9
        
       , ...

     

       10
        
       } @ args:

     

       11
        
       

     

       12
       +
       (kernel.override ( args // {

     

       13
        
       

     

       14
        
         argsOverride = {

     

       15
        
           version = "${kernel.version}-bcachefs-unstable-${date}";

     
···

       30
        
             extraConfig = "BCACHEFS_FS m";

     

       31
        
           } ] ++ kernelPatches;

     

       32
        
       

     

       33
       +
       })).overrideAttrs ({ meta ? {}, ... }: { meta = meta // { broken = true; }; })

-2

pkgs/top-level/aliases.nix

···

       466
        
         linuxPackages_4_19 = linuxKernel.packages.linux_4_19;

     

       467
        
         linuxPackages_5_4 = linuxKernel.packages.linux_5_4;

     

       468
        
         linuxPackages_5_10 = linuxKernel.packages.linux_5_10;

     

       469
       -
         linuxPackages_5_13 = linuxKernel.packages.linux_5_13;

     

       470
        
         linuxPackages_5_14 = linuxKernel.packages.linux_5_14;

     

       471
        
       

     

       472
        
         linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95;

     
···

       483
        
         linux_5_10 = linuxKernel.kernels.linux_5_10;

     

       484
        
         linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10;

     

       485
        
         linux-rt_5_11 = linuxKernel.kernels.linux_rt_5_11;

     

       486
       -
         linux_5_13 = linuxKernel.kernels.linux_5_13;

     

       487
        
         linux_5_14 = linuxKernel.kernels.linux_5_14;

     

       488
        
       

     

       489
        
         # added 2020-04-04

···

       466
        
         linuxPackages_4_19 = linuxKernel.packages.linux_4_19;

     

       467
        
         linuxPackages_5_4 = linuxKernel.packages.linux_5_4;

     

       468
        
         linuxPackages_5_10 = linuxKernel.packages.linux_5_10;

     

       0
        
       
     

       469
        
         linuxPackages_5_14 = linuxKernel.packages.linux_5_14;

     

       470
        
       

     

       471
        
         linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95;

     
···

       482
        
         linux_5_10 = linuxKernel.kernels.linux_5_10;

     

       483
        
         linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10;

     

       484
        
         linux-rt_5_11 = linuxKernel.kernels.linux_rt_5_11;

     

       0
        
       
     

       485
        
         linux_5_14 = linuxKernel.kernels.linux_5_14;

     

       486
        
       

     

       487
        
         # added 2020-04-04

-2

pkgs/top-level/all-packages.nix

···

       21552
        
         linux_5_4_hardened = linuxKernel.kernels.linux_5_4_hardened;

     

       21553
        
         linuxPackages_5_10_hardened = linuxKernel.packages.linux_5_10_hardened;

     

       21554
        
         linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened;

     

       21555
       -
         linuxPackages_5_13_hardened = linuxKernel.packages.linux_5_13_hardened;

     

       21556
       -
         linux_5_13_hardened = linuxKernel.kernels.linux_5_13_hardened;

     

       21557
        
         linuxPackages_5_14_hardened = linuxKernel.packages.linux_5_14_hardened;

     

       21558
        
         linux_5_14_hardened = linuxKernel.kernels.linux_5_14_hardened;

     

       21559

···

       21552
        
         linux_5_4_hardened = linuxKernel.kernels.linux_5_4_hardened;

     

       21553
        
         linuxPackages_5_10_hardened = linuxKernel.packages.linux_5_10_hardened;

     

       21554
        
         linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened;

     

       0
        
       
     

       0
        
       
     

       21555
        
         linuxPackages_5_14_hardened = linuxKernel.packages.linux_5_14_hardened;

     

       21556
        
         linux_5_14_hardened = linuxKernel.kernels.linux_5_14_hardened;

     

       21557

+1 -11

pkgs/top-level/linux-kernels.nix

···

       155
        
             ];

     

       156
        
           };

     

       157
        
       

     

       158
       -
           linux_5_13 = callPackage ../os-specific/linux/kernel/linux-5.13.nix {

     

       159
       -
             kernelPatches = [

     

       160
       -
               kernelPatches.bridge_stp_helper

     

       161
       -
               kernelPatches.request_key_helper

     

       162
       -
             ];

     

       163
       -
           };

     

       164
       -
       

     

       165
        
           linux_5_14 = callPackage ../os-specific/linux/kernel/linux-5.14.nix {

     

       166
        
             kernelPatches = [

     

       167
        
               kernelPatches.bridge_stp_helper

     
···

       177
        
           };

     

       178
        
       

     

       179
        
           linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec {

     

       180
       -
             kernel = linux_5_13;

     

       181
        
             kernelPatches = kernel.kernelPatches;

     

       182
        
          };

     

       183
        
       

     
···

       220
        
           linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 { };

     

       221
        
           linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { };

     

       222
        
           linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };

     

       223
       -
           linux_5_13_hardened = hardenedKernelFor kernels.linux_5_13 { };

     

       224
        
           linux_5_14_hardened = hardenedKernelFor kernels.linux_5_14 { };

     

       225
        
       

     

       226
        
         }));

     
···

       458
        
           linux_4_19 = recurseIntoAttrs (packagesFor kernels.linux_4_19);

     

       459
        
           linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4);

     

       460
        
           linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10);

     

       461
       -
           linux_5_13 = recurseIntoAttrs (packagesFor kernels.linux_5_13);

     

       462
        
           linux_5_14 = recurseIntoAttrs (packagesFor kernels.linux_5_14);

     

       463
        
         };

     

       464
        
       

     
···

       489
        
           linux_4_19_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_4_19 { });

     

       490
        
           linux_5_4_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_4 { });

     

       491
        
           linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { });

     

       492
       -
           linux_5_13_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_13 { });

     

       493
        
           linux_5_14_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_14 { });

     

       494
        
       

     

       495
        
           linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);

···

       155
        
             ];

     

       156
        
           };

     

       157
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       158
        
           linux_5_14 = callPackage ../os-specific/linux/kernel/linux-5.14.nix {

     

       159
        
             kernelPatches = [

     

       160
        
               kernelPatches.bridge_stp_helper

     
···

       170
        
           };

     

       171
        
       

     

       172
        
           linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec {

     

       173
       +
             kernel = linux_5_14;

     

       174
        
             kernelPatches = kernel.kernelPatches;

     

       175
        
          };

     

       176
        
       

     
···

       213
        
           linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 { };

     

       214
        
           linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { };

     

       215
        
           linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };

     

       0
        
       
     

       216
        
           linux_5_14_hardened = hardenedKernelFor kernels.linux_5_14 { };

     

       217
        
       

     

       218
        
         }));

     
···

       450
        
           linux_4_19 = recurseIntoAttrs (packagesFor kernels.linux_4_19);

     

       451
        
           linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4);

     

       452
        
           linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10);

     

       0
        
       
     

       453
        
           linux_5_14 = recurseIntoAttrs (packagesFor kernels.linux_5_14);

     

       454
        
         };

     

       455
        
       

     
···

       480
        
           linux_4_19_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_4_19 { });

     

       481
        
           linux_5_4_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_4 { });

     

       482
        
           linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { });

     

       0
        
       
     

       483
        
           linux_5_14_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_14 { });

     

       484
        
       

     

       485
        
           linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);