Merge branch 'master' into staging-next

2021-01-24 00:09:45 +01:00
parent 58752914f4 f1778cd90e
commit 01ee4ea574
871 changed files with 3294 additions and 3821 deletions
@@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec {
    mv "$out/"*.1 "$out/share/man/man1/"
  '';

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "An improved, cross-platform substitute for Make";
    longDescription = ''
      SCons is an Open Source software construction tool. Think of