summary refs log tree commit diff
path: root/nixos/modules/system/boot/systemd-unit-options.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-28 16:14:15 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-28 22:45:56 +0100
commitd5047faedef254d01a21618224698c190bb67e5b (patch)
tree42a43de15611b5e35b2888f02fb940365edb1402 /nixos/modules/system/boot/systemd-unit-options.nix
parentf4a418761b481b15900c78b8086e7be58b0afe4e (diff)
downloadnixpkgs-d5047faedef254d01a21618224698c190bb67e5b.tar
nixpkgs-d5047faedef254d01a21618224698c190bb67e5b.tar.gz
nixpkgs-d5047faedef254d01a21618224698c190bb67e5b.tar.bz2
nixpkgs-d5047faedef254d01a21618224698c190bb67e5b.tar.lz
nixpkgs-d5047faedef254d01a21618224698c190bb67e5b.tar.xz
nixpkgs-d5047faedef254d01a21618224698c190bb67e5b.tar.zst
nixpkgs-d5047faedef254d01a21618224698c190bb67e5b.zip
Remove uses of the "merge" option attribute
It's redundant because you can (and should) specify an option type, or
an apply function.
Diffstat (limited to 'nixos/modules/system/boot/systemd-unit-options.nix')
-rw-r--r--nixos/modules/system/boot/systemd-unit-options.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index 5c1fe34572c..d18c5d86417 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -319,8 +319,7 @@ rec {
     options = mkOption {
       default = "";
       example = "noatime";
-      type = types.string;
-      merge = concatStringsSep ",";
+      type = types.commas;
       description = "Options used to mount the file system.";
     };