public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #30258 from srhb/tz-nospace

Browse Source 
nixos/config/timezone: Disallow spaces
This commit is contained in:
Graham Christensen 2017-10-14 10:27:09 -04:00 committed by GitHub
commit 55bc53d1dd
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/config/timezone.nix
View File

@ -5,6 +5,9 @@ with lib;
let let
tzdir = "${pkgs.tzdata}/share/zoneinfo"; tzdir = "${pkgs.tzdata}/share/zoneinfo";
nospace = str: filter (c: c == " ") (stringToCharacters str) == [];
timezone = types.nullOr (types.addCheck types.str nospace)
// { description = "null or string without spaces"; };
in in
@ -15,7 +18,7 @@ in
timeZone = mkOption { timeZone = mkOption {
default = null; default = null;
type = types.nullOr types.str; type = timezone;
example = "America/New_York"; example = "America/New_York";
description = '' description = ''
The time zone used when displaying times and dates. See <link The time zone used when displaying times and dates. See <link