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

top-level: cleanup whitespace

Browse Source
This commit is contained in:
Jan Malakhovski 2019-02-03 15:30:14 +00:00
parent 849b10a419
commit 107f0fc9e7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/top-level/impure.nix
View File

@ -52,22 +52,22 @@ in
map (n: import (path + ("/" + n))) map (n: import (path + ("/" + n)))
(builtins.filter (n: builtins.match ".*\\.nix" n != null || pathExists (path + ("/" + n + "/default.nix"))) (builtins.filter (n: builtins.match ".*\\.nix" n != null || pathExists (path + ("/" + n + "/default.nix")))
(attrNames content)) (attrNames content))
else else
# it's a file, so the result is the contents of the file itself # it's a file, so the result is the contents of the file itself
import path; import path;
in in
if pathOverlays != "" && pathExists pathOverlays then overlays pathOverlays if pathOverlays != "" && pathExists pathOverlays then overlays pathOverlays
else if pathExists homeOverlaysFile && pathExists homeOverlaysDir then else if pathExists homeOverlaysFile && pathExists homeOverlaysDir then
throw '' throw ''
Nixpkgs overlays can be specified with ${homeOverlaysFile} or ${homeOverlaysDir}, but not both. Nixpkgs overlays can be specified with ${homeOverlaysFile} or ${homeOverlaysDir}, but not both.
Please remove one of them and try again. Please remove one of them and try again.
'' ''
else if pathExists homeOverlaysFile then else if pathExists homeOverlaysFile then
if isDir homeOverlaysFile then if isDir homeOverlaysFile then
throw (homeOverlaysFile + " should be a file") throw (homeOverlaysFile + " should be a file")
else overlays homeOverlaysFile else overlays homeOverlaysFile
else if pathExists homeOverlaysDir then else if pathExists homeOverlaysDir then
if !(isDir homeOverlaysDir) then if !(isDir homeOverlaysDir) then
throw (homeOverlaysDir + " should be a directory") throw (homeOverlaysDir + " should be a directory")
else overlays homeOverlaysDir else overlays homeOverlaysDir
else [] else []