Merge master into staging-next

2021-04-17 18:10:38 +00:00
parent 85d9aa3a8b c27aea5e87
commit 8156636ab9
75 changed files with 819 additions and 1282 deletions
@@ -3712,7 +3712,7 @@ in
    buildInputs = globalBuildInputs;
    meta = {
      description = "Portable Unix shell commands for Node.js";
-      homepage = "http://github.com/shelljs/shelljs";
+      homepage = "https://github.com/shelljs/shelljs";
      license = "BSD-3-Clause";
    };
    production = true;