summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2018-10-05 10:48:42 -0400
committerGraham Christensen <graham@grahamc.com>2018-10-05 11:06:28 -0400
commit4312cfdbda1855088905a3d9959a4fac362fd051 (patch)
treefa5fcd7c6d2c18d583057b9ccf0f6f964565af2d /lib
parent730dac1d7bccd4f4d540c780fc94133807757493 (diff)
downloadnixlib-4312cfdbda1855088905a3d9959a4fac362fd051.tar
nixlib-4312cfdbda1855088905a3d9959a4fac362fd051.tar.gz
nixlib-4312cfdbda1855088905a3d9959a4fac362fd051.tar.bz2
nixlib-4312cfdbda1855088905a3d9959a4fac362fd051.tar.lz
nixlib-4312cfdbda1855088905a3d9959a4fac362fd051.tar.xz
nixlib-4312cfdbda1855088905a3d9959a4fac362fd051.tar.zst
nixlib-4312cfdbda1855088905a3d9959a4fac362fd051.zip
version.nix: extract revision-fetching function
Diffstat (limited to 'lib')
-rw-r--r--lib/trivial.nix10
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/trivial.nix b/lib/trivial.nix
index b1eea0bf1247..938df6ced476 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -105,6 +105,16 @@ rec {
     then lib.strings.fileContents suffixFile
     else "pre-git";
 
+  # Attempt to get the revision nixpkgs is from
+  revisionWithDefault = default:
+    let
+      revisionFile = "${toString ./..}/.git-revision";
+      gitRepo      = "${toString ./..}/.git";
+    in if lib.pathIsDirectory gitRepo
+       then lib.commitIdFromGitRepo gitRepo
+       else if lib.pathExists revisionFile then lib.fileContents revisionFile
+       else default;
+
   nixpkgsVersion = builtins.trace "`lib.nixpkgsVersion` is deprecated, use `lib.version` instead!" version;
 
   # Whether we're being called by nix-shell.