ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-05 20:19:16 +03:00
Code Issues Projects Releases Wiki Activity

nemo-with-extensions: Move from cinnamon scope to top-level

Browse Source
This commit is contained in:
Bobby Rong 2024-07-22 23:35:24 +08:00
parent 0dbc48ae70
commit f3d0454e4a
No known key found for this signature in database
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/x11/desktop-managers/cinnamon.nix
View File

@ -104,7 +104,7 @@ in
services.dbus.packages = with pkgs; [
cinnamon.cinnamon-common
cinnamon.cinnamon-screensaver
cinnamon.nemo-with-extensions
nemo-with-extensions
xapp
];
services.cinnamon.apps.enable = mkDefault true;
@ -156,7 +156,7 @@ in
polkit_gnome
# packages
cinnamon.nemo-with-extensions
nemo-with-extensions
gnome-online-accounts-gtk
cinnamon.cinnamon-control-center
cinnamon-settings-daemon

2
pkgs/desktops/cinnamon/nemo/wrapper.nix → pkgs/by-name/ne/nemo-with-extensions/package.nix
View File

@ -51,5 +51,5 @@ symlinkJoin {
done
'';
inherit (nemo) meta;
meta = builtins.removeAttrs nemo.meta [ "name" "outputsToInstall" "position" ];
}

4
pkgs/desktops/cinnamon/default.nix
View File

@ -6,7 +6,6 @@ lib.makeScope pkgs.newScope (self: with self; {
cinnamon-gsettings-overrides = callPackage ./cinnamon-gsettings-overrides { };
cinnamon-screensaver = callPackage ./cinnamon-screensaver { };
cinnamon-session = callPackage ./cinnamon-session { };
nemo-with-extensions = callPackage ./nemo/wrapper.nix { };
muffin = callPackage ./muffin { };
}) // lib.optionalAttrs config.allowAliases {
# Aliases need to be outside the scope or they will shadow the attributes from parent scope.
@ -30,7 +29,8 @@ lib.makeScope pkgs.newScope (self: with self; {
nemo-emblems = lib.warn "cinnamon.nemo-emblems was moved to top-level. Please use pkgs.nemo-emblems directly." pkgs.nemo-emblems; # Added on 2024-07-22
nemo-fileroller = lib.warn "cinnamon.nemo-fileroller was moved to top-level. Please use pkgs.nemo-fileroller directly." pkgs.nemo-fileroller; # Added on 2024-07-22
nemo-python = lib.warn "cinnamon.nemo-python was moved to top-level. Please use pkgs.nemo-python directly." pkgs.nemo-python; # Added on 2024-07-22
nemoExtensions = throw "cinnamon.nemoExtensions is no longer exposed. To modify list of selected nemo extensions please override cinnamon.nemo-with-extensions."; # Added on 2024-07-14
nemo-with-extensions = lib.warn "cinnamon.nemo-with-extensions was moved to top-level. Please use pkgs.nemo-with-extensions directly." pkgs.nemo-with-extensions; # Added on 2024-07-22
nemoExtensions = throw "cinnamon.nemoExtensions is no longer exposed. To modify list of selected nemo extensions please override pkgs.nemo-with-extensions."; # 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
xapp = lib.warn "cinnamon.xapp was moved to top-level. Please use pkgs.xapp directly." pkgs.xapp; # Added on 2024-07-14