Merge staging-next into staging

2021-04-02 00:21:46 +00:00
parent e2191cb47d 9eaff3b9be
commit 636e58e31b
37 changed files with 314 additions and 170 deletions
@@ -104,7 +104,9 @@ let
    if urls != [] && url == "" then
      (if lib.isList urls then urls
       else throw "`urls` is not a list")
-    else if urls == [] && url != "" then [url]
+    else if urls == [] && url != "" then
+      (if lib.isString url then [url]
+       else throw "`url` is not a string")
    else throw "fetchurl requires either `url` or `urls` to be set";

  hash_ =