Merge branch 'upstream-master' into stdenv-updates

This commit is contained in:
Shea Levy
2013-02-19 10:09:39 -05:00
15 changed files with 345 additions and 35 deletions
+213 -17
View File
@@ -119,13 +119,13 @@ pythonPackages = python.modules // rec {
alot = buildPythonPackage rec {
rev = "6b5f1a8bf68eecf4364f97c71ec177cf715c081e";
rev = "c765ebd6041a845a800cc9fd30705102ae2d040f";
name = "alot-0.3.3_${rev}";
src = fetchurl {
url = "https://github.com/pazz/alot/tarball/${rev}";
name = "${name}.tar.bz";
sha256 = "1l6b5gy0z549p54p2va1q7pxyiwb6ghqfy6gdm3kg1np9hw59rl4";
sha256 = "0yyp3nz5n1zfwf0l4rkkphq5l6prd988b57ighnmi2samzqa9yv4";
};
# error: invalid command 'test'
@@ -275,12 +275,35 @@ pythonPackages = python.modules // rec {
propagatedBuildInputs = [ logilab_common ];
};
beautifulsoup = buildPythonPackage (rec {
name = "beautifulsoup-3.0.8";
beets = buildPythonPackage rec {
name = "beets-1.0.0";
src = fetchurl {
url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.0.8.tar.gz";
sha256 = "1gasiy5lwbhsxw27g36d88n36xbj52434klisvqhljgckd4xqcy7";
url = "http://pypi.python.org/packages/source/b/beets/${name}.tar.gz";
md5 = "88ad09a93aa0d69ce813205cf23b2a6c";
};
# tests depend on $HOME setting
configurePhase = "export HOME=$TMPDIR";
propagatedBuildInputs = [ pyyaml unidecode mutagen munkres musicbrainzngs python.modules.sqlite3 python.modules.readline ];
meta = {
homepage = http://beets.radbox.org;
description = "Music tagger and library organizer";
license = pkgs.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.iElectric ];
};
};
beautifulsoup = buildPythonPackage (rec {
name = "beautifulsoup-3.2.1";
src = fetchurl {
url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz";
sha256 = "1nshbcpdn0jpcj51x0spzjp519pkmqz0n0748j7dgpz70zlqbfpm";
};
# error: invalid command 'test'
@@ -288,13 +311,30 @@ pythonPackages = python.modules // rec {
meta = {
homepage = http://www.crummy.com/software/BeautifulSoup/;
license = "bsd";
description = "Undemanding HTML/XML parser";
};
});
beautifulsoup4 = buildPythonPackage (rec {
name = "beautifulsoup4-4.1.3";
src = fetchurl {
url = "http://pypi.python.org/packages/source/b/beautifulsoup4/${name}.tar.gz";
md5 = "c012adc06217b8532c446d181cc56586";
};
# invalid command 'test'
doCheck = false;
meta = {
homepage = http://crummy.com/software/BeautifulSoup/bs4/;
description = "HTML and XML parser";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.iElectric ];
};
});
# euca2ools (and maybe Nova) needs boto 1.9, 2.0 doesn't work.
boto_1_9 = buildPythonPackage (rec {
name = "boto-1.9b";
@@ -402,7 +442,7 @@ pythonPackages = python.modules // rec {
# It makes buildout useful in a nix profile, but this alters the default functionality
patchPhase = ''
sed -i "s/return (stdlib, site_paths)/return (stdlib, sys.path)/g" src/zc/buildout/easy_install.py
'';
'';
meta = {
homepage = http://www.buildout.org/;
@@ -963,6 +1003,23 @@ pythonPackages = python.modules // rec {
};
feedparser = buildPythonPackage (rec {
name = "feedparser-5.1.3";
src = fetchurl {
url = "http://pypi.python.org/packages/source/f/feedparser/${name}.tar.gz";
md5 = "f2253de78085a1d5738f626fcc1d8f71";
};
meta = {
homepage = http://code.google.com/p/feedparser/;
description = "Universal feed parser";
license = stdenv.lib.licenses.bsd2;
maintainers = [ stdenv.lib.maintainers.iElectric ];
};
});
flake8 = buildPythonPackage (rec {
name = "flake8-1.7.0";
@@ -1003,6 +1060,26 @@ pythonPackages = python.modules // rec {
};
flexget = buildPythonPackage (rec {
name = "FlexGet-1.0.3353";
src = fetchurl {
url = "http://download.flexget.com/archive/${name}.tar.gz";
md5 = "cffc4e51b5c5efddb339d265524e46b8";
};
buildInputs = [ nose ];
propagatedBuildInputs = [ beautifulsoup4 pyrss2gen feedparser pynzb html5lib dateutil beautifulsoup flask jinja2 requests sqlalchemy pyyaml cherrypy progressbar ];
meta = {
homepage = http://flexget.com/;
description = "Multipurpose automation tool for content like torrents, ...";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.iElectric ];
};
});
flup = buildPythonPackage (rec {
name = "flup-1.0.2";
@@ -1199,6 +1276,21 @@ pythonPackages = python.modules // rec {
};
};
html5lib = buildPythonPackage (rec {
name = "html5lib-0.95";
src = fetchurl {
url = "http://pypi.python.org/packages/source/h/html5lib/${name}.tar.gz";
md5 = "fe607f9917d81763e842f818f23464ee";
};
meta = {
homepage = http://code.google.com/p/html5lib/;
description = "HTML parser based on WHAT-WG HTML5 specification";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.iElectric ];
};
});
httplib2 = buildPythonPackage rec {
name = "httplib2-0.7.7";
@@ -1624,6 +1716,43 @@ pythonPackages = python.modules // rec {
};
munkres = buildPythonPackage rec {
name = "munkres-1.0.5.4";
src = fetchurl {
url = "http://pypi.python.org/packages/source/m/munkres/${name}.tar.gz";
md5 = "cb9d114fb523428bab4742e88bc83696";
};
# error: invalid command 'test'
doCheck = false;
meta = {
homepage = http://bmc.github.com/munkres/;
description = "Munkres algorithm for the Assignment Problem";
license = pkgs.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.iElectric ];
};
};
musicbrainzngs = buildPythonPackage rec {
name = "musicbrainzngs-0.2";
src = fetchurl {
url = "http://pypi.python.org/packages/source/m/musicbrainzngs/${name}.tar.gz";
md5 = "bc32aa1cf121f29c3ca1c06e9668865f";
};
meta = {
homepage = http://alastair/python-musicbrainz-ngs;
description = "Python bindings for musicbrainz NGS webservice";
license = pkgs.lib.licenses.bsd2;
maintainers = [ stdenv.lib.maintainers.iElectric ];
};
};
mutagen = buildPythonPackage (rec {
name = "mutagen-1.20";
@@ -2452,6 +2581,56 @@ pythonPackages = python.modules // rec {
};
};
pyrss2gen = buildPythonPackage (rec {
name = "PyRSS2Gen-1.0.0";
src = fetchurl {
url = "http://pypi.python.org/packages/source/P/PyRSS2Gen/${name}.tar.gz";
md5 = "eae2bc6412c5679c287ecc1a59588f75";
};
meta = {
homepage = http://www.dalkescientific.om/Python/PyRSS2Gen.html;
description = "Library for generating RSS 2.0 feeds";
license = stdenv.lib.licenses.bsd2;
maintainers = [ stdenv.lib.maintainers.iElectric ];
};
});
pynzb = buildPythonPackage (rec {
name = "pynzb-0.1.0";
src = fetchurl {
url = "http://pypi.python.org/packages/source/p/pynzb/${name}.tar.gz";
md5 = "63c74a36348ac28aa99732dcb8be8c59";
};
meta = {
homepage = http://github.com/ericflo/pynzb;
description = "Unified API for parsing NZB files";
license = stdenv.lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.iElectric ];
};
});
progressbar = buildPythonPackage (rec {
name = "progressbar-2.2";
src = fetchurl {
url = "http://pypi.python.org/packages/source/p/progressbar/${name}.tar.gz";
md5 = "8ea4e2c17a8ec9e7d153767c5f2a7b28";
};
# invalid command 'test'
doCheck = false;
meta = {
homepage = http://code.google.com/p/python-progressbar/;
description = "Text progressbar library for python";
license = stdenv.lib.licenses.lgpl3Plus;
maintainers = [ stdenv.lib.maintainers.iElectric ];
};
});
ldap = buildPythonPackage rec {
name = "python-ldap-2.4.3";
@@ -3173,11 +3352,11 @@ pythonPackages = python.modules // rec {
sqlalchemy = buildPythonPackage {
name = "sqlalchemy-0.6.6";
name = "sqlalchemy-0.7.9";
src = fetchurl {
url = mirror://sourceforge/sqlalchemy/0.6.6/SQLAlchemy-0.6.6.tar.gz;
sha256 = "0inj9b66pi447cw500mqn7d09dij20ic3k5bnyhj6rpdl2l83a0l";
url = mirror://sourceforge/sqlalchemy/0.7.9/SQLAlchemy-0.7.9.tar.gz;
md5 = "c4852d586d95a59fbc9358f4467875d5";
};
buildInputs = [ nose ];
@@ -3394,11 +3573,11 @@ pythonPackages = python.modules // rec {
turses = buildPythonPackage (rec {
name = "turses-0.2.11";
name = "turses-0.2.12";
src = fetchurl {
url = "http://pypi.python.org/packages/source/t/turses/${name}.tar.gz";
sha256 = "0zd0fjb5rr5if8wp6kmi29wrkj7ypp4vz00xxb0if1kjrakczlvm";
sha256 = "016fw2ch1gy3rrlfjsdpd6y11mkrbjw4h84h7954k2vhc84l1gm0";
};
propagatedBuildInputs = [ oauth2 urwid tweepy ] ++ optional isPy26 argparse;
@@ -3417,11 +3596,11 @@ pythonPackages = python.modules // rec {
});
tweepy = buildPythonPackage (rec {
name = "tweepy-1.13";
name = "tweepy-2.0";
src = fetchurl {
url = "http://pypi.python.org/packages/source/t/tweepy/${name}.tar.gz";
sha256 = "1gaki8qvzi72jaj5xls51lc6fgs1xnm9c6jgpirwklpdn7y8wyy5";
sha256 = "1b95xcw11b5871gd4br78hxbvcq8y9f0i0sqga85dgg9hnmvdcx0";
};
meta = {
@@ -4119,7 +4298,7 @@ pythonPackages = python.modules // rec {
url = "http://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.2.2.tar.gz";
md5 = "e7e581af8193551831560a736a53cf58";
};
propagatedBuildInputs = [ zope_event zope_interface zope_testing ];
# ignore circular dependency on zope_location
@@ -4389,6 +4568,23 @@ pythonPackages = python.modules // rec {
};
};
unidecode = buildPythonPackage rec {
name = "Unidecode-0.04.12";
src = fetchurl {
url = "http://pypi.python.org/packages/source/U/Unidecode/${name}.tar.gz";
md5 = "351dc98f4512bdd2e93f7a6c498730eb";
};
meta = {
homepage = http://pypi.python.org/pypi/Unidecode/;
description = "ASCII transliterations of Unicode text";
license = pkgs.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.iElectric ];
};
};
txamqp = buildPythonPackage rec {
name = "txamqp-${version}";
version = "0.3";