lib/string: make `isStorePath` total (#26216)

fix #9278
7 years ago · 2b0a8427e6
parent 4e88e82e06
commit 2b0a8427e6
1 changed files with 6 additions and 1 deletions
--- a/lib/strings.nix
+++ b/lib/strings.nix
@ -438,8 +438,13 @@ rec {
       => true
       isStorePath pkgs.python
       => true
+       isStorePath [] || isStorePath 42 || isStorePath {} || …
+       => false
  */
-  isStorePath = x: builtins.substring 0 1 (toString x) == "/" && dirOf (builtins.toPath x) == builtins.storeDir;
+  isStorePath = x:
+       builtins.isString x
+    && builtins.substring 0 1 (toString x) == "/"
+    && dirOf (builtins.toPath x) == builtins.storeDir;

  /* Convert string to int
     Obviously, it is a bit hacky to use fromJSON that way.