Merge master into staging-next

2020-06-17 08:40:33 +02:00
parent c610d82167 0b671216bb
commit 8850815577
68 changed files with 458 additions and 297 deletions
--- a/pkgs/development/python-modules/av/default.nix
+++ b/pkgs/development/python-modules/av/default.nix
@@ -3,7 +3,7 @@
 , fetchPypi
 , isPy27
 , numpy
-, ffmpeg_4
+, ffmpeg
 , pkgconfig
 }:

@@ -20,7 +20,7 @@ buildPythonPackage rec {
  checkInputs = [ numpy ];

  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ ffmpeg_4 ];
+  buildInputs = [ ffmpeg ];

  # Tests require downloading files from internet
  doCheck = false;