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

Set some missing types

Browse Source
This commit is contained in:
Eelco Dolstra 2013-01-16 15:03:54 +01:00
parent b35fe01f02
commit f290808509
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/misc/version.nix
View File

@ -7,10 +7,12 @@ with pkgs.lib;
options = { options = {
system.nixosVersion = mkOption { system.nixosVersion = mkOption {
type = types.uniq types.string;
description = "NixOS version."; description = "NixOS version.";
}; };
system.nixosVersionSuffix = mkOption { system.nixosVersionSuffix = mkOption {
type = types.uniq types.string;
description = "NixOS version suffix."; description = "NixOS version suffix.";
}; };
@ -19,10 +21,10 @@ with pkgs.lib;
config = { config = {
system.nixosVersion = system.nixosVersion =
builtins.readFile ../../.version + config.system.nixosVersionSuffix; mkDefault (builtins.readFile ../../.version + config.system.nixosVersionSuffix);
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 # Generate /etc/os-release. See
# http://0pointer.de/public/systemd-man/os-release.html for the # http://0pointer.de/public/systemd-man/os-release.html for the