Commit 90a6faa0 authored by K900's avatar K900
Browse files

Merge remote-tracking branch 'origin/master' into staging-next

parents 98a73a98 cdec2bc3

maintainers/maintainer-list.nix

+6 −6
Original line number Diff line number Diff line
@@ -15543,12 +15543,6 @@ 
    githubId = 1140462;

    name = "magenbluten";

  };

  maggesi = {

    email = "marco.maggesi@gmail.com";

    github = "maggesi";

    githubId = 1809783;

    name = "Marco Maggesi";

  };

  magicquark = {

    name = "magicquark";

    github = "magicquark";
@@ -18989,6 +18983,12 @@ 
    githubId = 1348;

    name = "Nate Smith";

  };

  nxm = {

    email = "szturomski@jakub.app";

    name = "Jakub Szturomski";

    github = "nxm";

    githubId = 22380073;

  };

  nyabinary = {

    name = "Niko Cantero";

    email = "nyanbinary@keemail.me";

nixos/doc/manual/release-notes/rl-2511.section.md

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ 


- Due to [deprecation of gnome-session X11 support](https://blogs.gnome.org/alatiera/2025/06/08/the-x11-session-removal/), `services.desktopManager.pantheon` now defaults to pantheon-wayland session. The X11 session has been removed, see [this issue](https://github.com/elementary/session-settings/issues/91) for details.



- `bcachefs` file systems will now use the out-of-tree module for supported kernels. The in-tree module is unmaintained and users are strongly recommended to switch to kernels that support the out-of-tree module.

- `bcachefs` file systems will now use the out-of-tree module for supported kernels. The in-tree module has been removed, and users will need to switch to kernels that support the out-of-tree module.



- `services.filesender` and the package `filesender` have been removed because they depend on `simplesamlphp`.

nixos/modules/installer/cd-dvd/latest-kernel.nix

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
{

  boot.kernelPackages = pkgs.linuxPackages_latest;

  boot.supportedFilesystems.zfs = false;

  boot.supportedFilesystems.bcachefs = true;

  environment.etc."nixos-generate-config.conf".text = ''

    [Defaults]

    Kernel=latest

nixos/modules/tasks/filesystems/bcachefs.nix

+1 −11
Original line number Diff line number Diff line
@@ -242,14 +242,6 @@ in 
          }

        ];



        warnings = lib.mkIf cfg.modulePackage.meta.broken [

          ''

            Using unmaintained in-tree bcachefs kernel module. This

            will be removed in 26.05. Please use a kernel supported

            by the out-of-tree module package.

          ''

        ];



        # Bcachefs upstream recommends using the latest kernel

        boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
@@ -257,9 +249,7 @@ in 
        system.fsPackages = [ cfg.package ];

        services.udev.packages = [ cfg.package ];



        boot.extraModulePackages = lib.optionals (!cfg.modulePackage.meta.broken) [

          cfg.modulePackage

        ];

        boot.extraModulePackages = [ cfg.modulePackage ];



        systemd = {

          packages = [ cfg.package ];

nixos/tests/kernel-generic/default.nix

+9 −1
Original line number Diff line number Diff line
@@ -55,6 +55,14 @@ let 
        nodes.machine =

          { config, ... }:

          {

            # we could/would do something like below, but linuxPackages comes from outside

            # the machine closure, so an overlay doesn't apply to the kernelPackages.

            # nixpkgs.overlays = [

            #   (final: prev: {

            #     kernelPackagesExtensions = prev.kernelPackagesExtensions ++ [ helloWorldExtension ];

            #   })

            # ]



            boot.kernelPackages = linuxPackages;



            boot.extraModulePackages = [ config.boot.kernelPackages.hello-world ];
@@ -93,6 +101,6 @@ mapAttrs (_: lP: testsForLinuxPackages lP) kernels 
    # Useful for development testing of all Kernel configs without building full Kernel

    configfiles = mapAttrs (_: lP: lP.kernel.configfile) kernels;



    testsForKernel = kernel: testsForLinuxPackages (pkgs.linuxPackagesFor kernel);

    testsForKernel = kernel: testsForLinuxPackages (patchedPkgs.linuxPackagesFor kernel);

  };

}