Merge master into staging-next

2020-06-13 11:02:21 +02:00
parent 98f95ef9c4 0905a5d990
commit 1523382160
201 changed files with 1867 additions and 1351 deletions
--- a/pkgs/development/python-modules/stytra/default.nix
+++ b/pkgs/development/python-modules/stytra/default.nix
@@ -8,7 +8,7 @@
 , pandas
 , tables
 , git
-, ffmpeg
+, ffmpeg_3
 , scikitimage
 , matplotlib
 , qdarkstyle
@@ -55,7 +55,7 @@ buildPythonPackage rec {
    pandas
    tables
    git
-    ffmpeg
+    ffmpeg_3
    scikitimage
    matplotlib
    qdarkstyle