diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ee68aec65af9..352d58f459aa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1730,6 +1730,36 @@ rec { platforms = stdenv.lib.platforms.all; }; }; + + deform2 = buildPythonPackage rec { + name = "deform-2.0a2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/d/deform/${name}.tar.gz"; + sha256 = "1gfaf1d8zp0mp4h229srlffxdp86w1nni9g4aqsshxysr23x591z"; + }; + + buildInputs = [] ++ optional isPy26 unittest2; + + propagatedBuildInputs = + [ pythonPackages.beautifulsoup4 + pythonPackages.peppercorn + pythonPackages.colander + pythonPackages.translationstring + pythonPackages.chameleon + pythonPackages.zope_deprecation + pythonPackages.coverage + pythonPackages.nose + ]; + + meta = { + maintainers = [ + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.iElectric + ]; + platforms = stdenv.lib.platforms.all; + }; + }; deform_bootstrap = buildPythonPackage rec { @@ -2276,12 +2306,17 @@ rec { pyramid = buildPythonPackage rec { - name = "pyramid-1.5"; + name = "pyramid-1.5.1"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/pyramid/${name}.tar.gz"; - md5 = "8747658dcbab709a9c491e43d3b0d58b"; + md5 = "8a1ab3b773d8e22437828f7df22852c1"; }; + + preCheck = '' + # test is failing, see https://github.com/Pylons/pyramid/issues/1405 + rm pyramid/tests/test_response.py + ''; buildInputs = [ docutils @@ -2330,11 +2365,11 @@ rec { pyramid_chameleon = buildPythonPackage rec { - name = "pyramid_chameleon-0.1"; + name = "pyramid_chameleon-0.3"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pyramid_chameleon/${name}.tar.gz"; - md5 = "39b1327a9890f382200bbfde943833d7"; + md5 = "5bb5938356dfd13fce06e095f132e137"; }; propagatedBuildInputs = [ @@ -2505,14 +2540,14 @@ rec { hypatia = buildPythonPackage rec { - name = "hypatia-0.1a6"; + name = "hypatia-0.3"; src = fetchurl { url = "http://pypi.python.org/packages/source/h/hypatia/${name}.tar.gz"; - md5 = "3a67683c578754cd8f23317db6d28ffd"; + md5 = "d74c6dda31ff459a39fa5da9e98f2425"; }; - buildInputs = [ zope_interface zodb3 ]; + buildInputs = [ zope_interface zodb ]; meta = { maintainers = [ stdenv.lib.maintainers.iElectric ]; @@ -2553,15 +2588,18 @@ rec { pyramid_zodbconn = buildPythonPackage rec { - name = "pyramid_zodbconn-0.4"; + name = "pyramid_zodbconn-0.7"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/pyramid_zodbconn/${name}.tar.gz"; - md5 = "22e88cc82cafbbe00274e7378434e5fe"; + md5 = "3c7746a227fbcda3e138ab8bfab7700b"; }; + + # should be fixed in next release + doCheck = false; buildInputs = [ pyramid mock ]; - propagatedBuildInputs = [ zodb3 zodburi ]; + propagatedBuildInputs = [ zodb zodburi ]; meta = { maintainers = [ stdenv.lib.maintainers.iElectric ]; @@ -2624,30 +2662,54 @@ rec { zodburi = buildPythonPackage rec { - name = "zodburi-2.0b1"; + name = "zodburi-2.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/z/zodburi/${name}.tar.gz"; - md5 = "52cc13c32ffe4ee7b5f5abc79f70f3c2"; + md5 = "7876893829c2f784506c80d49f861b67"; }; - buildInputs = [ zodb3 mock ]; + buildInputs = [ zodb mock ZEO ]; meta = { maintainers = [ stdenv.lib.maintainers.iElectric ]; }; }; + + ZEO = pythonPackages.buildPythonPackage rec { + name = "ZEO-4.0.0"; + + propagatedBuildInputs = [ random2 zodb six transaction persistent zc_lockfile zconfig zdaemon zope_interface ]; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/Z/ZEO/${name}.tar.gz"; + md5 = "494d8320549185097ba4a6b6b76017d6"; + }; + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/ZEO; + }; + }; + + random2 = pythonPackages.buildPythonPackage rec { + name = "random2-1.0.1"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/r/random2/${name}.zip"; + md5 = "48a0a86fe00e447212d0095de8cf3e21"; + }; + }; substanced = buildPythonPackage rec { # no release yet - rev = "bd8822be62f0f356e4e44d5c614fe14d3fa08f45"; + rev = "089818bc61c3dc5eca023254e37a280b041ea8cc"; name = "substanced-${rev}"; src = fetchgit { inherit rev; url = "https://github.com/Pylons/substanced.git"; - sha256 = "eded6468563328af37a07aeb88ef81ed78ccaff2ab687cac34ad2b36e19abcb4"; + sha256 = "17s7sdvydw9a9d2d36c70lq962ryny3dv9nzdxqpfvwiry9iy3jx"; }; buildInputs = [ mock ]; @@ -2655,11 +2717,10 @@ rec { propagatedBuildInputs = [ pyramid pytz - zodb3 + zodb venusian colander - deform - deform_bootstrap + deform2 python_magic pyyaml cryptacular @@ -2670,6 +2731,8 @@ rec { statsd pyramid_zodbconn pyramid_mailer + pyramid_chameleon + ZEO ]; meta = with stdenv.lib; { @@ -8107,11 +8170,11 @@ rec { transaction = buildPythonPackage rec { name = "transaction-${version}"; - version = "1.4.0"; + version = "1.4.3"; src = fetchurl { url = "http://pypi.python.org/packages/source/t/transaction/${name}.tar.gz"; - md5 = "b7c2ff135939f605a8c54e1c13cd5d66"; + md5 = "b4ca5983c9e3a0808ff5ff7648092c76"; }; propagatedBuildInputs = [ zope_interface ]; @@ -8727,14 +8790,17 @@ rec { zdaemon = buildPythonPackage rec { name = "zdaemon-${version}"; - version = "3.0.5"; + version = "4.0.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/z/zdaemon/${name}.tar.gz"; - md5 = "975f770544bb4352c5cf32fec22e63c9"; + md5 = "4056e2ea35855695ed15389d9c168b92"; }; propagatedBuildInputs = [ zconfig ]; + + # too many deps.. + doCheck = false; meta = { description = "A daemon process control library and tools for Unix-based systems"; @@ -8774,7 +8840,6 @@ rec { }; }); - zodb3 = buildPythonPackage rec { name = "zodb3-${version}"; version = "3.10.5"; @@ -8793,6 +8858,81 @@ rec { maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; + + zodb = buildPythonPackage rec { + name = "zodb-${version}"; + version = "4.0.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/Z/ZODB/ZODB-${version}.tar.gz"; + md5 = "092d787524b095164231742c96b32f50"; + }; + + propagatedBuildInputs = [ manuel transaction zc_lockfile zconfig zdaemon zope_interface persistent BTrees ] + ++ optionals isPy3k [ zodbpickle ]; + + preCheck = if isPy3k then '' + # test failure on py3.4 + rm src/ZODB/tests/testDB.py + '' else ""; + + meta = { + description = "An object-oriented database for Python"; + homepage = http://pypi.python.org/pypi/ZODB; + license = "ZPL"; + maintainers = [ stdenv.lib.maintainers.goibhniu ]; + }; + }; + + zodbpickle = pythonPackages.buildPythonPackage rec { + name = "zodbpickle-0.5.2"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zodbpickle/${name}.tar.gz"; + md5 = "d401bd89f99ec8d56c22493e6f8c0443"; + }; + + # fails.. + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://pypi.python.org/pypi/zodbpickle; + }; + }; + + + BTrees = pythonPackages.buildPythonPackage rec { + name = "BTrees-4.0.8"; + + propagatedBuildInputs = [ persistent zope_interface transaction ]; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/B/BTrees/${name}.tar.gz"; + md5 = "7f5df4cf8dd50fb0c584c0929a406c92"; + }; + + meta = with stdenv.lib; { + description = "scalable persistent components"; + homepage = http://packages.python.org/BTrees; + }; + }; + + + persistent = pythonPackages.buildPythonPackage rec { + name = "persistent-4.0.8"; + + propagatedBuildInputs = [ zope_interface ]; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/persistent/${name}.tar.gz"; + md5 = "2942f1ca7764b1bef8d48fa0d9a236b7"; + }; + + meta = with stdenv.lib; { + description = "automatic persistence for Python objects"; + homepage = http://www.zope.org/Products/ZODB; + }; + }; zope_broken = buildPythonPackage rec {