Commit 1f8d21d8 authored by Anders Kaseorg's avatar Anders Kaseorg
Browse files

gnomeExtensions: Update for GNOME 49 



Signed-off-by: default avatarAnders Kaseorg <andersk@mit.edu>
parent d16a1d3d

pkgs/desktops/gnome/extensions/collisions.json

+9 −8
Original line number Diff line number Diff line 
{

  "activitywatch-status": [

    "activitywatch-status@cweiske.de",

    "aw-status@brayo.dev"

  ],

  "applications-menu": [

    "Applications_Menu@rmy.pobox.com",

    "apps-menu@gnome-shell-extensions.gcampax.github.com"
@@ -12,14 +16,14 @@ 
    "eur-usd-gshell@vezza.github.com",

    "usd-mxn-gshell@kinduff.github.com"

  ],

  "fullscreen-to-empty-workspace": [

    "fullscreen-to-empty-workspace2@corgijan.dev",

    "fullscreen-to-empty-workspace@aiono.dev"

  ],

  "fuzzy-clock": [

    "FuzzyClock@fire-man-x",

    "FuzzyClock@johngoetz"

  ],

  "lock-keys": [

    "lockkeys@febueldo.test",

    "lockkeys@vaina.lt"

  ],

  "mouse-follows-focus": [

    "mouse-follows-focus@crisidev.org",

    "mousefollowsfocus@matthes.biz"
@@ -32,12 +36,9 @@ 
    "PersianCalendar@oxygenws.com",

    "persian-calendar@iamrezamousavi.gmail.com"

  ],

  "power-profile-indicator": [

    "power-profile-indicator@laux.wtf",

    "power-profile@fthx"

  ],

  "system-monitor": [

    "System_Monitor@bghome.gmail.com",

    "system-monitor@axet.github.com",

    "system-monitor@gnome-shell-extensions.gcampax.github.com"

  ]

}

pkgs/desktops/gnome/extensions/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -76,9 +76,10 @@ rec { 
  gnome46Extensions = mapUuidNames (produceExtensionsList "46");

  gnome47Extensions = mapUuidNames (produceExtensionsList "47");

  gnome48Extensions = mapUuidNames (produceExtensionsList "48");

  gnome49Extensions = mapUuidNames (produceExtensionsList "49");



  # Keep the last three versions in here

  gnomeExtensions = lib.trivial.pipe (gnome46Extensions // gnome47Extensions // gnome48Extensions) [

  gnomeExtensions = lib.trivial.pipe (gnome47Extensions // gnome48Extensions // gnome49Extensions) [

    # Apply some custom patches for automatically packaged extensions

    (callPackage ./extensionOverrides.nix { })

    # Add all manually packaged extensions

pkgs/desktops/gnome/extensions/extensionOverrides.nix

+0 −10
Original line number Diff line number Diff line
@@ -123,16 +123,6 @@ lib.trivial.pipe super [ 
    ];

  }))



  (patchExtension "gnome-shell-screenshot@ttll.de" (old: {

    # Requires gjs

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

    postPatch = ''

      for file in *.js; do

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

      done

    '';

  }))



  (patchExtension "gtk4-ding@smedius.gitlab.com" (old: {

    nativeBuildInputs = [ wrapGAppsHook3 ];

    patches = [

pkgs/desktops/gnome/extensions/extensions.json

+3126 −1671

File changed.

Preview size limit exceeded, changes collapsed.

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

+2 −1
Original line number Diff line number Diff line
@@ -32,10 +32,11 @@ supported_versions = { 
    "46": "46",

    "47": "47",

    "48": "48",

    "49": "49",

}



# shell versions that we want to put into the gnomeExtensions attr set

versions_to_merge = ["46", "47", "48"]

versions_to_merge = ["47", "48", "49"]



# Some type alias to increase readability of complex compound types

PackageName = str