pyrox.dev / nixpkgs
lol
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request #279531 from K900/linux-6.7

linux_6_7: init at 6.7

authored by

K900 and committed by
GitHub b4394617 383b9154

+16 -3
+2 -2
nixos/modules/tasks/filesystems/bcachefs.nix
··· 123 123 inherit assertions; 124 124 # needed for systemd-remount-fs 125 125 system.fsPackages = [ pkgs.bcachefs-tools ]; 126 - # FIXME: Replace this with `linuxPackages_latest` when 6.7 is released, remove this line when the LTS version is at least 6.7 127 - boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_testing; 126 + # FIXME: Remove this line when the default kernel has bcachefs 127 + boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; 128 128 systemd.services = lib.mapAttrs' (mkUnits "") (lib.filterAttrs (n: fs: (fs.fsType == "bcachefs") && (!utils.fsNeededForBoot fs)) config.fileSystems); 129 129 } 130 130
+4
pkgs/os-specific/linux/kernel/kernels-org.json
··· 30 30 "6.6": { 31 31 "version": "6.6.10", 32 32 "hash": "sha256:0v2l0l90w7scv7bxkxxjgqnay0fjh678k9gdlgycgbh9q7j2grly" 33 + }, 34 + "6.7": { 35 + "version": "6.7", 36 + "hash": "sha256:0s8hbcsg7fdvspqam8kzcxygjsznr4zfi60nqgc81l3n4m518cgg" 33 37 } 34 38 }
+10 -1
pkgs/top-level/linux-kernels.nix
··· 185 185 ]; 186 186 }; 187 187 188 + linux_6_7 = callPackage ../os-specific/linux/kernel/mainline.nix { 189 + branch = "6.7"; 190 + kernelPatches = [ 191 + kernelPatches.bridge_stp_helper 192 + kernelPatches.request_key_helper 193 + ]; 194 + }; 195 + 188 196 linux_testing = let 189 197 testing = callPackage ../os-specific/linux/kernel/mainline.nix { 190 198 # A special branch that tracks the kernel under the release process ··· 586 594 linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); 587 595 linux_6_5 = recurseIntoAttrs (packagesFor kernels.linux_6_5); 588 596 linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6); 597 + linux_6_7 = recurseIntoAttrs (packagesFor kernels.linux_6_7); 589 598 __attrsFailEvaluation = true; 590 599 } // lib.optionalAttrs config.allowAliases { 591 600 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 659 packageAliases = { 651 660 linux_default = packages.linux_6_1; 652 661 # Update this when adding the newest kernel major version! 653 - linux_latest = packages.linux_6_6; 662 + linux_latest = packages.linux_6_7; 654 663 linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; 655 664 linux_rt_default = packages.linux_rt_5_4; 656 665 linux_rt_latest = packages.linux_rt_6_1;