From 61ec424cd4d4371f595c43fe18a90c08cd2d9f8f Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 3 Aug 2015 09:28:11 +0000 Subject: [PATCH 1/5] python33Packages.asyncio: init at 3.4.3 --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8eb7174558c..0cd5ef718c2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -517,6 +517,24 @@ let }; }; + asyncio = buildPythonPackage rec { + name = "asyncio-${version}"; + version = "3.4.3"; + + disabled = (!isPy33); + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/a/asyncio/${name}.tar.gz"; + sha256 = "0hfbqwk9y0bbfgxzg93s2wyk6gcjsdxlr5jwy97hx64ppkw0ydl3"; + }; + + meta = { + description = "reference implementation of PEP 3156"; + homepage = http://www.python.org/dev/peps/pep-3156; + license = licenses.free; + }; + }; + funcsigs = buildPythonPackage rec { name = "funcsigs-0.4"; disabled = ! (isPy26 || isPy27 || isPy33 || isPyPy); From f3a0fa9d96abc87daded54b8c2db20a869443083 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 3 Aug 2015 09:28:52 +0000 Subject: [PATCH 2/5] pythonPackages.pycares: init at 0.7.0 --- pkgs/top-level/python-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0cd5ef718c2..5fcb060f6fb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4216,6 +4216,23 @@ let }; }; + pycares = buildPythonPackage rec { + name = "pycares-${version}"; + version = "0.7.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pycares/${name}.tar.gz"; + sha256 = "10lr3ij67khmfm14cb3sqch3vhv37f3j1whwznq6qy4prfmz5gvl"; + }; + + propagatedBuildInputs = [ pkgs.c-ares ]; + + meta = { + homepage = http://github.com/saghul/pycares; + description = "Interface for c-ares"; + license = licenses.mit; + }; + }; pyramid = buildPythonPackage rec { name = "pyramid-1.5.2"; From 44be36869feda036a2eff3a3032c09b8acb0c5b9 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 3 Aug 2015 09:29:34 +0000 Subject: [PATCH 3/5] =?UTF-8?q?pythonPackages.aiodns:=C2=A0init=20at=200.3?= =?UTF-8?q?.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 5fcb060f6fb..3210141564b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -275,6 +275,26 @@ let }; }; + aiodns = buildPythonPackage rec { + name = "aiodns-${version}"; + version = "0.3.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/a/aiodns/${name}.tar.gz"; + sha256 = "0i9ypv9l4d59j87kkrsh1livfgnspyzcbx26jw9x58xs5z05xj7k"; + }; + + propagatedBuildInputs = with self ; [ + pycares + ] ++ optional (isPy33) self.asyncio + ++ optional (isPy26 || isPy27) self.trollius; + + meta = { + homepage = http://github.com/saghul/aiodns; + license = licenses.mit; + description = "Simple DNS resolver for asyncio"; + }; + }; alabaster = buildPythonPackage rec { name = "alabaster-0.7.3"; From eda7843cab45ad4fab16896aa04a93e06745d21f Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 3 Aug 2015 09:30:27 +0000 Subject: [PATCH 4/5] python34Packages.slixmpp: init at 1.0.post5 --- 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 3210141564b..f1065390f10 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8134,6 +8134,26 @@ let }; }; + slixmpp = buildPythonPackage rec { + name = "slixmpp-${version}"; + version = "1.0.post5"; + + disabled = (!isPy34); + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/slixmpp/${name}.tar.gz"; + sha256 = "0ik23w3y52m30z56874wgac07j70k7b06n20j44slii8avf58p4b"; + }; + + propagatedBuildInputs = with self ; [ aiodns pyasn1 ]; + + meta = { + meta = "Elegant Python library for XMPP"; + license = licenses.mit; + homepage = https://dev.louiz.org/projects/slixmpp; + }; + }; + netaddr = buildPythonPackage rec { name = "netaddr-0.7.5"; From b867cc62a78221de7378a3e416d44151a8303251 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 3 Aug 2015 09:31:21 +0000 Subject: [PATCH 5/5] poezio: 0.8.1 -> 0.9 --- .../poezio/fix_requirements.patch | 11 ------ .../poezio/make_default_config_writable.patch | 34 +++++++++---------- pkgs/top-level/python-packages.nix | 11 +++--- 3 files changed, 22 insertions(+), 34 deletions(-) delete mode 100644 pkgs/development/python-modules/poezio/fix_requirements.patch 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 = {