summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobert Hensing <robert@roberthensing.nl>2023-07-05 13:40:14 +0200
committerRobert Hensing <robert@roberthensing.nl>2023-07-05 14:54:27 +0200
commit4bbd44908c5d4d271daf91d71325ec5b6b2cf0c5 (patch)
tree5a8d583292f28427b25f9ec65cb0fbf7c87e8f1e
parent19e33831c698da6b2e8a5d9a49b3f63b896fe219 (diff)
downloadnixpkgs-4bbd44908c5d4d271daf91d71325ec5b6b2cf0c5.tar
nixpkgs-4bbd44908c5d4d271daf91d71325ec5b6b2cf0c5.tar.gz
nixpkgs-4bbd44908c5d4d271daf91d71325ec5b6b2cf0c5.tar.bz2
nixpkgs-4bbd44908c5d4d271daf91d71325ec5b6b2cf0c5.tar.lz
nixpkgs-4bbd44908c5d4d271daf91d71325ec5b6b2cf0c5.tar.xz
nixpkgs-4bbd44908c5d4d271daf91d71325ec5b6b2cf0c5.tar.zst
nixpkgs-4bbd44908c5d4d271daf91d71325ec5b6b2cf0c5.zip
nixos/config/nix: Move extraOptions
-rw-r--r--nixos/modules/config/nix.nix10
-rw-r--r--nixos/modules/services/misc/nix-daemon.nix10
2 files changed, 10 insertions, 10 deletions
diff --git a/nixos/modules/config/nix.nix b/nixos/modules/config/nix.nix
index 3161f130921..8285db20faa 100644
--- a/nixos/modules/config/nix.nix
+++ b/nixos/modules/config/nix.nix
@@ -150,6 +150,16 @@ in
         '';
       };
 
+      extraOptions = mkOption {
+        type = types.lines;
+        default = "";
+        example = ''
+          keep-outputs = true
+          keep-derivations = true
+        '';
+        description = lib.mdDoc "Additional text appended to {file}`nix.conf`.";
+      };
+
       settings = mkOption {
         type = types.submodule {
           freeformType = semanticConfType;
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 87b8d068912..e5afffab21d 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -360,16 +360,6 @@ in
           A system-wide flake registry.
         '';
       };
-
-      extraOptions = mkOption {
-        type = types.lines;
-        default = "";
-        example = ''
-          keep-outputs = true
-          keep-derivations = true
-        '';
-        description = lib.mdDoc "Additional text appended to {file}`nix.conf`.";
-      };
     };
   };