Merge pull request #201931 from kouyk/update/jetbrains

pkgs/applications/editors/jetbrains/default.nix

@@ -93,10 +93,10 @@ let
       };
     });
 
-  buildGateway = { pname, version, src, license, description, wmClass, ... }:
+  buildGateway = { pname, version, src, license, description, wmClass, product, ... }:
     (mkJetBrainsProduct {
-      inherit pname version src wmClass jdk;
-      product = "Gateway";
+      inherit pname version src wmClass jdk product;
+      productShort = "Gateway";
       meta = with lib; {
         homepage = "https://www.jetbrains.com/remote-development/gateway/";
         inherit description license platforms;
@@ -127,9 +127,9 @@ let
     }).overrideAttrs (attrs: {
       postFixup = (attrs.postFixup or "") + lib.optionalString stdenv.isLinux ''
         interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
-        patchelf --set-interpreter $interp $out/goland*/plugins/go/lib/dlv/linux/dlv
+        patchelf --set-interpreter $interp $out/goland*/plugins/go-plugin/lib/dlv/linux/dlv
 
-        chmod +x $out/goland*/plugins/go/lib/dlv/linux/dlv
+        chmod +x $out/goland*/plugins/go-plugin/lib/dlv/linux/dlv
 
         # fortify source breaks build since delve compiles with -O0
         wrapProgram $out/bin/goland \
@@ -328,6 +328,7 @@ in
 
   gateway = buildGateway rec {
     pname = "gateway";
+    product = "JetBrains Gateway";
     version = products.gateway.version;
     description = "Your single entry point to all remote development environments";
     license = lib.licenses.unfree;

pkgs/applications/editors/jetbrains/update.py

@@ -64,7 +64,7 @@ def update_product(name, product):
             build = latest_build(channel)
             new_version = build["@version"]
             new_build_number = build["@fullNumber"]
-            if "EAP" not in channel["@name"]:
+            if all(x not in channel["@name"] for x in ["EAP", "Gateway"]):
                 version_or_build_number = new_version
             else:
                 version_or_build_number = new_build_number