From 029c124ea8d9eaaecbae9e026d5b603dcb3fa591 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 14 Jul 2024 22:52:37 +0800 Subject: [PATCH] bulky: Move from cinnamon scope to top-level --- .../bulky/default.nix => by-name/bu/bulky/package.nix} | 0 pkgs/desktops/cinnamon/default.nix | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/{desktops/cinnamon/bulky/default.nix => by-name/bu/bulky/package.nix} (100%) diff --git a/pkgs/desktops/cinnamon/bulky/default.nix b/pkgs/by-name/bu/bulky/package.nix similarity index 100% rename from pkgs/desktops/cinnamon/bulky/default.nix rename to pkgs/by-name/bu/bulky/package.nix diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index 5b5ca276425a..fadc269a6382 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -22,8 +22,6 @@ lib.makeScope pkgs.newScope (self: with self; { nemo-python ]; - # blueberry -> pkgs/tools/bluetooth/blueberry/default.nix - bulky = callPackage ./bulky { }; cinnamon-common = callPackage ./cinnamon-common { }; cinnamon-control-center = callPackage ./cinnamon-control-center { }; cinnamon-desktop = callPackage ./cinnamon-desktop { }; @@ -55,5 +53,6 @@ lib.makeScope pkgs.newScope (self: with self; { xviewer = callPackage ./xviewer { }; }) // lib.optionalAttrs config.allowAliases { # Aliases need to be outside the scope or they will shadow the attributes from parent scope. + bulky = lib.warn "cinnamon.bulky was moved to top-level. Please use pkgs.bulky directly." pkgs.bulky; # Added on 2024-07-14 xapps = pkgs.cinnamon.xapp; # added 2022-07-27 }