diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-02-15 20:14:46 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2020-02-15 20:16:14 +0100 |
| commit | a5f883e5359ca97fb946dade25418d5732e3cdf7 (patch) | |
| tree | ae6fc85675dbc4d794d902ba63de657442bac090 /nixos | |
| parent | bfb7ebf5dfded338aef31fa9640c5ebc1050932e (diff) | |
| download | nixpkgs-a5f883e5359ca97fb946dade25418d5732e3cdf7.tar nixpkgs-a5f883e5359ca97fb946dade25418d5732e3cdf7.tar.gz nixpkgs-a5f883e5359ca97fb946dade25418d5732e3cdf7.tar.bz2 nixpkgs-a5f883e5359ca97fb946dade25418d5732e3cdf7.tar.lz nixpkgs-a5f883e5359ca97fb946dade25418d5732e3cdf7.tar.xz nixpkgs-a5f883e5359ca97fb946dade25418d5732e3cdf7.tar.zst nixpkgs-a5f883e5359ca97fb946dade25418d5732e3cdf7.zip | |
nixos/modules/installer/cd-dvd/channel.nix: Handle null config.system.nixos.revision
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/channel.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix index ab5e7c0645f..92164d65e53 100644 --- a/nixos/modules/installer/cd-dvd/channel.nix +++ b/nixos/modules/installer/cd-dvd/channel.nix @@ -21,7 +21,9 @@ let if [ ! -e $out/nixos/nixpkgs ]; then ln -s . $out/nixos/nixpkgs fi - echo -n ${config.system.nixos.revision} > $out/nixos/.git-revision + ${optionalString (config.system.nixos.revision != null) '' + echo -n ${config.system.nixos.revision} > $out/nixos/.git-revision + ''} echo -n ${config.system.nixos.versionSuffix} > $out/nixos/.version-suffix echo ${config.system.nixos.versionSuffix} | sed -e s/pre// > $out/nixos/svn-revision ''; |