From 7cd6b3cf7666455319769ff7c863ab8a08a1720e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Sat, 15 Aug 2015 15:38:12 +0200 Subject: [PATCH] Revert change of path type The change caused lots of evaluation errors, since it caused derivations to no longer be valid paths as well. --- lib/types.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index 27b653ebb6c7..a7f9bf1946e6 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; };