diff options
| author | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2004-08-24 11:38:40 +0000 |
|---|---|---|
| committer | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2004-08-24 11:38:40 +0000 |
| commit | 007765937b3e6b120516d7e88e48ea48b794ec19 (patch) | |
| tree | eaca2a30e06e5401b5d27122bcdb7052cd4da9fe /pkgs/system/all-packages-generic.nix | |
| parent | c70943c332edc8f0bfebce0729b823c0061eac36 (diff) | |
| download | nixpkgs-007765937b3e6b120516d7e88e48ea48b794ec19.tar nixpkgs-007765937b3e6b120516d7e88e48ea48b794ec19.tar.gz nixpkgs-007765937b3e6b120516d7e88e48ea48b794ec19.tar.bz2 nixpkgs-007765937b3e6b120516d7e88e48ea48b794ec19.tar.lz nixpkgs-007765937b3e6b120516d7e88e48ea48b794ec19.tar.xz nixpkgs-007765937b3e6b120516d7e88e48ea48b794ec19.tar.zst nixpkgs-007765937b3e6b120516d7e88e48ea48b794ec19.zip | |
These Ants just keep getting better\!. Also added prelim. version of PostgreSQL.
svn path=/nixpkgs/trunk/; revision=1326
Diffstat (limited to 'pkgs/system/all-packages-generic.nix')
| -rw-r--r-- | pkgs/system/all-packages-generic.nix | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 9e87d814505..0fb4e26ab0d 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -325,7 +325,7 @@ rec { jclasslib = (import ../development/tools/java/jclasslib) { inherit fetchurl stdenv xpf; j2re = j2sdk15; - ant = apacheant14.body; + ant = apacheAnt14; }; ocaml = (import ../development/compilers/ocaml) { @@ -405,18 +405,18 @@ rec { 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; 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; j2sdk = blackdown; 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; name = "ant-j2sdk-1.5.0"; j2sdk = j2sdk15; @@ -631,6 +631,12 @@ rec { buildClientLibs = true; }; + postgresql = (import ../servers/sql/postgresql) { + inherit fetchurl stdenv readline; + jdbcSupport = true; + ant = apacheAntBlackdown14; + }; + ### OS-SPECIFIC kernelHeaders = (import ../os-specific/linux/kernel-headers) { |