aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-01-03 15:58:20 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-01-06 14:36:13 +0100
commit4728ec3f99579911d6d880807ec3b5b53b7ef0d5 (patch)
tree2898742182fef5483b391278f49a783459b44d4e
parentc180be8cf55878627751c128a250a9c8d6fe7e4b (diff)
Fix some references to apacheAntOpenJDK
-rw-r--r--pkgs/build-support/release/ant-build.nix2
-rw-r--r--pkgs/top-level/release-python.nix2
2 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix
index 0cabdf2f7e79..c3ff7d100ccc 100644
--- a/pkgs/build-support/release/ant-build.nix
+++ b/pkgs/build-support/release/ant-build.nix
@@ -8,7 +8,7 @@
, antProperties ? []
, antBuildInputs ? []
, buildfile ? "build.xml"
-, ant ? pkgs.apacheAntOpenJDK
+, ant ? pkgs.ant
, jre ? pkgs.openjdk
, hydraAntLogger ? pkgs.hydraAntLogger
, ... } @ args:
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index 24484c68b320..c041e2a836c8 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -59,8 +59,6 @@ let
antlr = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
antlr3 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
apacheAntGcj = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
- apacheAntOpenJDK = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
- apacheAntOracleJDK = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
apparmor = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
aqbanking = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
arb = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };