summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorRoy van den Broek <rbroek@cs.uu.nl>2006-04-03 13:02:05 +0000
committerRoy van den Broek <rbroek@cs.uu.nl>2006-04-03 13:02:05 +0000
commit0ff118b5f277f43c728cb6e938b39af128c50996 (patch)
tree2705cf1c01dcbe8bf410a7d2177b7a423d0b86af /pkgs/top-level/all-packages.nix
parent8c188ffe04363cfd53bba9af40bfba1d75a01fcb (diff)
downloadnixpkgs-0ff118b5f277f43c728cb6e938b39af128c50996.tar
nixpkgs-0ff118b5f277f43c728cb6e938b39af128c50996.tar.gz
nixpkgs-0ff118b5f277f43c728cb6e938b39af128c50996.tar.bz2
nixpkgs-0ff118b5f277f43c728cb6e938b39af128c50996.tar.lz
nixpkgs-0ff118b5f277f43c728cb6e938b39af128c50996.tar.xz
nixpkgs-0ff118b5f277f43c728cb6e938b39af128c50996.tar.zst
nixpkgs-0ff118b5f277f43c728cb6e938b39af128c50996.zip
Added Axis 1.3.
svn path=/nixpkgs/trunk/; revision=5138
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix12
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b388d86686..215046ca152 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1049,6 +1049,10 @@ rec {
     inherit fetchurl stdenv ncurses;
   };
 
+  axis = (import ../development/libraries/axis) {
+    inherit fetchurl stdenv;
+  };
+
   libcaca = (import ../development/libraries/libcaca) {
     inherit fetchurl stdenv ncurses;
   };
@@ -2409,8 +2413,14 @@ rec {
     patchelf = patchelfNew;
   };
 
+  maven = (import ../misc/maven/maven-1.0.nix) {
+    inherit stdenv fetchurl jdk;
+  };
+
+/*
   maven = (import ../misc/maven) {
    inherit stdenv fetchurl jdk;
   };
-  
+*/
+    
 }