diff --git a/pkgs/development/python-modules/poezio/fix_requirements.patch b/pkgs/development/python-modules/poezio/fix_requirements.patch deleted file mode 100644 index 99b022c0e78..00000000000 --- a/pkgs/development/python-modules/poezio/fix_requirements.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/setup.py 2014-03-20 22:27:14.000000000 +0100 -+++ b/setup.py 2015-07-10 21:18:30.156196111 +0200 -@@ -49,7 +49,7 @@ - scripts = ['scripts/poezio'], - data_files = [('share/man/man1/', ['data/poezio.1'])], - -- install_requires = ['sleekxmpp==1.2.4', -+ install_requires = ['sleekxmpp==1.2.5', - 'dnspython3>=1.11.1'], - extras_require = {'OTR plugin': 'python-potr>=1.0', - 'Screen autoaway plugin': 'pyinotify==0.9.4'} diff --git a/pkgs/development/python-modules/poezio/make_default_config_writable.patch b/pkgs/development/python-modules/poezio/make_default_config_writable.patch index aa431dcc928..03d732e256c 100644 --- a/pkgs/development/python-modules/poezio/make_default_config_writable.patch +++ b/pkgs/development/python-modules/poezio/make_default_config_writable.patch @@ -1,25 +1,25 @@ diff -ruN a/src/config.py b/src/config.py ---- a/src/config.py 2014-03-20 22:27:05.000000000 +0100 -+++ b/src/config.py 2015-07-10 21:24:37.583136078 +0200 -@@ -18,6 +18,7 @@ +--- a/src/config.py 2015-07-31 19:35:37.000000000 +0000 ++++ b/src/config.py 2015-08-03 09:23:34.322098081 +0000 +@@ -14,6 +14,7 @@ + import logging.config import os - import logging +import stat + import sys + import pkg_resources - from configparser import RawConfigParser, NoOptionError, NoSectionError - from os import environ, makedirs, path, remove -@@ -279,6 +280,13 @@ - copy2(default, options.filename) - elif path.isfile(other): - copy2(other, options.filename) +@@ -563,6 +564,13 @@ + copy2(default, options.filename) + elif path.isfile(other): + copy2(other, options.filename) + -+ # Inside the nixstore, the reference file is readonly, so is the copy. -+ # Make it writable by the user who just created it. -+ if os.path.exists(options.filename): -+ os.chmod(options.filename, -+ os.stat(options.filename).st_mode | stat.S_IWUSR) ++ # Inside the nixstore, the reference file is readonly, so is the copy. ++ # Make it writable by the user who just created it. ++ if os.path.exists(options.filename): ++ os.chmod(options.filename, ++ os.stat(options.filename).st_mode | stat.S_IWUSR) + - firstrun = True + global firstrun + firstrun = True - try: diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f1065390f10..39c459259ea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16822,21 +16822,20 @@ let poezio = buildPythonPackage rec { name = "poezio-${version}"; - version = "0.8.1"; + version = "0.9"; namePrefix = ""; - disabled = (!isPy3k); - propagatedBuildInputs = with self ; [ dnspython3 sleekxmpp ]; + disabled = (!isPy34); + propagatedBuildInputs = with self ; [ aiodns slixmpp ]; patches = let patch_base = ../development/python-modules/poezio ; in [ "${patch_base}/make_default_config_writable.patch" - "${patch_base}/fix_requirements.patch" ]; src = pkgs.fetchurl { - url = "http://dev.louiz.org/attachments/download/52/${name}.tar.xz"; - sha256 = "0n3phh3lc82609ssfvqvd4papvhykd1sf2bm88dggh2x4mypwjff"; + url = "http://dev.louiz.org/attachments/download/91/${name}.tar.xz"; + sha256 = "1vc7zn4rp0ds0cdh1xcmbwx6w2qh4pnpzi5mdnj3rpl7xdr6jqzi"; }; meta = {