* Removed Subversion 1.4 - obsolete.
* Updated Subversion 1.5.x to 1.5.6. svn path=/nixpkgs/trunk/; revision=14685
This commit is contained in:
Eelco Dolstra
parent
ea443ec70a
commit
e230599c08
@ -1,41 +0,0 @@
|
||||
source $stdenv/setup
|
||||
|
||||
if test "$httpServer"; then
|
||||
makeFlags="APACHE_LIBEXECDIR=$out/modules $makeFlags"
|
||||
fi
|
||||
|
||||
|
||||
postInstall() {
|
||||
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
|
||||
if test "$javahlBindings"; then
|
||||
mkdir -p subversion/bindings/java/javahl/classes # bug fix
|
||||
make javahl
|
||||
make install-javahl
|
||||
# Hack to prevent java.lang.UnsatisfiedLinkError: no svnjavahl in java.library.path
|
||||
cd $out/lib
|
||||
ln -s libsvnjavahl-1.so libsvnjavahl.so
|
||||
cd -
|
||||
mkdir -p $out/share/doc/$name
|
||||
$jdk/bin/javadoc -d $out/share/doc/$name \
|
||||
-windowtitle "JavaHL Subversion Bindings" \
|
||||
-link http://java.sun.com/j2se/1.4.2/docs/api/ \
|
||||
subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/*.java
|
||||
fi
|
||||
ensureDir $out/share/emacs/site-lisp
|
||||
cp contrib/client-side/psvn/psvn.el contrib/client-side/vc-svn.el $out/share/emacs/site-lisp/
|
||||
}
|
||||
postInstall=postInstall
|
||||
|
||||
|
||||
genericBuild
|
||||
@ -1,62 +0,0 @@
|
||||
{ bdbSupport ? false
|
||||
, httpServer ? false
|
||||
, sslSupport ? false
|
||||
, compressionSupport ? false
|
||||
, pythonBindings ? false
|
||||
, perlBindings ? false
|
||||
, javahlBindings ? false
|
||||
, stdenv, fetchurl, apr, aprutil, neon, zlib
|
||||
, httpd ? null, expat, swig ? null, jdk ? null
|
||||
}:
|
||||
|
||||
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.4.6"; # attribute version is used within svnmerge as well
|
||||
|
||||
name = "subversion-${version}";
|
||||
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = http://subversion.tigris.org/downloads/subversion-1.4.6.tar.bz2;
|
||||
sha1 = "a9c941e2309744f6a2986200698b60da057a7527";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[expat zlib]
|
||||
++ stdenv.lib.optional pythonBindings swig.python
|
||||
++ stdenv.lib.optional perlBindings swig.perl
|
||||
;
|
||||
|
||||
configureFlags = ''
|
||||
--without-gdbm --disable-static
|
||||
--with-apr=${apr} -with-apr-util=${aprutil} --with-neon=${neon}
|
||||
--disable-keychain
|
||||
${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
|
||||
'';
|
||||
|
||||
inherit httpServer pythonBindings javahlBindings perlBindings;
|
||||
|
||||
patches = [ ./subversion-respect_CPPFLAGS_in_perl_bindings.patch ];
|
||||
|
||||
passthru = {
|
||||
inherit perlBindings pythonBindings;
|
||||
python = if swig != null && swig ? python then swig.python else null;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A version control system intended to be a compelling replacement for CVS in the open source community";
|
||||
homepage = http://subversion.tigris.org/;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
Index: subversion/bindings/swig/perl/native/Makefile.PL.in
|
||||
===================================================================
|
||||
--- subversion-1.4.5/subversion/bindings/swig/perl/native/Makefile.PL.in (revision 27184)
|
||||
+++ subversion-1.4.5/subversion/bindings/swig/perl/native/Makefile.PL.in (working copy)
|
||||
@@ -26,6 +26,7 @@
|
||||
my @ldmodules = map {"-lsvn_$_-1"} (@modules, qw/diff subr/);
|
||||
|
||||
my $apr_shlib_path_var = '@SVN_APR_SHLIB_PATH_VAR@';
|
||||
+my $cppflags = '@CPPFLAGS@';
|
||||
my $apr_cflags = '@SVN_APR_INCLUDES@';
|
||||
my $apu_cflags = '@SVN_APRUTIL_INCLUDES@';
|
||||
|
||||
@@ -38,7 +39,7 @@
|
||||
|
||||
my %config = (
|
||||
ABSTRACT => 'Perl bindings for Subversion',
|
||||
- INC => join(' ',$apr_cflags, $apu_cflags,
|
||||
+ INC => join(' ', $cppflags, $apr_cflags, $apu_cflags,
|
||||
" -I$swig_srcdir/perl/libsvn_swig_perl",
|
||||
" -I$svnlib_srcdir/include",
|
||||
" -I$svnlib_builddir",
|
||||
|
||||
@ -20,13 +20,13 @@ assert compressionSupport -> neon.compressionSupport;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
version = "1.5.5";
|
||||
version = "1.5.6";
|
||||
|
||||
name = "subversion-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://subversion.tigris.org/downloads/subversion-1.5.5.tar.bz2;
|
||||
sha256 = "1gkpmnwspb3x1310l97kb7n1kh5bmdb7bzq92xwm34sqbnx29kw8";
|
||||
url = "http://subversion.tigris.org/downloads/${name}.tar.bz2";
|
||||
sha256 = "1hj69zvg6wk6gryaaa1gi896j53633560wkirypdjhyczrszw0gp";
|
||||
};
|
||||
|
||||
buildInputs = [zlib apr aprutil]
|
||||
|
||||
@ -8674,19 +8674,6 @@ let
|
||||
|
||||
subversion = subversion15;
|
||||
|
||||
subversion14 = makeOverridable (import ../applications/version-management/subversion-1.4.x) {
|
||||
inherit fetchurl stdenv apr aprutil expat swig zlib jdk;
|
||||
neon = neon026;
|
||||
bdbSupport = getConfig ["subversion" "bdbSupport"] true;
|
||||
httpServer = getConfig ["subversion" "httpServer"] false;
|
||||
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;
|
||||
};
|
||||
|
||||
subversion15 = makeOverridable (import ../applications/version-management/subversion/1.5.nix) {
|
||||
inherit fetchurl stdenv apr aprutil expat swig zlib jdk;
|
||||
neon = neon028;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user