From 9c24fb82f9c8e3b69f6692a296a6ab8b798852e3 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 22 Jul 2024 23:05:41 +0800 Subject: [PATCH] cjs: Move from cinnamon scope to top-level --- .../cinnamon/cjs/default.nix => by-name/cj/cjs/package.nix} | 0 pkgs/desktops/cinnamon/default.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{desktops/cinnamon/cjs/default.nix => by-name/cj/cjs/package.nix} (100%) diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/by-name/cj/cjs/package.nix similarity index 100% rename from pkgs/desktops/cinnamon/cjs/default.nix rename to pkgs/by-name/cj/cjs/package.nix diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index ce336e48aeff..6d652c11a421 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -7,7 +7,6 @@ lib.makeScope pkgs.newScope (self: with self; { cinnamon-screensaver = callPackage ./cinnamon-screensaver { }; cinnamon-session = callPackage ./cinnamon-session { }; cinnamon-settings-daemon = callPackage ./cinnamon-settings-daemon { }; - cjs = callPackage ./cjs { }; nemo = callPackage ./nemo { }; nemo-emblems = callPackage ./nemo-extensions/nemo-emblems { }; nemo-fileroller = callPackage ./nemo-extensions/nemo-fileroller { }; @@ -20,6 +19,7 @@ lib.makeScope pkgs.newScope (self: with self; { 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 cinnamon-translations = lib.warn "cinnamon.cinnamon-translations was moved to top-level. Please use pkgs.cinnamon-translations directly." pkgs.cinnamon-translations; # Added on 2024-07-22 + cjs = lib.warn "cinnamon.cjs was moved to top-level. Please use pkgs.cjs directly." pkgs.cjs; # 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