From b2b995f65af29343a28d596c03994a1be9f6273b Mon Sep 17 00:00:00 2001 From: rittelle <33598633+rittelle@users.noreply.github.com> Date: Thu, 23 Nov 2017 15:51:52 +0100 Subject: [PATCH 1/2] jetbrains.goland: renamed from jetbrains.gogland Product renamed to match the name used on the Product website and inside the update.xml used by the update script. This also updated the version to 173.3727.79. --- .../editors/jetbrains/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 746da7534e6..730bbbdf489 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -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 { inherit name version src wmClass jdk; - product = "Gogland"; + product = "Goland"; 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 + Goland 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 @@ -96,9 +96,9 @@ let }) (attrs: { postFixup = (attrs.postFixup or "") + '' 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 ''; }); @@ -250,17 +250,17 @@ in update-channel = "datagrip_2017_2"; }; - gogland = buildGogland rec { - name = "gogland-${version}"; - version = "173.2696.28"; /* updated by script */ + goland = buildGoland rec { + name = "goland-${version}"; + version = "173.3727.79"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "07nz2pf7fnjxsvc82vihk2i880cji349czxzshr1dk50ixlydq7n"; /* updated by script */ + sha256 = "0bmd7r3h76pg0s9m3i5qv7zfkcj3gannj0c12cw087b831ga7ccz"; /* updated by script */ }; - wmClass = "jetbrains-gogland"; - update-channel = "gogland_1.0_EAP"; + wmClass = "jetbrains-goland"; + update-channel = "goland_1.0_EAP"; }; idea-community = buildIdea rec { From beee8119b82a5aefb772fe34d6230cb3bca0d813 Mon Sep 17 00:00:00 2001 From: rittelle <33598633+rittelle@users.noreply.github.com> Date: Thu, 23 Nov 2017 15:54:03 +0100 Subject: [PATCH 2/2] jetbrains.datagrip: 2017.2.2 -> 2017.2.3 --- 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 730bbbdf489..fabb0982d46 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -239,12 +239,12 @@ in datagrip = buildDataGrip rec { 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"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "1l8y65fw9g5ckzwpcgigm2qwy8fhpw2hil576rphsnx6qvnh4swn"; /* updated by script */ + sha256 = "0yp5h8ps5hfi07gsz14pp61skibfx48klg8qmc4f6q6xzcfdqxsf"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "datagrip_2017_2";