summary refs log tree commit diff
path: root/lib/trivial.nix
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2018-04-26 10:31:05 +0200
committerMaximilian Bosch <maximilian@mbosch.me>2018-04-28 14:23:53 +0200
commit9274ea390348e17f766732e7fbd335e3bc164954 (patch)
treeea75418843caff7129e5b9b87434e59f9cac0ef1 /lib/trivial.nix
parent39909289f452fcd60127cbd2372f22ac35f25d08 (diff)
downloadnixpkgs-9274ea390348e17f766732e7fbd335e3bc164954.tar
nixpkgs-9274ea390348e17f766732e7fbd335e3bc164954.tar.gz
nixpkgs-9274ea390348e17f766732e7fbd335e3bc164954.tar.bz2
nixpkgs-9274ea390348e17f766732e7fbd335e3bc164954.tar.lz
nixpkgs-9274ea390348e17f766732e7fbd335e3bc164954.tar.xz
nixpkgs-9274ea390348e17f766732e7fbd335e3bc164954.tar.zst
nixpkgs-9274ea390348e17f766732e7fbd335e3bc164954.zip
treewide: rename version attributes
As suggested in https://github.com/NixOS/nixpkgs/pull/39416#discussion_r183845745
the versioning attributes in `lib` should be consistent to
`nixos/version` which implicates the following changes:

* `lib.trivial.version` -> `lib.trivial.release`
* `lib.trivial.suffix` -> `lib.trivial.versionSuffix`
* `lib.nixpkgsVersion` -> `lib.version`

As `lib.nixpkgsVersion` is referenced several times in `NixOS/nixpkgs`,
`NixOS/nix` and probably several user's setups. As the rename will cause
a notable impact it's better to keep `lib.nixpkgsVersion` as alias with
a warning yielded by `builtins.trace`.
Diffstat (limited to 'lib/trivial.nix')
-rw-r--r--lib/trivial.nix8
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" != "";