nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-04 04:46:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #154825 from risicle/ris-pillow-9.0.0

Browse Source
This commit is contained in:
Sandro 2022-01-13 13:41:09 +01:00 committed by GitHub
commit d6374a376b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/python-modules/imageio/default.nix
View File

@ -2,6 +2,7 @@
, buildPythonPackage
, isPy27
, fetchPypi
, fetchpatch
, imageio-ffmpeg
, numpy
, pillow
@ -12,14 +13,23 @@
buildPythonPackage rec {
pname = "imageio";
version = "2.13.2";
version = "2.13.5";
disabled = isPy27;
src = fetchPypi {
sha256 = "5b7a55d07de88a2fd70f18a1608ca05ba2b55596a942fb2c390240201009a6c3";
sha256 = "0gc41aiz2i0napk1y00v9bgb4m7dd21sz3lghfm6w6s0ivjjpv67";
inherit pname version;
};
patches = [
# already present in master, remove on next bump
(fetchpatch {
name = "pillow-9-gif-rgba.patch";
url = "https://github.com/imageio/imageio/commit/836b7a9b077a96de8adab5b67ea53b1292048275.patch";
sha256 = "0rlyppa4w16n6qn5hr4wrg8xiy7ifs8c5dhmq8a9yncypx87glpv";
})
];
propagatedBuildInputs = [
imageio-ffmpeg
numpy

4
pkgs/development/python-modules/pillow/default.nix
View File

@ -5,13 +5,13 @@
import ./generic.nix (rec {
pname = "Pillow";
version = "8.4.0";
version = "9.0.0";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "b8e2f83c56e141920c39464b852de3719dfbfb6e3c99a2d8da0edf4fb33176ed";
sha256 = "0gjry0yqryd2678sm47jhdnbghzxn5wk8pgyaqwr4qi7x5ijjvpf";
};
meta = with lib; {