From 747df8295c7ee06b9e8937cd4e06b28c36d96115 Mon Sep 17 00:00:00 2001 From: Martin Bravenboer Date: Mon, 19 Sep 2005 12:43:33 +0000 Subject: [PATCH] Updated Eclipse to 3.1 svn path=/nixpkgs/trunk/; revision=3902 --- pkgs/applications/editors/eclipse/builder.sh | 2 +- pkgs/applications/editors/eclipse/default.nix | 9 ++++----- pkgs/system/all-packages-generic.nix | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/eclipse/builder.sh b/pkgs/applications/editors/eclipse/builder.sh index 7e1895f2fef..9a7e56312d7 100755 --- a/pkgs/applications/editors/eclipse/builder.sh +++ b/pkgs/applications/editors/eclipse/builder.sh @@ -2,6 +2,6 @@ set -e . $stdenv/setup -$unzip/bin/unzip $src +tar zxvf $src mkdir $out mv eclipse $out/ diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index e244bf383ce..ce072127219 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,17 +1,16 @@ -{fetchurl, stdenv, unzip}: +{fetchurl, stdenv}: let { body = stdenv.mkDerivation { - name = "eclipse-sdk-3.0.1"; + name = "eclipse-sdk-3.1"; builder = ./builder.sh; src = bindist; - inherit unzip; }; bindist = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/eclipse-SDK-3.0.1-linux-gtk.zip; - md5 = "d0f743c972adf13e71a43b2dc6c9c55b"; + url = ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/eclipse/R-3.1-200506271435/eclipse-SDK-3.1-linux-gtk.tar.gz; + md5 = "0441c11cc5af1e84ed3be322929899e8"; }; } diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 436eb772f40..4a5de2eaece 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -1545,7 +1545,7 @@ rec { }; eclipse = (import ../applications/editors/eclipse) { - inherit fetchurl stdenv unzip; + inherit fetchurl stdenv; }; monodevelop = (import ../applications/editors/monodevelop) {