BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #7008 from bendlas/jetbrains

Browse source 
idea.ruby-mine: 7.0 -> 7.0.4
idea.clion: eap update
openjdk8: add home location as passthrough
This commit is contained in:
Edward Tjörnhammar 2015-03-26 20:50:24 +01:00
commit ba555339f4
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/editors/idea/default.nix
View file

@ -205,14 +205,14 @@ in
};
clion = buildClion rec {
name = "clion-${version}";
name = "clion-${build}";
version = "eap";
build = "140.1740.3";
build = "141.102.4";
description = "C/C++ IDE. New. Intelligent. Cross-platform.";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/${name}-${build}.tar.gz";
sha256 = "1hpsq37hq61id836wg5j6l3xapln6qdkqa10r3ig2p1rs2hq7i9y";
url = "https://download.jetbrains.com/cpp/${name}.tar.gz";
sha256 = "0qjm8wxqn171wfd7yqf5ys1g4mwl0iyhlbry29jkgkikxp7h9dym";
};
};
@ -242,13 +242,13 @@ in
ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}";
version = "7.0";
build = "135.1104";
version = "7.0.4";
build = "139.1231";
description = "The Most Intelligent Ruby and Rails IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
sha256 = "0xsx44gaddarkw5k4yjidzwkayf2xvsxklfzdnzcck4rg4vyk4v4";
sha256 = "08b0iwccb5w9b1yk0kbs99r5mxkcyxqs9mkr57wb5j71an80yx38";
};
};

8
pkgs/development/compilers/openjdk/openjdk8.nix
View file

@ -37,8 +37,7 @@ let
url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
sha256 = "1np8hkg2fmj5s6ipd1vb8x0z6xy00kbi2ipqca9pxzib58caj6b2";
};
in
stdenv.mkDerivation {
openjdk8 = stdenv.mkDerivation {
name = "openjdk-8u${update}b${build}";
srcs = [jdk8 langtools hotspot corba jdk jaxws jaxp nashorn];
outputs = [ "out" "jre" ];
@ -138,5 +137,6 @@ stdenv.mkDerivation {
maintainers = [ stdenv.lib.maintainers.cocreature ];
platforms = stdenv.lib.platforms.linux;
};
}
passthru.home = "${openjdk8}/lib/openjdk";
}; in openjdk8