diff --git a/pkgs/applications/version-management/subversion-1.1.x/builder.sh b/pkgs/applications/version-management/subversion-1.1.x/builder.sh index d0fc5a45ec01..168ba61c7929 100644 --- a/pkgs/applications/version-management/subversion-1.1.x/builder.sh +++ b/pkgs/applications/version-management/subversion-1.1.x/builder.sh @@ -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" diff --git a/pkgs/applications/version-management/subversion-1.1.x/default.nix b/pkgs/applications/version-management/subversion-1.1.x/default.nix index a047e00402c3..28ef1609ef3e 100644 --- a/pkgs/applications/version-management/subversion-1.1.x/default.nix +++ b/pkgs/applications/version-management/subversion-1.1.x/default.nix @@ -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; diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index ef269bba56b6..5ae6ad71464d 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -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; };