Improved Ants in Nix. The names of the various Ants now reflects the j2sdk configuration: ant-j2sdk-1.4.2, ant-j2sdk-1.5.0, ant-blackdown
svn path=/nixpkgs/trunk/; revision=1325
This commit is contained in:
parent
5f15317a59
commit
c70943c332
@ -1,9 +1,9 @@
|
|||||||
{stdenv, fetchurl, j2sdk}:
|
{stdenv, fetchurl, j2sdk, name}:
|
||||||
|
|
||||||
rec {
|
rec {
|
||||||
body =
|
body =
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = ant.realname;
|
name = name;
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
buildInputs = [ant j2sdk];
|
buildInputs = [ant j2sdk];
|
||||||
inherit ant j2sdk;
|
inherit ant j2sdk;
|
||||||
|
@ -407,12 +407,20 @@ rec {
|
|||||||
|
|
||||||
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";
|
||||||
};
|
};
|
||||||
|
|
||||||
# apacheant15 = (import ../development/tools/build-managers/apache-ant) {
|
apacheantblackdown14 = (import ../development/tools/build-managers/apache-ant) {
|
||||||
# inherit fetchurl stdenv;
|
inherit fetchurl stdenv;
|
||||||
# j2sdk = j2sdk15;
|
j2sdk = blackdown;
|
||||||
# };
|
name = "ant-blackdown-1.4.2";
|
||||||
|
};
|
||||||
|
|
||||||
|
apacheant15 = (import ../development/tools/build-managers/apache-ant) {
|
||||||
|
inherit fetchurl stdenv;
|
||||||
|
name = "ant-j2sdk-1.5.0";
|
||||||
|
j2sdk = j2sdk15;
|
||||||
|
};
|
||||||
|
|
||||||
tomcat5 = (import ../servers/http/tomcat) {
|
tomcat5 = (import ../servers/http/tomcat) {
|
||||||
inherit fetchurl stdenv j2sdk;
|
inherit fetchurl stdenv j2sdk;
|
||||||
@ -623,7 +631,6 @@ rec {
|
|||||||
buildClientLibs = true;
|
buildClientLibs = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
### OS-SPECIFIC
|
### OS-SPECIFIC
|
||||||
|
|
||||||
kernelHeaders = (import ../os-specific/linux/kernel-headers) {
|
kernelHeaders = (import ../os-specific/linux/kernel-headers) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user