jetbrains: include small set of generated IDEA plugins

Some edge cases but appears to work on my machine (TM).

Still TODO is setting up the job to generate and commit updates.

bin/update-jetbrains-plugins.py

@@ -7,7 +7,6 @@ import re
 import requests
 import subprocess as sp
 import sys
-import unicodedata
 import urllib
 
 from lxml import etree
@@ -36,7 +35,6 @@ def to_slug(name):
     slug = name.replace(" ", "-").lstrip(".")
     for char in ",/;'\\<>:\"|!@#$%^&*()":
         slug = slug.replace(char, "")
-    slug = unicodedata.normalize("NFD", slug).encode("ascii", "ignore").decode("utf-8")
     return slug
 
 
@@ -197,10 +195,8 @@ def prefetch(plugin, build, url=None):
         ["nix-prefetch-url", "--name", plugin.filename(), url], capture_output=True,
     )
     if not res.stdout:
-        raise IOError(
+        raise IOError(f"nix-prefetch-url {plugin} failed: {res.stderr.decode('utf-8')}")
-            f"nix-prefetch-url {plugin} failed: {res.stderr.decode('unicode-escape')}"
+    return res.stdout.decode("utf-8").strip()
-        )
-    return res.stdout.decode("unicode-escape").strip()
 
 
 def custom_license(short, full, url, free=False):

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

@@ -0,0 +1,41 @@
+{ lib, stdenv, fetchzip }:
+
+self:
+
+let
+
+  commonBuild = import ../../../build-support/jetbrains/plugin.nix {
+    inherit lib stdenv fetchzip;
+    jetbrainsPlatforms = [
+      "clion"
+      "datagrip"
+      "goland"
+      "idea-community"
+      "idea-ultimate"
+      "phpstorm"
+      "pycharm-community"
+      "pycharm-professional"
+      "rider"
+      "ruby-mine"
+      "webstorm"
+    ];
+  };
+
+  generateCommon = lib.makeOverridable ({
+    common ? ./manual-common-packages.nix
+  }: let
+
+    imported = import common {
+      inherit (self) callPackage;
+    };
+
+    super = imported;
+
+    overrides = { };
+
+    jetbrainsPlugins = super // overrides;
+
+  in jetbrainsPlugins // { inherit commonBuild; });
+
+in generateCommon { }
+

pkgs/applications/editors/jetbrains/update-jetbrains

@@ -1,12 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell --show-trace ./updater.nix -i bash
-
-set -e
-
-for app in $APPS; do
-  ./updater-jetbrains $app -o ${app#-[0-9.]*}-generated.nix
-done
-
-# Local Variables:
-# mode: sh
-# End:

pkgs/applications/editors/jetbrains/updater.nix

@@ -1,26 +0,0 @@
-{ pkgs ? import <nixpkgs> { } }:
-let
-  inherit (pkgs.stdenv) lib;
-in
-pkgs.mkShell {
-  buildInputs = [
-    pkgs.bash
-  ];
-
-  APPS = lib.mapAttrsToList
-    (k: v: v.name)
-    {
-      inherit (pkgs.jetbrains)
-        clion
-        datagrip
-        goland
-        idea-community
-        idea-ultimate
-        phpstorm
-        pycharm-community
-        pycharm-professional
-        rider
-        ruby-mine
-        webstorm;
-    };
-}

pkgs/applications/editors/jetbrains/wrapper.nix

@@ -39,7 +39,7 @@ runCommand
   for plugin in $plugins; do
     local pluginName=$(basename $plugin)
     pluginName=''${pluginName#*-}
-    pluginName=''${pluginName%-[0-9.]*}
+    pluginName=''${pluginName%-([0-9].)*}
     ln -s $plugin $out/$packageName/plugins/$pluginName
   done