diff options
| author | William A. Kennington III <william@wkennington.com> | 2013-12-31 07:55:34 -0600 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2013-12-31 07:59:37 -0600 |
| commit | 184dd198fbcdc1b392f56791702ba4b4d733b991 (patch) | |
| tree | 2fa4372f73fd0751e244fa5f390d38d231ed23b9 /pkgs/applications/version-management/subversion | |
| parent | 515488790e4fbf7dfce8648317b036e0ecb924fc (diff) | |
| download | nixlib-184dd198fbcdc1b392f56791702ba4b4d733b991.tar nixlib-184dd198fbcdc1b392f56791702ba4b4d733b991.tar.gz nixlib-184dd198fbcdc1b392f56791702ba4b4d733b991.tar.bz2 nixlib-184dd198fbcdc1b392f56791702ba4b4d733b991.tar.lz nixlib-184dd198fbcdc1b392f56791702ba4b4d733b991.tar.xz nixlib-184dd198fbcdc1b392f56791702ba4b4d733b991.tar.zst nixlib-184dd198fbcdc1b392f56791702ba4b4d733b991.zip | |
subversion: Tweaks and Fixes
Remove ssl and compression options which are no longer valid when using serf in place of neon. Also, make sure serf is an optional dependency.
Diffstat (limited to 'pkgs/applications/version-management/subversion')
| -rw-r--r-- | pkgs/applications/version-management/subversion/default.nix | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 6ba60aa0f686..67346ef8389b 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -1,13 +1,11 @@ { bdbSupport ? false # build support for Berkeley DB repositories , httpServer ? false # build Apache DAV module , httpSupport ? false # client must support http -, sslSupport ? false # client must support https -, compressionSupport ? false # client must support http compression , pythonBindings ? false , perlBindings ? false , javahlBindings ? false , saslSupport ? false -, stdenv, fetchurl, apr, aprutil, neon, zlib, sqlite +, stdenv, fetchurl, apr, aprutil, zlib, sqlite , httpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null , sasl ? null, serf ? null }: @@ -16,8 +14,6 @@ assert bdbSupport -> aprutil.bdbSupport; assert httpServer -> httpd != null; assert pythonBindings -> swig != null && python != null; assert javahlBindings -> jdk != null && perl != null; -assert sslSupport -> neon.sslSupport; -assert compressionSupport -> neon.compressionSupport; stdenv.mkDerivation rec { @@ -31,7 +27,6 @@ stdenv.mkDerivation rec { }; buildInputs = [ zlib apr aprutil sqlite ] - ++ stdenv.lib.optional httpSupport neon ++ stdenv.lib.optional httpSupport serf ++ stdenv.lib.optional pythonBindings python ++ stdenv.lib.optional perlBindings perl |