Unverified Commit c8d5be9d authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 0f3ccf81 8fcd9a31

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -3484,6 +3484,12 @@ 
    githubId = 1298344;

    name = "Daniel Fullmer";

  };

  daniyalsuri6 = {

    email = "daniyal.suri@gmail.com";

    github = "daniyalsuri6";

    githubId = 107034852;

    name = "Daniyal Suri";

  };

  dansbandit = {

    github = "dansbandit";

    githubId = 4530687;

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

+2 −0
Original line number Diff line number Diff line
@@ -176,6 +176,8 @@ In addition to numerous new and upgraded packages, this release has the followin 


- The `ssh` client tool now disables the `~C` escape sequence by default. This can be re-enabled by setting `EnableEscapeCommandline yes`



- Many `services.syncthing` options have been moved to `services.syncthing.settings`, as part of [RFC 42](https://github.com/NixOS/rfcs/pull/42)'s implementation, see [#226088](https://github.com/NixOS/nixpkgs/pull/226088).



- The `ssh` module does not read `/etc/ssh/ssh_known_hosts2` anymore since this location is [deprecated since 2001](https://marc.info/?l=openssh-unix-dev&m=100508718416162&w=2).



- The openssh module does not read `~/.ssh/authorized_keys2` anymore since this location is [deprecated since 2001](https://marc.info/?l=openssh-unix-dev&m=100508718416162&w=2).

nixos/maintainers/scripts/cloudstack/cloudstack-image.nix

+0 −2
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 


{ config, lib, pkgs, ... }:



with lib;



{

  imports =

    [ ../../../modules/virtualisation/cloudstack-config.nix ];

nixos/maintainers/scripts/lxd/lxd-image-inner.nix

+0 −2
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ 


{ config, pkgs, lib, ... }:



with lib;



{

  imports =

    [ # Include the default lxd configuration.

nixos/maintainers/scripts/lxd/lxd-image.nix

+0 −2
Original line number Diff line number Diff line 
{ lib, config, pkgs, ... }:



with lib;



{

  imports = [

    ../../../modules/virtualisation/lxc-container.nix