summary refs log tree commit diff
path: root/nixos/modules/misc/version.nix
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2020-02-10 15:25:44 +0100
committerEelco Dolstra <edolstra@gmail.com>2020-02-10 15:45:15 +0100
commitc05cc615f2ef65d223700409fb91915bf83fab4d (patch)
treeb41e7078b7a3272bbe2990c90b60231b9f60105d /nixos/modules/misc/version.nix
parentb98ea4560899470536506426a74704a907fcfc8f (diff)
downloadnixpkgs-c05cc615f2ef65d223700409fb91915bf83fab4d.tar
nixpkgs-c05cc615f2ef65d223700409fb91915bf83fab4d.tar.gz
nixpkgs-c05cc615f2ef65d223700409fb91915bf83fab4d.tar.bz2
nixpkgs-c05cc615f2ef65d223700409fb91915bf83fab4d.tar.lz
nixpkgs-c05cc615f2ef65d223700409fb91915bf83fab4d.tar.xz
nixpkgs-c05cc615f2ef65d223700409fb91915bf83fab4d.tar.zst
nixpkgs-c05cc615f2ef65d223700409fb91915bf83fab4d.zip
nixos.revision: Use null instead of "master"
"master" is not a valid SHA-1 commit hash, and it's not even
necessarily the branch used. 'nixos-version --revision' now returns an
error if the commit hash is not known.
Diffstat (limited to 'nixos/modules/misc/version.nix')
-rw-r--r--nixos/modules/misc/version.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 8dbbbe6761c..c394ff592f4 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -42,8 +42,8 @@ in
 
     nixos.revision = mkOption {
       internal = true;
-      type = types.str;
-      default = trivial.revisionWithDefault "master";
+      type = types.nullOr types.str;
+      default = trivial.revisionWithDefault null;
       description = "The Git revision from which this NixOS configuration was built.";
     };