gnomeExtensions: integrate manually packaged extensions better with the others

Their keys are now not used directly. Instead, we go the standard route of mapping to the
UUID in order to apply the rename procedure. This makes sure the manual override always does
the correct thing, and also gives us more consistency overall.

pkgs/desktops/gnome/extensions/arcmenu/default.nix

···
 
   makeFlags = [ "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" ];
 
-  passthru.extensionUuid = "[e-mail]";
+  passthru = {
+    extensionUuid = "[e-mail]";
+    extensionPortalSlug = "arcmenu";
+  };
 
   meta = with lib; {
     description = "Application menu for GNOME Shell, designed to provide a more traditional user experience and workflow";

pkgs/desktops/gnome/extensions/caffeine/default.nix

···
     sha256 = "0dyagnjmk91h96xr98mc177c473bqpxcv86qf6g3kyh3arwa9shs";
   };
 
-  passthru.extensionUuid = "[e-mail]";
+  passthru = {
+   extensionPortalSlug = "caffeine";
+   extensionUuid = "[e-mail]";
+  };
 
   nativeBuildInputs = [
     glib gettext

pkgs/desktops/gnome/extensions/clock-override/default.nix

···
     stripRoot = false;
   };
 
-  passthru.extensionUuid = "[e-mail]";
+  passthru = {
+    extensionUuid = "[e-mail]";
+    extensionPortalSlug = "clock-override";
+  };
 
   nativeBuildInputs = [ gettext glib ];
 

pkgs/desktops/gnome/extensions/dash-to-dock/default.nix

···
     "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions"
   ];
 
-  passthru.extensionUuid = "[e-mail]";
+  passthru = {
+    extensionUuid = "[e-mail]";
+    extensionPortalSlug = "dash-to-dock";
+  };
 
   meta = with lib; {
     description = "A dock for the Gnome Shell";

pkgs/desktops/gnome/extensions/dash-to-panel/default.nix

···
 
   makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ];
 
