diff options
| author | Eelco Visser <visser@acm.org> | 2004-08-20 10:14:55 +0000 |
|---|---|---|
| committer | Eelco Visser <visser@acm.org> | 2004-08-20 10:14:55 +0000 |
| commit | 7f3a3764eed4c03f1b0ad491135b2cf0133cb57d (patch) | |
| tree | 819b88e2cd667865e9beb54f61f6b15b0f6c12c0 /pkgs/system/all-packages-generic.nix | |
| parent | f407ca0506a20dc8cd81a2c93134dd04eae2a835 (diff) | |
| download | nixpkgs-7f3a3764eed4c03f1b0ad491135b2cf0133cb57d.tar nixpkgs-7f3a3764eed4c03f1b0ad491135b2cf0133cb57d.tar.gz nixpkgs-7f3a3764eed4c03f1b0ad491135b2cf0133cb57d.tar.bz2 nixpkgs-7f3a3764eed4c03f1b0ad491135b2cf0133cb57d.tar.lz nixpkgs-7f3a3764eed4c03f1b0ad491135b2cf0133cb57d.tar.xz nixpkgs-7f3a3764eed4c03f1b0ad491135b2cf0133cb57d.tar.zst nixpkgs-7f3a3764eed4c03f1b0ad491135b2cf0133cb57d.zip | |
- upgrade ant to 1.6.2
- comment out ant15 since nix-env cannot make the distinction - installation of tomcat 5 svn path=/nixpkgs/trunk/; revision=1299
Diffstat (limited to 'pkgs/system/all-packages-generic.nix')
| -rw-r--r-- | pkgs/system/all-packages-generic.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 6dda81bf028..386e40e96db 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -384,9 +384,13 @@ rec { inherit fetchurl stdenv j2sdk; }; - apacheant15 = (import ../development/tools/build-managers/apache-ant) { +# apacheant15 = (import ../development/tools/build-managers/apache-ant) { +# inherit fetchurl stdenv; +# j2sdk = j2sdk15; +# }; + + tomcat5 = (import ../servers/http/tomcat) { inherit fetchurl stdenv; - j2sdk = j2sdk15; }; pcre = (import ../development/libraries/pcre) { |