mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-20 20:20:26 +03:00
* SWIG apparently doesn't need Perl/Python/Guile/JDK/20 other
languages at build time. It seems they're only used in "make check". * Subversion: updated to 1.6.5. svn path=/nixpkgs/trunk/; revision=17594
This commit is contained in:
Eelco Dolstra
parent
d68835524d
commit
4041f93fbf
@ -1,78 +0,0 @@
|
||||
{ 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
|
||||
, httpd ? null, expat, swig ? null, jdk ? null
|
||||
, static ? false
|
||||
}:
|
||||
|
||||
assert bdbSupport -> aprutil.bdbSupport;
|
||||
assert httpServer -> httpd != null;
|
||||
assert pythonBindings -> swig != null && swig.pythonSupport;
|
||||
assert javahlBindings -> jdk != null;
|
||||
assert sslSupport -> neon.sslSupport;
|
||||
assert compressionSupport -> neon.compressionSupport;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
version = "1.5.6";
|
||||
|
||||
name = "subversion-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://subversion.tigris.org/downloads/${name}.tar.bz2";
|
||||
sha256 = "1hj69zvg6wk6gryaaa1gi896j53633560wkirypdjhyczrszw0gp";
|
||||
};
|
||||
|
||||
buildInputs = [zlib apr aprutil]
|
||||
++ 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 ""}
|
||||
${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/;
|
||||
};
|
||||
}
|
||||
|
||||
@ -7,32 +7,32 @@
|
||||
, perlBindings ? false
|
||||
, javahlBindings ? false
|
||||
, stdenv, fetchurl, apr, aprutil, neon, zlib, sqlite
|
||||
, httpd ? null, expat, swig ? null, jdk ? null
|
||||
, httpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null
|
||||
, static ? false
|
||||
}:
|
||||
|
||||
assert bdbSupport -> aprutil.bdbSupport;
|
||||
assert httpServer -> httpd != null;
|
||||
assert pythonBindings -> swig != null && swig.pythonSupport;
|
||||
assert javahlBindings -> jdk != null;
|
||||
assert pythonBindings -> swig != null && python != null;
|
||||
assert javahlBindings -> jdk != null && perl != null;
|
||||
assert sslSupport -> neon.sslSupport;
|
||||
assert compressionSupport -> neon.compressionSupport;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
version = "1.6.4";
|
||||
version = "1.6.5";
|
||||
|
||||
name = "subversion-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://subversion.tigris.org/downloads/${name}.tar.bz2";
|
||||
sha256 = "0lhfmz0bnvwka3w8j8hpfimcyqz1w6khqv100wvzx13wfgkgd6vw";
|
||||
sha256 = "1badvnx1305dm79g31l1536z78nsi7n9wi4v6s6lp64y8pd1ncv4";
|
||||
};
|
||||
|
||||
buildInputs = [zlib apr aprutil sqlite]
|
||||
++ stdenv.lib.optional httpSupport neon
|
||||
++ stdenv.lib.optional pythonBindings swig.python
|
||||
++ stdenv.lib.optional perlBindings swig.perl
|
||||
++ stdenv.lib.optional pythonBindings python
|
||||
++ stdenv.lib.optional perlBindings perl
|
||||
;
|
||||
|
||||
configureFlags = ''
|
||||
@ -55,12 +55,12 @@ stdenv.mkDerivation rec {
|
||||
ensureDir $out/share/emacs/site-lisp
|
||||
cp contrib/client-side/emacs/*.el $out/share/emacs/site-lisp/
|
||||
|
||||
if test "$pythonBindings"; then
|
||||
if test -n "$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
|
||||
if test -n "$perlBindings"; then
|
||||
make swig-pl-lib
|
||||
make install-swig-pl-lib
|
||||
cd subversion/bindings/swig/perl/native
|
||||
|
||||
@ -1,15 +1,4 @@
|
||||
{ /* SWIG doesn't carry any run-time dependency on Perl, Python, etc., so
|
||||
it's safe to enable everything by default. */
|
||||
perlSupport ? true, pythonSupport ? true, javaSupport ? true
|
||||
, guileSupport ? true
|
||||
|
||||
, stdenv, fetchurl, boost, perl ? null, python ? null, jdk ? null
|
||||
, guile ? null }:
|
||||
|
||||
assert perlSupport -> perl != null;
|
||||
assert pythonSupport -> python != null;
|
||||
assert guileSupport -> guile != null;
|
||||
assert javaSupport -> jdk != null;
|
||||
{ stdenv, fetchurl, boost }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "swig-1.3.40";
|
||||
@ -19,11 +8,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "02dc8g8wy75nd2is1974rl24c6mdl0ai1vszs1xpg9nd7dlv6i8r";
|
||||
};
|
||||
|
||||
buildInputs = [ boost ] # Boost is used in the test suite
|
||||
++ stdenv.lib.optional perlSupport perl
|
||||
++ stdenv.lib.optional pythonSupport python
|
||||
++ stdenv.lib.optional guileSupport guile
|
||||
++ stdenv.lib.optional javaSupport jdk;
|
||||
#buildInputs = [ boost ]; # needed for `make check'
|
||||
|
||||
/* The test suite fails this way:
|
||||
|
||||
@ -36,11 +21,6 @@ stdenv.mkDerivation rec {
|
||||
*/
|
||||
doCheck = false;
|
||||
|
||||
passthru = {
|
||||
inherit perl python jdk guile;
|
||||
inherit perlSupport pythonSupport guileSupport javaSupport;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages";
|
||||
|
||||
|
||||
@ -2795,7 +2795,7 @@ let
|
||||
};
|
||||
|
||||
swig = import ../development/tools/misc/swig {
|
||||
inherit fetchurl stdenv boost perl python guile jdk;
|
||||
inherit fetchurl stdenv boost;
|
||||
};
|
||||
|
||||
swigWithJava = swig;
|
||||
@ -7498,22 +7498,8 @@ let
|
||||
|
||||
subversion = subversion16;
|
||||
|
||||
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;
|
||||
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;
|
||||
};
|
||||
|
||||
subversion16 = makeOverridable (import ../applications/version-management/subversion/1.6.nix) {
|
||||
inherit (pkgsOverriden) fetchurl stdenv apr aprutil expat swig zlib jdk sqlite;
|
||||
inherit (pkgsOverriden) fetchurl stdenv apr aprutil expat swig zlib jdk python perl sqlite;
|
||||
neon = neon028;
|
||||
bdbSupport = getConfig ["subversion" "bdbSupport"] true;
|
||||
httpServer = getConfig ["subversion" "httpServer"] false;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user