diff options
| author | Sarah Brofeldt <sbrofeldt@gmail.com> | 2018-10-12 10:03:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-12 10:03:19 +0200 |
| commit | 9cba2f54fa2bfeb6a07a84956d7f6fa908d62795 (patch) | |
| tree | 0da7053ddcc4781b002da8afa97fa615ce57bd4d /pkgs | |
| parent | aac6e1032935063a9a3d3fb3b7821825de89dfd8 (diff) | |
| parent | 5352cb3748a80a5471f7ed216372aaa0cd1b465e (diff) | |
| download | nixlib-9cba2f54fa2bfeb6a07a84956d7f6fa908d62795.tar nixlib-9cba2f54fa2bfeb6a07a84956d7f6fa908d62795.tar.gz nixlib-9cba2f54fa2bfeb6a07a84956d7f6fa908d62795.tar.bz2 nixlib-9cba2f54fa2bfeb6a07a84956d7f6fa908d62795.tar.lz nixlib-9cba2f54fa2bfeb6a07a84956d7f6fa908d62795.tar.xz nixlib-9cba2f54fa2bfeb6a07a84956d7f6fa908d62795.tar.zst nixlib-9cba2f54fa2bfeb6a07a84956d7f6fa908d62795.zip | |
Merge pull request #48079 from lopsided98/python-av-update
pythonPackages.av: 0.4.1 -> 0.5.3
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/av/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index 7e68265eed83..4440edc22362 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -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; }; -} \ No newline at end of file +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e178823f45e1..1b4abe4a327a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 {}; |