Merge branch 'no-toPath'

2018-09-06 08:09:53 -04:00
parent 0af9072e74 6da6accd30
commit 18337f3ece
11 changed files with 14 additions and 15 deletions
@@ -112,7 +112,7 @@ runTests {
        storePathAppendix = isStorePath
          "${goodPath}/bin/python";
        nonAbsolute = isStorePath (concatStrings (tail (stringToCharacters goodPath)));
-        asPath = isStorePath (builtins.toPath goodPath);
+        asPath = isStorePath goodPath;
        otherPath = isStorePath "/something/else";
        otherVals = {
          attrset = isStorePath {};
@@ -357,7 +357,7 @@ runTests {
      int = 42;
      bool = true;
      string = ''fno"rd'';
-      path = /. + "/foo"; # toPath returns a string
+      path = /. + "/foo";
      null_ = null;
      function = x: x;
      functionArgs = { arg ? 4, foo }: arg;