jetbrains: update IDEA for generated plugins

pkgs/applications/editors/jetbrains/common-plugins.nix

@@ -4,7 +4,7 @@ self:
 
 let
 
-  commonBuild = import ../../../build-support/jetbrains/plugin.nix {
+  commonBuild = import ../../../build-support/jetbrains/plugin-old.nix {
     inherit lib stdenv fetchzip;
     jetbrainsPlatforms = [
       "clion"

pkgs/applications/editors/jetbrains/idea-plugins.nix

@@ -1,19 +1,19 @@
-{ lib, stdenv, fetchzip }:
+{ lib, stdenv, variant }:
 
 self:
 
 let
 
   ideaBuild = import ../../../build-support/jetbrains/plugin.nix {
-    inherit lib stdenv fetchzip;
+    inherit lib stdenv variant;
     jetbrainsPlatforms = [ "idea-community" "idea-ultimate" ];
   };
 
   generateIdea = lib.makeOverridable ({
-    idea ? ./manual-idea-packages.nix
+    generated ? ./idea-generated.nix
   }: let
 
-    imported = import idea {
+    imported = import generated {
       inherit (self) callPackage;
     };
 
@@ -26,4 +26,3 @@ let
   in ideaPlugins // { inherit ideaBuild; });
 
 in generateIdea { }
-

pkgs/applications/editors/jetbrains/wrapper.nix

@@ -21,11 +21,13 @@ in
 assert assertMsg (length badPlugins == 0) errorMsg;
 
 appendToName "with-plugins" (package.overrideAttrs (oldAttrs: {
-  passthru = { inherit plugins; };
+  inherit plugins;
-  # TODO: Purely aesthetics, but link the plugin to its name instead of hash-name-version
+  # TODO: Remove version from directory name
   installPhase = oldAttrs.installPhase + ''
     for plugin in $plugins; do
-      ln -s "$plugin" "$out/$name/plugins/$(basename $plugin)"
+      local dirname=$(basename "$plugin")
+      dirname=''${dirname:33}
+      ln -s "$plugin" "$out/$name/plugins/$dirname"
     done
   '';
 }))

pkgs/build-support/jetbrains/plugin-old.nix

@@ -0,0 +1,33 @@
+{ lib
+, stdenv
+, fetchzip
+, jetbrainsPlatforms
+}:
+
+{ pluginId
+, pname
+, version
+, versionId
+, sha256
+, filename ? "${pname}-${version}.zip"
+}:
+
+stdenv.mkDerivation {
+  inherit pname version;
+
+  src = fetchzip {
+    inherit sha256;
+    url = "https://plugins.jetbrains.com/files/${toString pluginId}/${toString versionId}/${filename}";
+  };
+
+  passthru = { inherit jetbrainsPlatforms; };
+
+  installPhase = ''
+    mkdir $out
+    cp -r * $out/
+  '';
+
+  meta = {
+    homepage = "https://plugins.jetbrains.com/plugin/${pluginId}-${lib.toLower pname}";
+  };
+}

pkgs/build-support/jetbrains/plugin.nix

@@ -1,33 +1,71 @@
 { lib
 , stdenv
-, fetchzip
+, variant
 , jetbrainsPlatforms
 }:
 
-{ pluginId
+with lib;
-, pname
-, version
-, versionId
-, sha256
-, filename ? "${pname}-${version}.zip"
-}:
 
-stdenv.mkDerivation {
+{ pname
+, version
+
+, plugname
+, plugid
+
+, buildInputs ? []
+, packageRequires ? []
+, meta ? {}
+
+, ...
+}@args:
+
+let
+
+  defaultMeta = {
+    broken = false;
+    platforms = variant.meta.platforms;
+  } // optionalAttrs ((args.src.meta.homepage or "") != "") {
+    homepage = args.src.meta.homepage;
+  } // optionalAttrs ((args.src.meta.description or "") != "") {
+    description = args.src.meta.description;
+  };
+
+in
+
+stdenv.mkDerivation ({
   inherit pname version;
 
-  src = fetchzip {
+  unpackCmd = ''
-    inherit sha256;
+    case "$curSrc" in
-    url = "https://plugins.jetbrains.com/files/${toString pluginId}/${toString versionId}/${filename}";
+      *.jar)
-  };
+        # don't unpack; keep original source filename without the hash
-
+        local filename=$(basename "$curSrc")
-  passthru = { inherit jetbrainsPlatforms; };
+        filename="''${filename:33}"
-
+        cp $curSrc $filename
-  installPhase = ''
+        chmod +w $filename
-    mkdir $out
+        sourceRoot="."
-    cp -r * $out/
+        ;;
+      *)
+        _defaultUnpack "$curSrc"
+        ;;
+    esac
   '';
 
-  meta = {
+  # FIXME: Entirely possible this isn't correct for niche plugins;
-    homepage = "https://plugins.jetbrains.com/plugin/${pluginId}-${lib.toLower pname}";
+  # at the very least there are some plugins that come with JS
-  };
+  installPhase = ''
+    mkdir -p "$out/lib"
+    find -iname '*.jar' -exec cp {} "$out/lib/" \;
+  '';
+
+  buildInputs = [ ] ++ packageRequires ++ buildInputs;
+  propagatedBuildInputs = packageRequires;
+
+  passthru = { inherit jetbrainsPlatforms plugid plugname; };
+
+  doCheck = false;
+
+  meta = defaultMeta // meta;
 }
+
+// removeAttrs args [ "buildInputs" "packageRequires" "meta" ])

pkgs/top-level/jetbrains-plugins.nix

@@ -13,7 +13,7 @@ let
   };
 
   mkIdeaPlugins = import ../applications/editors/jetbrains/idea-plugins.nix {
-    inherit lib stdenv fetchzip;
+    inherit lib stdenv variant;
   };
 
   jetbrainsWithPlugins = import ../applications/editors/jetbrains/wrapper.nix {