Unverified Commit ed814a45 authored by maralorn's avatar maralorn Committed by GitHub
Browse files

Merge pull request #142215 from rhoriguchi/gnome41Extensions 

Add gnome41Extensions
parents 7ca1cabb bb412a51

pkgs/desktops/gnome/extensions/collisions.json

+10 −0
Original line number Diff line number Diff line
@@ -91,5 +91,15 @@ 
      "wireguard-indicator@gregos.me",

      "wireguard-indicator@atareao.es"

    ]

  },

  "41": {

    "applications-menu": [

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

      "Applications_Menu@rmy.pobox.com"

    ],

    "floating-dock": [

      "floatingDock@sun.wxg@gmail.com",

      "floating-dock@nandoferreira_prof@hotmail.com"

    ]

  }

}

pkgs/desktops/gnome/extensions/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -59,8 +59,9 @@ in rec { 


  gnome38Extensions = mapUuidNames (produceExtensionsList "38");

  gnome40Extensions = mapUuidNames (produceExtensionsList "40");

  gnome41Extensions = mapUuidNames (produceExtensionsList "41");



  gnomeExtensions = lib.trivial.pipe gnome40Extensions [

  gnomeExtensions = lib.trivial.pipe (gnome40Extensions // gnome41Extensions) [

    # Apply some custom patches for automatically packaged extensions

    (callPackage ./extensionOverrides.nix {})

    # Add all manually packaged extensions

pkgs/desktops/gnome/extensions/extensionRenames.nix

+15 −13
Original line number Diff line number Diff line
@@ -3,10 +3,21 @@ 
# - Every item from ./collisions.json (for the respective Shell version) should have an entry in here

# - Set the value to `null` for filtering (duplicate or unmaintained extensions)

# - Sort the entries in order of appearance in the collisions.json

# - Make a separate section for each GNOME version. Collisions will come back eventually

#   as the extensions are updated.

{

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

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



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

  "floating-dock@nandoferreira_prof@hotmail.com" = "floating-dock";



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

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



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

  "horizontal-workspace-indicator@tty2.io" = "workspace-indicator-2";
@@ -38,23 +49,14 @@ 
  "extension-list@tu.berry" = "extension-list";

  "screen-lock@garciabaameiro.com" = "screen-lock"; # Don't know why they got 'extension-list' as slug



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

  "floating-dock@nandoferreira_prof@hotmail.com" = "floating-dock";



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

  # These are conflicts for 3.38 extensions. They will very probably come back

  # once more of them support 40.

  # ####### GNOME 3.38 #######



  # See https://github.com/pbxqdown/gnome-shell-extension-transparent-window/issues/12#issuecomment-800765381

  #"transparent-window@pbxqdown.github.com" = "transparent-window";

  #"transparentwindows.mdirshad07" = null;



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

  #"floating-dock@nandoferreira_prof@hotmail.com" = "floating-dock-2";

  "transparent-window@pbxqdown.github.com" = "transparent-window";

  "transparentwindows.mdirshad07" = null;



  # That extension is broken because of https://github.com/NixOS/nixpkgs/issues/118612

  #"flypie@schneegans.github.com" = null;



  "flypie@schneegans.github.com" = null;



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

  # Overrides for extensions that were manually packaged in the past but are gradually

pkgs/desktops/gnome/extensions/extensions.json

+144 −141

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
@@ -17,6 +17,7 @@ import base64 
supported_versions = {

    "38": "3.38",

    "40": "40",

    "41": "41",

}