summary refs log tree commit diff
path: root/nixos/modules/tasks/filesystems.nix
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2016-09-01 12:18:33 +0300
committerTuomas Tynkkynen <tuomas@tuxera.com>2016-09-01 12:18:33 +0300
commitd02e5a7d8fcbc4c9ab21b4a25680469d5c3a9804 (patch)
tree0b799425c51905c18e26728184837e0cd3e73fd1 /nixos/modules/tasks/filesystems.nix
parent202d9e29c3aeea336f9caf22285de92d120d9b7c (diff)
downloadnixpkgs-d02e5a7d8fcbc4c9ab21b4a25680469d5c3a9804.tar
nixpkgs-d02e5a7d8fcbc4c9ab21b4a25680469d5c3a9804.tar.gz
nixpkgs-d02e5a7d8fcbc4c9ab21b4a25680469d5c3a9804.tar.bz2
nixpkgs-d02e5a7d8fcbc4c9ab21b4a25680469d5c3a9804.tar.lz
nixpkgs-d02e5a7d8fcbc4c9ab21b4a25680469d5c3a9804.tar.xz
nixpkgs-d02e5a7d8fcbc4c9ab21b4a25680469d5c3a9804.tar.zst
nixpkgs-d02e5a7d8fcbc4c9ab21b4a25680469d5c3a9804.zip
nixos/filesystems: Drop compat code for filesystems.*.options type
Diffstat (limited to 'nixos/modules/tasks/filesystems.nix')
-rw-r--r--nixos/modules/tasks/filesystems.nix6
1 files changed, 1 insertions, 5 deletions
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index dd632437a78..9ab1baeacb9 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -48,12 +48,8 @@ let
         default = [ "defaults" ];
         example = [ "data=journal" ];
         description = "Options used to mount the file system.";
-      } // (if versionAtLeast lib.nixpkgsVersion "16.09" then {
         type = types.listOf types.str;
-      } else {
-        type = types.either types.commas (types.listOf types.str);
-        apply = x: if isList x then x else lib.strings.splitString "," (builtins.trace "warning: passing a comma-separated string for filesystem options is deprecated; use a list of strings instead. This will become a hard error in 16.09." x);
-      });
+      };
 
     };