diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:30:14 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:30:14 +0000 |
| commit | 107f0fc9e712996674ce7f67ac4d2e6163f88822 (patch) | |
| tree | b2b7678f9b33e249807e9734ca60a171a48d840c /pkgs/top-level/impure.nix | |
| parent | 849b10a41949cf510db02adaa20d615a2014ba10 (diff) | |
top-level: cleanup whitespace
Diffstat (limited to 'pkgs/top-level/impure.nix')
| -rw-r--r-- | pkgs/top-level/impure.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index dafa351c4e41..b0532ceb5db4 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -52,22 +52,22 @@ in map (n: import (path + ("/" + n))) (builtins.filter (n: builtins.match ".*\\.nix" n != null || pathExists (path + ("/" + n + "/default.nix"))) (attrNames content)) - else + else # it's a file, so the result is the contents of the file itself import path; in if pathOverlays != "" && pathExists pathOverlays then overlays pathOverlays - else if pathExists homeOverlaysFile && pathExists homeOverlaysDir then + else if pathExists homeOverlaysFile && pathExists homeOverlaysDir then throw '' Nixpkgs overlays can be specified with ${homeOverlaysFile} or ${homeOverlaysDir}, but not both. Please remove one of them and try again. '' - else if pathExists homeOverlaysFile then - if isDir homeOverlaysFile then + else if pathExists homeOverlaysFile then + if isDir homeOverlaysFile then throw (homeOverlaysFile + " should be a file") else overlays homeOverlaysFile else if pathExists homeOverlaysDir then - if !(isDir homeOverlaysDir) then + if !(isDir homeOverlaysDir) then throw (homeOverlaysDir + " should be a directory") else overlays homeOverlaysDir else [] |