Unverified Commit 816ad3d3 authored by piegames's avatar piegames Committed by GitHub
Browse files

Merge pull request #225381: gnomeExtensions: Update for GNOME 44

parents 83a39a0a faed40ae

pkgs/desktops/gnome/extensions/collisions.json

+34 −5
Original line number Diff line number Diff line
@@ -56,9 +56,14 @@ 
      "gnome-trash@gnome-trash.b00f.gitlab.com",

      "gnome-trash@b00f.github.io"

    ],

    "true-color-invert": [

      "true-color-invert@jackkenney",

      "true-color-window-invert@lynet101"

    ],

    "volume-scroller": [

      "volume_scroller@trflynn89.pm.me",

      "volume_scroller@noskoski"

      "volume_scroller@noskoski",

      "volume_scroller@francislavoie.github.io"

    ]

  },

  "40": {
@@ -82,6 +87,10 @@ 
      "Hide_Activities@shay.shayel.org",

      "hide-activities-button@nmingori.gnome-shell-extensions.org"

    ],

    "clipboard-indicator": [

      "clipboard-indicator@tudmotu.com",

      "clipboard-indicator@Dieg0Js.github.io"

    ],

    "shutdowntimer": [

      "ShutdownTimer@neumann",

      "shutdown-timer-gnome-shell-extension",
@@ -123,9 +132,14 @@ 
      "wireguard-indicator@gregos.me",

      "wireguard-indicator@atareao.es"

    ],

    "true-color-invert": [

      "true-color-invert@jackkenney",

      "true-color-window-invert@lynet101"

    ],

    "volume-scroller": [

      "volume_scroller@trflynn89.pm.me",

      "volume_scroller@noskoski"

      "volume_scroller@noskoski",

      "volume_scroller@francislavoie.github.io"

    ],

    "floating-panel": [

      "floating-panel@aylur",
@@ -177,9 +191,14 @@ 
      "wireguard-indicator@gregos.me",

      "wireguard-indicator@atareao.es"

    ],

    "true-color-invert": [

      "true-color-invert@jackkenney",

      "true-color-window-invert@lynet101"

    ],

    "volume-scroller": [

      "volume_scroller@trflynn89.pm.me",

      "volume_scroller@noskoski"

      "volume_scroller@noskoski",

      "volume_scroller@francislavoie.github.io"

    ],

    "floating-panel": [

      "floating-panel@aylur",
@@ -219,9 +238,14 @@ 
      "wireguard-indicator@gregos.me",

      "wireguard-indicator@atareao.es"

    ],

    "true-color-invert": [

      "true-color-invert@jackkenney",

      "true-color-window-invert@lynet101"

    ],

    "volume-scroller": [

      "volume_scroller@trflynn89.pm.me",

      "volume_scroller@noskoski"

      "volume_scroller@noskoski",

      "volume_scroller@francislavoie.github.io"

    ],

    "auto-activities": [

      "auto-activities@acedron.github.io",
@@ -265,9 +289,14 @@ 
      "batime@martin.zurowietz.de",

      "batterytime@typeof.pw"

    ],

    "volume-scroller": [

      "volume_scroller@trflynn89.pm.me",

      "volume_scroller@francislavoie.github.io"

    ],

    "floating-panel": [

      "floating-panel@aylur",

      "floating-panel-usedbymyself@wpism"

    ]

  }

  },

  "44": {}

}

pkgs/desktops/gnome/extensions/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -61,9 +61,10 @@ in rec { 
  gnome41Extensions = mapUuidNames (produceExtensionsList "41");

  gnome42Extensions = mapUuidNames (produceExtensionsList "42");

  gnome43Extensions = mapUuidNames (produceExtensionsList "43");

  gnome44Extensions = mapUuidNames (produceExtensionsList "44");



  # Keep the last three versions in here

  gnomeExtensions = lib.trivial.pipe (gnome41Extensions // gnome42Extensions // gnome43Extensions) [

  gnomeExtensions = lib.trivial.pipe (gnome42Extensions // gnome43Extensions // gnome44Extensions) [

    # Apply some custom patches for automatically packaged extensions

    (callPackage ./extensionOverrides.nix {})

    # Add all manually packaged extensions

pkgs/desktops/gnome/extensions/extensionOverrides.nix

+0 −22
Original line number Diff line number Diff line
@@ -91,28 +91,6 @@ super: lib.trivial.pipe super [ 
    ];

  }))



  (patchExtension "screen-autorotate@kosmospredanie.yandex.ru" (old: {

    # Requires gjs

    # https://github.com/NixOS/nixpkgs/issues/164865

    postPatch = ''

      for file in *.js; do

        substituteInPlace $file --replace "gjs" "${gjs}/bin/gjs"

      done

    '';

  }))



  (patchExtension "shell-volume-mixer@derhofbauer.at" (old: {

    patches = [

      (substituteAll {

        src = ./extensionOverridesPatches/shell-volume-mixer_at_derhofbauer.at.patch;

        inherit pulseaudio;

        inherit python3;

      })

    ];



    meta.maintainers = with lib.maintainers; [ rhoriguchi ];

  }))



  (patchExtension "tophat@fflewddur.github.io" (old: {

    patches = [

      (substituteAll {

pkgs/desktops/gnome/extensions/extensionRenames.nix

+12 −6
Original line number Diff line number Diff line
@@ -6,6 +6,11 @@ 
# - Make a separate section for each GNOME version. Collisions will come back eventually

#   as the extensions are updated.

{

  # ############################################################################

  # These are conflicts for older extensions (i.e. they don't support the latest GNOME version).

  # Make sure to move them up once they are updated



  # ####### GNOME 43 #######

  "apps-menu@gnome-shell-extensions.gcampax.github.com" = "applications-menu";

  "Applications_Menu@rmy.pobox.com" = "frippery-applications-menu";
@@ -31,14 +36,13 @@ 
  "batime@martin.zurowietz.de" = "battery-time";

  "batterytime@typeof.pw" = "battery-time-2";



  "volume_scroller@trflynn89.pm.me" = "volume-scroller";

  "volume_scroller@francislavoie.github.io" = "volume-scroller-2";



  # no source repository can be found for this extension

  "floating-panel@aylur" = "floating-panel";

  "floating-panel-usedbymyself@wpism" = null;



  # ############################################################################

  # These are conflicts for older extensions (i.e. they don't support the latest GNOME version).

  # Make sure to move them up once they are updated



  # ####### GNOME 42 #######



  "lockkeys@vaina.lt" = "lock-keys";
@@ -47,8 +51,7 @@ 
  "panel-date-format@keiii.github.com" = "panel-date-format";

  "panel-date-format@atareao.es" = "panel-date-format-2";



  "volume_scroller@trflynn89.pm.me" = "volume-scroller";

  "volume_scroller@noskoski" = "volume-scroller-2";

  "volume_scroller@noskoski" = "volume-scroller-3";



  "wireguard-indicator@gregos.me" = "wireguard-indicator-2";

  "wireguard-indicator@atareao.es" = "wireguard-indicator";
@@ -56,6 +59,9 @@ 
  "auto-activities@acedron.github.io" = "auto-activities-2";

  "auto-activities@CleoMenezesJr.github.io" = "auto-activities";



  "true-color-invert@jackkenney" = "true-color-invert";

  "true-color-window-invert@lynet101" = "true-color-window-invert";



  # ####### GNOME 41 #######



  "floatingDock@sun.wxg@gmail.com" = "floating-dock-2";

pkgs/desktops/gnome/extensions/extensions.json

+253 −235

File changed.

Preview size limit exceeded, changes collapsed.