- adding experimental python31 build

- cleanup python libraries:
 * moving all python libraries into a attr set into a directory
   so that expressions can be used for both: python 2.5 and 2.6 easily
 * disabling packages which don't build

svn path=/nixpkgs/trunk/; revision=21142
This commit is contained in:
Marc Weber
2010-04-17 18:28:25 +00:00
parent 9e59164e57
commit 8c0b7e4ad2
41 changed files with 1154 additions and 178 deletions

View File

@@ -1,15 +0,0 @@
{stdenv, fetchurl, python}:
stdenv.mkDerivation rec {
version = "3.2.1";
name = "zope-${version}";
src = fetchurl {
url = "http://www.zope.org/Products/Zope3/${version}/Zope-${version}.tgz";
sha256 = "8431984af75054e4ddfe45bf708924240f8b6b02220cd84d090138413ac82341";
};
patches = [
./zope_python-2.4.4.patch
./zope_python-readline.patch
];
buildInputs = [python];
}

View File

@@ -1,12 +0,0 @@
diff -r 8833d4892dfc Zope-3.2.1/configure
--- a/configure Mon Aug 18 14:55:39 2008 +0200
+++ b/configure Mon Aug 18 14:57:39 2008 +0200
@@ -21,7 +21,7 @@ prefix="$DEFAULT_PREFIX"
# Place the optimal target version number (as returned by sys.version)
# below
-TARGET="2.4.2"
+TARGET="2.4.4"
# Order a list of "acceptable" python version numbers (as returned by
# sys.version) below in "best" to "worst" order, not including the

View File

@@ -1,12 +0,0 @@
diff -r 8833d4892dfc Zope-3.2.1/Dependencies/zope.publisher-Zope-3.2.1/zope.publisher/http.py
--- a/Dependencies/zope.publisher-Zope-3.2.1/zope.publisher/http.py Mon Aug 18 14:55:39 2008 +0200
+++ b/Dependencies/zope.publisher-Zope-3.2.1/zope.publisher/http.py Mon Aug 18 16:37:02 2008 +0200
@@ -198,7 +198,7 @@ class HTTPInputStream(object):
self.cacheStream.write(data)
return data
- def readline(self):
+ def readline(self, size=None):
data = self.stream.readline()
self.cacheStream.write(data)
return data