Unverified Commit b4394617 authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #279531 from K900/linux-6.7 

linux_6_7: init at 6.7
parents 383b9154 ef190570

nixos/modules/tasks/filesystems/bcachefs.nix

+2 −2
Original line number Diff line number Diff line
@@ -123,8 +123,8 @@ in 
      inherit assertions;

      # needed for systemd-remount-fs

      system.fsPackages = [ pkgs.bcachefs-tools ];

      # FIXME: Replace this with `linuxPackages_latest` when 6.7 is released, remove this line when the LTS version is at least 6.7

      boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_testing;

      # FIXME: Remove this line when the default kernel has bcachefs

      boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;

      systemd.services = lib.mapAttrs' (mkUnits "") (lib.filterAttrs (n: fs: (fs.fsType == "bcachefs") && (!utils.fsNeededForBoot fs)) config.fileSystems);

    }

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

+4 −0
Original line number Diff line number Diff line
@@ -30,5 +30,9 @@ 
    "6.6": {

        "version": "6.6.10",

        "hash": "sha256:0v2l0l90w7scv7bxkxxjgqnay0fjh678k9gdlgycgbh9q7j2grly"

    },

    "6.7": {

        "version": "6.7",

        "hash": "sha256:0s8hbcsg7fdvspqam8kzcxygjsznr4zfi60nqgc81l3n4m518cgg"

    }

}

pkgs/top-level/linux-kernels.nix

+10 −1
Original line number Diff line number Diff line
@@ -185,6 +185,14 @@ in { 
      ];

    };



    linux_6_7 = callPackage ../os-specific/linux/kernel/mainline.nix {

      branch = "6.7";

      kernelPatches = [

        kernelPatches.bridge_stp_helper

        kernelPatches.request_key_helper

      ];

    };



    linux_testing = let

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

        # A special branch that tracks the kernel under the release process
@@ -586,6 +594,7 @@ in { 
    linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1);

    linux_6_5 = recurseIntoAttrs (packagesFor kernels.linux_6_5);

    linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);

    linux_6_7 = recurseIntoAttrs (packagesFor kernels.linux_6_7);

    __attrsFailEvaluation = true;

  } // lib.optionalAttrs config.allowAliases {

    linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08
@@ -650,7 +659,7 @@ in { 
  packageAliases = {

    linux_default = packages.linux_6_1;

    # Update this when adding the newest kernel major version!

    linux_latest = packages.linux_6_6;

    linux_latest = packages.linux_6_7;

    linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake";

    linux_rt_default = packages.linux_rt_5_4;

    linux_rt_latest = packages.linux_rt_6_1;