diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
| commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
| tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/python-modules/pyturbojpeg | |
| parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
| parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
| download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip | |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/pyturbojpeg')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix b/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix index eeffd6809bc8..a357e45a5faf 100644 --- a/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix @@ -1,21 +1,22 @@ { lib , stdenv -, python , buildPythonPackage , fetchPypi -, substituteAll , libjpeg_turbo , numpy +, python +, substituteAll }: buildPythonPackage rec { pname = "pyturbojpeg"; - version = "1.6.1"; + version = "1.6.3"; + format = "setuptools"; src = fetchPypi { pname = "PyTurboJPEG"; inherit version; - sha256 = "sha256-RiWkDoBETMYigAdbxdj5xb5ht9mQ5qzifE1omqTVZlo="; + sha256 = "sha256-5g9MQB7vpeuorVGExt0scHtLdrWlkuLOZMT38FhAsi4="; }; patches = [ @@ -34,7 +35,9 @@ buildPythonPackage rec { ${python.interpreter} -c 'from turbojpeg import TurboJPEG; TurboJPEG()' ''; - pythonImportsCheck = [ "turbojpeg" ]; + pythonImportsCheck = [ + "turbojpeg" + ]; meta = with lib; { description = "A Python wrapper of libjpeg-turbo for decoding and encoding JPEG image"; |