diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-21 18:07:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-21 18:07:51 +0000 |
| commit | 6ae26bb3c8f192281581014f76c3115bf60d7d84 (patch) | |
| tree | 9b404988a07154dce33cd9654a7f53ad7885be40 /nixos/modules/services | |
| parent | de642acb2e49a9499d4a0d71164007391326eb4d (diff) | |
| parent | 685d333b88e93b7de5eb23096f9d232a0bb97a61 (diff) | |
| download | nixpkgs-6ae26bb3c8f192281581014f76c3115bf60d7d84.tar nixpkgs-6ae26bb3c8f192281581014f76c3115bf60d7d84.tar.gz nixpkgs-6ae26bb3c8f192281581014f76c3115bf60d7d84.tar.bz2 nixpkgs-6ae26bb3c8f192281581014f76c3115bf60d7d84.tar.lz nixpkgs-6ae26bb3c8f192281581014f76c3115bf60d7d84.tar.xz nixpkgs-6ae26bb3c8f192281581014f76c3115bf60d7d84.tar.zst nixpkgs-6ae26bb3c8f192281581014f76c3115bf60d7d84.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 2b21df91b82..d56808c7564 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -112,11 +112,11 @@ in { imports = [ - (mkRenamedOptionModule [ "nix" "useChroot" ] [ "nix" "useSandbox" ]) - (mkRenamedOptionModule [ "nix" "chrootDirs" ] [ "nix" "sandboxPaths" ]) - (mkRenamedOptionModule [ "nix" "daemonIONiceLevel" ] [ "nix" "daemonIOSchedPriority" ]) + (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" ]; }) (mkRemovedOptionModule [ "nix" "daemonNiceLevel" ] "Consider nix.daemonCPUSchedPolicy instead.") - ] ++ mapAttrsToList (oldConf: newConf: mkRenamedOptionModule [ "nix" oldConf ] [ "nix" "settings" newConf ]) legacyConfMappings; + ] ++ mapAttrsToList (oldConf: newConf: mkRenamedOptionModuleWith { sinceRelease = 2205; from = [ "nix" oldConf ]; to = [ "nix" "settings" newConf ]; }) legacyConfMappings; ###### interface |