Merge pull request #315046 from honnip/fix-gnome-extensions-test
nixosTests.gnome-extensions: fix test
This commit is contained in:
@@ -84,7 +84,6 @@ import ./make-test-python.nix (
|
||||
"dash-to-dock"
|
||||
"dash-to-panel"
|
||||
"ddterm"
|
||||
"emoji-selector"
|
||||
"gsconnect"
|
||||
"system-monitor-next"
|
||||
"desktop-icons-ng-ding"
|
||||
@@ -138,11 +137,11 @@ import ./make-test-python.nix (
|
||||
# Enable and optionally disable
|
||||
|
||||
machine.succeed(f"${run "gnome-extensions enable {extension}"}")
|
||||
checkState("ENABLED", extension)
|
||||
checkState("ACTIVE", extension)
|
||||
|
||||
if disable:
|
||||
machine.succeed(f"${run "gnome-extensions disable {extension}"}")
|
||||
checkState("DISABLED", extension)
|
||||
checkState("INACTIVE", extension)
|
||||
''
|
||||
+ lib.concatLines (map (e: ''checkExtension("${e}", False)'') alwaysOnExtensions)
|
||||
+ lib.concatLines (map (e: ''checkExtension("${e}", True)'') testExtensions)
|
||||
|
||||
@@ -15,8 +15,6 @@
|
||||
, netcat-gnu
|
||||
, nvme-cli
|
||||
, procps
|
||||
, pulseaudio
|
||||
, python3
|
||||
, smartmontools
|
||||
, substituteAll
|
||||
, touchegg
|
||||
@@ -107,14 +105,6 @@ super: lib.trivial.pipe super [
|
||||
];
|
||||
}))
|
||||
|
||||
(patchExtension "mullvadindicator@pobega.github.com" (old: {
|
||||
patches = [
|
||||
# Patch from https://github.com/Pobega/gnome-shell-extension-mullvad-indicator/pull/36
|
||||
# tweaked to drop the Makefile changes to fix application
|
||||
./extensionOverridesPatches/mullvadindicator_at_pobega.github.com.patch
|
||||
];
|
||||
}))
|
||||
|
||||
(patchExtension "pano@elhan.io" (old: {
|
||||
patches = [
|
||||
(substituteAll {
|
||||
|
||||
-25
@@ -1,25 +0,0 @@
|
||||
From ea472538fc73e9ab81e50183444dbb256d32ecc0 Mon Sep 17 00:00:00 2001
|
||||
From: Sergio Rubio <rubiojr@rbel.co>
|
||||
Date: Wed, 27 Mar 2024 20:43:38 +0100
|
||||
Subject: [PATCH] Bump GNOME desktop version
|
||||
|
||||
The extension is 46 compatible.
|
||||
|
||||
---
|
||||
metadata.json | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/metadata.json b/metadata.json
|
||||
index bc0e272..e647258 100644
|
||||
--- a/metadata.json
|
||||
+++ b/metadata.json
|
||||
@@ -3,7 +3,8 @@
|
||||
"description": "Mullvad connection status indicator",
|
||||
"uuid": "mullvadindicator@pobega.github.com",
|
||||
"shell-version": [
|
||||
- "45"
|
||||
+ "45",
|
||||
+ "46"
|
||||
],
|
||||
"url": "https://github.com/Pobega/gnome-shell-extension-mullvad-indicator",
|
||||
"settings-schema": "org.gnome.shell.extensions.MullvadIndicator",
|
||||
Reference in New Issue
Block a user