subversion: updated to version 1.6.0

svn path=/nixpkgs/trunk/; revision=14682

pkgs/applications/version-management/subversion/1.6.nix

@@ -0,0 +1,77 @@
+{ 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
+, stdenv, fetchurl, apr, aprutil, neon, zlib, sqlite
+, httpd ? null, expat, swig ? null, jdk ? null
+, static ? false
+}:
+
+assert bdbSupport -> aprutil.bdbSupport;
+assert httpServer -> httpd != null && httpd.apr == apr && httpd.aprutil == aprutil;
+assert pythonBindings -> swig != null && swig.pythonSupport;
+assert javahlBindings -> jdk != null;
+assert sslSupport -> neon.sslSupport;
+assert compressionSupport -> neon.compressionSupport;
+
+stdenv.mkDerivation rec {
+
+  version = "1.6.0";
+
+  name = "subversion-${version}";
+
+  src = fetchurl {
+    url = "http://subversion.tigris.org/downloads/${name}.tar.bz2";
+    sha256 = "d6fb8bf61638580a0ad661edb642c38fbffad2a4c273e3f8631c6cc0da14d0a2";
+  };
+
+  buildInputs = [zlib apr aprutil sqlite]
+    ++ stdenv.lib.optional httpSupport neon
+    ++ stdenv.lib.optional pythonBindings swig.python
+    ++ stdenv.lib.optional perlBindings swig.perl
+    ;
+
+  configureFlags = ''
+    --disable-keychain
+    ${if static then "--disable-shared --enable-all-static" else "--disable-static"}
+    ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"}
+    ${if httpServer then "--with-apxs=${httpd}/bin/apxs" else "--without-apxs"}
+    ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"}
+    ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""}
+    --disable-neon-version-check
+  '';
+
+  preBuild = ''
+    makeFlagsArray=(APACHE_LIBEXECDIR=$out/modules)
+  '';
+
+  postInstall = ''
+    ensureDir $out/share/emacs/site-lisp
+    cp contrib/client-side/emacs/*.el $out/share/emacs/site-lisp/
+
+    if test "$pythonBindings"; then
+        make swig-py swig_pydir=$(toPythonPath $out)/libsvn swig_pydir_extra=$(toPythonPath $out)/svn
+        make install-swig-py swig_pydir=$(toPythonPath $out)/libsvn swig_pydir_extra=$(toPythonPath $out)/svn
+    fi
+
+    if test "$perlBindings"; then
+        make swig-pl-lib
+        make install-swig-pl-lib
+        cd subversion/bindings/swig/perl/native
+        perl Makefile.PL PREFIX=$out
+        make install
+        cd -
+    fi
+  ''; # */
+
+  inherit perlBindings pythonBindings;
+
+  meta = {
+    description = "A version control system intended to be a compelling replacement for CVS in the open source community";
+    homepage = http://subversion.tigris.org/;
+  };
+}

pkgs/top-level/all-packages.nix

@@ -7929,7 +7929,7 @@ let
   };
 
   dmtx = builderDefsPackage (import ../tools/graphics/dmtx) {
-    inherit libpng libtiff libjpeg imagemagick librsvg 
+    inherit libpng libtiff libjpeg imagemagick librsvg
       pkgconfig bzip2 zlib;
     inherit (xlibs) libX11;
   };
@@ -8687,7 +8687,7 @@ let
     httpd = apacheHttpd;
   };
 
-  subversion15 = makeOverridable (import ../applications/version-management/subversion-1.5.x) {
+  subversion15 = makeOverridable (import ../applications/version-management/subversion/1.5.nix) {
     inherit fetchurl stdenv apr aprutil expat swig zlib jdk;
     neon = neon028;
     bdbSupport = getConfig ["subversion" "bdbSupport"] true;
@@ -8701,7 +8701,21 @@ let
     httpd = apacheHttpd;
   };
 
-  subversionStatic = lowPrio (appendToName "static" (import ../applications/version-management/subversion-1.5.x {
+  subversion16 = makeOverridable (import ../applications/version-management/subversion/1.6.nix) {
+    inherit fetchurl stdenv apr aprutil expat swig zlib jdk sqlite;
+    neon = neon028;
+    bdbSupport = getConfig ["subversion" "bdbSupport"] true;
+    httpServer = getConfig ["subversion" "httpServer"] false;
+    httpSupport = getConfig ["subversion" "httpSupport"] true;
+    sslSupport = getConfig ["subversion" "sslSupport"] true;
+    pythonBindings = getConfig ["subversion" "pythonBindings"] false;
+    perlBindings = getConfig ["subversion" "perlBindings"] false;
+    javahlBindings = getConfig ["subversion" "javahlBindings"] false;
+    compressionSupport = getConfig ["subversion" "compressionSupport"] true;
+    httpd = apacheHttpd;
+  };
+
+  subversionStatic = lowPrio (appendToName "static" (import ../applications/version-management/subversion/1.6.nix {
     inherit fetchurl stdenv apr aprutil expat swig jdk;
     neon = import ../development/libraries/neon/0.28.nix {
         inherit fetchurl stdenv libxml2 zlib openssl;
@@ -8713,6 +8727,10 @@ let
     zlib = import ../development/libraries/zlib {
       inherit fetchurl stdenv;
       static = true;
+    };
+      sqlite = import ../development/libraries/sqlite {
+      inherit fetchurl stdenv readline;
+      static = true;
     };
     bdbSupport = true;
     httpServer = false;