diff options
Diffstat (limited to 'lib/trivial.nix')
| -rw-r--r-- | lib/trivial.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/trivial.nix b/lib/trivial.nix index a6a4abba118..251cb796db0 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -58,12 +58,14 @@ rec { inherit (lib.strings) fileContents; - version = fileContents ../.version; - suffix = let suffixFile = ../.version-suffix; in + release = fileContents ../.version; + versionSuffix = let suffixFile = ../.version-suffix; in if pathExists suffixFile then fileContents suffixFile else "pre-git"; # Return the Nixpkgs version number. - nixpkgsVersion = version + suffix; + version = release + versionSuffix; + + nixpkgsVersion = builtins.trace "`lib.nixpkgsVersion` is deprecated, use `lib.version` instead!" version; # Whether we're being called by nix-shell. inNixShell = builtins.getEnv "IN_NIX_SHELL" != ""; |