Unverified Commit 1dc3c7f6 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-nixos

parents b1b20463 e7d78082

ci/OWNERS

+0 −3
Original line number Diff line number Diff line
@@ -294,9 +294,6 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt 
/nixos/modules/services/databases/mysql.nix     @6543

/nixos/modules/services/backup/mysql-backup.nix @6543



# Hardened profile & related modules

/pkgs/os-specific/linux/kernel/hardened/        @fabianhjr



# Home Automation

/nixos/modules/services/home-automation/home-assistant.nix @mweinelt

/nixos/modules/services/home-automation/zigbee2mqtt.nix @mweinelt

doc/packages/linux.section.md

+0 −9
Original line number Diff line number Diff line
@@ -149,15 +149,6 @@ The change gets submitted like this: 
    ```

  * Update `linux_latest` to the new attribute.

* __SQUASH__ the changes into the `linux: init at …` commit.

* If a new hardened is available:

  * Instantiate a `linux_X_Y_hardened = hardenedKernelsFor kernels.linux_X_Y { };` in `kernels` and

    `linux_X_Y_hardened = hardenedKernelFor kernels.linux_X_Y { };` in the `packages`-section.

  * Make sure to remove the hardened variant of the previous kernel version unless it's LTS.

    We only support the latest and latest LTS version of hardened.

* If no new hardened kernel is available:

  * Keep the previously latest kernel until its mainline counterpart gets removed.

    After that `linux_hardened` points to the latest LTS supported by hardened.

* __SQUASH__ the changes into the `linux_X_Y_hardened: init at …` commit.



### Policy for accepting new kernel flavours {#sec-linux-new-kernels}

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

+4 −0
Original line number Diff line number Diff line
@@ -133,8 +133,12 @@ 


- `services.pyload` has been removed because the package it relies on does not exist anymore in nixpkgs due to vulnerabilities and being unmaintained.



- `linux_hardened` kernel has been removed due to a lack of maintenance.



- `services.tandoor-recipes` now uses a sub-directory for media files by default starting with `26.05`. Existing setups should move media files out of the data directory and adjust `services.tandoor-recipes.extraConfig.MEDIA_ROOT` accordingly. See [Migrating media files for pre 26.05 installations](#module-services-tandoor-recipes-migrating-media).



- `linux-rt` kernel has been removed due to a lack of maintenance.



- `rustic` was upgraded to `0.11.x`, which contains breaking [changes to command-line parameters and configuration file](https://rustic.cli.rs/docs/breaking_changes.html#0110).



- The packages `iw` and `wirelesstools` (`iwconfig`, `iwlist`, etc.) are no longer installed implicitly if wireless networking has been enabled.

nixos/modules/system/boot/networkd.nix

+1 −1
Original line number Diff line number Diff line
@@ -2360,7 +2360,7 @@ let 
      description = ''

        Whether to manage network configuration using {command}`systemd-network`.



        This also enables {option}`systemd.networkd.enable`.

        This also enables {option}`systemd.network.enable`.

      '';

    };

nixos/tests/kernel-generic/default.nix

+0 −5
Original line number Diff line number Diff line
@@ -79,11 +79,6 @@ let 
    ) args);

  kernels = patchedPkgs.linuxKernel.vanillaPackages // {

    inherit (patchedPkgs.linuxKernel.packages)

      linux_6_12_hardened

      linux_rt_5_10

      linux_rt_5_15

      linux_rt_6_1

      linux_rt_6_6



      linux_testing

      ;