summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorMartin Bravenboer <martin.bravenboer@logicblox.com>2006-03-26 03:52:55 +0000
committerMartin Bravenboer <martin.bravenboer@logicblox.com>2006-03-26 03:52:55 +0000
commit8dbf2c38fb2adee4969f8ef7c33230714c75270d (patch)
treef78305ccc676a56a5ec0e9157d4b834bcb34025c /pkgs/top-level/all-packages.nix
parentd88e2ea70f60dca43eab87adf675d366e79cca42 (diff)
downloadnixpkgs-8dbf2c38fb2adee4969f8ef7c33230714c75270d.tar
nixpkgs-8dbf2c38fb2adee4969f8ef7c33230714c75270d.tar.gz
nixpkgs-8dbf2c38fb2adee4969f8ef7c33230714c75270d.tar.bz2
nixpkgs-8dbf2c38fb2adee4969f8ef7c33230714c75270d.tar.lz
nixpkgs-8dbf2c38fb2adee4969f8ef7c33230714c75270d.tar.xz
nixpkgs-8dbf2c38fb2adee4969f8ef7c33230714c75270d.tar.zst
nixpkgs-8dbf2c38fb2adee4969f8ef7c33230714c75270d.zip
* Update of jre
* Added aspectj-1.5.0


svn path=/nixpkgs/trunk/; revision=5110
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b789af479d0..ef2be5b7b4d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -710,14 +710,18 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  aspectj =
+    (import ../development/compilers/aspectj) {
+      inherit stdenv fetchurl jre;
+    };
+
   abc =
     abcPatchable [];
 
   abcPatchable = patches : 
     (import ../development/compilers/abc/default.nix) {
-      inherit stdenv fetchurl patches;
+      inherit stdenv fetchurl patches jre;
       apacheAnt = apacheAntBlackdown14;
-      jre = blackdown;
       javaCup = import ../development/libraries/java/cup {
         inherit stdenv fetchurl;
         jdk = blackdown;