diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-02-27 02:14:24 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-03-03 23:56:43 +0100 |
| commit | d7e3cff83ebf82b1761a6fafa6e2c668b4973a8c (patch) | |
| tree | 049ce365a0cb4513ae146ef53fd63dc8a8c22b56 | |
| parent | 161757d56d4cd9a6b84c8b7453ee88ac51034a4d (diff) | |
| download | nixpkgs-d7e3cff83ebf82b1761a6fafa6e2c668b4973a8c.tar nixpkgs-d7e3cff83ebf82b1761a6fafa6e2c668b4973a8c.tar.gz nixpkgs-d7e3cff83ebf82b1761a6fafa6e2c668b4973a8c.tar.bz2 nixpkgs-d7e3cff83ebf82b1761a6fafa6e2c668b4973a8c.tar.lz nixpkgs-d7e3cff83ebf82b1761a6fafa6e2c668b4973a8c.tar.xz nixpkgs-d7e3cff83ebf82b1761a6fafa6e2c668b4973a8c.tar.zst nixpkgs-d7e3cff83ebf82b1761a6fafa6e2c668b4973a8c.zip | |
python3Packages.imageio-ffmpeg: 0.4.7 -> 0.4.8
| -rw-r--r-- | pkgs/development/python-modules/imageio-ffmpeg/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch | 16 |
2 files changed, 8 insertions, 12 deletions
diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix index 2fa5f47d583..4627927ea9f 100644 --- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "imageio-ffmpeg"; - version = "0.4.7"; + version = "0.4.8"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-egiDj5fzY+N8pBghuGT9P9yZqx/iQhBAx4619Wqecj4="; + sha256 = "sha256-/aoFrRD+Bwt/qOX2FcsNKPO5t5HQCvbSoR5pQVjRCqk="; }; patches = [ diff --git a/pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch b/pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch index d193ec199f9..33e2f9695d8 100644 --- a/pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch +++ b/pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch @@ -1,11 +1,11 @@ diff --git a/imageio_ffmpeg/_utils.py b/imageio_ffmpeg/_utils.py -index 1399cfd..c0eb9be 100644 +index 6387834..e5e312d 100644 --- a/imageio_ffmpeg/_utils.py +++ b/imageio_ffmpeg/_utils.py -@@ -23,33 +23,7 @@ def get_ffmpeg_exe(): - if exe: - return exe +@@ -38,29 +38,7 @@ def get_ffmpeg_exe(): + @lru_cache() + def _get_ffmpeg_exe(): - plat = get_platform() - - # 2. Try from here @@ -28,12 +28,8 @@ index 1399cfd..c0eb9be 100644 - if _is_valid_exe(exe): - return exe - -- # Nothing was found -- raise RuntimeError( -- "No ffmpeg exe could be found. Install ffmpeg on your system, " -- "or set the IMAGEIO_FFMPEG_EXE environment variable." -- ) -+ return '@ffmpeg@' +- return None ++ return "@ffmpeg@" def _popen_kwargs(prevent_sigint=False): |