diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2024-05-28 09:46:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-28 09:46:45 +0200 |
commit | d552665012dc58126b6ae9cd94bfa70ed2ff73e7 (patch) | |
tree | d29fbbde6151def3f34749f552bf12de2fc3a7e9 | |
parent | ce717d82e6e4ace2e5852e860a4ff572d120d503 (diff) | |
parent | 709d32685862eef770bc7586d4a41f9465ab791d (diff) |
Merge pull request #315046 from honnip/fix-gnome-extensions-test
nixosTests.gnome-extensions: fix test
3 files changed, 2 insertions, 38 deletions
diff --git a/nixos/tests/gnome-extensions.nix b/nixos/tests/gnome-extensions.nix index 51ccabd7e6a65..332cf44b0ed4f 100644 --- a/nixos/tests/gnome-extensions.nix +++ b/nixos/tests/gnome-extensions.nix @@ -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) diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index 22eff684afc4d..7867fe8387c72 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -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 { diff --git a/pkgs/desktops/gnome/extensions/extensionOverridesPatches/mullvadindicator_at_pobega.github.com.patch b/pkgs/desktops/gnome/extensions/extensionOverridesPatches/mullvadindicator_at_pobega.github.com.patch deleted file mode 100644 index 772da94271103..0000000000000 --- a/pkgs/desktops/gnome/extensions/extensionOverridesPatches/mullvadindicator_at_pobega.github.com.patch +++ /dev/null @@ -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", |