diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2018-04-26 10:31:05 +0200 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2018-04-28 14:23:53 +0200 |
| commit | 9274ea390348e17f766732e7fbd335e3bc164954 (patch) | |
| tree | ea75418843caff7129e5b9b87434e59f9cac0ef1 /doc | |
| parent | 39909289f452fcd60127cbd2372f22ac35f25d08 (diff) | |
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 'doc')
| -rw-r--r-- | doc/Makefile | 2 | ||||
| -rw-r--r-- | doc/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/Makefile b/doc/Makefile index 0ddae8631f3c..952ef4bfcbb9 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -64,7 +64,7 @@ manual-full.xml: ${MD_TARGETS} .version *.xml .version: nix-instantiate --eval \ - -E '(import ../lib).nixpkgsVersion' > .version + -E '(import ../lib).version' > .version %.section.xml: %.section.md pandoc $^ -w docbook+smart \ diff --git a/doc/default.nix b/doc/default.nix index 8abde58bb114..e5be364506ff 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -30,7 +30,7 @@ pkgs.stdenv.mkDerivation { ]; postPatch = '' - echo ${lib.nixpkgsVersion} > .version + echo ${lib.version} > .version ''; installPhase = '' |