dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

cinnamon.nemoExtensions: Drop

Browse Source 
There is no reason exposing this.
This commit is contained in:
Bobby Rong 2024-07-22 00:08:04 +08:00
parent d114d56aad
commit cf238ea3d5
No known key found for this signature in database
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,16 +1,6 @@
{ config, pkgs, lib }: { config, pkgs, lib }:
lib.makeScope pkgs.newScope (self: with self; { lib.makeScope pkgs.newScope (self: with self; {
# Extensions added here will be shipped by default
# We keep this in sync with a default Mint installation
# Right now (only) nemo-share is missing
nemoExtensions = [
pkgs.folder-color-switcher
nemo-emblems
nemo-fileroller
nemo-python
];
cinnamon-common = callPackage ./cinnamon-common { }; cinnamon-common = callPackage ./cinnamon-common { };
cinnamon-control-center = callPackage ./cinnamon-control-center { }; cinnamon-control-center = callPackage ./cinnamon-control-center { };
cinnamon-desktop = callPackage ./cinnamon-desktop { }; cinnamon-desktop = callPackage ./cinnamon-desktop { };
@ -40,6 +30,7 @@ lib.makeScope pkgs.newScope (self: with self; {
mint-themes = lib.warn "cinnamon.mint-themes was moved to top-level. Please use pkgs.mint-themes directly." pkgs.mint-themes; # Added on 2024-07-14 mint-themes = lib.warn "cinnamon.mint-themes was moved to top-level. Please use pkgs.mint-themes directly." pkgs.mint-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 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
mint-y-icons = lib.warn "cinnamon.mint-y-icons was moved to top-level. Please use pkgs.mint-y-icons directly." pkgs.mint-y-icons; # Added on 2024-07-14 mint-y-icons = lib.warn "cinnamon.mint-y-icons was moved to top-level. Please use pkgs.mint-y-icons directly." pkgs.mint-y-icons; # Added on 2024-07-14
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
pix = lib.warn "cinnamon.pix was moved to top-level. Please use pkgs.pix directly." pkgs.pix; # 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 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 xapp = lib.warn "cinnamon.xapp was moved to top-level. Please use pkgs.xapp directly." pkgs.xapp; # Added on 2024-07-14

14
pkgs/desktops/cinnamon/nemo/wrapper.nix
View File

@ -1,15 +1,25 @@
{ symlinkJoin { symlinkJoin
, lib , lib
, makeWrapper , makeWrapper
, folder-color-switcher
, nemo , nemo
, nemoExtensions , nemo-emblems
, nemo-fileroller
, nemo-python
, python3 , python3
, extensions ? [ ] , extensions ? [ ]
, useDefaultExtensions ? true , useDefaultExtensions ? true
}: }:
let let
selectedExtensions = extensions ++ (lib.optionals useDefaultExtensions nemoExtensions); selectedExtensions = extensions ++ lib.optionals useDefaultExtensions [
# We keep this in sync with a default Mint installation
# Right now (only) nemo-share is missing
folder-color-switcher
nemo-emblems
nemo-fileroller
nemo-python
];
nemoPythonExtensionsDeps = lib.concatMap (x: x.nemoPythonExtensionDeps or []) selectedExtensions; nemoPythonExtensionsDeps = lib.concatMap (x: x.nemoPythonExtensionDeps or []) selectedExtensions;
in in
symlinkJoin { symlinkJoin {