alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

These Ants just keep getting better\!. Also added prelim. version of PostgreSQL.

Browse source 
svn path=/nixpkgs/trunk/; revision=1326
This commit is contained in:
Martin Bravenboer 2004-08-24 11:38:40 +00:00
parent c70943c332
commit 007765937b
4 changed files with 37 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/tools/build-managers/apache-ant/default.nix
View file

@ -1,6 +1,6 @@
{stdenv, fetchurl, j2sdk, name}: {stdenv, fetchurl, j2sdk, name}:
rec { let {
body = body =
stdenv.mkDerivation { stdenv.mkDerivation {
name = name; name = name;

8
pkgs/servers/sql/postgresql/builder.sh Executable file
View file

@ -0,0 +1,8 @@
. $stdenv/setup
configureFlags=""
if test "$jdbcSupport"; then
configureFlags="--with-java $configureFlags"
fi
genericBuild

18
pkgs/servers/sql/postgresql/default.nix Normal file
View file

@ -0,0 +1,18 @@
{stdenv, fetchurl, readline, jdbcSupport ? true, ant ? null}:
assert jdbcSupport -> ant != null;
stdenv.mkDerivation {
name = "postgresql-7.4.5";
builder = ./builder.sh;
src = fetchurl {
url = ftp://ftp2.nl.postgresql.org/mirror/postgresql/latest/postgresql-7.4.5.tar.bz2;
md5 = "97e750c8e69c208b75b6efedc5a36efb";
};
inherit jdbcSupport;
ant = if jdbcSupport then ant else null;
buildInputs = if jdbcSupport then [ant] else [];
}

14
pkgs/system/all-packages-generic.nix
View file

@ -325,7 +325,7 @@ rec {
jclasslib = (import ../development/tools/java/jclasslib) { jclasslib = (import ../development/tools/java/jclasslib) {
inherit fetchurl stdenv xpf; inherit fetchurl stdenv xpf;
j2re = j2sdk15; j2re = j2sdk15;
ant = apacheant14.body; ant = apacheAnt14;
}; };
ocaml = (import ../development/compilers/ocaml) { ocaml = (import ../development/compilers/ocaml) {
@ -405,18 +405,18 @@ rec {
inherit fetchurl stdenv jikes alsaLib xlibs; inherit fetchurl stdenv jikes alsaLib xlibs;
}; };
apacheant14 = (import ../development/tools/build-managers/apache-ant) { apacheAnt14 = (import ../development/tools/build-managers/apache-ant) {
inherit fetchurl stdenv j2sdk; inherit fetchurl stdenv j2sdk;
name = "ant-j2sdk-1.4.2"; name = "ant-j2sdk-1.4.2";
}; };
apacheantblackdown14 = (import ../development/tools/build-managers/apache-ant) { apacheAntBlackdown14 = (import ../development/tools/build-managers/apache-ant) {
inherit fetchurl stdenv; inherit fetchurl stdenv;
j2sdk = blackdown; j2sdk = blackdown;
name = "ant-blackdown-1.4.2"; name = "ant-blackdown-1.4.2";
}; };
apacheant15 = (import ../development/tools/build-managers/apache-ant) { apacheAnt15 = (import ../development/tools/build-managers/apache-ant) {
inherit fetchurl stdenv; inherit fetchurl stdenv;
name = "ant-j2sdk-1.5.0"; name = "ant-j2sdk-1.5.0";
j2sdk = j2sdk15; j2sdk = j2sdk15;
@ -631,6 +631,12 @@ rec {
buildClientLibs = true; buildClientLibs = true;
}; };
postgresql = (import ../servers/sql/postgresql) {
inherit fetchurl stdenv readline;
jdbcSupport = true;
ant = apacheAntBlackdown14;
};
### OS-SPECIFIC ### OS-SPECIFIC
kernelHeaders = (import ../os-specific/linux/kernel-headers) { kernelHeaders = (import ../os-specific/linux/kernel-headers) {