diff options
| author | Graham Christensen <graham@grahamc.com> | 2018-10-05 10:48:42 -0400 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2018-10-05 13:14:07 -0400 |
| commit | 09b8ed042af131ee48df9d9c348f342bb2601565 (patch) | |
| tree | 7414a5f3b8e02cf8312282eaaba115af18c9e0cd /nixos | |
| parent | 9d5f0ba8e3d3ecce905b137f1ff528710d872d42 (diff) | |
version.nix: extract revision-fetching function
(cherry picked from commit 4312cfdbda1855088905a3d9959a4fac362fd051)
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/misc/version.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 2901dac442f37..0bb8880471873 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -5,7 +5,6 @@ with lib; let cfg = config.system.nixos; - revisionFile = "${toString pkgs.path}/.git-revision"; gitRepo = "${toString pkgs.path}/.git"; gitCommitId = lib.substring 0 7 (commitIdFromGitRepo gitRepo); in @@ -37,9 +36,7 @@ in nixos.revision = mkOption { internal = true; type = types.str; - default = if pathIsDirectory gitRepo then commitIdFromGitRepo gitRepo - else if pathExists revisionFile then fileContents revisionFile - else "master"; + default = lib.trivial.revisionWithDefault "master"; description = "The Git revision from which this NixOS configuration was built."; }; |