1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 17:41:12 +00:00
nixpkgs/pkgs/development/python-modules/yowsup/argparse-dependency.patch
Maximilian Bosch cf50edf583
python3Packages.yowsup: 2.5.2 -> 2.5.7
The latest update of `yowsup` (https://github.com/tgalal/yowsup/releases/tag/v2.5.7)
contains the following fixes:

* Updated tokens
* Fixed tgalal/yowsup#1842: Bug in protocol_groups RemoveGroupsNotificationProtocolEntity
* Other minor bug fixes

The `argparse-dependency.patch` required a rebase onto the latest
version of `setup.py` and ensures that `argparse` won't be needed as
extra dependency as our `python3` package ships `argparse` by default.

A short note to Python 2 support:

the actual issue related to Python 2.x support has been resolved
(https://github.com/tgalal/yowsup/issues/2325#issuecomment-354533727),
however this relies on `six==1.10` which isn't support by `nixpkgs` as
`six` has been bumped to `1.11`. When trying to inject a patched version
of our `six` package based on `six==1.10` you'll run into issues with
duplicated libraries in your closure as further build dependencies
(`pytest` in this case) use the latest `six` version. As Python 2.7 will
die in 2020 (https://pythonclock.org/) and patching around in the
dependencies of `pytest` to get `yowsup` running isn't worth the effort
in my opinion I decided to keep the Python 2.x build disabled for now.
2018-05-04 09:09:59 +02:00

14 lines
372 B
Diff

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