From bab0ed75c0207fde57ca80bcf0983ba2e32e1271 Mon Sep 17 00:00:00 2001 From: Vasiliy Solovey Date: Sat, 1 Apr 2017 10:21:19 +0300 Subject: [PATCH 01/10] idea: rename to jetbrains JetBrains IDEs were put under wrong scope which was confusing. Fixes #24453 --- .../editors/{idea => jetbrains}/common.nix | 0 .../editors/{idea => jetbrains}/default.nix | 16 ++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) rename pkgs/applications/editors/{idea => jetbrains}/common.nix (100%) rename pkgs/applications/editors/{idea => jetbrains}/default.nix (98%) diff --git a/pkgs/applications/editors/idea/common.nix b/pkgs/applications/editors/jetbrains/common.nix similarity index 100% rename from pkgs/applications/editors/idea/common.nix rename to pkgs/applications/editors/jetbrains/common.nix diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/jetbrains/default.nix similarity index 98% rename from pkgs/applications/editors/idea/default.nix rename to pkgs/applications/editors/jetbrains/default.nix index e298385f793e7c..8955f2ddba6b13 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -6,10 +6,10 @@ assert stdenv.isLinux; let - mkIdeaProduct = callPackage ./common.nix { }; + mkJetBrainsProduct = callPackage ./common.nix { }; buildClion = { name, version, src, license, description, wmClass }: - (mkIdeaProduct rec { + (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "CLion"; meta = with stdenv.lib; { @@ -25,7 +25,7 @@ let }); buildIdea = { name, version, src, license, description, wmClass }: - (mkIdeaProduct rec { + (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "IDEA"; meta = with stdenv.lib; { @@ -42,7 +42,7 @@ let }); buildRubyMine = { name, version, src, license, description, wmClass }: - (mkIdeaProduct rec { + (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "RubyMine"; meta = with stdenv.lib; { @@ -55,7 +55,7 @@ let }); buildPhpStorm = { name, version, src, license, description, wmClass }: - (mkIdeaProduct { + (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "PhpStorm"; meta = with stdenv.lib; { @@ -72,7 +72,7 @@ let }); buildWebStorm = { name, version, src, license, description, wmClass }: - (mkIdeaProduct { + (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "WebStorm"; meta = with stdenv.lib; { @@ -89,7 +89,7 @@ let }); buildPycharm = { name, version, src, license, description, wmClass }: - (mkIdeaProduct rec { + (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "PyCharm"; meta = with stdenv.lib; { @@ -116,7 +116,7 @@ let }; buildDataGrip = { name, version, src, license, description, wmClass }: - (mkIdeaProduct { + (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "DataGrip"; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e403f303d126ed..f87daa799a56e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13839,7 +13839,7 @@ with pkgs; libart = pkgs.gnome2.libart_lgpl; }; - idea = recurseIntoAttrs (callPackages ../applications/editors/idea { androidsdk = androidsdk_extras; }); + jetbrains = recurseIntoAttrs (callPackages ../applications/editors/jetbrains { androidsdk = androidsdk_extras; }); libquvi = callPackage ../applications/video/quvi/library.nix { }; From 5cb39dd45f3fd4846637ab1874f9e7a3fab04c0c Mon Sep 17 00:00:00 2001 From: Vasiliy Solovey Date: Sat, 1 Apr 2017 10:25:38 +0300 Subject: [PATCH 02/10] clion: 2016.3.3 -> 2017.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 8955f2ddba6b13..de96e8d6e39d37 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -136,12 +136,12 @@ in { clion = buildClion rec { name = "clion-${version}"; - version = "2016.3.3"; + version = "2017.1"; description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "1zziyg0y51lfybflq83qwd94wcypkv4gh0cdkwfybbk4yidpnz05"; + sha256 = "00fc023ca56f2781864cddc7bd5c2897d837d1db17dd8f987abe046ed4df3ca5"; }; wmClass = "jetbrains-clion"; }; From d41dee0a9f3f85eec872171565ebb81e1f4b6bb2 Mon Sep 17 00:00:00 2001 From: Vasiliy Solovey Date: Sat, 1 Apr 2017 10:27:23 +0300 Subject: [PATCH 03/10] clion1: remove package It is no longer present on JetBrains download servers and is very outdated. --- pkgs/applications/editors/jetbrains/default.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index de96e8d6e39d37..6080a9ab8431ad 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -146,18 +146,6 @@ in wmClass = "jetbrains-clion"; }; - clion1 = buildClion rec { - name = "clion-${version}"; - version = "1.2.5"; - description = "C/C++ IDE. New. Intelligent. Cross-platform"; - license = stdenv.lib.licenses.unfree; - src = fetchurl { - url = "https://download.jetbrains.com/cpp/${name}.tar.gz"; - sha256 = "0ll1rcnnbd1if6x5rp3qw35lvp5zdzmvyg9n1lha89i34xiw36jp"; - }; - wmClass = "jetbrains-clion"; - }; - idea14-community = buildIdea rec { name = "idea-community-${version}"; version = "14.1.7"; From 23f5958dd0cf8a80b505a2c0ce633de8bd65ac54 Mon Sep 17 00:00:00 2001 From: Vasiliy Solovey Date: Sat, 1 Apr 2017 10:36:35 +0300 Subject: [PATCH 04/10] datagrip: 2016.3.2 -> 2017.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 6080a9ab8431ad..9e163da70fe1b8 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -328,12 +328,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2016.3.2"; + version = "2017.1"; description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "19njb6i7nl6szql7cy99jmig59b304c6im3988p1dd8dj2j6csv3"; + sha256 = "91ee6a1e43d75a45ae51829835e457da85262410d89e617324d0239ba5625dfa"; }; wmClass = "jetbrains-datagrip"; }; From 3aaf146f0746e10f94f3151cdaa0932f1fbf3495 Mon Sep 17 00:00:00 2001 From: Vasiliy Solovey Date: Sat, 1 Apr 2017 10:45:25 +0300 Subject: [PATCH 05/10] jebrains: sort packages alphabetically --- .../editors/jetbrains/default.nix | 181 +++++++++--------- 1 file changed, 93 insertions(+), 88 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 9e163da70fe1b8..c2bc9d8e170f2d 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -8,6 +8,8 @@ assert stdenv.isLinux; let mkJetBrainsProduct = callPackage ./common.nix { }; + # Sorted alphabetically + buildClion = { name, version, src, license, description, wmClass }: (mkJetBrainsProduct rec { inherit name version src wmClass jdk; @@ -24,31 +26,35 @@ let }; }); - buildIdea = { name, version, src, license, description, wmClass }: - (mkJetBrainsProduct rec { + buildDataGrip = { name, version, src, license, description, wmClass }: + (mkJetBrainsProduct { inherit name version src wmClass jdk; - product = "IDEA"; + product = "DataGrip"; meta = with stdenv.lib; { - homepage = "https://www.jetbrains.com/idea/"; + homepage = "https://www.jetbrains.com/datagrip/"; inherit description license; longDescription = '' - IDE for Java SE, Groovy & Scala development Powerful - environment for building Google Android apps Integration - with JUnit, TestNG, popular SCMs, Ant & Maven. + DataGrip is a new IDE from JetBrains built for database admins. + It allows you to quickly migrate and refactor relational databases, + construct efficient, statically checked SQL queries and much more. ''; - maintainers = with maintainers; [ edwtjo ]; + maintainers = with maintainers; [ loskutov ]; platforms = platforms.linux; }; }); - buildRubyMine = { name, version, src, license, description, wmClass }: + buildIdea = { name, version, src, license, description, wmClass }: (mkJetBrainsProduct rec { inherit name version src wmClass jdk; - product = "RubyMine"; + product = "IDEA"; meta = with stdenv.lib; { - homepage = "https://www.jetbrains.com/ruby/"; + homepage = "https://www.jetbrains.com/idea/"; inherit description license; - longDescription = description; + longDescription = '' + IDE for Java SE, Groovy & Scala development Powerful + environment for building Google Android apps Integration + with JUnit, TestNG, popular SCMs, Ant & Maven. + ''; maintainers = with maintainers; [ edwtjo ]; platforms = platforms.linux; }; @@ -71,23 +77,6 @@ let }; }); - buildWebStorm = { name, version, src, license, description, wmClass }: - (mkJetBrainsProduct { - inherit name version src wmClass jdk; - product = "WebStorm"; - meta = with stdenv.lib; { - homepage = "https://www.jetbrains.com/webstorm/"; - inherit description license; - longDescription = '' - WebStorm provides an editor for HTML, JavaScript (incl. Node.js), - and CSS with on-the-fly code analysis, error prevention and - automated refactorings for JavaScript code. - ''; - maintainers = with maintainers; [ abaldeau ]; - platforms = platforms.linux; - }; - }); - buildPycharm = { name, version, src, license, description, wmClass }: (mkJetBrainsProduct rec { inherit name version src wmClass jdk; @@ -115,25 +104,41 @@ let propagatedUserEnvPkgs = [ python ]; }; - buildDataGrip = { name, version, src, license, description, wmClass }: + buildRubyMine = { name, version, src, license, description, wmClass }: + (mkJetBrainsProduct rec { + inherit name version src wmClass jdk; + product = "RubyMine"; + meta = with stdenv.lib; { + homepage = "https://www.jetbrains.com/ruby/"; + inherit description license; + longDescription = description; + maintainers = with maintainers; [ edwtjo ]; + platforms = platforms.linux; + }; + }); + + buildWebStorm = { name, version, src, license, description, wmClass }: (mkJetBrainsProduct { inherit name version src wmClass jdk; - product = "DataGrip"; + product = "WebStorm"; meta = with stdenv.lib; { - homepage = "https://www.jetbrains.com/datagrip/"; + homepage = "https://www.jetbrains.com/webstorm/"; inherit description license; longDescription = '' - DataGrip is a new IDE from JetBrains built for database admins. - It allows you to quickly migrate and refactor relational databases, - construct efficient, statically checked SQL queries and much more. + WebStorm provides an editor for HTML, JavaScript (incl. Node.js), + and CSS with on-the-fly code analysis, error prevention and + automated refactorings for JavaScript code. ''; - maintainers = with maintainers; [ loskutov ]; + maintainers = with maintainers; [ abaldeau ]; platforms = platforms.linux; }; }); + in { + # Sorted alphabetically + clion = buildClion rec { name = "clion-${version}"; version = "2017.1"; @@ -146,6 +151,18 @@ in wmClass = "jetbrains-clion"; }; + datagrip = buildDataGrip rec { + name = "datagrip-${version}"; + version = "2017.1"; + description = "Your Swiss Army Knife for Databases and SQL"; + license = stdenv.lib.licenses.unfree; + src = fetchurl { + url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; + sha256 = "91ee6a1e43d75a45ae51829835e457da85262410d89e617324d0239ba5625dfa"; + }; + wmClass = "jetbrains-datagrip"; + }; + idea14-community = buildIdea rec { name = "idea-community-${version}"; version = "14.1.7"; @@ -206,40 +223,28 @@ in wmClass = "jetbrains-idea"; }; - ruby-mine = buildRubyMine rec { - name = "ruby-mine-${version}"; - version = "2016.3.2"; - 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 = "1fqlrvhlk09z8nx68qv4nqs5n8ldia3lixsl6r04gsfyl1a69sb6"; - }; - wmClass = "jetbrains-rubymine"; - }; - - ruby-mine7 = buildRubyMine rec { - name = "ruby-mine-${version}"; - version = "7.1.5"; - description = "The Most Intelligent Ruby and Rails IDE"; + phpstorm = buildPhpStorm rec { + name = "phpstorm-${version}"; + version = "2017.1"; + description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "04fcxj1xlap9mxmwf051s926p2darlj5kwl4lms2gy5d8b2lhd5l"; + url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; + sha256 = "1ynffm5x8fqq2r71rr9rbvdifbwbvbhqb2x1hkyy4az38gxal1bm"; }; - wmClass = "jetbrains-rubymine"; + wmClass = "jetbrains-phpstorm"; }; - ruby-mine8 = buildRubyMine rec { - name = "ruby-mine-${version}"; - version = "8.0.4"; - description = "The Most Intelligent Ruby and Rails IDE"; + phpstorm10 = buildPhpStorm rec { + name = "phpstorm-${version}"; + version = "10.0.4"; + description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "0hipxib7377232w1jbf8h98bmh0djkllsrq3lq0w3fdxqglma43a"; + url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; + sha256 = "0fi042zvjpg5pn2mnhj3bbrdkl1b9vmhpf2l6ca4nr0rhjjv7dsm"; }; - wmClass = "jetbrains-rubymine"; + wmClass = "jetbrains-phpstorm"; }; pycharm-community = buildPycharm rec { @@ -266,28 +271,40 @@ in wmClass = "jetbrains-pycharm"; }; - phpstorm = buildPhpStorm rec { - name = "phpstorm-${version}"; - version = "2017.1"; - description = "Professional IDE for Web and PHP developers"; + ruby-mine = buildRubyMine rec { + name = "ruby-mine-${version}"; + version = "2016.3.2"; + description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "1ynffm5x8fqq2r71rr9rbvdifbwbvbhqb2x1hkyy4az38gxal1bm"; + url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; + sha256 = "1fqlrvhlk09z8nx68qv4nqs5n8ldia3lixsl6r04gsfyl1a69sb6"; }; - wmClass = "jetbrains-phpstorm"; + wmClass = "jetbrains-rubymine"; }; - phpstorm10 = buildPhpStorm rec { - name = "phpstorm-${version}"; - version = "10.0.4"; - description = "Professional IDE for Web and PHP developers"; + ruby-mine7 = buildRubyMine rec { + name = "ruby-mine-${version}"; + version = "7.1.5"; + description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "0fi042zvjpg5pn2mnhj3bbrdkl1b9vmhpf2l6ca4nr0rhjjv7dsm"; + url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; + sha256 = "04fcxj1xlap9mxmwf051s926p2darlj5kwl4lms2gy5d8b2lhd5l"; }; - wmClass = "jetbrains-phpstorm"; + wmClass = "jetbrains-rubymine"; + }; + + ruby-mine8 = buildRubyMine rec { + name = "ruby-mine-${version}"; + version = "8.0.4"; + 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 = "0hipxib7377232w1jbf8h98bmh0djkllsrq3lq0w3fdxqglma43a"; + }; + wmClass = "jetbrains-rubymine"; }; webstorm = buildWebStorm rec { @@ -325,16 +342,4 @@ in }; wmClass = "jetbrains-webstorm"; }; - - datagrip = buildDataGrip rec { - name = "datagrip-${version}"; - version = "2017.1"; - description = "Your Swiss Army Knife for Databases and SQL"; - license = stdenv.lib.licenses.unfree; - src = fetchurl { - url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "91ee6a1e43d75a45ae51829835e457da85262410d89e617324d0239ba5625dfa"; - }; - wmClass = "jetbrains-datagrip"; - }; } From f8832fb2771791cb27703aa9ef33b5c4e471bf61 Mon Sep 17 00:00:00 2001 From: Vasiliy Solovey Date: Sat, 1 Apr 2017 11:48:52 +0300 Subject: [PATCH 06/10] rider: init at 171.3655.1246 --- .../applications/editors/jetbrains/common.nix | 4 ++ .../editors/jetbrains/default.nix | 40 ++++++++++++++++++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index 839f537843d096..a7ac367f048acc 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -63,6 +63,10 @@ with stdenv; lib.makeOverridable mkDerivation rec { makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \ --prefix PATH : "$out/libexec/${name}:${stdenv.lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ + # Some internals want libstdc++.so.6 + stdenv.cc.cc.lib + ]}" \ --set JDK_HOME "$jdk" \ --set ${hiName}_JDK "$jdk" \ --set ANDROID_JAVA_HOME "$jdk" \ diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index c2bc9d8e170f2d..f91aa6b2cdd7c4 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf +{ lib, stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf , coreutils, gnugrep, which, git, python, unzip, p7zip , androidsdk, jdk }: @@ -104,6 +104,32 @@ let propagatedUserEnvPkgs = [ python ]; }; + buildRider = { name, version, src, license, description, wmClass }: + lib.overrideDerivation (mkJetBrainsProduct rec { + inherit name version src wmClass jdk; + product = "Rider"; + meta = with stdenv.lib; { + homepage = "https://www.jetbrains.com/rider/"; + inherit description license; + longDescription = '' + JetBrains Rider is a new .NET IDE based on the IntelliJ + platform and ReSharper. Rider supports .NET Core, + .NET Framework and Mono based projects. This lets you + develop a wide array of applications including .NET desktop + apps, services and libraries, Unity games, ASP.NET and + ASP.NET Core web applications. + ''; + maintainers = [ maintainers.miltador ]; + platforms = platforms.linux; + }; + }) (attrs: { + patchPhase = attrs.patchPhase + '' + # Patch built-in mono for ReSharperHost to start successfully + interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) + patchelf --set-interpreter "$interpreter" lib/ReSharperHost/linux-x64/mono/bin/mono-sgen + ''; + }); + buildRubyMine = { name, version, src, license, description, wmClass }: (mkJetBrainsProduct rec { inherit name version src wmClass jdk; @@ -271,6 +297,18 @@ in wmClass = "jetbrains-pycharm"; }; + rider = buildRider rec { + name = "rider-${version}"; + version = "171.3655.1246"; + description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; + license = stdenv.lib.licenses.unfree; + src = fetchurl { + url = "https://download.jetbrains.com/resharper/riderRS-${version}.tar.gz"; + sha256 = "90f9f8f1919e0f1dad42387f1a308483448323b089c13c409f3dd4d52992266b"; + }; + wmClass = "jetbrains-rider"; + }; + ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; version = "2016.3.2"; From 1d170e1f820a1818cd8e52bddd5207de5217588b Mon Sep 17 00:00:00 2001 From: Vasiliy Solovey Date: Sat, 1 Apr 2017 11:54:16 +0300 Subject: [PATCH 07/10] ruby-mine: 2016.3.2 -> 2017.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index f91aa6b2cdd7c4..db5320da8a18c6 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -311,12 +311,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2016.3.2"; + version = "2017.1"; 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 = "1fqlrvhlk09z8nx68qv4nqs5n8ldia3lixsl6r04gsfyl1a69sb6"; + sha256 = "6c27f43ddc385ffba2cb2f011b80ab46d9b128d0fccf3b4ea43272fe36401a3a"; }; wmClass = "jetbrains-rubymine"; }; From 7bd4b1cdbd6461de4bdfcfb33f6bf03b610e35b3 Mon Sep 17 00:00:00 2001 From: Vasiliy Solovey Date: Sat, 1 Apr 2017 12:04:06 +0300 Subject: [PATCH 08/10] gogland: init at 171.3780.106 --- .../editors/jetbrains/default.nix | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index db5320da8a18c6..7e9c5e48ad0281 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -43,6 +43,24 @@ let }; }); + buildGogland = { name, version, src, license, description, wmClass }: + (mkJetBrainsProduct { + inherit name version src wmClass jdk; + product = "Gogland"; + meta = with stdenv.lib; { + homepage = "https://www.jetbrains.com/go/"; + inherit description license; + longDescription = '' + Gogland is the codename for a new commercial IDE by JetBrains + aimed at providing an ergonomic environment for Go development. + The new IDE extends the IntelliJ platform with the coding assistance + and tool integrations specific for the Go language + ''; + maintainers = [ maintainers.miltador ]; + platforms = platforms.linux; + }; + }); + buildIdea = { name, version, src, license, description, wmClass }: (mkJetBrainsProduct rec { inherit name version src wmClass jdk; @@ -189,6 +207,18 @@ in wmClass = "jetbrains-datagrip"; }; + gogland = buildGogland rec { + name = "gogland-${version}"; + version = "171.3780.106"; + description = "Up and Coming Go IDE"; + license = stdenv.lib.licenses.unfree; + src = fetchurl { + url = "https://download.jetbrains.com/go/${name}.tar.gz"; + sha256 = "cbe84d07fdec6425d8ac63b0ecd5e04148299c1c0c6d05751523aaaa9360110b"; + }; + wmClass = "jetbrains-gogland"; + }; + idea14-community = buildIdea rec { name = "idea-community-${version}"; version = "14.1.7"; From 4fc2a867952d583ada03e482c379fc24e9476bfa Mon Sep 17 00:00:00 2001 From: Vasiliy Solovey Date: Sat, 1 Apr 2017 12:46:27 +0300 Subject: [PATCH 09/10] rl-notes 17.09: add note about idea -> jetbrains renaming --- nixos/doc/manual/release-notes/rl-1709.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index bd999b60013359..5fba4c34ec82f2 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -35,6 +35,8 @@ following incompatible changes: + Top-level idea package collection was renamed. + All JetBrains IDEs are now at jetbrains. From 68db8222b633ff20b61199941274547d87edac9f Mon Sep 17 00:00:00 2001 From: Vasiliy Solovey Date: Mon, 3 Apr 2017 04:21:30 +0300 Subject: [PATCH 10/10] jetbrains: add alias for idea --- pkgs/top-level/aliases.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 324e2d35cfd254..48db8f47295ca0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -62,6 +62,7 @@ doNotDisplayTwice rec { gnustep-make = gnustep.make; # added 2016-7-6 htmlTidy = html-tidy; # added 2014-12-06 iana_etc = iana-etc; # added 2017-03-08 + idea = jetbrains; # added 2017-04-03 inherit (haskell.compiler) jhc uhc; # 2015-05-15 inotifyTools = inotify-tools; joseki = apache-jena-fuseki; # added 2016-02-28