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

Don't break compatibility with pre-1.6 nix

Browse Source 
Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
Shea Levy 2013-09-24 09:40:06 -04:00
parent ec2266b2e2
commit 9ce148e738
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/config/shells-environment.nix
View File

@ -28,7 +28,7 @@ in
merge = xs: merge = xs:
let xs' = evalProperties xs; in let xs' = evalProperties xs; in
if isList (head xs') then concatLists xs' if isList (head xs') then concatLists xs'
else if length xs' > 1 then abort "variable in ‘environment.variables’ has multiple values" else if builtins.lessThan 1 (length xs') then abort "variable in ‘environment.variables’ has multiple values"
else if !builtins.isString (head xs') then abort "variable in ‘environment.variables’ does not have a string value" else if !builtins.isString (head xs') then abort "variable in ‘environment.variables’ does not have a string value"
else head xs'; else head xs';
}); });