Unverified Commit 6e318d1c authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #315285 from NixOS/backport-315046-to-release-24.05 

[Backport release-24.05] nixosTests.gnome-extensions: fix test
parents fe837891 81758519

nixos/tests/gnome-extensions.nix

+2 −3
Original line number Diff line number Diff line
@@ -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)

pkgs/desktops/gnome/extensions/extensionOverrides.nix

+0 −10
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 
, netcat-gnu

, nvme-cli

, procps

, pulseaudio

, python3

, smartmontools

, substituteAll

, touchegg
@@ -106,14 +104,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 {

pkgs/desktops/gnome/extensions/extensionOverridesPatches/mullvadindicator_at_pobega.github.com.patch

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
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",