* Get rid of many instances of "args: with args;", and other coding

guidelines violations.
* Updated libsamplerate to 0.1.7.

svn path=/nixpkgs/trunk/; revision=22782
This commit is contained in:
Eelco Dolstra
2010-07-28 11:55:54 +00:00
parent b4a3f99c78
commit 6609710409
132 changed files with 925 additions and 958 deletions
+33 -34
View File
@@ -1,42 +1,41 @@
args: with args;
{ composableDerivation, fetchurl, pcre, openssl, readline, libxml2, geos, apacheAnt, jdk5 }:
let inherit (args.composableDerivation) composableDerivation edf; in
composableDerivation {} {
let inherit (composableDerivation) edf; in
name = "monetdb-may-2009";
composableDerivation.composableDerivation {} {
src = fetchurl {
url = http://monetdb.cwi.nl/downloads/sources/May2009-SP1/MonetDB-May2009-SuperBall-SP1.tar.bz2;
sha256 = "0r794snnwa4m0x57nv8cgfdxwb689946c1mi2s44wp4iljka2ryj";
};
name = "monetdb-may-2009";
flags = edf { name = "geom"; enable = { buildInputs = [geos]; }; }
// {
java = { buildInputs = [ (apacheAnt.override {jdk = jdk5;}) jdk5 /* must be 1.5 */ ]; };
/* perl TODO export these (SWIG only if its present) HAVE_PERL=1 HAVE_PERL_DEVEL=1 HAVE_PERL_SWIG=1 */
};
src = fetchurl {
url = http://monetdb.cwi.nl/downloads/sources/May2009-SP1/MonetDB-May2009-SuperBall-SP1.tar.bz2;
sha256 = "0r794snnwa4m0x57nv8cgfdxwb689946c1mi2s44wp4iljka2ryj";
};
buildInputs = [ (pcre.override { unicodeSupport = true; })
openssl readline libxml2]; # optional python perl php java ?
flags = edf { name = "geom"; enable = { buildInputs = [geos]; }; }
// {
java = { buildInputs = [ (apacheAnt.override {jdk = jdk5;}) jdk5 /* must be 1.5 */ ]; };
/* perl TODO export these (SWIG only if its present) HAVE_PERL=1 HAVE_PERL_DEVEL=1 HAVE_PERL_SWIG=1 */
};
cfg = {
geomSupport = true;
javaSupport = true;
};
buildInputs = [ (pcre.override { unicodeSupport = true; })
openssl readline libxml2 ]; # optional python perl php java ?
configurePhase = ":";
buildPhase = ":";
# --enable-template (nightly or cvs sources)
# --enable-optimise
# --enable-geom (geos-config required ?)
installPhase = ''
mkdir $TMP/build
sh monetdb-install.sh --build=$TMP/build --prefix=$out --enable-sql --enable-xquery
'';
cfg = {
geomSupport = true;
javaSupport = true;
};
meta = {
description = "MonetDB is a open-source database system for high-performance applications in data mining, OLAP, GIS, XML Query, text and multimedia retrieval";
homepage = http://monetdb.cwi.nl/;
license = "MonetDB Public License"; # very similar to Mozilla public license (MPL) Version see 1.1 http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
};
}
configurePhase = ":";
buildPhase = ":";
installPhase = ''
mkdir $TMP/build
sh monetdb-install.sh --build=$TMP/build --prefix=$out --enable-sql --enable-xquery
'';
meta = {
description = "MonetDB is a open-source database system for high-performance applications in data mining, OLAP, GIS, XML Query, text and multimedia retrieval";
homepage = http://monetdb.cwi.nl/;
license = "MonetDB Public License"; # very similar to Mozilla public license (MPL) Version see 1.1 http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
};
}