public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #35358 from volth/patch-100 

nixos/label: no prepend '-' if there are no tags
This commit is contained in:
Michael Raskin 2018-02-22 20:00:21 +00:00 committed by GitHub
parent 8cd9194a80 eef641aa6d
commit 4440e267c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/misc/label.nix
View File

@ -65,8 +65,8 @@ in
# This is set here rather than up there so that changing it would # This is set here rather than up there so that changing it would
# not rebuild the manual # not rebuild the manual
system.nixos.label = mkDefault (maybeEnv "NIXOS_LABEL" system.nixos.label = mkDefault (maybeEnv "NIXOS_LABEL"
(concatStringsSep "-" (sort (x: y: x < y) cfg.tags) (concatStringsSep "-" ((sort (x: y: x < y) cfg.tags)
+ "-" + maybeEnv "NIXOS_LABEL_VERSION" cfg.version)); ++ [ (maybeEnv "NIXOS_LABEL_VERSION" cfg.version) ])));
}; };
} }