mirrors/nix-darwin
mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-16 21:38:21 +00:00
Code Activity

version: include darwin metadata in system label

Browse source 
This makes it possible to trace back what version of both darwin and
nixpkgs the system was built with.
This commit is contained in:
Daiderd Jordan 2019-05-04 20:59:25 +02:00
parent 3da5c1a322
commit ba29af7ae3
No known key found for this signature in database
GPG key ID: D02435D05B810C96
2 changed files with 38 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/documentation/default.nix
View file

@ -13,7 +13,7 @@ let
manual = import ../../doc/manual rec { manual = import ../../doc/manual rec {
inherit pkgs config; inherit pkgs config;
version = "0.0.1"; version = "0.0.1";
revision = "release-${version}"; revision = "master";
options = options =
let let
scrubbedEval = evalModules { scrubbedEval = evalModules {

60
modules/system/version.nix
View file

@ -7,19 +7,27 @@ let
defaultStateVersion = options.system.stateVersion.default; defaultStateVersion = options.system.stateVersion.default;
gitCommitId = lib.substring 0 7 (commitIdFromGitRepo gitRepo); parseGit = path:
gitRepo = "${toString pkgs.path}/.git/"; if pathExists "${path}/.git/" then rec {
rev = commitIdFromGitRepo "${path}/.git/";
shortRev = substring 0 7 rev;
}
else if pathExists "${path}/.git-revision" then rec {
rev = fileContents "${path}/.git-revision";
shortRev = substring 0 7 rev;
}
else {
shortRev = "0000000";
};
darwin = parseGit (toString ../..);
nixpkgs = parseGit (toString pkgs.path);
releaseFile = "${toString pkgs.path}/.version"; releaseFile = "${toString pkgs.path}/.version";
revisionFile = "${toString pkgs.path}/.git-revision";
suffixFile = "${toString pkgs.path}/.version-suffix"; suffixFile = "${toString pkgs.path}/.version-suffix";
revision = if builtins.pathExists gitRepo then gitCommitId nixpkgsSuffix = if pathExists suffixFile then fileContents suffixFile
else if builtins.pathExists revisionFile then fileContents revisionFile else ".git." + nixpkgs.shortRev;
else null;
versionSuffix = if builtins.pathExists gitRepo then ".git." + gitCommitId
else if builtins.pathExists suffixFile then fileContents suffixFile
else null;
in in
{ {
@ -42,14 +50,24 @@ in
system.darwinLabel = mkOption { system.darwinLabel = mkOption {
type = types.str; type = types.str;
default = cfg.nixpkgsVersion;
description = "Label to be used in the names of generated outputs."; description = "Label to be used in the names of generated outputs.";
}; };
system.darwinVersion = mkOption {
internal = true;
type = types.str;
description = "The full darwin version (e.g. <literal>16.03.1160.f2d4ee1</literal>).";
};
system.darwinRevision = mkOption {
internal = true;
type = types.str;
description = "The darwin git revision from which this configuration was built.";
};
system.nixpkgsRelease = mkOption { system.nixpkgsRelease = mkOption {
readOnly = true; readOnly = true;
type = types.str; type = types.str;
default = fileContents releaseFile;
description = "The nixpkgs release (e.g. <literal>16.03</literal>)."; description = "The nixpkgs release (e.g. <literal>16.03</literal>).";
}; };
@ -59,17 +77,9 @@ in
description = "The full nixpkgs version (e.g. <literal>16.03.1160.f2d4ee1</literal>)."; description = "The full nixpkgs version (e.g. <literal>16.03.1160.f2d4ee1</literal>).";
}; };
system.nixpkgsVersionSuffix = mkOption {
internal = true;
type = types.str;
default = "pre-git";
description = "The nixpkgs version suffix (e.g. <literal>1160.f2d4ee1</literal>).";
};
system.nixpkgsRevision = mkOption { system.nixpkgsRevision = mkOption {
internal = true; internal = true;
type = types.str; type = types.str;
default = "master";
description = "The nixpkgs git revision from which this configuration was built."; description = "The nixpkgs git revision from which this configuration was built.";
}; };
}; };
@ -78,9 +88,13 @@ in
# These defaults are set here rather than up there so that # These defaults are set here rather than up there so that
# changing them would not rebuild the manual # changing them would not rebuild the manual
system.nixpkgsVersion = mkDefault (cfg.nixpkgsRelease + cfg.nixpkgsVersionSuffix); system.darwinLabel = "${cfg.nixpkgsVersion}+${cfg.darwinVersion}";
system.nixpkgsRevision = mkIf (revision != null) (mkDefault revision); system.darwinVersion = "darwin" + toString cfg.stateVersion + "." + darwin.shortRev;
system.nixpkgsVersionSuffix = mkIf (versionSuffix != null) (mkDefault versionSuffix); system.darwinRevision = mkIf (darwin ? rev) (mkDefault darwin.rev);
system.nixpkgsVersion = mkDefault (cfg.nixpkgsRelease + nixpkgsSuffix);
system.nixpkgsRelease = mkDefault (fileContents releaseFile);
system.nixpkgsRevision = mkIf (nixpkgs ? rev) (mkDefault nixpkgs.rev);
assertions = [ { assertion = cfg.stateVersion <= defaultStateVersion; message = "system.stateVersion = ${toString cfg.stateVersion}; is not a valid value"; } ]; assertions = [ { assertion = cfg.stateVersion <= defaultStateVersion; message = "system.stateVersion = ${toString cfg.stateVersion}; is not a valid value"; } ];