Unverified Commit 080759b6 authored by piegames's avatar piegames Committed by GitHub
Browse files

Merge pull request #260458: gnomeExtensions: Update for GNOME 45

parents 5cc1b8a0 817e2ca4

pkgs/desktops/gnome/extensions/collisions.json

+6 −0
Original line number Diff line number Diff line
@@ -343,5 +343,11 @@ 
      "batime@martin.zurowietz.de",

      "batterytime@typeof.pw"

    ]

  },

  "45": {

    "applications-menu": [

      "apps-menu@gnome-shell-extensions.gcampax.github.com",

      "Applications_Menu@rmy.pobox.com"

    ]

  }

}

pkgs/desktops/gnome/extensions/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -62,9 +62,10 @@ in rec { 
  gnome42Extensions = mapUuidNames (produceExtensionsList "42");

  gnome43Extensions = mapUuidNames (produceExtensionsList "43");

  gnome44Extensions = mapUuidNames (produceExtensionsList "44");

  gnome45Extensions = mapUuidNames (produceExtensionsList "45");



  # Keep the last three versions in here

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

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

    # Apply some custom patches for automatically packaged extensions

    (callPackage ./extensionOverrides.nix {})

    # Add all manually packaged extensions

pkgs/desktops/gnome/extensions/extensionRenames.nix

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

#   as the extensions are updated.

{



  # ####### GNOME 44 #######

  # ####### GNOME 45 #######



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

  "Applications_Menu@rmy.pobox.com" = "frippery-applications-menu";



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

  # 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 44 #######



  "workspace-indicator@gnome-shell-extensions.gcampax.github.com" = "workspace-indicator";

  "horizontal-workspace-indicator@tty2.io" = "workspace-indicator-2";
@@ -30,10 +35,6 @@ 
  "batime@martin.zurowietz.de" = "battery-time";

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



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

  # 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 #######



  "lockkeys@vaina.lt" = "lock-keys";

pkgs/desktops/gnome/extensions/extensions.json

+262 −240

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/desktops/gnome/extensions/update-extensions.py

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ supported_versions = { 
    "42": "42",

    "43": "43",

    "44": "44",

    "45": "45",

}



# Some type alias to increase readability of complex compound types