JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #48079 from lopsided98/python-av-update

Browse Source 
pythonPackages.av: 0.4.1 -> 0.5.3
This commit is contained in:
Sarah Brofeldt 2018-10-12 10:03:19 +02:00 committed by GitHub
commit 9cba2f54fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/python-modules/av/default.nix
View File

@ -4,7 +4,7 @@
, nose
, pillow
, numpy
, ffmpeg_2
, ffmpeg_4
, git
, libav
, pkgconfig
@ -12,16 +12,16 @@
buildPythonPackage rec {
pname = "av";
version = "0.4.1";
version = "0.5.3";
src = fetchPypi {
inherit pname version;
sha256 = "bf9a8d113392c6a445f424e16f9e64ac53d1db1548731e6326763d555647c24f";
sha256 = "0k5nbff8c2wxc8wnyn1qghndbd2rjck1y3552s63w41mccj1k1qr";
};
buildInputs = [ nose pillow numpy ffmpeg_2 git libav pkgconfig ];
buildInputs = [ nose pillow numpy ffmpeg_4 git pkgconfig ];
# Because of https://github.com/mikeboers/PyAV/issues/152
# Tests require downloading files from internet
doCheck = false;
meta = {
@ -29,4 +29,4 @@ buildPythonPackage rec {
homepage = https://github.com/mikeboers/PyAV/;
license = lib.licenses.bsd2;
};
}
}

4
pkgs/top-level/python-packages.nix
View File

@ -750,9 +750,7 @@ in {
autopep8 = callPackage ../development/python-modules/autopep8 { };
av = callPackage ../development/python-modules/av {
inherit (pkgs) ffmpeg_2 git libav pkgconfig;
};
av = callPackage ../development/python-modules/av { };
avro = callPackage ../development/python-modules/avro {};