* Added Subversion 1.5.0. Some features probably don't work yet

(building the Apache modules, building various language bindings).
* Neon 0.28.2.  Also kept Neon 0.26.x because Subversion 1.4.x needs
  it.

svn path=/nixpkgs/trunk/; revision=12162
This commit is contained in:
Eelco Dolstra
2008-06-19 15:29:25 +00:00
parent 8b3a7e2713
commit 9663d4c76a
5 changed files with 146 additions and 26 deletions

View File

@@ -0,0 +1,31 @@
{ stdenv, fetchurl, libxml2
, compressionSupport ? true, zlib ? null
, sslSupport ? true, openssl ? null
}:
assert compressionSupport -> zlib != null;
assert sslSupport -> openssl != null;
stdenv.mkDerivation {
name = "neon-0.26.4";
src = fetchurl {
url = http://www.webdav.org/neon/neon-0.26.4.tar.gz;
sha256 = "1pjrn5wb18gy419293hmwd02blmh36aaxsrgajm9nkkkjzqakncj";
};
buildInputs = [libxml2] ++ stdenv.lib.optional compressionSupport zlib;
configureFlags = ''
--enable-shared --disable-static
${if compressionSupport then "--with-zlib" else "--without-zlib"}
${if sslSupport then "--with-ssl --with-libs=${openssl}" else "--without-ssl"}
'';
passthru = {inherit compressionSupport sslSupport;};
meta = {
description = "An HTTP and WebDAV client library";
homepage = http://www.webdav.org/neon/;
};
}

View File

@@ -0,0 +1,31 @@
{ stdenv, fetchurl, libxml2
, compressionSupport ? true, zlib ? null
, sslSupport ? true, openssl ? null
}:
assert compressionSupport -> zlib != null;
assert sslSupport -> openssl != null;
stdenv.mkDerivation {
name = "neon-0.28.2";
src = fetchurl {
url = http://www.webdav.org/neon/neon-0.28.2.tar.gz;
sha256 = "154hzy2xa8a1dfdrjcggkik6dhpq1f5r1q2masrgysnv2cb61kfr";
};
buildInputs = [libxml2] ++ stdenv.lib.optional compressionSupport zlib;
configureFlags = ''
--enable-shared --disable-static
${if compressionSupport then "--with-zlib" else "--without-zlib"}
${if sslSupport then "--with-ssl --with-libs=${openssl}" else "--without-ssl"}
'';
passthru = {inherit compressionSupport sslSupport;};
meta = {
description = "An HTTP and WebDAV client library";
homepage = http://www.webdav.org/neon/;
};
}

View File

@@ -1,24 +0,0 @@
{ stdenv, fetchurl, libxml2
, compressionSupport ? true, zlib ? null
, sslSupport ? true, openssl ? null
}:
assert compressionSupport -> zlib != null;
assert sslSupport -> openssl != null;
(stdenv.mkDerivation {
name = "neon-0.26.3";
src = fetchurl {
url = http://www.webdav.org/neon/neon-0.26.3.tar.gz;
sha256 = "0gvv5a5z0fmfhdvz5qb1zb1z30jlml1y03hjzg8dn9246nw7z2dn";
};
buildInputs = [libxml2] ++ (if compressionSupport then [zlib] else []);
configureFlags="
--enable-shared --disable-static
${if compressionSupport then "--with-zlib" else "--without-zlib"}
${if sslSupport then "--with-ssl --with-libs=${openssl}" else "--without-ssl"}
";
}) // {inherit compressionSupport sslSupport;}