diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-24 12:01:15 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-24 12:01:15 +0000 |
commit | a3e2b0de906a8fe0143c2783199abdc132dee56a (patch) | |
tree | 3cd8ea6bcc6257cfb258c407387bceb975a7bb46 /nixos/modules/config | |
parent | e9dcfb33c420b5ea8bb4538e0a3d3f53d24a97da (diff) | |
parent | 8db50d6f207f6e6bea072986fe5abfc955f04bfc (diff) | |
download | nixlib-a3e2b0de906a8fe0143c2783199abdc132dee56a.tar nixlib-a3e2b0de906a8fe0143c2783199abdc132dee56a.tar.gz nixlib-a3e2b0de906a8fe0143c2783199abdc132dee56a.tar.bz2 nixlib-a3e2b0de906a8fe0143c2783199abdc132dee56a.tar.lz nixlib-a3e2b0de906a8fe0143c2783199abdc132dee56a.tar.xz nixlib-a3e2b0de906a8fe0143c2783199abdc132dee56a.tar.zst nixlib-a3e2b0de906a8fe0143c2783199abdc132dee56a.zip |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/config')
-rw-r--r-- | nixos/modules/config/nix.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/config/nix.nix b/nixos/modules/config/nix.nix index 2769d8b25ef6..e6a74bbb73fc 100644 --- a/nixos/modules/config/nix.nix +++ b/nixos/modules/config/nix.nix @@ -1,5 +1,5 @@ /* - Manages /etc/nix.conf. + Manages /etc/nix/nix.conf. See also - ./nix-channel.nix |