diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-16 23:05:42 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-16 23:07:47 +0200 |
| commit | 84d4358635031c4e86a30f71b5ccd37462a94821 (patch) | |
| tree | d338b9a93d07e23c92de63d52d3dc2c79815b80e /nixos | |
| parent | 418fa3bb330af527e0d48e3f597a296a7d42c461 (diff) | |
| download | nixlib-84d4358635031c4e86a30f71b5ccd37462a94821.tar nixlib-84d4358635031c4e86a30f71b5ccd37462a94821.tar.gz nixlib-84d4358635031c4e86a30f71b5ccd37462a94821.tar.bz2 nixlib-84d4358635031c4e86a30f71b5ccd37462a94821.tar.lz nixlib-84d4358635031c4e86a30f71b5ccd37462a94821.tar.xz nixlib-84d4358635031c4e86a30f71b5ccd37462a94821.tar.zst nixlib-84d4358635031c4e86a30f71b5ccd37462a94821.zip | |
Fix compatibility with Nix < 1.6
Nix 1.6 (accidentally) changed the semantics of strings like
"${path}/bla", so this happened to work on 1.6 but not before.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/misc/version.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index e9ee476d36a9..1b519d3e6eef 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -26,10 +26,10 @@ with pkgs.lib; config = { system.nixosVersion = - mkDefault (builtins.readFile "${pkgs.path}/.version" + config.system.nixosVersionSuffix); + mkDefault (builtins.readFile "${toString pkgs.path}/.version" + config.system.nixosVersionSuffix); system.nixosVersionSuffix = - let suffixFile = "${pkgs.path}/.version-suffix"; in + let suffixFile = "${toString pkgs.path}/.version-suffix"; in mkDefault (if builtins.pathExists suffixFile then builtins.readFile suffixFile else "pre-git"); # Note: code names must only increase in alphabetical order. |