diff --git a/pkgs/desktops/gnome/extensions/arcmenu/default.nix b/pkgs/desktops/gnome/extensions/arcmenu/default.nix index a8fba0292176..f9c49111f529 100644 --- a/pkgs/desktops/gnome/extensions/arcmenu/default.nix +++ b/pkgs/desktops/gnome/extensions/arcmenu/default.nix @@ -24,7 +24,10 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" ]; - passthru.extensionUuid = "arcmenu@arcmenu.com"; + passthru = { + extensionUuid = "arcmenu@arcmenu.com"; + extensionPortalSlug = "arcmenu"; + }; meta = with lib; { description = "Application menu for GNOME Shell, designed to provide a more traditional user experience and workflow"; diff --git a/pkgs/desktops/gnome/extensions/caffeine/default.nix b/pkgs/desktops/gnome/extensions/caffeine/default.nix index 7cb98b569b7a..7ac5f916736e 100644 --- a/pkgs/desktops/gnome/extensions/caffeine/default.nix +++ b/pkgs/desktops/gnome/extensions/caffeine/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0dyagnjmk91h96xr98mc177c473bqpxcv86qf6g3kyh3arwa9shs"; }; - passthru.extensionUuid = "caffeine@patapon.info"; + passthru = { + extensionPortalSlug = "caffeine"; + extensionUuid = "caffeine@patapon.info"; + }; nativeBuildInputs = [ glib gettext diff --git a/pkgs/desktops/gnome/extensions/clock-override/default.nix b/pkgs/desktops/gnome/extensions/clock-override/default.nix index 9576bbf53e5b..1f749574c40c 100644 --- a/pkgs/desktops/gnome/extensions/clock-override/default.nix +++ b/pkgs/desktops/gnome/extensions/clock-override/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation rec { stripRoot = false; }; - passthru.extensionUuid = "clock-override@gnomeshell.kryogenix.org"; + passthru = { + extensionUuid = "clock-override@gnomeshell.kryogenix.org"; + extensionPortalSlug = "clock-override"; + }; nativeBuildInputs = [ gettext glib ]; diff --git a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix index cacce95008d7..ebf15cada970 100644 --- a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix @@ -24,7 +24,10 @@ stdenv.mkDerivation rec { "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" ]; - passthru.extensionUuid = "dash-to-dock@micxgx.gmail.com"; + passthru = { + extensionUuid = "dash-to-dock@micxgx.gmail.com"; + extensionPortalSlug = "dash-to-dock"; + }; meta = with lib; { description = "A dock for the Gnome Shell"; diff --git a/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix index 4acd8565e5e9..6e8beb70a230 100644 --- a/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix +++ b/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix @@ -17,7 +17,10 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; - passthru.extensionUuid = "dash-to-panel@jderose9.github.com"; + passthru = { + extensionUuid = "dash-to-panel@jderose9.github.com"; + extensionPortalSlug = "dash-to-panel"; + }; meta = with lib; { description = "An icon taskbar for Gnome Shell"; diff --git a/pkgs/desktops/gnome/extensions/default.nix b/pkgs/desktops/gnome/extensions/default.nix index a4255411934f..f98e2fb4e67a 100644 --- a/pkgs/desktops/gnome/extensions/default.nix +++ b/pkgs/desktops/gnome/extensions/default.nix @@ -1,5 +1,6 @@ { lib , callPackage +, callPackages , config }: let @@ -60,8 +61,9 @@ in rec { gnome40Extensions = mapUuidNames (produceExtensionsList "40"); gnomeExtensions = lib.recurseIntoAttrs ( - (mapReadableNames (produceExtensionsList "40")) - // (callPackage ./manuallyPackaged.nix {}) + (mapReadableNames + (lib.attrValues (gnome40Extensions // (callPackages ./manuallyPackaged.nix {}))) + ) // lib.optionalAttrs (config.allowAliases or true) { unite-shell = gnomeExtensions.unite; # added 2021-01-19 arc-menu = gnomeExtensions.arcmenu; # added 2021-02-14 diff --git a/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix b/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix index 414a67ccabda..ebcf918df103 100644 --- a/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix +++ b/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0igfxgrjdqq6z6xg4rsawxn261pk25g5dw2pm3bhwz5sqsy4bq3i"; }; - passthru.extensionUuid = "drop-down-terminal@gs-extensions.zzrough.org"; + passthru = { + extensionUuid = "drop-down-terminal@gs-extensions.zzrough.org"; + extensionPortalSlug = "drop-down-terminal"; + }; patches = [ (substituteAll { diff --git a/pkgs/desktops/gnome/extensions/emoji-selector/default.nix b/pkgs/desktops/gnome/extensions/emoji-selector/default.nix index a3706fbbe243..6f249bcb635d 100644 --- a/pkgs/desktops/gnome/extensions/emoji-selector/default.nix +++ b/pkgs/desktops/gnome/extensions/emoji-selector/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0x60pg5nl5d73av494dg29hyfml7fbf2d03wm053vx1q8a3pxbyb"; }; - passthru.extensionUuid = "emoji-selector@maestroschan.fr"; + passthru = { + extensionUuid = "emoji-selector@maestroschan.fr"; + extensionPortalSlug = "emoji-selector"; + }; nativeBuildInputs = [ glib ]; diff --git a/pkgs/desktops/gnome/extensions/extensionRenames.nix b/pkgs/desktops/gnome/extensions/extensionRenames.nix index 912e47a104e9..9df97998891f 100644 --- a/pkgs/desktops/gnome/extensions/extensionRenames.nix +++ b/pkgs/desktops/gnome/extensions/extensionRenames.nix @@ -14,6 +14,8 @@ "lockkeys@fawtytoo" = "lock-keys-2"; + + # ############################################################################ # These are conflicts for 3.38 extensions. They will very probably come back # once more of them support 40. @@ -26,4 +28,24 @@ # That extension is broken because of https://github.com/NixOS/nixpkgs/issues/118612 #"flypie@schneegans.github.com" = null; + + + + # ############################################################################ + # Overrides for extensions that were manually packaged in the past but are gradually + # being replaced by automatic packaging where possible. + # + # The manually packaged ones: + "EasyScreenCast@iacopodeenosee.gmail.com" = "easyScreenCast"; # extensionPortalSlug is "easyscreencast" + "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com" = "fuzzy-app-search"; # extensionPortalSlug is "gnome-fuzzy-app-search" + "TopIcons@phocean.net" = "topicons-plus"; # extensionPortalSlug is "topicons" + "paperwm@hedning:matrix.org" = "paperwm"; # is not on extensions.gnome.org + "no-title-bar@jonaspoehler.de" = "no-title-bar"; # extensionPortalSlug is "no-title-bar-forked" + # These extensions are automatically packaged at the moment. We preserve the old attribute name + # for backwards compatibility. + "appindicatorsupport@rgcjonas.gmail.com" = "appindicator"; # extensionPortalSlug is "appindicator-support" + "unredirect@vaina.lt" = "disable-unredirect"; # extensionPortalSlug is "disable-unredirect-fullscreen-windows" + "drawOnYourScreen@abakkk.framagit.org" = "draw-on-your-screen"; # extensionPortalSlug is "draw-on-you-screen" + "timepp@zagortenay333" = "timepp"; # extensionPortalSlug is "time" + "windowIsReady_Remover@nunofarruca@gmail.com" = "window-is-ready-remover"; # extensionPortalSlug is "window-is-ready-notification-remover" } diff --git a/pkgs/desktops/gnome/extensions/freon/default.nix b/pkgs/desktops/gnome/extensions/freon/default.nix index 5877fe6dc6cd..39224e6245b6 100644 --- a/pkgs/desktops/gnome/extensions/freon/default.nix +++ b/pkgs/desktops/gnome/extensions/freon/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-freon"; version = "44"; - passthru.extensionUuid = "freon@UshakovVasilii_Github.yahoo.com"; + passthru = { + extensionUuid = "freon@UshakovVasilii_Github.yahoo.com"; + extensionPortalSlug = "freon"; + }; src = fetchFromGitHub { owner = "UshakovVasilii"; diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix index 4eb92bf923f4..6afaacc00b88 100644 --- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix @@ -98,7 +98,10 @@ stdenv.mkDerivation rec { done ''; - passthru.extensionUuid = "gsconnect@andyholmes.github.io"; + passthru = { + extensionUuid = "gsconnect@andyholmes.github.io"; + extensionPortalSlug = "gsconnect"; + }; passthru = { tests = { diff --git a/pkgs/desktops/gnome/extensions/icon-hider/default.nix b/pkgs/desktops/gnome/extensions/icon-hider/default.nix index 446c7b0e26c6..b5b2ae8ec747 100644 --- a/pkgs/desktops/gnome/extensions/icon-hider/default.nix +++ b/pkgs/desktops/gnome/extensions/icon-hider/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "18c8zkdrmdbghqqz7b450vhgpykgz25mgigwn2nggcb2lxmvm9ks"; }; - passthru.extensionUuid = "icon-hider@kalnitsky.org"; + passthru = { + extensionUuid = "icon-hider@kalnitsky.org"; + extensionPortalSlug = "icon-hider"; + }; installPhase = '' runHook preInstall diff --git a/pkgs/desktops/gnome/extensions/impatience/default.nix b/pkgs/desktops/gnome/extensions/impatience/default.nix index 676bf8f053b0..867534ba61d0 100644 --- a/pkgs/desktops/gnome/extensions/impatience/default.nix +++ b/pkgs/desktops/gnome/extensions/impatience/default.nix @@ -28,7 +28,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.extensionUuid = "impatience@gfxmonk.net"; + passthru = { + extensionUuid = "impatience@gfxmonk.net"; + extensionPortalSlug = "impatience"; + }; meta = with lib; { description = "Speed up builtin gnome-shell animations"; diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index 4e30130774af..24048517a1d2 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -1,39 +1,39 @@ { callPackage }: { - appindicator = callPackage ./appindicator { }; - arcmenu = callPackage ./arcmenu { }; - caffeine = callPackage ./caffeine { }; - clipboard-indicator = callPackage ./clipboard-indicator { }; - clock-override = callPackage ./clock-override { }; - dash-to-dock = callPackage ./dash-to-dock { }; - dash-to-panel = callPackage ./dash-to-panel { }; - disable-unredirect = callPackage ./disable-unredirect { }; - draw-on-your-screen = callPackage ./draw-on-your-screen { }; - drop-down-terminal = callPackage ./drop-down-terminal { }; - dynamic-panel-transparency = callPackage ./dynamic-panel-transparency { }; - easyScreenCast = callPackage ./EasyScreenCast { }; - emoji-selector = callPackage ./emoji-selector { }; - freon = callPackage ./freon { }; - fuzzy-app-search = callPackage ./fuzzy-app-search { }; - gsconnect = callPackage ./gsconnect { }; - hot-edge = callPackage ./hot-edge { }; - icon-hider = callPackage ./icon-hider { }; - impatience = callPackage ./impatience { }; - material-shell = callPackage ./material-shell { }; - mpris-indicator-button = callPackage ./mpris-indicator-button { }; - night-theme-switcher = callPackage ./night-theme-switcher { }; - no-title-bar = callPackage ./no-title-bar { }; - noannoyance = callPackage ./noannoyance { }; - paperwm = callPackage ./paperwm { }; - pidgin-im-integration = callPackage ./pidgin-im-integration { }; - sound-output-device-chooser = callPackage ./sound-output-device-chooser { }; - system-monitor = callPackage ./system-monitor { }; - taskwhisperer = callPackage ./taskwhisperer { }; - tilingnome = callPackage ./tilingnome { }; - timepp = callPackage ./timepp { }; - topicons-plus = callPackage ./topicons-plus { }; - unite = callPackage ./unite { }; - window-corner-preview = callPackage ./window-corner-preview { }; - window-is-ready-remover = callPackage ./window-is-ready-remover { }; - workspace-matrix = callPackage ./workspace-matrix { }; + "appindicatorsupport@rgcjonas.gmail.com" = callPackage ./appindicator { }; + "arcmenu@arcmenu.com" = callPackage ./arcmenu { }; + "caffeine@patapon.info" = callPackage ./caffeine { }; + "clipboard-indicator@tudmotu.com" = callPackage ./clipboard-indicator { }; + "clock-override@gnomeshell.kryogenix.org" = callPackage ./clock-override { }; + "dash-to-dock@micxgx.gmail.com" = callPackage ./dash-to-dock { }; + "dash-to-panel@jderose9.github.com" = callPackage ./dash-to-panel { }; + "unredirect@vaina.lt" = callPackage ./disable-unredirect { }; + "drawOnYourScreen@abakkk.framagit.org" = callPackage ./draw-on-your-screen { }; + "drop-down-terminal@gs-extensions.zzrough.org" = callPackage ./drop-down-terminal { }; + "dynamic-panel-transparency@rockon999.github.io" = callPackage ./dynamic-panel-transparency { }; + "EasyScreenCast@iacopodeenosee.gmail.com" = callPackage ./EasyScreenCast { }; + "emoji-selector@maestroschan.fr" = callPackage ./emoji-selector { }; + "freon@UshakovVasilii_Github.yahoo.com" = callPackage ./freon { }; + "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com" = callPackage ./fuzzy-app-search { }; + "gsconnect@andyholmes.github.io" = callPackage ./gsconnect { }; + "hotedge@jonathan.jdoda.ca" = callPackage ./hot-edge { }; + "icon-hider@kalnitsky.org" = callPackage ./icon-hider { }; + "impatience@gfxmonk.net" = callPackage ./impatience { }; + "material-shell@papyelgringo" = callPackage ./material-shell { }; + "mprisindicatorbutton@JasonLG1979.github.io" = callPackage ./mpris-indicator-button { }; + "nightthemeswitcher@romainvigier.fr" = callPackage ./night-theme-switcher { }; + "noannoyance@daase.net" = callPackage ./noannoyance { }; + "no-title-bar@jonaspoehler.de" = callPackage ./no-title-bar { }; + "paperwm@hedning:matrix.org" = callPackage ./paperwm { }; + "pidgin@muffinmad" = callPackage ./pidgin-im-integration { }; + "sound-output-device-chooser@kgshank.net" = callPackage ./sound-output-device-chooser { }; + "system-monitor@paradoxxx.zero.gmail.com" = callPackage ./system-monitor { }; + "taskwhisperer-extension@infinicode.de" = callPackage ./taskwhisperer { }; + "tilingnome@rliang.github.com" = callPackage ./tilingnome { }; + "timepp@zagortenay333" = callPackage ./timepp { }; + "TopIcons@phocean.net" = callPackage ./topicons-plus { }; + "unite@hardpixel.eu" = callPackage ./unite { }; + "window-corner-preview@fabiomereu.it" = callPackage ./window-corner-preview { }; + "windowIsReady_Remover@nunofarruca@gmail.com" = callPackage ./window-is-ready-remover { }; + "wsmatrix@martin.zurowietz.de" = callPackage ./workspace-matrix { }; } diff --git a/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix b/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix index 52eef56a7434..0065fed4cff4 100644 --- a/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix +++ b/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix @@ -14,7 +14,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; buildInputs = [ glib gnome.gnome-shell ]; - passthru.extensionUuid = "nightthemeswitcher@romainvigier.fr"; + passthru = { + extensionUuid = "nightthemeswitcher@romainvigier.fr"; + extensionPortalSlug = "night-theme-switcher"; + }; installPhase = '' runHook preInstall diff --git a/pkgs/desktops/gnome/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome/extensions/no-title-bar/default.nix index 518e3f78f642..e46b49c8f6ea 100644 --- a/pkgs/desktops/gnome/extensions/no-title-bar/default.nix +++ b/pkgs/desktops/gnome/extensions/no-title-bar/default.nix @@ -23,7 +23,9 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; - passthru.extensionUuid = "no-title-bar@jonaspoehler.de"; + passthru = { + extensionUuid = "no-title-bar@jonaspoehler.de"; + }; meta = with lib; { description = "Integrates maximized windows with the top panel"; diff --git a/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix index 7f3ee00960cf..92e0bfe94d70 100644 --- a/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix +++ b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix @@ -23,7 +23,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.extensionUuid = "pidgin@muffinmad"; + passthru = { + extensionUuid = "pidgin@muffinmad"; + extensionPortalSlug = "pidgin-im-integration"; + }; meta = with lib; { homepage = "https://github.com/muffinmad/pidgin-im-gnome-shell-extension"; diff --git a/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix index e166f8ca0835..e439e5b5a50a 100644 --- a/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix +++ b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix @@ -27,7 +27,10 @@ stdenv.mkDerivation rec { dontBuild = true; - passthru.extensionUuid = "sound-output-device-chooser@kgshank.net"; + passthru = { + extensionUuid = "sound-output-device-chooser@kgshank.net"; + extensionPortalSlug = "sound-output-device-chooser"; + }; makeFlags = [ "INSTALL_DIR=${placeholder "out"}/share/gnome-shell/extensions" diff --git a/pkgs/desktops/gnome/extensions/system-monitor/default.nix b/pkgs/desktops/gnome/extensions/system-monitor/default.nix index 31df563387b9..2179f63c1ebf 100644 --- a/pkgs/desktops/gnome/extensions/system-monitor/default.nix +++ b/pkgs/desktops/gnome/extensions/system-monitor/default.nix @@ -39,7 +39,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.extensionUuid = "system-monitor@paradoxxx.zero.gmail.com"; + passthru = { + extensionUuid = "system-monitor@paradoxxx.zero.gmail.com"; + extensionPortalSlug = "system-monitor"; + }; meta = with lib; { description = "Display system informations in gnome shell status bar"; diff --git a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix index 66df4cf6f250..19936f6be61d 100644 --- a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix +++ b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix @@ -19,7 +19,10 @@ stdenv.mkDerivation rec { taskwarrior ]; - passthru.extensionUuid = "taskwhisperer-extension@infinicode.de"; + passthru = { + extensionUuid = "taskwhisperer-extension@infinicode.de"; + extensionPortalSlug = "taskwhisperer"; + }; makeFlags = [ "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" diff --git a/pkgs/desktops/gnome/extensions/tilingnome/default.nix b/pkgs/desktops/gnome/extensions/tilingnome/default.nix index 78a5a60dba3b..42c6467dba80 100644 --- a/pkgs/desktops/gnome/extensions/tilingnome/default.nix +++ b/pkgs/desktops/gnome/extensions/tilingnome/default.nix @@ -26,7 +26,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.extensionUuid = "tilingnome@rliang.github.com"; + passthru = { + extensionUuid = "tilingnome@rliang.github.com"; + extensionPortalSlug = "tilingnome"; + }; meta = with lib; { description = "Tiling window management for GNOME Shell"; diff --git a/pkgs/desktops/gnome/extensions/unite/default.nix b/pkgs/desktops/gnome/extensions/unite/default.nix index 8796305f046a..776139b36867 100644 --- a/pkgs/desktops/gnome/extensions/unite/default.nix +++ b/pkgs/desktops/gnome/extensions/unite/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-Ys2kWPj/FugW/LkvLAZdbj7Ufg/KShC+EX6QrjKNVH8="; }; - passthru.extensionUuid = "unite@hardpixel.eu"; + passthru = { + extensionUuid = "unite@hardpixel.eu"; + extensionPortalSlug = "unite"; + }; nativeBuildInputs = [ glib ]; diff --git a/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix b/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix index d42a4d9541b9..ef0e22b7abed 100644 --- a/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix +++ b/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix @@ -13,7 +13,11 @@ stdenv.mkDerivation rec { dontBuild = true; - passthru.extensionUuid = "window-corner-preview@fabiomereu.it"; + passthru = { + extensionUuid = "window-corner-preview@fabiomereu.it"; + extensionPortalSlug = "window-corner-preview"; + }; + installPhase = '' runHook preInstall mkdir -p $out/share/gnome-shell/extensions