From db8748b170da93feac32d0584b47d7472f419caf Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 19 Nov 2010 13:24:11 +0000
Subject: [PATCH] added eclipse 3.6.1, maven3, szip

svn path=/nixpkgs/trunk/; revision=24772
---
 pkgs/applications/editors/eclipse/default.nix | 14 +++++++++++++-
 pkgs/development/libraries/szip/default.nix   |  9 +++++++++
 pkgs/misc/maven/3.0.nix                       | 15 +++++++++++++++
 pkgs/top-level/all-packages.nix               |  9 +++++++--
 4 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/szip/default.nix
 create mode 100644 pkgs/misc/maven/3.0.nix

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 937c5df5894b..eb12aa0819ed 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -98,6 +98,17 @@ stdenv.mkDerivation rec {
         url = http://mirrors.linux-bg.org/eclipse/eclipse/downloads/drops/R-3.5.1-200909170800/eclipse-SDK-3.5.1-linux-gtk.tar.gz;
         sha256 = "0a0lpa7gxg91zswpahi6fvg3csl4csvlym4z2ad5cc1d4yvicp56";
       }
+    else if v == "3.6.1" then
+     if stdenv.system == "x86_64-linux" then
+       fetchurl {
+        url = http://ftp.ing.umu.se/mirror/eclipse/eclipse/downloads/drops/R-3.6.1-201009090800/eclipse-SDK-3.6.1-linux-gtk-x86_64.tar.gz;
+        sha256 = "1cg9rrb5w978sdqbzz9lnli1lds9zhb6wfsj3wp725bqf1i6v9lg";
+       }
+     else
+       fetchurl {
+        url = http://ftp.ing.umu.se/mirror/eclipse/eclipse/downloads/drops/R-3.6.1-201009090800/eclipse-SDK-3.6.1-linux-gtk.tar.gz;
+        sha256 = "0s48rjaswi8m5gan1zlqvfwb4l06x5nslkq41wpkrbyj9ka8gh4x";
+      }
     else throw "no source for eclipse version ${v} known";
 
   desktopItem = makeDesktopItem {
@@ -131,11 +142,12 @@ stdenv.mkDerivation rec {
     ensureDir $out/share/applications
     cp ${desktopItem}/share/applications/* $out/share/applications
   '';
-
+  
   meta = {
     homepage = http://www.eclipse.org/;
     description = "A extensible multi-language software development environment";
     longDescription = ''
     '';
   };
+  
 }
diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix
new file mode 100644
index 000000000000..38cde3bfd707
--- /dev/null
+++ b/pkgs/development/libraries/szip/default.nix
@@ -0,0 +1,9 @@
+{ stdenv, fetchurl }:
+    
+stdenv.mkDerivation {
+    name = "szip-2.1";
+    src = fetchurl {
+        url = ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/szip-2.1.tar.gz;
+        sha256 = "05707lrdhwp8mv0dgzh2b6m2mwamv1z6k29m2v1v7pz0c1w2gb6z";
+    };
+}
\ No newline at end of file
diff --git a/pkgs/misc/maven/3.0.nix b/pkgs/misc/maven/3.0.nix
new file mode 100644
index 000000000000..f66a2f7f04b2
--- /dev/null
+++ b/pkgs/misc/maven/3.0.nix
@@ -0,0 +1,15 @@
+{stdenv, fetchurl, jdk, makeWrapper}:
+
+assert jdk != null;
+
+stdenv.mkDerivation {
+	name = "apache-maven-3.0";
+	builder = ./builder.sh;
+	src = fetchurl {
+		url = mirror://apache/maven/binaries/apache-maven-3.0-bin.tar.gz;
+		sha256 = "18i7vf7w79pvga4k0plixv2ppdvm476cgikaxxnar1fac5v0qsh4";
+	};
+	
+        buildInputs = [makeWrapper]; 
+	inherit jdk;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df5a441a50ff..d9bb73dca7ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -745,7 +745,7 @@ let
   hddtemp = callPackage ../tools/misc/hddtemp { };
 
   hdf5 = callPackage ../tools/misc/hdf5 { };
-
+  
   hevea = callPackage ../tools/typesetting/hevea { };
 
   highlight = callPackage ../tools/text/highlight { };
@@ -3855,6 +3855,8 @@ let
 
   sword = callPackage ../development/libraries/sword { };
 
+  szip = callPackage ../development/libraries/szip { };
+
   t1lib = callPackage ../development/libraries/t1lib { };
 
   taglib = callPackage ../development/libraries/taglib { };
@@ -5462,6 +5464,9 @@ let
     inherit (gtkLibs216) glib gtk;
   };
   eclipseLatest = eclipse.override { version = "latest"; };
+  eclipse36 = callPackage ../applications/editors/eclipse {
+      version = "3.6.1";
+  };
 
   ed = callPackage ../applications/editors/ed { };
 
@@ -7052,8 +7057,8 @@ let
   martyr = callPackage ../development/libraries/martyr { };
 
   maven = callPackage ../misc/maven/maven-1.0.nix { };
-
   maven2 = callPackage ../misc/maven { };
+  maven3 = callPackage ../misc/maven/3.0.nix { };
 
   mess = callPackage ../misc/emulators/mess { };