commit e02ff39e396fa6c4b794ddde17eb49aacec358ec · pyrox.dev/nixpkgs

+6

nixos/release-small.nix

···

       64
       64
        
               proxy

     

       65
       65
        
               simple

     

       66
       66
        
               ;

     

       67
       67
       +
             latestKernel = {

     

       68
       68
       +
               inherit (nixos'.tests.latestKernel)

     

       69
       69
       +
                 login

     

       70
       70
       +
                 ;

     

       71
       71
       +
             };

     

       67
       72
        
             installer = {

     

       68
       73
        
               inherit (nixos'.tests.installer)

     

       69
       74
        
                 lvm

     
···

       137
       142
        
                 "nixos.tests.ipv6"

     

       138
       143
        
                 "nixos.tests.installer.simpleUefiSystemdBoot"

     

       139
       144
        
                 "nixos.tests.login"

     

       145
       145
       +
                 "nixos.tests.latestKernel.login"

     

       140
       146
        
                 "nixos.tests.misc"

     

       141
       147
        
                 "nixos.tests.nat.firewall"

     

       142
       148
        
                 "nixos.tests.nat.standalone"

+4

pkgs/os-specific/linux/kernel/kernels-org.json

···

       30
       30
        
           "6.12": {

     

       31
       31
        
               "version": "6.12.10",

     

       32
       32
        
               "hash": "sha256:15xjjn8ff7g9q0ljr2g8k098ppxnpvxlgv22rdrplls8sxg6wlaa"

     

       33
       33
       +
           },

     

       34
       34
       +
           "6.13": {

     

       35
       35
       +
               "version": "6.13",

     

       36
       36
       +
               "hash": "sha256:0vhdz1as27kxav81rkf6fm85sqrbj5hjhz5hpyxcd5b6p1pcr7g7"

     

       33
       37
        
           }

     

       34
       38
        
       }

+5 -18

pkgs/os-specific/linux/kernel/perf/default.nix

···

       61
       61
        
         inherit (kernel) version src;

     

       62
       62
        
       

     

       63
       63
        
         patches =

     

       64
       64
       -
           lib.optionals (lib.versionAtLeast kernel.version "5.10") [

     

       65
       65
       -
             # fix wrong path to dmesg

     

       66
       66
       -
             ./fix-dmesg-path.diff

     

       67
       67
       -
           ]

     

       68
       68
       -
           ++ lib.optionals (lib.versions.majorMinor kernel.version == "6.10") [

     

       69
       69
       -
             (fetchpatch {

     

       70
       70
       -
               url = "https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/patch/?id=0f0e1f44569061e3dc590cd0b8cb74d8fd53706b";

     

       71
       71
       -
               hash = "sha256-9u/zhbsDgwOr4T4k9td/WJYRuSHIfbtfS+oNx8nbOlM=";

     

       72
       72
       -
             })

     

       73
       73
       -
             (fetchpatch {

     

       74
       74
       -
               url = "https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/patch/?id=366e17409f1f17ad872259ce4a4f8a92beb4c4ee";

     

       75
       75
       -
               hash = "sha256-NZK1u40qvMwWcgkgJPGpEax2eMo9xHrCQxSYYOK0rbo=";

     

       76
       76
       -
             })

     

       77
       77
       -
             (fetchpatch {

     

       78
       78
       -
               url = "https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/patch/?id=1d302f626c2a23e4fd05bb810eff300e8f2174fd";

     

       79
       79
       -
               hash = "sha256-KhCmof8LkyTcBBpfMEtolL3m3kmC5rukKzQvufVKCdI=";

     

       80
       80
       -
             })

     

       81
       81
       -
           ];

     

       64
       64
       +
           lib.optionals (lib.versionAtLeast kernel.version "5.10" && lib.versionOlder kernel.version "6.13")

     

       65
       65
       +
             [

     

       66
       66
       +
               # fix wrong path to dmesg

     

       67
       67
       +
               ./fix-dmesg-path.diff

     

       68
       68
       +
             ];

     

       82
       69
        
       

     

       83
       70
        
         postPatch =

     

       84
       71
        
           ''

+2

pkgs/top-level/aliases.nix

···

       744
       744
        
         linuxPackages_6_10 = linuxKernel.packages.linux_6_10;

     

       745
       745
        
         linuxPackages_6_11 = linuxKernel.packages.linux_6_11;

     

       746
       746
        
         linuxPackages_6_12 = linuxKernel.packages.linux_6_12;

     

       747
       747
       +
         linuxPackages_6_13 = linuxKernel.packages.linux_6_13;

     

       747
       748
        
         linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;

     

       748
       749
        
         linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3;

     

       749
       750
        
         linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1;

     
···

       769
       770
        
         linux_6_10 = linuxKernel.kernels.linux_6_10;

     

       770
       771
        
         linux_6_11 = linuxKernel.kernels.linux_6_11;

     

       771
       772
        
         linux_6_12 = linuxKernel.kernels.linux_6_12;

     

       773
       773
       +
         linux_6_13 = linuxKernel.kernels.linux_6_13;

     

       772
       774
        
         linux_rpi0 = linuxKernel.kernels.linux_rpi1;

     

       773
       775
        
         linux_rpi02w = linuxKernel.kernels.linux_rpi3;

     

       774
       776
        
         linux_rpi1 = linuxKernel.kernels.linux_rpi1;

+10 -1

pkgs/top-level/linux-kernels.nix

···

       197
       197
        
             ];

     

       198
       198
        
           };

     

       199
       199
        
       

     

       200
       200
       +
           linux_6_13 = callPackage ../os-specific/linux/kernel/mainline.nix {

     

       201
       201
       +
             branch = "6.13";

     

       202
       202
       +
             kernelPatches = [

     

       203
       203
       +
               kernelPatches.bridge_stp_helper

     

       204
       204
       +
               kernelPatches.request_key_helper

     

       205
       205
       +
             ];

     

       206
       206
       +
           };

     

       207
       207
       +
       

     

       200
       208
        
           linux_testing = let

     

       201
       209
        
             testing = callPackage ../os-specific/linux/kernel/mainline.nix {

     

       202
       210
        
               # A special branch that tracks the kernel under the release process

     
···

       645
       653
        
           linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);

     

       646
       654
        
           linux_6_11 = recurseIntoAttrs (packagesFor kernels.linux_6_11);

     

       647
       655
        
           linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12);

     

       656
       656
       +
           linux_6_13 = recurseIntoAttrs (packagesFor kernels.linux_6_13);

     

       648
       657
        
         } // lib.optionalAttrs config.allowAliases {

     

       649
       658
        
           linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; # Added 2023-10-11

     

       650
       659
        
           linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-21

     
···

       711
       720
        
         packageAliases = {

     

       712
       721
        
           linux_default = packages.linux_6_12;

     

       713
       722
        
           # Update this when adding the newest kernel major version!

     

       714
       714
       -
           linux_latest = packages.linux_6_12;

     

       723
       723
       +
           linux_latest = packages.linux_6_13;

     

       715
       724
        
           linux_rt_default = packages.linux_rt_5_15;

     

       716
       725
        
           linux_rt_latest = packages.linux_rt_6_6;

     

       717
       726
        
         } // lib.optionalAttrs config.allowAliases {