-  passthru.extensionUuid = "[e-mail]";
+  passthru = {
+    extensionUuid = "[e-mail]";
+    extensionPortalSlug = "dash-to-panel";
+  };
 
   meta = with lib; {
     description = "An icon taskbar for Gnome Shell";

pkgs/desktops/gnome/extensions/default.nix

···
 { lib
 , callPackage
+, callPackages
 , config
 }:
 let
···
   gnome40Extensions = mapUuidNames (produceExtensionsList "40");
 
   gnomeExtensions = lib.recurseIntoAttrs (
-    (mapReadableNames (produceExtensionsList "40"))
-    // (callPackage ./manuallyPackaged.nix {})
+    (mapReadableNames
+      (lib.attrValues (gnome40Extensions // (callPackages ./manuallyPackaged.nix {})))
+    )
     // lib.optionalAttrs (config.allowAliases or true) {
       unite-shell = gnomeExtensions.unite; # added 2021-01-19
       arc-menu = gnomeExtensions.arcmenu; # added 2021-02-14

pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix

···
     sha256 = "0igfxgrjdqq6z6xg4rsawxn261pk25g5dw2pm3bhwz5sqsy4bq3i";
   };
 
-  passthru.extensionUuid = "[e-mail]";
+  passthru = {
+    extensionUuid = "[e-mail]";
+    extensionPortalSlug = "drop-down-terminal";
+  };
 
   patches = [
     (substituteAll {

pkgs/desktops/gnome/extensions/emoji-selector/default.nix

···
     sha256 = "0x60pg5nl5d73av494dg29hyfml7fbf2d03wm053vx1q8a3pxbyb";
   };
 
-  passthru.extensionUuid = "[e-mail]";
+  passthru = {
+    extensionUuid = "[e-mail]";
+    extensionPortalSlug = "emoji-selector";
+  };
 
   nativeBuildInputs = [ glib ];
 

pkgs/desktops/gnome/extensions/extensionRenames.nix

···
   "lockkeys@fawtytoo" = "lock-keys-2";
 
 
+
+  # ############################################################################
   # These are conflicts for 3.38 extensions. They will very probably come back
   # once more of them support 40.
 
···
 
   # That extension is broken because of https://github.com/NixOS/nixpkgs/issues/118612
   #"[e-mail]" = null;
+
+
+
+  # ############################################################################
+  # Overrides for extensions that were manually packaged in the past but are gradually
+  # being replaced by automatic packaging where possible.
+  #
+  # The manually packaged ones:
+  "[e-mail]" = "easyScreenCast"; # extensionPortalSlug is "easyscreencast"
+  "[e-mail]" = "fuzzy-app-search"; # extensionPortalSlug is "gnome-fuzzy-app-search"
+  "[e-mail]" = "topicons-plus"; # extensionPortalSlug is "topicons"
+  "paperwm@hedning:matrix.org" = "paperwm"; # is not on extensions.gnome.org
+  "[e-mail]" = "no-title-bar"; # extensionPortalSlug is "no-title-bar-forked"
+  # These extensions are automatically packaged at the moment. We preserve the old attribute name
+  # for backwards compatibility.
+  "[e-mail]" = "appindicator"; # extensionPortalSlug is "appindicator-support"
+  "[e-mail]" = "disable-unredirect"; # extensionPortalSlug is "disable-unredirect-fullscreen-windows"
+  "[e-mail]" = "draw-on-your-screen"; # extensionPortalSlug is "draw-on-you-screen"
+  "timepp@zagortenay333" = "timepp"; # extensionPortalSlug is "time"
+  "windowIsReady_Remover@[e-mail]" = "window-is-ready-remover"; # extensionPortalSlug is "window-is-ready-notification-remover"
 }

pkgs/desktops/gnome/extensions/freon/default.nix

···
   pname = "gnome-shell-extension-freon";
   version = "44";
 
-  passthru.extensionUuid = "freon@UshakovVasilii_Github.yahoo.com";
+  passthru = {
+    extensionUuid = "freon@UshakovVasilii_Github.yahoo.com";
+    extensionPortalSlug = "freon";
+  };
 
   src = fetchFromGitHub {
     owner = "UshakovVasilii";

pkgs/desktops/gnome/extensions/gsconnect/default.nix

···
     done
   '';
 
-  passthru.extensionUuid = "[e-mail]";
+  passthru = {
+    extensionUuid = "[e-mail]";
+    extensionPortalSlug = "gsconnect";
+  };
 
   passthru = {
     tests = {

pkgs/desktops/gnome/extensions/icon-hider/default.nix

···
     sha256 = "18c8zkdrmdbghqqz7b450vhgpykgz25mgigwn2nggcb2lxmvm9ks";
   };
 
-  passthru.extensionUuid = "[e-mail]";
+  passthru = {
+    extensionUuid = "[e-mail]";
+    extensionPortalSlug = "icon-hider";
+  };
 
   installPhase = ''
     runHook preInstall

pkgs/desktops/gnome/extensions/impatience/default.nix

···
     runHook postInstall
   '';
 
-  passthru.extensionUuid = "[e-mail]";
+  passthru = {
+    extensionUuid = "[e-mail]";
+    extensionPortalSlug = "impatience";
+  };
 
   meta = with lib; {
     description = "Speed up builtin gnome-shell animations";

pkgs/desktops/gnome/extensions/manuallyPackaged.nix

···
 { callPackage }:
 {
-  appindicator = callPackage ./appindicator { };
-  arcmenu = callPackage ./arcmenu { };
-  caffeine = callPackage ./caffeine { };
-  clipboard-indicator = callPackage ./clipboard-indicator { };
-  clock-override = callPackage ./clock-override { };
-  dash-to-dock = callPackage ./dash-to-dock { };
-  dash-to-panel = callPackage ./dash-to-panel { };
-  disable-unredirect = callPackage ./disable-unredirect { };
-  draw-on-your-screen = callPackage ./draw-on-your-screen { };
-  drop-down-terminal = callPackage ./drop-down-terminal { };
-  dynamic-panel-transparency = callPackage ./dynamic-panel-transparency { };
-  easyScreenCast = callPackage ./EasyScreenCast { };
-  emoji-selector = callPackage ./emoji-selector { };
-  freon = callPackage ./freon { };
-  fuzzy-app-search = callPackage ./fuzzy-app-search { };
-  gsconnect = callPackage ./gsconnect { };
-  hot-edge = callPackage ./hot-edge { };
-  icon-hider = callPackage ./icon-hider { };
-  impatience = callPackage ./impatience { };
-  material-shell = callPackage ./material-shell { };
-  mpris-indicator-button = callPackage ./mpris-indicator-button { };
-  night-theme-switcher = callPackage ./night-theme-switcher { };
-  no-title-bar = callPackage ./no-title-bar { };
-  noannoyance = callPackage ./noannoyance { };
-  paperwm = callPackage ./paperwm { };
-  pidgin-im-integration = callPackage ./pidgin-im-integration { };
-  sound-output-device-chooser = callPackage ./sound-output-device-chooser { };
-  system-monitor = callPackage ./system-monitor { };
-  taskwhisperer = callPackage ./taskwhisperer { };
-  tilingnome = callPackage ./tilingnome { };
-  timepp = callPackage ./timepp { };
-  topicons-plus = callPackage ./topicons-plus { };
-  unite = callPackage ./unite { };
-  window-corner-preview = callPackage ./window-corner-preview { };
-  window-is-ready-remover = callPackage ./window-is-ready-remover { };
-  workspace-matrix = callPackage ./workspace-matrix { };
+  "[e-mail]" = callPackage ./appindicator { };
+  "[e-mail]" = callPackage ./arcmenu { };
+  "[e-mail]" = callPackage ./caffeine { };
+  "[e-mail]" = callPackage ./clipboard-indicator { };
+  "[e-mail]" = callPackage ./clock-override { };
+  "[e-mail]" = callPackage ./dash-to-dock { };
+  "[e-mail]" = callPackage ./dash-to-panel { };
+  "[e-mail]" = callPackage ./disable-unredirect { };
+  "[e-mail]" = callPackage ./draw-on-your-screen { };
+  "[e-mail]" = callPackage ./drop-down-terminal { };
+  "[e-mail]" = callPackage ./dynamic-panel-transparency { };
+  "[e-mail]" = callPackage ./EasyScreenCast { };
+  "[e-mail]" = callPackage ./emoji-selector { };
+  "freon@UshakovVasilii_Github.yahoo.com" = callPackage ./freon { };
+  "[e-mail]" = callPackage ./fuzzy-app-search { };
+  "[e-mail]" = callPackage ./gsconnect { };
+  "[e-mail]" = callPackage ./hot-edge { };
+  "[e-mail]" = callPackage ./icon-hider { };
+  "[e-mail]" = callPackage ./impatience { };
+  "material-shell@papyelgringo" = callPackage ./material-shell { };
+  "[e-mail]" = callPackage ./mpris-indicator-button { };
+  "[e-mail]" = callPackage ./night-theme-switcher { };
+  "[e-mail]" = callPackage ./noannoyance { };
+  "[e-mail]" = callPackage ./no-title-bar { };
+  "paperwm@hedning:matrix.org" = callPackage ./paperwm { };
+  "pidgin@muffinmad" = callPackage ./pidgin-im-integration { };
+  "[e-mail]" = callPackage ./sound-output-device-chooser { };
+  "[e-mail]" = callPackage ./system-monitor { };
+  "[e-mail]" = callPackage ./taskwhisperer { };
+  "[e-mail]" = callPackage ./tilingnome { };
+  "timepp@zagortenay333" = callPackage ./timepp { };
+  "[e-mail]" = callPackage ./topicons-plus { };
+  "[e-mail]" = callPackage ./unite { };
+  "[e-mail]" = callPackage ./window-corner-preview { };
+  "windowIsReady_Remover@[e-mail]" = callPackage ./window-is-ready-remover { };
+  "[e-mail]" = callPackage ./workspace-matrix { };
 }

pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix

···
   nativeBuildInputs = [ unzip ];
   buildInputs = [ glib gnome.gnome-shell ];
 
-  passthru.extensionUuid = "[e-mail]";
+  passthru = {
+    extensionUuid = "[e-mail]";
+    extensionPortalSlug = "night-theme-switcher";
+  };
 
   installPhase = ''
     runHook preInstall

pkgs/desktops/gnome/extensions/no-title-bar/default.nix

···
 
   makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ];
 
-  passthru.extensionUuid = "[e-mail]";
+  passthru = {
+    extensionUuid = "[e-mail]";
+  };
 
   meta = with lib; {
     description = "Integrates maximized windows with the top panel";

pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix

···
     runHook postInstall
   '';
 
-  passthru.extensionUuid = "pidgin@muffinmad";
+  passthru = {
+    extensionUuid = "pidgin@muffinmad";
+    extensionPortalSlug = "pidgin-im-integration";
+  };
 
   meta = with lib; {
     homepage = "https://github.com/muffinmad/pidgin-im-gnome-shell-extension";

pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix

···
 
   dontBuild = true;
 
-  passthru.extensionUuid = "[e-mail]";
+  passthru = {
+    extensionUuid = "[e-mail]";
+    extensionPortalSlug = "sound-output-device-chooser";
+  };
 
   makeFlags = [
     "INSTALL_DIR=${placeholder "out"}/share/gnome-shell/extensions"

pkgs/desktops/gnome/extensions/system-monitor/default.nix

···
     runHook postInstall
   '';
 
-  passthru.extensionUuid = "[e-mail]";
+  passthru = {
+    extensionUuid = "[e-mail]";
+    extensionPortalSlug = "system-monitor";
+  };
 
   meta = with lib; {
     description = "Display system informations in gnome shell status bar";

pkgs/desktops/gnome/extensions/taskwhisperer/default.nix

···
     taskwarrior
   ];
 
-  passthru.extensionUuid = "[e-mail]";
+  passthru = {
+    extensionUuid = "[e-mail]";
+    extensionPortalSlug = "taskwhisperer";
+  };
 
   makeFlags = [
     "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions"

pkgs/desktops/gnome/extensions/tilingnome/default.nix

···
     runHook postInstall
   '';
 
-  passthru.extensionUuid = "[e-mail]";
+  passthru = {
+    extensionUuid = "[e-mail]";
+    extensionPortalSlug = "tilingnome";
+  };
 
   meta = with lib; {
     description = "Tiling window management for GNOME Shell";

pkgs/desktops/gnome/extensions/unite/default.nix

···
     sha256 = "sha256-Ys2kWPj/FugW/LkvLAZdbj7Ufg/KShC+EX6QrjKNVH8=";
   };
 
-  passthru.extensionUuid = "[e-mail]";
+  passthru = {
+    extensionUuid = "[e-mail]";
+    extensionPortalSlug = "unite";
+  };
 
   nativeBuildInputs = [ glib ];
 

pkgs/desktops/gnome/extensions/window-corner-preview/default.nix

···
 
   dontBuild = true;
 
-  passthru.extensionUuid = "[e-mail]";
+  passthru = {
+    extensionUuid = "[e-mail]";
+    extensionPortalSlug = "window-corner-preview";
+  };
+
   installPhase = ''
     runHook preInstall
     mkdir -p $out/share/gnome-shell/extensions