Merge master into staging-next

2021-01-25 18:52:08 +00:00
parent 351b28d469 9ce1caa63c
commit a127deeb88
2813 changed files with 3233 additions and 2989 deletions
@@ -1,6 +1,6 @@
 { version, sha256 }:

-{ stdenv, fetchurl, python3Packages, lib }:
+{ fetchurl, python3Packages, lib }:

 python3Packages.buildPythonApplication rec {
  pname = "scons";