public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Clean up the Ant name, e.g. "ant-openjdk-1.8.0RC1" instead of

Browse Source 
"ant-<JDK name>".
* Remove openjdkDarwin/ecjDarwin/antDarwin attributes.  Instead
  the openjdk attribute refers to the Darwin package on Darwin.

svn path=/nixpkgs/trunk/; revision=34505
This commit is contained in:
Eelco Dolstra 2012-06-13 14:11:52 +00:00
parent abdd4f3498
commit 4f19239875
2 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/development/tools/build-managers/apache-ant/default.nix
View File

@ -1,23 +1,26 @@
{fetchurl, stdenv, jdk, name}: { fetchurl, stdenv, jdk }:
let { let
body =
stdenv.mkDerivation { antContrib = import ./ant-contrib.nix {
name = name; inherit fetchurl stdenv;
};
version = "1.8.0RC1";
in
stdenv.mkDerivation {
name = "ant-${(builtins.parseDrvName jdk.name).name}-${version}";
builder = ./builder.sh; builder = ./builder.sh;
buildInputs = [antContrib jdk];
buildInputs = [ antContrib jdk ];
inherit antContrib jdk; inherit antContrib jdk;
src = fetchurl { src = fetchurl {
url = http://apache.mirror.transip.nl/ant/binaries/apache-ant-1.8.0RC1-bin.tar.bz2 ; url = "http://apache.mirror.transip.nl/ant/binaries/apache-ant-${version}-bin.tar.bz2";
sha256 = "0xvmrsghibq7p3wvfkmvmkkg0zzfmw32lrfjl5f6cfzchjjnw9wx"; sha256 = "0xvmrsghibq7p3wvfkmvmkkg0zzfmw32lrfjl5f6cfzchjjnw9wx";
}; };
};
antContrib =
(import ./ant-contrib.nix) {
inherit fetchurl stdenv;
};
} }

28
pkgs/top-level/all-packages.nix
View File

@ -2265,9 +2265,11 @@ let
path64 = callPackage ../development/compilers/path64 { }; path64 = callPackage ../development/compilers/path64 { };
openjdkDarwin = callPackage ../development/compilers/openjdk-darwin { }; openjdk =
if stdenv.isDarwin then
openjdk = callPackage ../development/compilers/openjdk { }; callPackage ../development/compilers/openjdk-darwin { }
else
callPackage ../development/compilers/openjdk { };
openjre = callPackage ../development/compilers/openjdk { openjre = callPackage ../development/compilers/openjdk {
jreOnly = true; jreOnly = true;
@ -2283,7 +2285,7 @@ let
assert system == "i686-linux" || system == "x86_64-linux"; assert system == "i686-linux" || system == "x86_64-linux";
callPackage ../development/compilers/jdk/default-5.nix { }); callPackage ../development/compilers/jdk/default-5.nix { });
jdk = if stdenv.isDarwin then openjdkDarwin else jdkdistro true false; jdk = if stdenv.isDarwin then openjdk else jdkdistro true false;
jre = jdkdistro false false; jre = jdkdistro false false;
jdkPlugin = lowPrio (jdkdistro true true); jdkPlugin = lowPrio (jdkdistro true true);
@ -2751,8 +2753,6 @@ let
ecj = callPackage ../development/eclipse/ecj { }; ecj = callPackage ../development/eclipse/ecj { };
ecjDarwin = ecj.override { gcj = openjdkDarwin; ant = antDarwin; };
jdtsdk = callPackage ../development/eclipse/jdt-sdk { }; jdtsdk = callPackage ../development/eclipse/jdt-sdk { };
jruby165 = callPackage ../development/interpreters/jruby { }; jruby165 = callPackage ../development/interpreters/jruby { };
@ -2781,20 +2781,16 @@ let
antlr3 = callPackage ../development/tools/parsing/antlr { }; antlr3 = callPackage ../development/tools/parsing/antlr { };
antDarwin = apacheAnt.override rec { jdk = openjdkDarwin; name = "ant-" + jdk.name; } ;
ant = apacheAnt; ant = apacheAnt;
apacheAnt = callPackage ../development/tools/build-managers/apache-ant { apacheAnt = callPackage ../development/tools/build-managers/apache-ant { };
name = "ant-" + jdk.name;
};
apacheAnt14 = callPackage ../development/tools/build-managers/apache-ant { apacheAntOpenJDK = apacheAnt.override { jdk = openjdk; };
jdk = j2sdk14x;
name = "ant-" + j2sdk14x.name;
};
apacheAntGcj = callPackage ../development/tools/build-managers/apache-ant/from-source.nix { # must be either pre-built or built with GCJ *alone* apacheAnt14 = apacheAnt.override { jdk = j2sdk14x; };
apacheAntGcj = callPackage ../development/tools/build-managers/apache-ant/from-source.nix {
# must be either pre-built or built with GCJ *alone*
gcj = gcj.gcc; # use the raw GCJ, which has ${gcj}/lib/jvm gcj = gcj.gcc; # use the raw GCJ, which has ${gcj}/lib/jvm
}; };