push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,22 @@
diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js
index 6eb58f1..28e1195 100644
--- a/extensions/apps-menu/extension.js
+++ b/extensions/apps-menu/extension.js
@@ -10,7 +10,7 @@ import Atk from 'gi://Atk';
import Clutter from 'gi://Clutter';
import Gio from 'gi://Gio';
import GLib from 'gi://GLib';
-import GMenu from 'gi://GMenu';
+import GIRepository from 'gi://GIRepository';
import GObject from 'gi://GObject';
import Gtk from 'gi://Gtk';
import Meta from 'gi://Meta';
@@ -25,6 +25,8 @@ import * as Main from 'resource:///org/gnome/shell/ui/main.js';
import * as PanelMenu from 'resource:///org/gnome/shell/ui/panelMenu.js';
import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
+GIRepository.Repository.prepend_search_path('@gmenu_path@');
+const {default: GMenu} = await import('gi://GMenu');
const appSys = Shell.AppSystem.get_default();
const APPLICATION_ICON_SIZE = 32;

View File

@@ -0,0 +1,25 @@
diff --git a/extensions/system-monitor/extension.js b/extensions/system-monitor/extension.js
index 37d2eb1..232d0d5 100644
--- a/extensions/system-monitor/extension.js
+++ b/extensions/system-monitor/extension.js
@@ -6,9 +6,9 @@
import Clutter from 'gi://Clutter';
import Gio from 'gi://Gio';
+import GIRepository from "gi://GIRepository";
import GLib from 'gi://GLib';
import GObject from 'gi://GObject';
-import GTop from 'gi://GTop';
import Pango from 'gi://Pango';
import Shell from 'gi://Shell';
import St from 'gi://St';
@@ -19,6 +19,9 @@ import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js';
import * as Main from 'resource:///org/gnome/shell/ui/main.js';
+GIRepository.Repository.prepend_search_path('@gtop_path@');
+const GTop = (await import("gi://GTop")).default;
+
const THRESHOLD_HIGH = 0.80;
// adapted from load-graph.cpp in gnome-system-monitor

View File

@@ -0,0 +1,78 @@
{
lib,
stdenv,
fetchurl,
meson,
ninja,
gettext,
pkg-config,
libgtop,
glib,
gnome,
gnome-menus,
replaceVars,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "gnome-shell-extensions";
version = "48.3";
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz";
hash = "sha256-rd40wI9AtjQRvm8dF+I1VQoAkElIceZIHDEpidf0otQ=";
};
patches = [
(replaceVars ./fix_gmenu.patch {
gmenu_path = "${gnome-menus}/lib/girepository-1.0";
})
(replaceVars ./fix_gtop.patch {
gtop_path = "${libgtop}/lib/girepository-1.0";
})
];
nativeBuildInputs = [
meson
ninja
pkg-config
gettext
glib
];
mesonFlags = [ "-Dextension_set=all" ];
preFixup = ''
# Since we do not install the schemas to central location,
# lets link them to where extensions installed
# through the extension portal would look for them.
# Adapted from export-zips.sh in the source.
extensiondir=$out/share/gnome-shell/extensions
schemadir=${glib.makeSchemaPath "$out" "$name"}
for f in $extensiondir/*; do
name=$(basename "''${f%%@*}")
schema=$schemadir/org.gnome.shell.extensions.$name.gschema.xml
schemas_compiled=$schemadir/gschemas.compiled
if [[ -f $schema ]]; then
mkdir "$f/schemas"
ln -s "$schema" "$f/schemas"
ln -s "$schemas_compiled" "$f/schemas"
fi
done
'';
passthru = {
updateScript = gnome.updateScript { packageName = "gnome-shell-extensions"; };
};
meta = with lib; {
homepage = "https://gitlab.gnome.org/GNOME/gnome-shell-extensions";
changelog = "https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/blob/${finalAttrs.version}/NEWS?ref_type=tags";
description = "Modify and extend GNOME Shell functionality and behavior";
teams = [ teams.gnome ];
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
})