summary refs log tree commit diff
path: root/nixos/modules/misc
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 /nixos/modules/misc
parent39909289f452fcd60127cbd2372f22ac35f25d08 (diff)
downloadnixlib-9274ea390348e17f766732e7fbd335e3bc164954.tar
nixlib-9274ea390348e17f766732e7fbd335e3bc164954.tar.gz
nixlib-9274ea390348e17f766732e7fbd335e3bc164954.tar.bz2
nixlib-9274ea390348e17f766732e7fbd335e3bc164954.tar.lz
nixlib-9274ea390348e17f766732e7fbd335e3bc164954.tar.xz
nixlib-9274ea390348e17f766732e7fbd335e3bc164954.tar.zst
nixlib-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 'nixos/modules/misc')
-rw-r--r--nixos/modules/misc/version.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index d9d60b725093..74c86443ab90 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -23,14 +23,14 @@ in
     nixos.release = mkOption {
       readOnly = true;
       type = types.str;
-      default = trivial.version;
+      default = trivial.release;
       description = "The NixOS release (e.g. <literal>16.03</literal>).";
     };
 
     nixos.versionSuffix = mkOption {
       internal = true;
       type = types.str;
-      default = trivial.suffix;
+      default = trivial.versionSuffix;
       description = "The NixOS version suffix (e.g. <literal>1160.f2d4ee1</literal>).";
     };