jetbrains: normalize file names

The main script only does a single program, and requires being fed the
name. This is a wrapper to get those names.

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

@@ -1,41 +0,0 @@
-{ 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

@@ -0,0 +1,12 @@
+#!/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-jetbrains

@@ -7,6 +7,7 @@ import re
 import requests
 import subprocess as sp
 import sys
+import unicodedata
 import urllib
 
 from lxml import etree
@@ -35,6 +36,7 @@ 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
 
 
@@ -195,8 +197,10 @@ def prefetch(plugin, build, url=None):
         ["nix-prefetch-url", "--name", plugin.filename(), url], capture_output=True,
     )
     if not res.stdout:
-        raise IOError(f"nix-prefetch-url {plugin} failed: {res.stderr.decode('utf-8')}")
+        raise IOError(
-    return res.stdout.decode("utf-8").strip()
+            f"nix-prefetch-url {plugin} failed: {res.stderr.decode('unicode-escape')}"
+        )
+    return res.stdout.decode("unicode-escape").strip()
 
 
 def custom_license(short, full, url, free=False):

pkgs/applications/editors/jetbrains/updater.nix

@@ -0,0 +1,26 @@
+{ 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