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,4 +1,4 @@
-{ lib, stdenv, fetchurl, pythonPackages }:
+{ lib, fetchurl, pythonPackages }:

 pythonPackages.buildPythonApplication rec {
  pname = "vnc2flv";