public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib: refactor nixpkgsVersion with fileContents

Browse Source
This commit is contained in:
Eric Sagnes 2016-07-31 21:59:30 +09:00
parent 85d8b01660
commit e276842f6a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/trivial.nix
View File

@ -62,11 +62,13 @@ rec {
isInt add sub lessThan isInt add sub lessThan
seq deepSeq genericClosure; seq deepSeq genericClosure;
inherit (import ./strings.nix) fileContents;
# Return the Nixpkgs version number. # Return the Nixpkgs version number.
nixpkgsVersion = nixpkgsVersion =
let suffixFile = ../.version-suffix; in let suffixFile = ../.version-suffix; in
readFile ../.version fileContents ../.version
+ (if pathExists suffixFile then readFile suffixFile else "pre-git"); + (if pathExists suffixFile then fileContents suffixFile else "pre-git");
# Whether we're being called by nix-shell. # Whether we're being called by nix-shell.
inNixShell = builtins.getEnv "IN_NIX_SHELL" == "1"; inNixShell = builtins.getEnv "IN_NIX_SHELL" == "1";