Merge pull request #325257 from honnip/update-gnome-extensions

gnomeExtensions: auto-update, fix the patches

pkgs/desktops/gnome/extensions/collisions.json

@@ -41,7 +41,8 @@
   ],
   "fuzzy-clock": [
     "fuzzy-clock@keepawayfromfire.co.uk",
-    "FuzzyClock@johngoetz"
+    "FuzzyClock@johngoetz",
+    "FuzzyClock@fire-man-x"
   ],
   "power-profile-indicator": [
     "power-profile-indicator@laux.wtf",

pkgs/desktops/gnome/extensions/extensionOverridesPatches/eepresetselector_at_ulville.github.io.patch

@@ -1,6 +1,19 @@
 --- a/extension.js
 +++ b/extension.js
-@@ -339,9 +339,9 @@ const EEPSIndicator = GObject.registerClass(
+@@ -397,9 +397,9 @@
+                     // String (values are seperated by new line)
+                     keys = listKeyResponse.trim().split('\n');
+                 } else if (appType === 'native') {
+-                    const settings = new Gio.Settings({
+-                        schema_id: 'com.github.wwmm.easyeffects',
+-                    });
++                    const _schema_source = Gio.SettingsSchemaSource.new_from_directory('@easyeffects_gsettings_path@', Gio.SettingsSchemaSource.get_default(), true);
++                    const _schema = _schema_source.lookup('com.github.wwmm.easyeffects', false);
++                    const settings = new Gio.Settings({settings_schema: _schema});
+                     keys = settings.settings_schema.list_keys();
+                 }
+                 // If key names are invalid, try fallback
+@@ -432,9 +432,9 @@
                      _lastUsedInputPreset = _idata.trim().slice(1, -1);
                  } else if (appType === 'native') {
                      // Get last used presets
@@ -10,6 +23,6 @@
 +                    const _schema_source = Gio.SettingsSchemaSource.new_from_directory('@easyeffects_gsettings_path@', Gio.SettingsSchemaSource.get_default(), true);
 +                    const _schema = _schema_source.lookup('com.github.wwmm.easyeffects', false);
 +                    const settings = new Gio.Settings({settings_schema: _schema});
-                     _lastUsedOutputPreset = settings.get_string(
-                         'last-used-output-preset'
-                     );
+                     _lastUsedOutputPreset = settings.get_string(lastOutputKeyName);
+                     _lastUsedInputPreset = settings.get_string(lastInputKeyName);
+                 }

pkgs/desktops/gnome/extensions/extensionOverridesPatches/tophat_at_fflewddur.github.io.patch

@@ -1,13 +1,65 @@
-diff --git a/extension.js b/extension.js
-index 60396f8..b044872 100644
---- a/extension.js
-+++ b/extension.js
-@@ -20,6 +20,8 @@
- 
- /* exported init, enable, disable */
- 
+diff --git a/lib/cpu.js b/lib/cpu.js
+--- a/lib/cpu.js
++++ b/lib/cpu.js
+@@ -21,7 +21,8 @@ import Clutter from 'gi://Clutter';
+ import Gio from 'gi://Gio';
+ import GLib from 'gi://GLib';
+ import GObject from 'gi://GObject';
+-import GTop from 'gi://GTop';
 +imports.gi.GIRepository.Repository.prepend_search_path('@gtop_path@');
-+
- let depFailures = [];
- let missingLibs = [];
++const {default: GTop} = await import('gi://GTop');
+ import St from 'gi://St';
  
+ import {gettext as _, ngettext} from 'resource:///org/gnome/shell/extensions/extension.js';
+diff --git a/lib/fs.js b/lib/fs.js
+--- a/lib/fs.js
++++ b/lib/fs.js
+@@ -21,7 +21,8 @@ import Clutter from 'gi://Clutter';
+ import Gio from 'gi://Gio';
+ import GLib from 'gi://GLib';
+ import GObject from 'gi://GObject';
+-import GTop from 'gi://GTop';
++imports.gi.GIRepository.Repository.prepend_search_path('@gtop_path@');
++const {default: GTop} = await import('gi://GTop');
+ import St from 'gi://St';
+ 
+ import * as Config from './config.js';
+diff --git a/lib/mem.js b/lib/mem.js
+--- a/lib/mem.js
++++ b/lib/mem.js
+@@ -21,7 +21,8 @@ import Clutter from 'gi://Clutter';
+ import Gio from 'gi://Gio';
+ import GLib from 'gi://GLib';
+ import GObject from 'gi://GObject';
+-import GTop from 'gi://GTop';
++imports.gi.GIRepository.Repository.prepend_search_path('@gtop_path@');
++const {default: GTop} = await import('gi://GTop');
+ import St from 'gi://St';
+ 
+ import {gettext as _, ngettext} from 'resource:///org/gnome/shell/extensions/extension.js';
+diff --git a/lib/net.js b/lib/net.js
+--- a/lib/net.js
++++ b/lib/net.js
+@@ -21,7 +21,8 @@ import Clutter from 'gi://Clutter';
+ import Gio from 'gi://Gio';
+ import GLib from 'gi://GLib';
+ import GObject from 'gi://GObject';
+-import GTop from 'gi://GTop';
++imports.gi.GIRepository.Repository.prepend_search_path('@gtop_path@');
++const {default: GTop} = await import('gi://GTop');
+ import St from 'gi://St';
+ 
+ import {gettext as _, ngettext} from 'resource:///org/gnome/shell/extensions/extension.js';
+diff --git a/lib/shared.js b/lib/shared.js
+--- a/lib/shared.js
++++ b/lib/shared.js
+@@ -18,7 +18,8 @@
+ // along with TopHat. If not, see <https://www.gnu.org/licenses/>.
+ 
+ import Gio from 'gi://Gio';
+-import GTop from 'gi://GTop';
++imports.gi.GIRepository.Repository.prepend_search_path('@gtop_path@');
++const {default: GTop} = await import('gi://GTop');
+ import Clutter from 'gi://Clutter';
+ 
+ export const SECOND_AS_MICROSECONDS = 1000000;

pkgs/desktops/gnome/extensions/extensionRenames.nix

@@ -35,6 +35,7 @@
   "kernel-indicator@elboulangero.gitlab.com" = null;
   "kernel-indicator@pvizc.gitlab.com" = "kernel-indicator";
 
+  "FuzzyClock@fire-man-x" = "fuzzy-clock-3";
   "fuzzy-clock@keepawayfromfire.co.uk" = "fuzzy-clock-2";
   "FuzzyClock@johngoetz" = "fuzzy-clock";