From 31e833ede5d4b45f142cb35810978f4117750abf Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 24 Jan 2021 14:58:22 -0800 Subject: [PATCH] gnomeExtensions.unite: move aliases from aliases.nix to set aliases.nix does not allow for nested attrs to exist, as it checks if the top-level attr exists before the alias overlay is applied --- pkgs/top-level/aliases.nix | 3 --- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8b79ea0f1c80..43bf489b0e54 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -737,9 +737,6 @@ mapAliases ({ youtubeDL = youtube-dl; # added 2014-10-26 ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; zdfmediathk = mediathekview; # added 2019-01-19 - gnomeExtensions = gnomeExtensions // { - unite-shell = gnomeExtensions.unite; # added 2021-01-19 - }; gnome_user_docs = gnome-user-docs; # added 2019-11-20 # spidermonkey is not ABI upwards-ompatible, so only allow this for nix-shell spidermonkey = spidermonkey_78; # added 2020-10-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33dcaf37baf8..38663fbe95bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27202,6 +27202,8 @@ in nohotcorner = throw "gnomeExtensions.nohotcorner removed since 2019-10-09: Since 3.34, it is a part of GNOME Shell configurable through GNOME Tweaks."; mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md"; + } // lib.optionalAttrs (config.allowAliases or false) { + unite-shell = gnomeExtensions.unite; # added 2021-01-19 }; gnome-connections = callPackage ../desktops/gnome-3/apps/gnome-connections { };