From 24ddfc7c38d0cb6f6348874be04bdb34a72ed7cd Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 26 Mar 2015 19:02:11 +0100 Subject: [PATCH 1/2] passthru.home in openjdk8, similar to other jdks --- pkgs/development/compilers/openjdk/openjdk8.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix index 55b7ff36f8fa..d7bcabd0a781 100644 --- a/pkgs/development/compilers/openjdk/openjdk8.nix +++ b/pkgs/development/compilers/openjdk/openjdk8.nix @@ -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 From df0c059f83b9bf079398c0257c032870b9328eca Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 26 Mar 2015 19:02:51 +0100 Subject: [PATCH 2/2] Update Jetbrains IDE versions --- pkgs/applications/editors/idea/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 61d508936b8b..9c4683b8c9e0 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -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"; }; };