From da0694932c2945bdc95e097abc6a0b2849028d69 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Sat, 13 Apr 2013 09:52:50 +0200 Subject: [PATCH] on the way to #463: make pythonPackages self-referential --- pkgs/top-level/python-packages.nix | 134 ++++++++++++++++++----------- 1 file changed, 86 insertions(+), 48 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a2ea04d99f23..b5d3f5037418 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -110,7 +110,7 @@ pythonPackages = python.modules // rec { sha256 = "74926d9ddfa69534cfbd08a82f0acccab2c649558062654d5d2ff2999d201384"; }; - propagatedBuildInputs = [ notmuch pkgs.dbacl ]; + propagatedBuildInputs = [ pythonPackages.notmuch pkgs.dbacl ]; # error: invalid command 'test' doCheck = false; @@ -139,34 +139,34 @@ pythonPackages = python.modules // rec { buildInputs = [ pkgs.which pkgs.unzip - coverage - mock - tissue - unittest2 - webtest + pythonPackages.coverage + pythonPackages.mock + pythonPackages.tissue + pythonPackages.unittest2 + pythonPackages.webtest ]; propagatedBuildInputs = [ pkgs.makeWrapper pkgs.bacula - colander - deform - deform_bootstrap - docutils - nose - mysql_connector_repackaged - pg8000 - pyramid - pyramid_beaker - pyramid_exclog - pyramid_jinja2 - pyramid_tm - pytz - sqlalchemy - transaction - waitress - webhelpers - zope_sqlalchemy + pythonPackages.colander + pythonPackages.deform + pythonPackages.deform_bootstrap + pythonPackages.docutils + pythonPackages.nose + pythonPackages.mysql_connector_repackaged + pythonPackages.pg8000 + pythonPackages.pyramid + pythonPackages.pyramid_beaker + pythonPackages.pyramid_exclog + pythonPackages.pyramid_jinja2 + pythonPackages.pyramid_tm + pythonPackages.pytz + pythonPackages.sqlalchemy + pythonPackages.transaction + pythonPackages.waitress + pythonPackages.webhelpers + pythonPackages.zope_sqlalchemy ]; postInstall = '' @@ -196,7 +196,14 @@ pythonPackages = python.modules // rec { # error: invalid command 'test' doCheck = false; - propagatedBuildInputs = [ notmuch urwid twisted magic configobj pygpgme ]; + propagatedBuildInputs = + [ pythonPackages.notmuch + pythonPackages.urwid + pythonPackages.twisted + pythonPackages.magic + pythonPackages.configobj + pythonPackages.pygpgme + ]; postInstall = '' wrapProgram $out/bin/alot \ @@ -219,7 +226,7 @@ pythonPackages = python.modules // rec { md5 = "2b53b5d53fc40af4da7268d3c3e35a50"; }; - buildInputs = [ nose ]; + buildInputs = [ pythonPackages.nose ]; meta = { homepage = http://pypi.python.org/pypi/anyjson/; @@ -280,7 +287,7 @@ pythonPackages = python.modules // rec { # error: invalid command 'test' doCheck = false; - propagatedBuildInputs = [ boto ]; + propagatedBuildInputs = [ pythonPackages.boto ]; }); @@ -316,6 +323,7 @@ pythonPackages = python.modules // rec { }; }); + awscli = buildPythonPackage rec { name = "awscli-0.8.3"; namePrefix = ""; @@ -325,8 +333,11 @@ pythonPackages = python.modules // rec { sha256 = "0v7igh00zja560v8qz315g3m7x9six1hprrrb10cpp9sy8n58xnn"; }; - propagatedBuildInputs = [ argparse botocore colorama ]; - + propagatedBuildInputs = + [ pythonPackages.argparse + pythonPackages.botocore + pythonPackages.colorama + ]; }; @@ -376,7 +387,13 @@ pythonPackages = python.modules // rec { md5 = "c2e102870ed4c53104dec48ceadf8e9d"; }; - buildInputs = [ sqlalchemy pycryptopp nose mock webtest ]; + buildInputs = + [ pythonPackages.sqlalchemy + pythonPackages.pycryptopp + pythonPackages.nose + pythonPackages.mock + pythonPackages.webtest + ]; # http://hydra.nixos.org/build/4511591/log/raw doCheck = false; @@ -402,7 +419,15 @@ pythonPackages = python.modules // rec { # tests depend on $HOME setting configurePhase = "export HOME=$TMPDIR"; - propagatedBuildInputs = [ pyyaml unidecode mutagen munkres musicbrainzngs python.modules.sqlite3 python.modules.readline ]; + propagatedBuildInputs = + [ pythonPackages.pyyaml + pythonPackages.unidecode + pythonPackages.mutagen + pythonPackages.munkres + pythonPackages.musicbrainzngs + python.modules.sqlite3 + python.modules.readline + ]; meta = { homepage = http://beets.radbox.org; @@ -475,7 +500,11 @@ pythonPackages = python.modules // rec { sha256 = "0dbm2clrh7zs4brqqj3xssz3nymdg24ff2lww27s3wliirwqdiv1"; }; - propagatedBuildInputs = [ dateutil requests jmespath ]; + propagatedBuildInputs = + [ pythonPackages.dateutil + pythonPackages.requests + pythonPackages.jmespath + ]; meta = { homepage = https://github.com/boto/botocore; @@ -496,7 +525,7 @@ pythonPackages = python.modules // rec { # rev = "refs/tags/0.9.3"; # }; # - # propagatedBuildInputs = [ argparse python.modules.ssl ]; + # propagatedBuildInputs = [ pythonPackages.argparse python.modules.ssl ]; # # doCheck = false; # @@ -559,9 +588,12 @@ pythonPackages = python.modules // rec { md5 = "530a0614de3a669314c3acd4995c54d5"; }; - buildInputs = [ nose ]; + buildInputs = [ pythonPackages.nose ]; - propagatedBuildInputs = [ amqplib anyjson ]; + propagatedBuildInputs = + [ pythonPackages.amqplib + pythonPackages.anyjson + ]; doCheck = false; # depends on the network @@ -581,7 +613,7 @@ pythonPackages = python.modules // rec { md5 = "853917116e731afbc8c8a43c37e6ddba"; }; - propagatedBuildInputs = [ markdown ]; + propagatedBuildInputs = [ pythonPackages.markdown ]; meta = { homepage = http://www.cheetahtemplate.org/; @@ -616,7 +648,7 @@ pythonPackages = python.modules // rec { sha256 = "16vibfxms5z4ld8gbkra6dkhqm2cc3jnn0fwp7mw70nlwxnmm51c"; }; - buildInputs = [ mock nose decorator ]; + buildInputs = [ pythonPackages.mock pythonPackages.nose pythonPackages.decorator ]; meta = { homepage = http://code.google.com/p/clepy/; @@ -651,7 +683,7 @@ pythonPackages = python.modules // rec { md5 = "308c6e38917bdbfc4d3b0783c614897d"; }; - propagatedBuildInputs = [ clientform ]; + propagatedBuildInputs = [ pythonPackages.clientform ]; doCheck = false; @@ -671,9 +703,9 @@ pythonPackages = python.modules // rec { md5 = "5f39727415b837abd02651eeb2721749"; }; - propagatedBuildInputs = [ stompclient distribute ]; + propagatedBuildInputs = [ pythonPackages.stompclient pythonPackages.distribute ]; - buildInputs = [ coverage sqlalchemy ]; + buildInputs = [ pythonPackages.coverage pythonPackages.sqlalchemy ]; # ValueError: Could not parse auth file: # /tmp/nix-build-.../CoilMQ-0.6.1/coilmq/tests/resources/auth.ini @@ -695,7 +727,7 @@ pythonPackages = python.modules // rec { md5 = "2d9f65a64cb6b7f35d6a0d7b607ce4c6"; }; - propagatedBuildInputs = [ translationstring ]; + propagatedBuildInputs = [ pythonPackages.translationstring ]; meta = { maintainers = [ @@ -750,7 +782,7 @@ pythonPackages = python.modules // rec { meta = { description = "plugin core for use by pytest-cov, nose-cov and nose2-cov"; }; - propagatedBuildInputs = [ coverage ]; + propagatedBuildInputs = [ pythonPackages.coverage ]; }; cssselect = buildPythonPackage rec { @@ -771,7 +803,7 @@ pythonPackages = python.modules // rec { sha256 = "139yfm9yz9k33kgqw4khsljs10rkhhxyywbq9i82bh2r31cil1pp"; }; - buildInputs = [ pkgs.unzip mock ]; + buildInputs = [ pkgs.unzip pythonPackages.mock ]; # couple of failing tests doCheck = false; @@ -793,7 +825,7 @@ pythonPackages = python.modules // rec { md5 = "94ca7e8c9ea0f69c0f3fc6f9fc88f65a"; }; - buildInputs = [ mock ]; + buildInputs = [ pythonPackages.mock ]; # Note: We don't actually need to provide Darcs as a build input. # Darcsver will DTRT when Darcs isn't available. See news.gmane.org @@ -821,7 +853,7 @@ pythonPackages = python.modules // rec { sha256 = "1vlx0lpsxjxz64pz87csx800cwfqznjyr2y7nk3vhmzhkwzyqi2c"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ pythonPackages.six ]; meta = { description = "Powerful extensions to the standard datetime module"; @@ -853,7 +885,13 @@ pythonPackages = python.modules // rec { md5 = "2ed7b69644a6d8f4e1404e1892329240"; }; - propagatedBuildInputs = [ beautifulsoup4 peppercorn colander translationstring chameleon ]; + propagatedBuildInputs = + [ pythonPackages.beautifulsoup4 + pythonPackages.peppercorn + pythonPackages.colander + pythonPackages.translationstring + pythonPackages.chameleon + ]; meta = { maintainers = [ @@ -1858,7 +1896,7 @@ pythonPackages = python.modules // rec { url = "http://pypi.python.org/packages/source/i/ipdb/ipdb-0.7.tar.gz"; md5 = "d879f9b2b0f26e0e999809585dcaec61"; }; - propagatedBuildInputs = [ ipython ]; + propagatedBuildInputs = [ pythonPackages.ipython ]; }; ipdbplugin = buildPythonPackage { @@ -1867,7 +1905,7 @@ pythonPackages = python.modules // rec { url = "https://pypi.python.org/packages/source/i/ipdbplugin/ipdbplugin-1.2.tar.gz"; md5 = "39169b00a2186b99469249c5b0613753"; }; - propagatedBuildInputs = [ nose ipython ]; + propagatedBuildInputs = [ pythonPackages.nose pythonPackages.ipython ]; };