diff options
| author | Graham Christensen <graham@grahamc.com> | 2018-10-05 13:13:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-05 13:13:15 -0400 |
| commit | b4755393cce4444d3c328315a6334095cc867417 (patch) | |
| tree | 9db16dda99022a4a7e4b7c49236fbaac0d905640 /nixos | |
| parent | 3f98dd18cafcd068bb2fb181f53212b07064aa36 (diff) | |
| parent | 5daee73ce41652d21743a7304b4fd3f9da926c35 (diff) | |
| download | nixlib-b4755393cce4444d3c328315a6334095cc867417.tar nixlib-b4755393cce4444d3c328315a6334095cc867417.tar.gz nixlib-b4755393cce4444d3c328315a6334095cc867417.tar.bz2 nixlib-b4755393cce4444d3c328315a6334095cc867417.tar.lz nixlib-b4755393cce4444d3c328315a6334095cc867417.tar.xz nixlib-b4755393cce4444d3c328315a6334095cc867417.tar.zst nixlib-b4755393cce4444d3c328315a6334095cc867417.zip | |
Merge pull request #47920 from grahamc/link-to-definition
docs: Link to Definition
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 c593adcdae6e..6d78b7c593f8 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."; }; |