diff options
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r-- | pkgs/applications/editors/eclipse/default.nix | 16 | ||||
-rw-r--r-- | pkgs/applications/editors/emacs-modes/magit/default.nix | 11 |
2 files changed, 21 insertions, 6 deletions
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index a9ee85d905e0..3be08f4496c8 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -160,6 +160,22 @@ in { }; }; + eclipse_cpp_42 = buildEclipse { + name = "eclipse-cpp-4.2"; + description = "Eclipse IDE for C/C++ Developers"; + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = http://eclipse.ialto.com/technology/epp/downloads/release/juno/SR2/eclipse-cpp-juno-SR2-linux-gtk-x86_64.tar.gz; + sha256 = "1qq04926pf7v9sf3s0z53zvlbl1j0rmmjmbmhqi49473fnjikh7y"; + } + else + fetchurl { + url = http://eclipse.ialto.com/technology/epp/downloads/release/juno/SR2/eclipse-cpp-juno-SR2-linux-gtk.tar.gz; + sha256 = "1a4s9qlhfpfpdhvffyglnfdr3dq5r2ywcxqywhqi95yhq5nmsgyk"; + }; + }; + eclipse_sdk_42 = buildEclipse { name = "eclipse-sdk-4.2"; description = "Eclipse Classic"; diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix index 580b2761fa97..a9149a0f919b 100644 --- a/pkgs/applications/editors/emacs-modes/magit/default.nix +++ b/pkgs/applications/editors/emacs-modes/magit/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchurl, emacs, texinfo, unzip }: +{ stdenv, fetchurl, emacs, texinfo }: let version = "1.2.0"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "magit-${version}"; src = fetchurl { - url = "https://github.com/magit/magit/zipball/${version}"; - sha256 = "1877s8ikvcb457mmljmw366h6pgg4zzx98qfazhqj8snl4yqsj4i"; - name = "magit-${version}.zip"; + url = "https://github.com/downloads/magit/magit/${name}.tar.gz"; + sha256 = "1a8vvilhd5y5vmlpsh194qpl4qlg0a1brylfscxcacpfp0cmhlzg"; }; - buildInputs = [ emacs texinfo unzip ]; + buildInputs = [ emacs texinfo ]; configurePhase = "makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc )"; |