pyrox.dev
Merge pull request #39926 from Ma27/update-yowsup
python3Packages.yowsup: 2.5.2 -> 2.5.7
authored by
Robert Schütz
and committed by
GitHub
f79e0fcf
da69dc40
+3
-3
pkgs/development/python-modules/yowsup/argparse-dependency.patch
+3
-3
pkgs/development/python-modules/yowsup/argparse-dependency.patch
···
1
1
diff --git a/setup.py b/setup.py
2
-
index 053ed07..60f0d9a 100755
2
+
index 991e89c..7a96ccf 100755
3
3
--- a/setup.py
4
4
+++ b/setup.py
5
5
@@ -5,7 +5,7 @@ import yowsup
6
6
import platform
7
7
import sys
8
8
9
-
-deps = ['python-dateutil', 'argparse', 'python-axolotl>=0.1.39', 'six']
9
+
-deps = ['python-dateutil', 'argparse', 'python-axolotl>=0.1.39', 'six==1.10']
10
10
+deps = ['python-dateutil', 'python-axolotl>=0.1.39', 'six']
11
11
12
12
if sys.version_info < (2,7):
13
-
deps += ['importlib']
13
+
deps += ['importlib', "protobuf==3.4.0"]
+4
-5
pkgs/development/python-modules/yowsup/default.nix
+4
-5
pkgs/development/python-modules/yowsup/default.nix
···
3
3
}:
4
4
5
5
buildPythonPackage rec {
6
-
name = "${pname}-${version}";
7
6
pname = "yowsup";
8
-
version = "2.5.2";
7
+
version = "2.5.7";
9
8
10
-
# python2 is currently incompatible with yowsup:
11
-
# https://github.com/tgalal/yowsup/issues/2325#issuecomment-343516519
9
+
# The Python 2.x support of this package is incompatible with `six==1.11`:
10
+
# https://github.com/tgalal/yowsup/issues/2416#issuecomment-365113486
12
11
disabled = !isPy3k;
13
12
14
13
src = fetchFromGitHub {
15
14
owner = "tgalal";
16
15
repo = "yowsup";
17
16
rev = "v${version}";
18
-
sha256 = "16l8jmr32wwvl11m0a4r4id3dkfqj2n7dn6gky1077xwmj2da4fl";
17
+
sha256 = "1p0hdj5x38v2cxjnhdnqcnp5g7la57mbi365m0z83wa01x2n73w6";
19
18
};
20
19
21
20
checkInputs = [ pytest ];