Merge pull request #215175: gnomeExtensions: auto-update

pkgs/desktops/gnome/extensions/collisions.json

@@ -187,6 +187,10 @@
       "lockkeys@vaina.lt",
       "lockkeys@fawtytoo"
     ],
+    "clipboard-indicator": [
+      "clipboard-indicator@tudmotu.com",
+      "clipboard-indicator@Dieg0Js.github.io"
+    ],
     "noannoyance": [
       "noannoyance@sindex.com",
       "noannoyance@daase.net"
@@ -221,10 +225,22 @@
       "workspace-indicator@gnome-shell-extensions.gcampax.github.com",
       "horizontal-workspace-indicator@tty2.io"
     ],
+    "clipboard-indicator": [
+      "clipboard-indicator@tudmotu.com",
+      "clipboard-indicator@Dieg0Js.github.io"
+    ],
+    "keep-awake": [
+      "KeepAwake@jepfa.de",
+      "awake@vixalien.com"
+    ],
     "noannoyance": [
       "noannoyance@sindex.com",
       "noannoyance@daase.net"
     ],
+    "battery-time": [
+      "batime@martin.zurowietz.de",
+      "batterytime@typeof.pw"
+    ],
     "floating-panel": [
       "floating-panel@aylur",
       "floating-panel-usedbymyself@wpism"

pkgs/desktops/gnome/extensions/extensionRenames.nix

@@ -12,17 +12,23 @@
   "workspace-indicator@gnome-shell-extensions.gcampax.github.com" = "workspace-indicator";
   "horizontal-workspace-indicator@tty2.io" = "workspace-indicator-2";
 
-  # no source repository can be found for this extension
-  "floating-panel@aylur" = "floating-panel";
-  "floating-panel-usedbymyself@wpism" = null;
+  "clipboard-indicator@tudmotu.com" = "clipboard-indicator";
+  "clipboard-indicator@Dieg0Js.github.io" = "clipboard-indicator-2";
 
-  # forks of each other, azan@faissal.bensefia.id is more recent
-  "azan@faissal.bensefia.id" = "azan-islamic-prayer-times";
-  "azan@hatem.masmoudi.org" = null;
+  # DEPRECATED: Use "Caffeine" instead
+  "KeepAwake@jepfa.de" = "keep-awake";
+  "awake@vixalien.com" = null;
 
   "noannoyance@sindex.com" = "noannoyance";
   "noannoyance@daase.net" = "noannoyance-2";
 
+  "batime@martin.zurowietz.de" = "battery-time";
+  "batterytime@typeof.pw" = "battery-time-2";
+
+  # no source repository can be found for this extension
+  "floating-panel@aylur" = "floating-panel";
+  "floating-panel-usedbymyself@wpism" = null;
+
   # ############################################################################
   # These are conflicts for older extensions (i.e. they don't support the latest GNOME version).
   # Make sure to move them up once they are updated
@@ -85,6 +91,10 @@
   "transparent-window@pbxqdown.github.com" = "transparent-window";
   "transparentwindows.mdirshad07" = null;
 
+  # Forks of each other, azan@faissal.bensefia.id is more recent
+  "azan@faissal.bensefia.id" = "azan-islamic-prayer-times";
+  "azan@hatem.masmoudi.org" = null;
+
   # That extension is broken because of https://github.com/NixOS/nixpkgs/issues/118612
   "flypie@schneegans.github.com" = null;