BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* Add zlib compression support to Subversion.

Browse source 
* Updated Subversion to 1.1.3.

svn path=/nixpkgs/trunk/; revision=2332
This commit is contained in:
Eelco Dolstra 2005-03-04 15:20:54 +00:00
parent 9efa069a65
commit 90e5c97727
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/version-management/subversion-1.1.x/builder.sh
View file

@ -1,4 +1,4 @@
buildInputs="$openssl $db4 $httpd $swig $python $j2sdk $expat $patch"
buildInputs="$openssl $zlib $db4 $httpd $swig $python $j2sdk $expat $patch"
. $stdenv/setup
configureFlags="--without-gdbm --disable-static"

11
pkgs/applications/version-management/subversion-1.1.x/default.nix
View file

@ -1,11 +1,12 @@
{ localServer ? false
, httpServer ? false
, sslSupport ? false
, compressionSupport ? false
, pythonBindings ? false
, javaSwigBindings ? false
, javahlBindings ? false
, stdenv, fetchurl
, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, j2sdk ? null
, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, j2sdk ? null, zlib ? null
}:
assert expat != null;
@ -15,14 +16,15 @@ assert sslSupport -> openssl != null && (httpServer -> httpd.openssl == openssl)
assert pythonBindings -> swig != null && swig.pythonSupport;
assert javaSwigBindings -> swig != null && swig.javaSupport;
assert javahlBindings -> j2sdk != null;
assert compressionSupport -> zlib != null;
stdenv.mkDerivation {
name = "subversion-1.1.2";
name = "subversion-1.1.3";
builder = ./builder.sh;
src = fetchurl {
url = http://catamaran.labs.cs.uu.nl/dist/tarballs/subversion-1.1.2.tar.bz2;
md5 = "b93a792b6bc610dc6c1c254591979a8c";
url = http://subversion.tigris.org/tarballs/subversion-1.1.3.tar.bz2;
md5 = "a09c2b2fa1a09566c024547954a48478";
};
# This is a hopefully temporary fix for the problem that
@ -31,6 +33,7 @@ stdenv.mkDerivation {
patches = if javahlBindings then [./javahl.patch] else [];
openssl = if sslSupport then openssl else null;
zlib = if compressionSupport then zlib else null;
httpd = if httpServer then httpd else null;
db4 = if localServer then db4 else null;
swig = if pythonBindings || javaSwigBindings then swig else null;

3
pkgs/system/all-packages-generic.nix
View file

@ -924,10 +924,11 @@ rec {
### APPLICATIONS
subversion = (import ../applications/version-management/subversion-1.1.x) {
inherit fetchurl stdenv openssl db4 expat swig;
inherit fetchurl stdenv openssl db4 expat swig zlib;
localServer = true;
httpServer = false;
sslSupport = true;
compressionSupport = true;
httpd = apacheHttpd;
};