From 5e3294d6a65b76e00cf00121951dd9c65c6fbe71 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 24 Aug 2016 20:42:29 +0000 Subject: idea.idea-ultimate: 2016.2 -> 2016.2.2 Clean up builds on the way. --- pkgs/applications/editors/idea/common.nix | 4 +-- pkgs/applications/editors/idea/default.nix | 42 ++++++++++-------------------- 2 files changed, 16 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/editors/idea/common.nix b/pkgs/applications/editors/idea/common.nix index 370660398516..839f537843d0 100644 --- a/pkgs/applications/editors/idea/common.nix +++ b/pkgs/applications/editors/idea/common.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip , coreutils, gnugrep, which, git, python, unzip }: -{ name, product, version, build, src, wmClass, jdk, meta } @ attrs: +{ name, product, version, src, wmClass, jdk, meta } @ attrs: with stdenv.lib; @@ -11,7 +11,7 @@ let loName = toLower product; in with stdenv; lib.makeOverridable mkDerivation rec { - inherit name build src meta; + inherit name src meta; desktopItem = makeDesktopItem { name = execName; exec = execName; diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index c113b63390fa..06573f22a1a5 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -6,13 +6,11 @@ assert stdenv.isLinux; let - - bnumber = with stdenv.lib; build: last (splitString "-" build); mkIdeaProduct = callPackage ./common.nix { }; - buildClion = { name, version, build, src, license, description, wmClass }: + buildClion = { name, version, src, license, description, wmClass }: (mkIdeaProduct rec { - inherit name version build src wmClass jdk; + inherit name version src wmClass jdk; product = "CLion"; meta = with stdenv.lib; { homepage = "https://www.jetbrains.com/clion/"; @@ -26,9 +24,9 @@ let }; }); - buildIdea = { name, version, build, src, license, description, wmClass }: + buildIdea = { name, version, src, license, description, wmClass }: (mkIdeaProduct rec { - inherit name version build src wmClass jdk; + inherit name version src wmClass jdk; product = "IDEA"; meta = with stdenv.lib; { homepage = "https://www.jetbrains.com/idea/"; @@ -43,9 +41,9 @@ let }; }); - buildRubyMine = { name, version, build, src, license, description, wmClass }: + buildRubyMine = { name, version, src, license, description, wmClass }: (mkIdeaProduct rec { - inherit name version build src wmClass jdk; + inherit name version src wmClass jdk; product = "RubyMine"; meta = with stdenv.lib; { homepage = "https://www.jetbrains.com/ruby/"; @@ -56,9 +54,9 @@ let }; }); - buildPhpStorm = { name, version, build, src, license, description, wmClass }: + buildPhpStorm = { name, version, src, license, description, wmClass }: (mkIdeaProduct { - inherit name version build src wmClass jdk; + inherit name version src wmClass jdk; product = "PhpStorm"; meta = with stdenv.lib; { homepage = "https://www.jetbrains.com/phpstorm/"; @@ -73,9 +71,9 @@ let }; }); - buildWebStorm = { name, version, build, src, license, description, wmClass }: + buildWebStorm = { name, version, src, license, description, wmClass }: (mkIdeaProduct { - inherit name version build src wmClass jdk; + inherit name version src wmClass jdk; product = "WebStorm"; meta = with stdenv.lib; { homepage = "https://www.jetbrains.com/webstorm/"; @@ -90,9 +88,9 @@ let }; }); - buildPycharm = { name, version, build, src, license, description, wmClass }: + buildPycharm = { name, version, src, license, description, wmClass }: (mkIdeaProduct rec { - inherit name version build src wmClass jdk; + inherit name version src wmClass jdk; product = "PyCharm"; meta = with stdenv.lib; { homepage = "https://www.jetbrains.com/pycharm/"; @@ -120,11 +118,9 @@ let in { - clion = buildClion rec { name = "clion-${version}"; version = "1.2.5"; - build = "CL-143.2370.46"; description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { @@ -137,7 +133,6 @@ in idea14-community = buildIdea rec { name = "idea-community-${version}"; version = "14.1.7"; - build = "IC-141.3058.30"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { @@ -150,7 +145,6 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; version = "2016.2"; - build = "IC-162.1121"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { @@ -163,7 +157,6 @@ in idea14-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; version = "14.1.7"; - build = "IU-141.3058.30"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { @@ -176,7 +169,6 @@ in idea15-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; version = "15.0.6"; - build = "IU-143.2370.31"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { @@ -188,13 +180,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2016.2"; - build = "IU-162.1121"; + version = "2016.2.2"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"; - sha256 = "10hiqh6ccmai2cnc5p72vqjcz9kzmmcpn0hy5v514h4mq6vs4zk4"; + sha256 = "1z5kr47n3hhx0ck163193lwlh76sykgchnq9hw1ihi25n6655j1z"; }; wmClass = "jetbrains-idea"; }; @@ -202,7 +193,6 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; version = "7.1.5"; - build = "RM-141.3058.29"; description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { @@ -215,7 +205,6 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; version = "2016.1.3"; - build = "PC-145.971.25"; description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { @@ -228,7 +217,6 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; version = "2016.1.3"; - build = "PY-145.971.25"; description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { @@ -241,7 +229,6 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; version = "10.0.4"; - build = "PS-143.2370.33"; description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { @@ -254,7 +241,6 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; version = "10.0.5"; - build = "WS-141.3058.35"; description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { -- cgit 1.4.1