Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c8c673568c8a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fa6e946383e5
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 28, 2017

  1. eclipse-platform: 4.6.2 -> 4.7

    @rycee
    rycee committed Jun 28, 2017
    Copy the full SHA
    0a52cc1 View commit details

  2. eclipse-sdk: 4.6.2 -> 4.7

    @rycee
    rycee committed Jun 28, 2017
    Copy the full SHA
    556a867 View commit details

  3. eclipse-plugin-jdt: 4.6.2 -> 4.7

    @rycee
    rycee committed Jun 28, 2017
    Copy the full SHA
    fa6e946 View commit details
Showing with 35 additions and 5 deletions.
  1. +32 −2 pkgs/applications/editors/eclipse/default.nix
  2. +3 −3 pkgs/applications/editors/eclipse/plugins.nix
34 changes: 32 additions & 2 deletions pkgs/applications/editors/eclipse/default.nix
View file
Original file line number Diff line number Diff line change
@@ -93,7 +93,7 @@ rec {

### Eclipse Platform

eclipse-platform = eclipse-platform-46; # always point to latest
eclipse-platform = eclipse-platform-47; # always point to latest

eclipse-platform-46 = buildEclipse {
name = "eclipse-platform-4.6.2";
@@ -110,6 +110,21 @@ rec {
};
};

eclipse-platform-47 = buildEclipse {
name = "eclipse-platform-4.7";
description = "Eclipse Platform Oxygen";
sources = {
"x86_64-linux" = fetchurl {
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-platform-4.7-linux-gtk-x86_64.tar.gz;
sha256 = "0hrgijydxvd2zz1npv5qw8d79f48a6lsdw3qy1wqf7k59aqyg2fq";
};
"i686-linux" = fetchurl {
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-platform-4.7-linux-gtk.tar.gz;
sha256 = "00m89j26m8nj190q144wx8d88mldx1z6i797p8isg3rhbz3x5dbc";
};
};
};

### Eclipse Scala SDK

eclipse-scala-sdk = eclipse-scala-sdk-441; # always point to latest
@@ -132,7 +147,7 @@ rec {

### Eclipse SDK

eclipse-sdk = eclipse-sdk-46; # always point to latest
eclipse-sdk = eclipse-sdk-47; # always point to latest

eclipse-sdk-46 = buildEclipse {
name = "eclipse-sdk-4.6.2";
@@ -149,6 +164,21 @@ rec {
};
};

eclipse-sdk-47 = buildEclipse {
name = "eclipse-sdk-4.7";
description = "Eclipse Oxygen Classic";
sources = {
"x86_64-linux" = fetchurl {
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-SDK-4.7-linux-gtk-x86_64.tar.gz;
sha256 = "1nz0hl0gg4a8iffnaggbhdw0ra8a7wljlimvijbbybh0nhvfd9n3";
};
"i686-linux" = fetchurl {
url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-SDK-4.7-linux-gtk.tar.gz;
sha256 = "0dar69v7d7bkl18si45bccvil809a85ghb7k88m1q2cq1kd2r8z5";
};
};
};

eclipse-sdk-37 = buildEclipse {
name = "eclipse-sdk-3.7";
description = "Eclipse Classic";
6 changes: 3 additions & 3 deletions pkgs/applications/editors/eclipse/plugins.nix
View file
Original file line number Diff line number Diff line change
@@ -364,12 +364,12 @@ rec {

jdt = buildEclipseUpdateSite rec {
name = "jdt-${version}";
version = "4.6.2";
version = "4.7";

src = fetchzip {
stripRoot = false;
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.2-201611241400/org.eclipse.jdt-4.6.2.zip";
sha256 = "1nnlrl05lh1hcsh14dlisnx0vwmj21agm4wia98rv0gl2gkp19n1";
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/org.eclipse.jdt-4.7.zip";
sha256 = "0y17shnlh90gg9226lraknvdnp2i71ck91dnxbbzvxl8b64v8v1p";
};

meta = with stdenv.lib; {