Merge pull request #31974 from rittelle/fix-goland

Rename Jetbrains' Go IDE Gogland to goland
This commit is contained in:
Jörg Thalheim 2017-11-24 11:36:27 +00:00 committed by GitHub
commit 17b9d12df8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -77,15 +77,15 @@ let
}; };
}); });
buildGogland = { name, version, src, license, description, wmClass, update-channel }: buildGoland = { name, version, src, license, description, wmClass, update-channel }:
lib.overrideDerivation (mkJetBrainsProduct { lib.overrideDerivation (mkJetBrainsProduct {
inherit name version src wmClass jdk; inherit name version src wmClass jdk;
product = "Gogland"; product = "Goland";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://www.jetbrains.com/go/; homepage = https://www.jetbrains.com/go/;
inherit description license; inherit description license;
longDescription = '' longDescription = ''
Gogland is the codename for a new commercial IDE by JetBrains Goland is the codename for a new commercial IDE by JetBrains
aimed at providing an ergonomic environment for Go development. aimed at providing an ergonomic environment for Go development.
The new IDE extends the IntelliJ platform with the coding assistance The new IDE extends the IntelliJ platform with the coding assistance
and tool integrations specific for the Go language and tool integrations specific for the Go language
@ -96,9 +96,9 @@ let
}) (attrs: { }) (attrs: {
postFixup = (attrs.postFixup or "") + '' postFixup = (attrs.postFixup or "") + ''
interp="$(cat $NIX_CC/nix-support/dynamic-linker)" interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
patchelf --set-interpreter $interp $out/gogland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv patchelf --set-interpreter $interp $out/goland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv
chmod +x $out/gogland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv chmod +x $out/goland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv
''; '';
}); });
@ -239,28 +239,28 @@ in
datagrip = buildDataGrip rec { datagrip = buildDataGrip rec {
name = "datagrip-${version}"; name = "datagrip-${version}";
version = "2017.2.2"; /* updated by script */ version = "2017.2.3"; /* updated by script */
description = "Your Swiss Army Knife for Databases and SQL"; description = "Your Swiss Army Knife for Databases and SQL";
license = stdenv.lib.licenses.unfree; license = stdenv.lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
sha256 = "1l8y65fw9g5ckzwpcgigm2qwy8fhpw2hil576rphsnx6qvnh4swn"; /* updated by script */ sha256 = "0yp5h8ps5hfi07gsz14pp61skibfx48klg8qmc4f6q6xzcfdqxsf"; /* updated by script */
}; };
wmClass = "jetbrains-datagrip"; wmClass = "jetbrains-datagrip";
update-channel = "datagrip_2017_2"; update-channel = "datagrip_2017_2";
}; };
gogland = buildGogland rec { goland = buildGoland rec {
name = "gogland-${version}"; name = "goland-${version}";
version = "173.2696.28"; /* updated by script */ version = "173.3727.79"; /* updated by script */
description = "Up and Coming Go IDE"; description = "Up and Coming Go IDE";
license = stdenv.lib.licenses.unfree; license = stdenv.lib.licenses.unfree;
src = fetchurl { src = fetchurl {
url = "https://download.jetbrains.com/go/${name}.tar.gz"; url = "https://download.jetbrains.com/go/${name}.tar.gz";
sha256 = "07nz2pf7fnjxsvc82vihk2i880cji349czxzshr1dk50ixlydq7n"; /* updated by script */ sha256 = "0bmd7r3h76pg0s9m3i5qv7zfkcj3gannj0c12cw087b831ga7ccz"; /* updated by script */
}; };
wmClass = "jetbrains-gogland"; wmClass = "jetbrains-goland";
update-channel = "gogland_1.0_EAP"; update-channel = "goland_1.0_EAP";
}; };
idea-community = buildIdea rec { idea-community = buildIdea rec {