public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #39926 from Ma27/update-yowsup 

python3Packages.yowsup: 2.5.2 -> 2.5.7
This commit is contained in:
Robert Schütz 2018-05-04 23:02:59 +02:00 committed by GitHub
parent da69dc40f0 cf50edf583
commit f79e0fcf75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/python-modules/yowsup/argparse-dependency.patch
View File

@ -1,13 +1,13 @@
diff --git a/setup.py b/setup.py diff --git a/setup.py b/setup.py
index 053ed07..60f0d9a 100755 index 991e89c..7a96ccf 100755
--- a/setup.py --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -5,7 +5,7 @@ import yowsup @@ -5,7 +5,7 @@ import yowsup
import platform import platform
import sys import sys
-deps = ['python-dateutil', 'argparse', 'python-axolotl>=0.1.39', 'six'] -deps = ['python-dateutil', 'argparse', 'python-axolotl>=0.1.39', 'six==1.10']
+deps = ['python-dateutil', 'python-axolotl>=0.1.39', 'six'] +deps = ['python-dateutil', 'python-axolotl>=0.1.39', 'six']
if sys.version_info < (2,7): if sys.version_info < (2,7):
deps += ['importlib'] deps += ['importlib', "protobuf==3.4.0"]

9
pkgs/development/python-modules/yowsup/default.nix
View File

@ -3,19 +3,18 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
name = "${pname}-${version}";
pname = "yowsup"; pname = "yowsup";
version = "2.5.2"; version = "2.5.7";
# python2 is currently incompatible with yowsup: # The Python 2.x support of this package is incompatible with `six==1.11`:
# https://github.com/tgalal/yowsup/issues/2325#issuecomment-343516519 # https://github.com/tgalal/yowsup/issues/2416#issuecomment-365113486
disabled = !isPy3k; disabled = !isPy3k;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tgalal"; owner = "tgalal";
repo = "yowsup"; repo = "yowsup";
rev = "v${version}"; rev = "v${version}";
sha256 = "16l8jmr32wwvl11m0a4r4id3dkfqj2n7dn6gky1077xwmj2da4fl"; sha256 = "1p0hdj5x38v2cxjnhdnqcnp5g7la57mbi365m0z83wa01x2n73w6";
}; };
checkInputs = [ pytest ]; checkInputs = [ pytest ];