movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

Merge branch 'master' into staging-next

Browse source 
Trivial conflict in pkgs/top-level/aliases.nix
This commit is contained in:
Vladimír Čunát 2022-02-06 10:29:49 +01:00
commit 3dfddd89c6
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
57 changed files with 372 additions and 220 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/config/users-groups.nix
View file

@ -635,9 +635,9 @@ in {
|| cfg.passwordFile != null
|| cfg.openssh.authorizedKeys.keys != []
|| cfg.openssh.authorizedKeys.keyFiles != [])
) cfg.users) ++ [
) cfg.users ++ [
config.security.googleOsLogin.enable
];
]);
message = ''
Neither the root account nor any wheel user has a password or SSH authorized key.
You must set one to prevent being locked out of your system.

1
nixos/modules/services/networking/yggdrasil.xml
View file

@ -84,7 +84,6 @@ in {
interface eth0
{
AdvSendAdvert on;
AdvDefaultLifetime 0;
prefix ${prefix}::/64 {
AdvOnLink on;
AdvAutonomous on;