commit 48665a415038e5e04d8bef71c447e60077dba501 · pyrox.dev/nixpkgs

-1

nixos/tests/kernel-generic.nix

···

       30
       30
        
             linux_5_4_hardened

     

       31
       31
        
             linux_5_10_hardened

     

       32
       32
        
             linux_5_15_hardened

     

       33
       33
       -
             linux_6_0_hardened

     

       34
       33
        
             linux_6_1_hardened

     

       35
       34
        
       

     

       36
       35
        
             linux_testing;

-10

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

···

       49
       49
        
               "sha256": "1bx77x4x10v38ygfiz0dcw938ybczq7f3srg11ifzvwm243r5if5",

     

       50
       50
        
               "version": "5.4.229"

     

       51
       51
        
           },

     

       52
       52
       -
           "6.0": {

     

       53
       53
       -
               "patch": {

     

       54
       54
       -
                   "extra": "-hardened1",

     

       55
       55
       -
                   "name": "linux-hardened-6.0.19-hardened1.patch",

     

       56
       56
       -
                   "sha256": "11yn5mrvs170685pwa9k7asxlv64vgfqfg2b6m5yn2a11pr1rxg5",

     

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

     

       58
       58
       -
               },

     

       59
       59
       -
               "sha256": "01q2sciv3l9brnsfcv9knx1ps3hq9rk1a08iqk3vscg3waq7xqxb",

     

       60
       60
       -
               "version": "6.0.19"

     

       61
       61
       -
           },

     

       62
       52
        
           "6.1": {

     

       63
       53
        
               "patch": {

     

       64
       54
        
                   "extra": "-hardened1",

-18

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

···

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

     

       2
       2
       -
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       5
       -
       buildLinux (args // rec {

     

       6
       6
       -
         version = "6.0.19";

     

       7
       7
       -
       

     

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

     

       9
       9
       -
         modDirVersion = versions.pad 3 version;

     

       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/v6.x/linux-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "01q2sciv3l9brnsfcv9knx1ps3hq9rk1a08iqk3vscg3waq7xqxb";

     

       17
       17
       -
         };

     

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

-2

pkgs/top-level/aliases.nix

···

       840
       840
        
         linuxPackages_4_9 = linuxKernel.packages.linux_4_9;

     

       841
       841
        
         linuxPackages_5_10 = linuxKernel.packages.linux_5_10;

     

       842
       842
        
         linuxPackages_5_15 = linuxKernel.packages.linux_5_15;

     

       843
       843
       -
         linuxPackages_5_17 = linuxKernel.packages.linux_5_17;

     

       844
       843
        
         linuxPackages_5_18 = linuxKernel.packages.linux_5_18;

     

       845
       844
        
         linuxPackages_5_19 = linuxKernel.packages.linux_5_19;

     

       846
       845
        
         linuxPackages_5_4 = linuxKernel.packages.linux_5_4;

     
···

       861
       860
        
         linux_4_9 = linuxKernel.kernels.linux_4_9;

     

       862
       861
        
         linux_5_10 = linuxKernel.kernels.linux_5_10;

     

       863
       862
        
         linux_5_15 = linuxKernel.kernels.linux_5_15;

     

       864
       864
       -
         linux_5_17 = linuxKernel.kernels.linux_5_17;

     

       865
       863
        
         linux_5_18 = linuxKernel.kernels.linux_5_18;

     

       866
       864
        
         linux_5_19 = linuxKernel.kernels.linux_5_19;

     

       867
       865
        
         linux_5_4 = linuxKernel.kernels.linux_5_4;

+4 -12

pkgs/top-level/linux-kernels.nix

···

       159
       159
        
             ];

     

       160
       160
        
           };

     

       161
       161
        
       

     

       162
       162
       -
           linux_5_17 = throw "linux 5.17 was removed because it has reached its end of life upstream";

     

       163
       163
       -
       

     

       164
       162
        
           linux_5_18 = throw "linux 5.18 was removed because it has reached its end of life upstream";

     

       165
       163
        
       

     

       166
       164
        
           linux_5_19 = throw "linux 5.19 was removed because it has reached its end of life upstream";

     

       167
       165
        
       

     

       168
       168
       -
           linux_6_0 = callPackage ../os-specific/linux/kernel/linux-6.0.nix {

     

       169
       169
       -
             kernelPatches = [

     

       170
       170
       -
               kernelPatches.bridge_stp_helper

     

       171
       171
       -
               kernelPatches.request_key_helper

     

       172
       172
       -
             ];

     

       173
       173
       -
           };

     

       166
       166
       +
           linux_6_0 = throw "linux 6.0 was removed because it has reached its end of life upstream";

     

       174
       167
        
       

     

       175
       168
        
           linux_6_1 = callPackage ../os-specific/linux/kernel/linux-6.1.nix {

     

       176
       169
        
             kernelPatches = [

     
···

       248
       241
        
           linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };

     

       249
       242
        
           linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream";

     

       250
       243
        
           linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream";

     

       251
       251
       -
           linux_6_0_hardened = hardenedKernelFor kernels.linux_6_0 { };

     

       244
       244
       +
           linux_6_0_hardened = throw "linux 6.0 was removed because it has reached its end of life upstream";

     

       252
       245
        
           linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { };

     

       253
       246
        
       

     

       254
       247
        
         }));

     
···

       532
       525
        
           linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4);

     

       533
       526
        
           linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10);

     

       534
       527
        
           linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);

     

       535
       535
       -
           linux_5_17 = throw "linux 5.17 was removed because it reached its end of life upstream"; # Added 2022-06-23

     

       536
       528
        
           linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17

     

       537
       529
        
           linux_5_19 = throw "linux 5.19 was removed because it reached its end of life upstream"; # Added 2022-11-01

     

       538
       538
       -
           linux_6_0 = recurseIntoAttrs (packagesFor kernels.linux_6_0);

     

       530
       530
       +
           linux_6_0 = throw "linux 6.0 was removed because it reached its end of life upstream"; # Added 2023-01-20

     

       539
       531
        
           linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1);

     

       540
       532
        
         };

     

       541
       533
        
       

     
···

       577
       569
        
           linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { });

     

       578
       570
        
           linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream";

     

       579
       571
        
           linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream";

     

       580
       580
       -
           linux_6_0_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_0 { });

     

       572
       572
       +
           linux_6_0_hardened = throw "linux 6.0 was removed because it has reached its end of life upstream";

     

       581
       573
        
           linux_6_1_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_1 { });

     

       582
       574
        
       

     

       583
       575
        
           linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);