public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

idea.idea-ultimate: 2016.2 -> 2016.2.2

Browse Source 
Clean up builds on the way.
This commit is contained in:
Robin Gloster 2016-08-24 20:42:29 +00:00
parent 075e33a682
commit 5e3294d6a6
2 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/idea/common.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip { stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip
, coreutils, gnugrep, which, git, python, unzip }: , 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; with stdenv.lib;
@ -11,7 +11,7 @@ let loName = toLower product;
in in
with stdenv; lib.makeOverridable mkDerivation rec { with stdenv; lib.makeOverridable mkDerivation rec {
inherit name build src meta; inherit name src meta;
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = execName; name = execName;
exec = execName; exec = execName;

42
pkgs/applications/editors/idea/default.nix
View File

@ -6,13 +6,11 @@
assert stdenv.isLinux; assert stdenv.isLinux;
let let
bnumber = with stdenv.lib; build: last (splitString "-" build);
mkIdeaProduct = callPackage ./common.nix { }; mkIdeaProduct = callPackage ./common.nix { };
buildClion = { name, version, build, src, license, description, wmClass }: buildClion = { name, version, src, license, description, wmClass }:
(mkIdeaProduct rec { (mkIdeaProduct rec {
inherit name version build src wmClass jdk; inherit name version src wmClass jdk;
product = "CLion"; product = "CLion";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://www.jetbrains.com/clion/"; 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 { (mkIdeaProduct rec {
inherit name version build src wmClass jdk; inherit name version src wmClass jdk;
product = "IDEA"; product = "IDEA";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://www.jetbrains.com/idea/"; 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 { (mkIdeaProduct rec {
inherit name version build src wmClass jdk; inherit name version src wmClass jdk;
product = "RubyMine"; product = "RubyMine";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://www.jetbrains.com/ruby/"; 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 { (mkIdeaProduct {
inherit name version build src wmClass jdk; inherit name version src wmClass jdk;
product = "PhpStorm"; product = "PhpStorm";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://www.jetbrains.com/phpstorm/"; 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 { (mkIdeaProduct {
inherit name version build src wmClass jdk; inherit name version src wmClass jdk;
product = "WebStorm"; product = "WebStorm";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://www.jetbrains.com/webstorm/"; 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 { (mkIdeaProduct rec {
inherit name version build src wmClass jdk; inherit name version src wmClass jdk;
product = "PyCharm"; product = "PyCharm";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://www.jetbrains.com/pycharm/"; homepage = "https://www.jetbrains.com/pycharm/";
@ -120,11 +118,9 @@ let
in in
{ {
clion = buildClion rec { clion = buildClion rec {
name = "clion-${version}"; name = "clion-${version}";
version = "1.2.5"; version = "1.2.5";
build = "CL-143.2370.46";
description = "C/C++ IDE. New. Intelligent. Cross-platform"; description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = stdenv.lib.licenses.unfree; license = stdenv.lib.licenses.unfree;
src = fetchurl { src = fetchurl {
@ -137,7 +133,6 @@ in
idea14-community = buildIdea rec { idea14-community = buildIdea rec {
name = "idea-community-${version}"; name = "idea-community-${version}";
version = "14.1.7"; version = "14.1.7";
build = "IC-141.3058.30";
description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20; license = stdenv.lib.licenses.asl20;
src = fetchurl { src = fetchurl {
@ -150,7 +145,6 @@ in
idea-community = buildIdea rec { idea-community = buildIdea rec {
name = "idea-community-${version}"; name = "idea-community-${version}";
version = "2016.2"; version = "2016.2";
build = "IC-162.1121";
description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20; license = stdenv.lib.licenses.asl20;
src = fetchurl { src = fetchurl {
@ -163,7 +157,6 @@ in
idea14-ultimate = buildIdea rec { idea14-ultimate = buildIdea rec {
name = "idea-ultimate-${version}"; name = "idea-ultimate-${version}";
version = "14.1.7"; version = "14.1.7";
build = "IU-141.3058.30";
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree; license = stdenv.lib.licenses.unfree;
src = fetchurl { src = fetchurl {
@ -176,7 +169,6 @@ in
idea15-ultimate = buildIdea rec { idea15-ultimate = buildIdea rec {
name = "idea-ultimate-${version}"; name = "idea-ultimate-${version}";
version = "15.0.6"; version = "15.0.6";
build = "IU-143.2370.31";
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree; license = stdenv.lib.licenses.unfree;
src = fetchurl { src = fetchurl {
@ -188,13 +180,12 @@ in
idea-ultimate = buildIdea rec { idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}"; name = "idea-ultimate-${version}";
version = "2016.2"; version = "2016.2.2";
build = "IU-162.1121";
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree; license = stdenv.lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz"; url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz";
sha256 = "10hiqh6ccmai2cnc5p72vqjcz9kzmmcpn0hy5v514h4mq6vs4zk4"; sha256 = "1z5kr47n3hhx0ck163193lwlh76sykgchnq9hw1ihi25n6655j1z";
}; };
wmClass = "jetbrains-idea"; wmClass = "jetbrains-idea";
}; };
@ -202,7 +193,6 @@ in
ruby-mine = buildRubyMine rec { ruby-mine = buildRubyMine rec {
name = "ruby-mine-${version}"; name = "ruby-mine-${version}";
version = "7.1.5"; version = "7.1.5";
build = "RM-141.3058.29";
description = "The Most Intelligent Ruby and Rails IDE"; description = "The Most Intelligent Ruby and Rails IDE";
license = stdenv.lib.licenses.unfree; license = stdenv.lib.licenses.unfree;
src = fetchurl { src = fetchurl {
@ -215,7 +205,6 @@ in
pycharm-community = buildPycharm rec { pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}"; name = "pycharm-community-${version}";
version = "2016.1.3"; version = "2016.1.3";
build = "PC-145.971.25";
description = "PyCharm Community Edition"; description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20; license = stdenv.lib.licenses.asl20;
src = fetchurl { src = fetchurl {
@ -228,7 +217,6 @@ in
pycharm-professional = buildPycharm rec { pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}"; name = "pycharm-professional-${version}";
version = "2016.1.3"; version = "2016.1.3";
build = "PY-145.971.25";
description = "PyCharm Professional Edition"; description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree; license = stdenv.lib.licenses.unfree;
src = fetchurl { src = fetchurl {
@ -241,7 +229,6 @@ in
phpstorm = buildPhpStorm rec { phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}"; name = "phpstorm-${version}";
version = "10.0.4"; version = "10.0.4";
build = "PS-143.2370.33";
description = "Professional IDE for Web and PHP developers"; description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree; license = stdenv.lib.licenses.unfree;
src = fetchurl { src = fetchurl {
@ -254,7 +241,6 @@ in
webstorm = buildWebStorm rec { webstorm = buildWebStorm rec {
name = "webstorm-${version}"; name = "webstorm-${version}";
version = "10.0.5"; version = "10.0.5";
build = "WS-141.3058.35";
description = "Professional IDE for Web and JavaScript development"; description = "Professional IDE for Web and JavaScript development";
license = stdenv.lib.licenses.unfree; license = stdenv.lib.licenses.unfree;
src = fetchurl { src = fetchurl {