From 1edf8fb1c379597854760bb9117e559bc9a32490 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 15 Jul 2024 23:14:39 +0800 Subject: [PATCH] folder-color-switcher: Move from cinnamon scope to top-level --- .../fo/folder-color-switcher/package.nix} | 0 pkgs/desktops/cinnamon/default.nix | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/{desktops/cinnamon/folder-color-switcher/default.nix => by-name/fo/folder-color-switcher/package.nix} (100%) diff --git a/pkgs/desktops/cinnamon/folder-color-switcher/default.nix b/pkgs/by-name/fo/folder-color-switcher/package.nix similarity index 100% rename from pkgs/desktops/cinnamon/folder-color-switcher/default.nix rename to pkgs/by-name/fo/folder-color-switcher/package.nix diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index 56c39b62257e..caafd5c8aefc 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -16,7 +16,7 @@ lib.makeScope pkgs.newScope (self: with self; { # We keep this in sync with a default Mint installation # Right now (only) nemo-share is missing nemoExtensions = [ - folder-color-switcher + pkgs.folder-color-switcher nemo-emblems nemo-fileroller nemo-python @@ -32,7 +32,6 @@ lib.makeScope pkgs.newScope (self: with self; { cinnamon-session = callPackage ./cinnamon-session { }; cinnamon-settings-daemon = callPackage ./cinnamon-settings-daemon { }; cjs = callPackage ./cjs { }; - folder-color-switcher = callPackage ./folder-color-switcher { }; nemo = callPackage ./nemo { }; nemo-emblems = callPackage ./nemo-extensions/nemo-emblems { }; nemo-fileroller = callPackage ./nemo-extensions/nemo-fileroller { }; @@ -50,6 +49,7 @@ lib.makeScope pkgs.newScope (self: with self; { }) // 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 + folder-color-switcher = lib.warn "cinnamon.folder-color-switcher was moved to top-level. Please use pkgs.folder-color-switcher directly." pkgs.folder-color-switcher; # Added on 2024-07-14 pix = lib.warn "cinnamon.pix was moved to top-level. Please use pkgs.pix directly." pkgs.pix; # Added on 2024-07-14 warpinator = lib.warn "cinnamon.warpinator was moved to top-level. Please use pkgs.warpinator directly." pkgs.warpinator; # Added on 2024-07-14 xapps = pkgs.cinnamon.xapp; # added 2022-07-27