From 3d2e46e7ad093ae62a89852a17f8946e0810b00f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 16 Nov 2016 16:55:36 +0100 Subject: [PATCH 1/3] pythonPackages.pymaging: init at 2016-11-16 --- pkgs/top-level/python-packages.nix | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0494df1989e..454d9448c48 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1067,7 +1067,7 @@ in { license = licenses.free; }; } else null; - + funcsigs = buildPythonPackage rec { name = "funcsigs-1.0.2"; @@ -14410,7 +14410,7 @@ in { broken = true; }; }; - + mock = buildPythonPackage (rec { name = "mock-2.0.0"; @@ -20953,6 +20953,24 @@ 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 ]; + }; + }; + pyPdf = buildPythonPackage rec { name = "pyPdf-1.13"; From ac8b3165b6bfe10bf246efe2d1a4bb24e3f863b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 16 Nov 2016 16:56:11 +0100 Subject: [PATCH 2/3] pythonPackages.pymaging_png: init at 2016-11-16 --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 454d9448c48..0728ed47b1e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20971,6 +20971,26 @@ in { }; }; + 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"; From 2b31fecfd8b8f5ac0747915acd2c6ff308f22750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 16 Nov 2016 16:56:50 +0100 Subject: [PATCH 3/3] pythonPackages.qrcode: fix dependencies this also fix tests for python3 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0728ed47b1e..9837eecd737 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25171,7 +25171,7 @@ in { sha256 = "0kljfrfq0c2rmxf8am57333ia41kd0snbm2rnqbdy816hgpcq5a1"; }; - propagatedBuildInputs = with self; [ six pillow ]; + propagatedBuildInputs = with self; [ six pillow pymaging_png ]; meta = { description = "Quick Response code generation for Python";