From f2908085099a1ce529843982bfe8cc3d3fd375d6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Jan 2013 15:03:54 +0100 Subject: [PATCH] Set some missing types --- modules/misc/version.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/misc/version.nix b/modules/misc/version.nix index 23e96171d1f..aa9557d9421 100644 --- a/modules/misc/version.nix +++ b/modules/misc/version.nix @@ -7,10 +7,12 @@ with pkgs.lib; options = { system.nixosVersion = mkOption { + type = types.uniq types.string; description = "NixOS version."; }; system.nixosVersionSuffix = mkOption { + type = types.uniq types.string; description = "NixOS version suffix."; }; @@ -19,10 +21,10 @@ with pkgs.lib; config = { system.nixosVersion = - builtins.readFile ../../.version + config.system.nixosVersionSuffix; + mkDefault (builtins.readFile ../../.version + config.system.nixosVersionSuffix); system.nixosVersionSuffix = - if builtins.pathExists ../../.version-suffix then builtins.readFile ../../.version-suffix else "pre-git"; + mkDefault (if builtins.pathExists ../../.version-suffix then builtins.readFile ../../.version-suffix else "pre-git"); # Generate /etc/os-release. See # http://0pointer.de/public/systemd-man/os-release.html for the