diff options
author | Andrew Marshall <andrew@johnandrewmarshall.com> | 2022-10-12 08:27:21 -0400 |
---|---|---|
committer | Andrew Marshall <andrew@johnandrewmarshall.com> | 2022-11-30 22:57:08 -0500 |
commit | c88944f025429430a58dff13b9b4c653ce955535 (patch) | |
tree | f1b6db13c31833d0651819cabf14cb6f1e53a8fa /nixos/modules/services/misc/nix-daemon.nix | |
parent | c49f0b22e178f2ad18b4e16e16fb623b341f8179 (diff) | |
download | nixpkgs-c88944f025429430a58dff13b9b4c653ce955535.tar nixpkgs-c88944f025429430a58dff13b9b4c653ce955535.tar.gz nixpkgs-c88944f025429430a58dff13b9b4c653ce955535.tar.bz2 nixpkgs-c88944f025429430a58dff13b9b4c653ce955535.tar.lz nixpkgs-c88944f025429430a58dff13b9b4c653ce955535.tar.xz nixpkgs-c88944f025429430a58dff13b9b4c653ce955535.tar.zst nixpkgs-c88944f025429430a58dff13b9b4c653ce955535.zip |
nixos: nix.readOnlyStore -> boot.readOnlyNixStore
The placement of this option under `nix` was misleading, as it is not configuration of the Nix daemon, but rather configuration of the NixOS boot process and how it mounts the Nix store. As such, make it an option of `boot` to clarify what it actually affects, and imply that it will only take effect on a reboot. Since it no longer has the context of nix, adjust the name to include it.
Diffstat (limited to 'nixos/modules/services/misc/nix-daemon.nix')
-rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 8eb1ed53d0c..c88fceb9a92 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -115,6 +115,7 @@ in (mkRenamedOptionModuleWith { sinceRelease = 2003; from = [ "nix" "useChroot" ]; to = [ "nix" "useSandbox" ]; }) (mkRenamedOptionModuleWith { sinceRelease = 2003; from = [ "nix" "chrootDirs" ]; to = [ "nix" "sandboxPaths" ]; }) (mkRenamedOptionModuleWith { sinceRelease = 2205; from = [ "nix" "daemonIONiceLevel" ]; to = [ "nix" "daemonIOSchedPriority" ]; }) + (mkRenamedOptionModuleWith { sinceRelease = 2211; from = [ "nix" "readOnlyStore" ]; to = [ "boot" "readOnlyNixStore" ]; }) (mkRemovedOptionModule [ "nix" "daemonNiceLevel" ] "Consider nix.daemonCPUSchedPolicy instead.") ] ++ mapAttrsToList (oldConf: newConf: mkRenamedOptionModuleWith { sinceRelease = 2205; from = [ "nix" oldConf ]; to = [ "nix" "settings" newConf ]; }) legacyConfMappings; @@ -366,17 +367,6 @@ in ''; }; - readOnlyStore = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - If set, NixOS will enforce the immutability of the Nix store - by making {file}`/nix/store` a read-only bind - mount. Nix will automatically make the store writable when - needed. - ''; - }; - nixPath = mkOption { type = types.listOf types.str; default = [ |