diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b88bbd51a4b3..7386b843c55e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -875,7 +875,7 @@ in modules // { buildInputs = with self; [ pytest - sqlalchemy9 + sqlalchemy tornado twisted mock @@ -3389,18 +3389,16 @@ in modules // { ColanderAlchemy = buildPythonPackage rec { - name = "ColanderAlchemy-0.2.0"; + name = "ColanderAlchemy-${version}"; + version = "0.3.3"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/C/ColanderAlchemy/${name}.tar.gz"; - sha256 = "d10e97b5f4648dcdc38c5e5c9f9b77fe39c8fa7f594d89d558b0d82e5631bfd7"; + sha256 = "11wcni2xmfmy001rj62q2pwf305vvngkrfm5c4zlwvgbvlsrvnnw"; }; buildInputs = with self; [ unittest2 ]; - propagatedBuildInputs = with self; [ colander sqlalchemy9 ]; - - # string: argument name cannot be overridden via info kwarg. - doCheck = false; + propagatedBuildInputs = with self; [ colander sqlalchemy ]; meta = { description = "Autogenerate Colander schemas based on SQLAlchemy models"; @@ -5004,7 +5002,7 @@ in modules // { doCheck = false; # requires redis server propagatedBuildInputs = with self; [ setuptools docker_registry_core blinker flask gevent gunicorn pyyaml - requests2 rsa sqlalchemy9 setuptools backports_lzma m2crypto + requests2 rsa sqlalchemy setuptools backports_lzma m2crypto ]; patchPhase = "> requirements/main.txt"; @@ -9209,7 +9207,7 @@ in modules // { doCheck = false; buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ paver feedparser sqlalchemy9 pyyaml rpyc + propagatedBuildInputs = with self; [ paver feedparser sqlalchemy pyyaml rpyc beautifulsoup_4_1_3 html5lib pyrss2gen pynzb progressbar jinja2 flask cherrypy requests dateutil_2_1 jsonschema python_tvrage tmdb3 guessit pathpy apscheduler ] @@ -12479,7 +12477,7 @@ in modules // { name = "pymysqlsa-${version}"; version = "1.0"; - propagatedBuildInputs = with self; [ pymysql sqlalchemy9 ]; + propagatedBuildInputs = with self; [ pymysql sqlalchemy ]; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pymysql_sa/pymysql_sa-1.0.tar.gz"; @@ -20730,32 +20728,6 @@ in modules // { }; }; - sqlalchemy9 = buildPythonPackage rec { - name = "SQLAlchemy-0.9.9"; - - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz"; - sha256 = "14az6hhrz4bgnicz4q373z119zmaf7j5zxl1jfbfl5lix5m1z9bj"; - }; - - buildInputs = with self; [ nose mock ] - ++ stdenv.lib.optional doCheck pysqlite; - propagatedBuildInputs = with self; [ modules.sqlite3 ]; - - # Test-only dependency pysqlite doesn't build on Python 3. This isn't an - # acceptable reason to make all dependents unavailable on Python 3 as well - doCheck = !(isPyPy || isPy3k); - - checkPhase = '' - ${python.executable} sqla_nose.py - ''; - - meta = { - homepage = http://www.sqlalchemy.org/; - description = "A Python SQL toolkit and Object Relational Mapper"; - }; - }; - sqlalchemy = buildPythonPackage rec { name = "SQLAlchemy-${version}"; version = "1.0.12"; @@ -23365,17 +23337,17 @@ in modules // { zope_sqlalchemy = buildPythonPackage rec { - name = "zope.sqlalchemy-0.7.5"; + name = "zope.sqlalchemy-0.7.6"; doCheck = !isPyPy; # https://github.com/zopefoundation/zope.sqlalchemy/issues/12 src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.sqlalchemy/${name}.zip"; - sha256 = "e196d1b2cf796f46e2c6127717e359ddd35d8d084a8ba059f0f0fabff245b9e1"; + sha256 = "0vxhpdvzihsmg63aralmc7hx62lzrsnlxvskvlcr4mkwzwb22haj"; }; buildInputs = with self; [ zope_testing zope_interface ]; - propagatedBuildInputs = with self; [ sqlalchemy9 transaction ]; + propagatedBuildInputs = with self; [ sqlalchemy transaction ]; meta = { maintainers = with maintainers; [ garbas iElectric ]; @@ -24836,18 +24808,18 @@ in modules // { syncserver = buildPythonPackage rec { name = "syncserver-${version}"; - version = "1.5.0"; + version = "1.5.2"; disabled = ! isPy27; src = pkgs.fetchgit { url = https://github.com/mozilla-services/syncserver.git; rev = "refs/tags/${version}"; - sha256 = "1xljylycxg7351hmqh7aa6fvvsjg06zvd4r7hcjqyd0k0sxvk7y6"; + sha256 = "002if8wk3bhz70zycggvp5qfvr1n2c6i27wnzj317wlkkjmcknx7"; }; buildInputs = with self; [ unittest2 ]; propagatedBuildInputs = with self; [ - cornice gunicorn pyramid requests simplejson sqlalchemy9 mozsvc tokenserver + cornice gunicorn pyramid requests simplejson sqlalchemy mozsvc tokenserver serversyncstorage configparser ]; @@ -24859,17 +24831,17 @@ in modules // { serversyncstorage = buildPythonPackage rec { name = "serversyncstorage-${version}"; - version = "1.5.11"; + version = "1.5.13"; disabled = !isPy27; src = pkgs.fetchgit { url = https://github.com/mozilla-services/server-syncstorage.git; rev = "refs/tags/${version}"; - sha256 = "1byq2k2f36f1jli9599ygfm2qsb4adl9140sxjpgfjbznb74q90q"; + sha256 = "06ss88j2gkgqchwd51fwynf2i41ssazs2xwiin8g7p8bc517ywmq"; }; propagatedBuildInputs = with self; [ - pyramid sqlalchemy9 simplejson mozsvc cornice pyramid_hawkauth pymysql + pyramid sqlalchemy simplejson mozsvc cornice pyramid_hawkauth pymysql pymysqlsa umemcache WSGIProxy requests pybrowserid ]; buildInputs = with self; [ testfixtures unittest2 ];