summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorRobert Helgesson <robert@rycee.net>2019-01-22 00:41:18 +0100
committerRobert Helgesson <robert@rycee.net>2019-01-22 00:41:18 +0100
commitc076bd22338f1c31ee09fb8b4123407ee14337e8 (patch)
treebdf09943410a0eb50a1a5cd2ba9ae054cdc0014d /pkgs
parentf5836d2d8251683b7ece210675e046e11561e7a7 (diff)
downloadnixpkgs-c076bd22338f1c31ee09fb8b4123407ee14337e8.tar
nixpkgs-c076bd22338f1c31ee09fb8b4123407ee14337e8.tar.gz
nixpkgs-c076bd22338f1c31ee09fb8b4123407ee14337e8.tar.bz2
nixpkgs-c076bd22338f1c31ee09fb8b4123407ee14337e8.tar.lz
nixpkgs-c076bd22338f1c31ee09fb8b4123407ee14337e8.tar.xz
nixpkgs-c076bd22338f1c31ee09fb8b4123407ee14337e8.tar.zst
nixpkgs-c076bd22338f1c31ee09fb8b4123407ee14337e8.zip
Revert "eclipses: 4.9 -> 4.10"
This reverts commit 08bf7311f532a875ea1c561d79b20760ac49ee04.

See https://github.com/NixOS/nixpkgs/pull/54390#issuecomment-455930334
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/editors/eclipse/default.nix26
-rw-r--r--pkgs/applications/editors/eclipse/plugins.nix6
2 files changed, 5 insertions, 27 deletions
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 9f48cf25587..55bbc778e3a 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -96,7 +96,7 @@ rec {
 
   ### Eclipse Platform
 
-  eclipse-platform = eclipse-platform-4_10; # always point to latest
+  eclipse-platform = eclipse-platform-49; # always point to latest
 
   eclipse-platform-47 = buildEclipse {
     name = "eclipse-platform-4.7.3a";
@@ -143,17 +143,6 @@ rec {
     };
   };
 
-  eclipse-platform-4_10 = buildEclipse {
-    name = "eclipse-platform-4.10";
-    description = "Eclipse Platform 2018-12";
-    sources = {
-      "x86_64-linux" = fetchurl {
-        url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.10-201812060815/eclipse-platform-4.10-linux-gtk-x86_64.tar.gz;
-        sha512 = "c7f6eb262567b850ee0c3446d3e5379c4e6cf5bb04703a78f09924a113ae6a6ba37bf6e4a33c55de995fd898bfa20d2047ca2c83b153536c5100540153aeddbe";
-      };
-    };
-  };
-
   ### Eclipse Scala SDK
 
   eclipse-scala-sdk = eclipse-scala-sdk-441; # always point to latest
@@ -176,7 +165,7 @@ rec {
 
   ### Eclipse SDK
 
-  eclipse-sdk = eclipse-sdk-4_10; # always point to latest
+  eclipse-sdk = eclipse-sdk-49; # always point to latest
 
   eclipse-sdk-47 = buildEclipse {
     name = "eclipse-sdk-4.7.3a";
@@ -223,17 +212,6 @@ rec {
     };
   };
 
-  eclipse-sdk-4_10 = buildEclipse {
-    name = "eclipse-sdk-4.10";
-    description = "Eclipse 2018-12 Classic";
-    sources = {
-      "x86_64-linux" = fetchurl {
-        url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.10-201812060815/eclipse-SDK-4.10-linux-gtk-x86_64.tar.gz;
-        sha512 = "5e74a0411f56b3973b7c6d8c3727392297d55ad458a814b4cc3f2f6a57dbeebc64852d1a6a958db5c3b08c620093bfb5bcc0d2c6a400f5594b82c2ef5d5fa9fb";
-      };
-    };
-  };
-
   eclipse-sdk-37 = buildEclipse {
     name = "eclipse-sdk-3.7";
     description = "Eclipse Classic";
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index fbe96f2e8fb..30f381644ac 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -470,12 +470,12 @@ rec {
 
   jdt = buildEclipseUpdateSite rec {
     name = "jdt-${version}";
-    version = "4.10";
+    version = "4.9";
 
     src = fetchzip {
       stripRoot = false;
-      url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.10-201812060815/org.eclipse.jdt-4.10.zip;
-      sha256 = "1h11w3zd6xy5w4sk6xnyb2a27wxwhp83qfx67ji7bzdrwbvljqkz";
+      url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.9-201809060745/org.eclipse.jdt-4.9.zip;
+      sha256 = "144rqrw0crxd2v862dqxm2p5y60n4pbzdryv709xnhcw54rycm7n";
     };
 
     meta = with stdenv.lib; {