* Upgrade to 1.0.1.
svn path=/nixpkgs/trunk/; revision=852
This commit is contained in:
parent
ee40be39a4
commit
158aa95f52
|
@ -1,35 +1,46 @@
|
||||||
#! /bin/sh
|
#! /bin/sh -e
|
||||||
|
|
||||||
buildinputs="$openssl $db4 $httpd $swig $python $expat"
|
buildInputs="$openssl $db4 $httpd $swig $python $expat"
|
||||||
. $stdenv/setup || exit 1
|
. $stdenv/setup
|
||||||
|
|
||||||
if test $localServer; then
|
configureFlags="--without-gdbm --disable-static"
|
||||||
extraflags="--with-berkeley-db=$db4 $extraflags"
|
|
||||||
|
if test "$localServer"; then
|
||||||
|
configureFlags="--with-berkeley-db=$db4 $configureFlags"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test $sslSupport; then
|
if test "$sslSupport"; then
|
||||||
extraflags="--with-ssl --with-libs=$openssl $extraflags"
|
configureFlags="--with-ssl --with-libs=$openssl $configureFlags"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test $httpServer; then
|
if test "$httpServer"; then
|
||||||
extraflags="--with-apxs=$httpd/bin/apxs --with-apr=$httpd --with-apr-util=$httpd $extraflags"
|
configureFlags="--with-apxs=$httpd/bin/apxs --with-apr=$httpd --with-apr-util=$httpd $configureFlags"
|
||||||
extramakeflags="APACHE_LIBEXECDIR=$out/modules $extramakeflags"
|
makeFlags="APACHE_LIBEXECDIR=$out/modules $makeFlags"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test $swigBindings; then
|
if test "$swigBindings"; then
|
||||||
extraflags="--with-swig=$swig $extraflags"
|
configureFlags="--with-swig=$swig $configureFlags"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "extra flags: $extraflags"
|
installFlags="$makeFlags"
|
||||||
|
|
||||||
tar xvfz $src || exit 1
|
|
||||||
cd subversion-* || exit 1
|
|
||||||
./configure --prefix=$out $extraflags \
|
|
||||||
--without-gdbm --disable-static || exit 1
|
|
||||||
make $extramakeflags || exit 1
|
|
||||||
make install $extramakeflags || exit 1
|
|
||||||
|
|
||||||
if test $swigBindings; then
|
preConfigure() {
|
||||||
make swig-py || exit 1
|
for i in $(find . -name "ltmain.sh"); do
|
||||||
make install-swig-py || exit 1
|
echo "fixing $i"
|
||||||
fi
|
fixLibtool $i
|
||||||
|
done
|
||||||
|
}
|
||||||
|
preConfigure=preConfigure
|
||||||
|
|
||||||
|
|
||||||
|
postInstall() {
|
||||||
|
if test "$swigBindings"; then
|
||||||
|
make swig-py
|
||||||
|
make install-swig-py
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
postInstall=postInstall
|
||||||
|
|
||||||
|
|
||||||
|
genericBuild
|
||||||
|
|
|
@ -6,20 +6,20 @@
|
||||||
, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null
|
, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert !isNull expat;
|
assert expat != null;
|
||||||
assert localServer -> !isNull db4;
|
assert localServer -> db4 != null;
|
||||||
assert httpServer -> !isNull httpd && httpd.expat == expat;
|
assert httpServer -> httpd != null && httpd.expat == expat;
|
||||||
assert sslSupport -> !isNull openssl && (httpServer -> httpd.openssl == openssl);
|
assert sslSupport -> openssl != null && (httpServer -> httpd.openssl == openssl);
|
||||||
assert swigBindings -> !isNull swig && swig.pythonSupport;
|
assert swigBindings -> swig != null && swig.pythonSupport;
|
||||||
|
|
||||||
derivation {
|
derivation {
|
||||||
name = "subversion-0.37.0";
|
name = "subversion-1.0.1";
|
||||||
system = stdenv.system;
|
system = stdenv.system;
|
||||||
|
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://subversion.tigris.org/tarballs/subversion-0.37.0.tar.gz;
|
url = http://subversion.tigris.org/tarballs/subversion-1.0.1.tar.bz2;
|
||||||
md5 = "048c4d17d5880dc8f3699020eac56224";
|
md5 = "50ca608d260b76d99ed85909acb7ae92";
|
||||||
};
|
};
|
||||||
|
|
||||||
openssl = if sslSupport then openssl else null;
|
openssl = if sslSupport then openssl else null;
|
||||||
|
|
Loading…
Reference in a new issue