From 6f102799e71220ed7ca40c4d8c8768439c59f4e8 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 22 Jul 2024 22:57:17 +0800 Subject: [PATCH] cinnamon-menus: Move from cinnamon scope to top-level --- nixos/modules/services/x11/desktop-managers/cinnamon.nix | 2 +- .../default.nix => by-name/ci/cinnamon-menus/package.nix} | 0 pkgs/desktops/cinnamon/default.nix | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/{desktops/cinnamon/cinnamon-menus/default.nix => by-name/ci/cinnamon-menus/package.nix} (100%) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index d5d801c7461d..0e2b25a0132d 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -141,7 +141,7 @@ in cinnamon.cinnamon-common cinnamon.cinnamon-session cinnamon-desktop - cinnamon.cinnamon-menus + cinnamon-menus cinnamon.cinnamon-translations # utils needed by some scripts diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/pkgs/by-name/ci/cinnamon-menus/package.nix similarity index 100% rename from pkgs/desktops/cinnamon/cinnamon-menus/default.nix rename to pkgs/by-name/ci/cinnamon-menus/package.nix diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index cd08384a5dec..65754dfcb6fb 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -4,7 +4,6 @@ lib.makeScope pkgs.newScope (self: with self; { cinnamon-common = callPackage ./cinnamon-common { }; cinnamon-control-center = callPackage ./cinnamon-control-center { }; cinnamon-gsettings-overrides = callPackage ./cinnamon-gsettings-overrides { }; - cinnamon-menus = callPackage ./cinnamon-menus { }; cinnamon-translations = callPackage ./cinnamon-translations { }; cinnamon-screensaver = callPackage ./cinnamon-screensaver { }; cinnamon-session = callPackage ./cinnamon-session { }; @@ -20,6 +19,7 @@ lib.makeScope pkgs.newScope (self: with self; { # 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 cinnamon-desktop = lib.warn "cinnamon.cinnamon-desktop was moved to top-level. Please use pkgs.cinnamon-desktop directly." pkgs.cinnamon-desktop; # Added on 2024-07-22 + cinnamon-menus = lib.warn "cinnamon.cinnamon-menus was moved to top-level. Please use pkgs.cinnamon-menus directly." pkgs.cinnamon-menus; # Added on 2024-07-22 iso-flags-png-320x420 = lib.warn "cinnamon.iso-flags-png-320x420 was moved to top-level and renamed to pkgs.iso-flags-png-320x240." pkgs.iso-flags-png-320x240; # Added on 2024-07-14 iso-flags-svg = throw "cinnamon.iso-flags-svg was removed because this is not used in Cinnamon. You can directly obtain the images from \"\${pkgs.iso-flags.src}/svg\"."; # 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