diff options
| author | Shea Levy <shea@shealevy.com> | 2013-05-02 15:04:21 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2013-05-02 15:04:21 -0400 |
| commit | 932dd06f3f9e39a461a687ba94d35fadcf11fb3f (patch) | |
| tree | c0f7686c0d5a3dc76e52877846f2bdd34d94233d /pkgs/lib/modules.nix | |
| parent | 2742087bdd092d77083dc99cdafb6e93444fba3e (diff) | |
| download | nixlib-932dd06f3f9e39a461a687ba94d35fadcf11fb3f.tar nixlib-932dd06f3f9e39a461a687ba94d35fadcf11fb3f.tar.gz nixlib-932dd06f3f9e39a461a687ba94d35fadcf11fb3f.tar.bz2 nixlib-932dd06f3f9e39a461a687ba94d35fadcf11fb3f.tar.lz nixlib-932dd06f3f9e39a461a687ba94d35fadcf11fb3f.tar.xz nixlib-932dd06f3f9e39a461a687ba94d35fadcf11fb3f.tar.zst nixlib-932dd06f3f9e39a461a687ba94d35fadcf11fb3f.zip | |
Revert "Add isPath to trivial.nix"
This breaks NixOS, and I don't actually need it, so someone who needs it can bring this back without breaking NixOS :) This reverts commit 2742087bdd092d77083dc99cdafb6e93444fba3e. Signed-off-by: Shea Levy <shea@shealevy.com>
Diffstat (limited to 'pkgs/lib/modules.nix')
| -rw-r--r-- | pkgs/lib/modules.nix | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/lib/modules.nix b/pkgs/lib/modules.nix index 4c00728a9a58..286178a0fa70 100644 --- a/pkgs/lib/modules.nix +++ b/pkgs/lib/modules.nix @@ -11,6 +11,17 @@ with import ./options.nix; with import ./properties.nix; rec { + + # Unfortunately this can also be a string. + isPath = x: !( + builtins.isFunction x + || builtins.isAttrs x + || builtins.isInt x + || builtins.isBool x + || builtins.isList x + ); + + importIfPath = path: if isPath path then import path |