1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-05 16:27:03 +00:00

nix: merge nix.settings.trusted-users by default

Backport of https://github.com/NixOS/nixpkgs/pull/318635
This commit is contained in:
Michael Hoang 2025-01-08 14:26:32 +11:00
parent ba9b3173b0
commit 9e856ad0c1

View file

@ -617,7 +617,6 @@ in
trusted-users = mkOption {
type = types.listOf types.str;
default = [ "root" ];
example = [ "root" "alice" "@admin" ];
description = ''
A list of names of users that have additional rights when
@ -835,10 +834,10 @@ in
done
'';
# Legacy configuration conversion.
nix.settings = mkMerge [
{
trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
trusted-users = [ "root" ];
substituters = mkAfter [ "https://cache.nixos.org/" ];
# Not implemented yet