Merge master into staging-next

2020-11-09 14:33:52 +01:00
parent 099bb158f9 f77eb9bb4d
commit 20f001c01e
313 changed files with 7523 additions and 7431 deletions
--- a/pkgs/development/interpreters/python/update-python-libraries/default.nix
+++ b/pkgs/development/interpreters/python/update-python-libraries/default.nix
@@ -9,4 +9,4 @@ runCommand "update-python-libraries" {
  cp ${./update-python-libraries.py} $out
  patchShebangs $out
  substituteInPlace $out --replace 'GIT = "git"' 'GIT = "${git}/bin/git"'
-''
+''