From 5a1aea6cfe89e1467ce8a683a2b0e8dcb956bb39 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 17 Jul 2024 21:12:04 +0800 Subject: [PATCH] mint-x-icons: Move from cinnamon scope to top-level --- .../default.nix => by-name/mi/mint-x-icons/package.nix} | 0 pkgs/desktops/cinnamon/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/{desktops/cinnamon/mint-x-icons/default.nix => by-name/mi/mint-x-icons/package.nix} (100%) diff --git a/pkgs/desktops/cinnamon/mint-x-icons/default.nix b/pkgs/by-name/mi/mint-x-icons/package.nix similarity index 100% rename from pkgs/desktops/cinnamon/mint-x-icons/default.nix rename to pkgs/by-name/mi/mint-x-icons/package.nix diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index bf12705fc7e8..124bdc154b50 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -40,7 +40,6 @@ lib.makeScope pkgs.newScope (self: with self; { mint-l-icons = callPackage ./mint-l-icons { }; mint-l-theme = callPackage ./mint-l-theme { }; mint-themes = callPackage ./mint-themes { }; - mint-x-icons = callPackage ./mint-x-icons { }; mint-y-icons = callPackage ./mint-y-icons { }; muffin = callPackage ./muffin { }; xapp = callPackage ./xapp { }; @@ -50,6 +49,7 @@ lib.makeScope pkgs.newScope (self: with self; { 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 mint-artwork = lib.warn "cinnamon.mint-artwork was moved to top-level. Please use pkgs.mint-artwork directly." pkgs.mint-artwork; # Added on 2024-07-14 mint-cursor-themes = lib.warn "cinnamon.mint-cursor-themes was moved to top-level. Please use pkgs.mint-cursor-themes directly." pkgs.mint-cursor-themes; # Added on 2024-07-14 + mint-x-icons = lib.warn "cinnamon.mint-x-icons was moved to top-level. Please use pkgs.mint-x-icons directly." pkgs.mint-x-icons; # 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2a18fff0194..8f91ecb18ea3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37070,7 +37070,7 @@ with pkgs; cdesktopenv = callPackage ../desktops/cdesktopenv { }; cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { }); - inherit (cinnamon) mint-x-icons mint-y-icons; + inherit (cinnamon) mint-y-icons; deepin = recurseIntoAttrs (callPackage ../desktops/deepin { });