Merge pull request #20472 from Mic92/qrcode

pythonPackages.qrcode: fix dependencies and tests
This commit is contained in:
Frederik Rietdijk 2016-11-16 21:59:41 +01:00 committed by GitHub
commit 9524aedfc8

View File

@ -1067,7 +1067,7 @@ in {
license = licenses.free;
};
} else null;
funcsigs = buildPythonPackage rec {
name = "funcsigs-1.0.2";
@ -14379,7 +14379,7 @@ in {
broken = true;
};
};
mock = buildPythonPackage (rec {
name = "mock-2.0.0";
@ -20881,6 +20881,44 @@ in {
};
};
pymaging = buildPythonPackage rec {
name = "pymaging-unstable-2016-11-16";
src = pkgs.fetchFromGitHub {
owner = "ojii";
repo = "pymaging";
rev = "596a08fce5664e58d6e8c96847393fbe987783f2";
sha256 = "18g3n7kfrark30l4vzykh0gdbnfv5wb1zvvjbs17sj6yampypn38";
};
meta = {
description = "Pure Python imaging library with Python 2.6, 2.7, 3.1+ support";
homepage = http://pymaging.rtfd.org;
license = licenses.mit;
maintainers = with maintainers; [ mic92 ];
};
};
pymaging_png = buildPythonPackage rec {
name = "pymaging-png-unstable-2016-11-16";
src = pkgs.fetchFromGitHub {
owner = "ojii";
repo = "pymaging-png";
rev = "83d85c44e4b2342818e6c068065e031a9f81bb9f";
sha256 = "1mknxvsq0lr1ffm8amzm3w2prn043c6ghqgpxlkw83r988p5fn57";
};
propagatedBuildInputs = with self; [ pymaging ];
meta = {
description = "Pure Python imaging library with Python 2.6, 2.7, 3.1+ support";
homepage = https://github.com/ojii/pymaging-png/;
license = licenses.mit;
maintainers = with maintainers; [ mic92 ];
};
};
pyPdf = buildPythonPackage rec {
name = "pyPdf-1.13";
@ -25065,7 +25103,7 @@ in {
sha256 = "0kljfrfq0c2rmxf8am57333ia41kd0snbm2rnqbdy816hgpcq5a1";
};
propagatedBuildInputs = with self; [ six pillow ];
propagatedBuildInputs = with self; [ six pillow pymaging_png ];
meta = {
description = "Quick Response code generation for Python";