diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2018-04-24 20:33:35 +0200 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2018-04-28 14:23:13 +0200 |
| commit | 39909289f452fcd60127cbd2372f22ac35f25d08 (patch) | |
| tree | c0f9e9020ae6159bda356424f316e23f9b319e64 /lib/trivial.nix | |
| parent | f66cdc71a3300581501fd953f8e359b7ff824933 (diff) | |
| download | nixlib-39909289f452fcd60127cbd2372f22ac35f25d08.tar nixlib-39909289f452fcd60127cbd2372f22ac35f25d08.tar.gz nixlib-39909289f452fcd60127cbd2372f22ac35f25d08.tar.bz2 nixlib-39909289f452fcd60127cbd2372f22ac35f25d08.tar.lz nixlib-39909289f452fcd60127cbd2372f22ac35f25d08.tar.xz nixlib-39909289f452fcd60127cbd2372f22ac35f25d08.tar.zst nixlib-39909289f452fcd60127cbd2372f22ac35f25d08.zip | |
lib: deduplicate version/suffix references
The logic regarding the generated `.version-suffix` file is already defined in `lib/trivial.nix` and shouldn't be duplicated in `nixos/version`.
Diffstat (limited to 'lib/trivial.nix')
| -rw-r--r-- | lib/trivial.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/trivial.nix b/lib/trivial.nix index a928e1dbca98..a6a4abba1189 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -58,11 +58,12 @@ rec { inherit (lib.strings) fileContents; + version = fileContents ../.version; + suffix = let suffixFile = ../.version-suffix; in + if pathExists suffixFile then fileContents suffixFile else "pre-git"; + # Return the Nixpkgs version number. - nixpkgsVersion = - let suffixFile = ../.version-suffix; in - fileContents ../.version - + (if pathExists suffixFile then fileContents suffixFile else "pre-git"); + nixpkgsVersion = version + suffix; # Whether we're being called by nix-shell. inNixShell = builtins.getEnv "IN_NIX_SHELL" != ""; |