diff options
| author | Benno Fünfstück <benno.fuenfstueck@gmail.com> | 2015-08-15 15:38:12 +0200 |
|---|---|---|
| committer | Benno Fünfstück <benno.fuenfstueck@gmail.com> | 2015-08-15 15:38:12 +0200 |
| commit | 7cd6b3cf7666455319769ff7c863ab8a08a1720e (patch) | |
| tree | b981e2b98fdb044da81c4311238e19e62be928d6 /lib/types.nix | |
| parent | e6f1e1e5dbcf85b132dcd080d27e89b10b69f433 (diff) | |
| download | nixpkgs-7cd6b3cf7666455319769ff7c863ab8a08a1720e.tar nixpkgs-7cd6b3cf7666455319769ff7c863ab8a08a1720e.tar.gz nixpkgs-7cd6b3cf7666455319769ff7c863ab8a08a1720e.tar.bz2 nixpkgs-7cd6b3cf7666455319769ff7c863ab8a08a1720e.tar.lz nixpkgs-7cd6b3cf7666455319769ff7c863ab8a08a1720e.tar.xz nixpkgs-7cd6b3cf7666455319769ff7c863ab8a08a1720e.tar.zst nixpkgs-7cd6b3cf7666455319769ff7c863ab8a08a1720e.zip | |
Revert change of path type
The change caused lots of evaluation errors, since it caused derivations to no longer be valid paths as well.
Diffstat (limited to 'lib/types.nix')
| -rw-r--r-- | lib/types.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/types.nix b/lib/types.nix index 27b653ebb6c..a7f9bf1946e 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -103,8 +103,7 @@ rec { path = mkOptionType { name = "path"; # Hacky: there is no ‘isPath’ primop. - # need to check isString first because otherwise toString throws an error. - check = x: builtins.isString x && builtins.substring 0 1 (toString x) == "/"; + check = x: builtins.substring 0 1 (toString x) == "/"; merge = mergeOneOption; }; |