Merge staging-next into staging

2021-05-03 18:25:49 +00:00
parent 7b413bfff9 ab8749a05c
commit 5e177b16b1
60 changed files with 840 additions and 260 deletions
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -142,6 +142,7 @@ in
      license = licenses.mit;
      maintainers = with maintainers; [ goibhniu gilligan cko marsam ];
      platforms = platforms.linux ++ platforms.darwin;
+      mainProgram = "node";
    };

    passthru.python = python; # to ensure nodeEnv uses the same version