From 4c5fdf42ed3612db4532bc2259dd3f7c6847e077 Mon Sep 17 00:00:00 2001 From: obadz Date: Thu, 2 Jun 2016 16:03:35 +0100 Subject: nixos/modules/misc/version.nix: check that .git is a directory That's not the case for git submodules Fixes #15928 --- nixos/modules/misc/version.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nixos/modules/misc/version.nix') diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index fd7cadf76cc18..9a37f5950930c 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -104,8 +104,8 @@ in # changing them would not rebuild the manual nixosLabel = mkDefault (maybeEnv "NIXOS_LABEL" cfg.nixosVersion); nixosVersion = mkDefault (maybeEnv "NIXOS_VERSION" (cfg.nixosRelease + cfg.nixosVersionSuffix)); - nixosRevision = mkIf (pathExists gitRepo) (mkDefault gitCommitId); - nixosVersionSuffix = mkIf (pathExists gitRepo) (mkDefault (".git." + gitCommitId)); + nixosRevision = mkIf (pathIsDirectory gitRepo) (mkDefault gitCommitId); + nixosVersionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + gitCommitId)); # Note: code names must only increase in alphabetical order. nixosCodeName = "Flounder"; -- cgit 1.4.1