mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-03-08 03:44:07 +01:00
mate.{cajaExtensions,panelApplets}: drop
Moved to corresponding packages.
This commit is contained in:
parent
565e31ff9e
commit
ffe8b46fec
3 changed files with 25 additions and 23 deletions
|
|
@ -5,13 +5,13 @@
|
|||
wrapGAppsHook3,
|
||||
lndir,
|
||||
caja,
|
||||
mate,
|
||||
caja-extensions,
|
||||
extensions ? [ ],
|
||||
useDefaultExtensions ? true,
|
||||
}:
|
||||
|
||||
let
|
||||
selectedExtensions = extensions ++ (lib.optionals useDefaultExtensions mate.cajaExtensions);
|
||||
selectedExtensions = extensions ++ (lib.optionals useDefaultExtensions [ caja-extensions ]);
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "${caja.pname}-with-extensions";
|
||||
|
|
|
|||
|
|
@ -5,14 +5,32 @@
|
|||
wrapGAppsHook3,
|
||||
lndir,
|
||||
marco,
|
||||
mate-applets,
|
||||
mate-indicator-applet,
|
||||
mate-netbook,
|
||||
mate-notification-daemon,
|
||||
mate-media,
|
||||
mate-panel,
|
||||
mate,
|
||||
mate-power-manager,
|
||||
mate-sensors-applet,
|
||||
mate-utils,
|
||||
applets ? [ ],
|
||||
useDefaultApplets ? true,
|
||||
}:
|
||||
|
||||
let
|
||||
selectedApplets = applets ++ (lib.optionals useDefaultApplets mate.panelApplets);
|
||||
selectedApplets =
|
||||
applets
|
||||
++ (lib.optionals useDefaultApplets [
|
||||
mate-applets
|
||||
mate-indicator-applet
|
||||
mate-netbook
|
||||
mate-notification-daemon
|
||||
mate-media
|
||||
mate-power-manager
|
||||
mate-sensors-applet
|
||||
mate-utils
|
||||
]);
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "${mate-panel.pname}-with-applets";
|
||||
|
|
|
|||
|
|
@ -4,29 +4,13 @@
|
|||
config,
|
||||
}:
|
||||
|
||||
let
|
||||
packages =
|
||||
self: with self; {
|
||||
cajaExtensions = [ pkgs.caja-extensions ];
|
||||
|
||||
panelApplets = with pkgs; [
|
||||
mate-applets
|
||||
mate-indicator-applet
|
||||
mate-netbook
|
||||
mate-notification-daemon
|
||||
mate-media
|
||||
mate-power-manager
|
||||
mate-sensors-applet
|
||||
mate-utils
|
||||
];
|
||||
};
|
||||
|
||||
in
|
||||
lib.makeScope pkgs.newScope packages
|
||||
lib.makeScope pkgs.newScope (self: { })
|
||||
// lib.optionalAttrs config.allowAliases {
|
||||
basePackages = throw "‘mate.basePackages’ was removed. Please list the packages you need explicitly"; # Added on 2026-02-14
|
||||
cajaExtensions = throw "‘mate.cajaExtensions’ was removed. Please list the extensions you need explicitly"; # Added on 2026-02-14
|
||||
extraPackages = throw "‘mate.extraPackages’ was removed. Please list the packages you need explicitly"; # Added on 2026-02-14
|
||||
mateUpdateScript = throw "‘mate.mateUpdateScript’ was removed. Please use ‘pkgs.gitUpdater’ directly"; # Added on 2026-02-14
|
||||
panelApplets = throw "‘mate.panelApplets’ was removed. Please list the applets you need explicitly"; # Added on 2026-02-14
|
||||
|
||||
atril = lib.warnOnInstantiate "‘mate.atril’ was moved to top-level. Please use ‘pkgs.atril’ directly" pkgs.atril; # Added on 2026-02-08
|
||||
engrampa = lib.warnOnInstantiate "‘mate.engrampa’ was moved to top-level. Please use ‘pkgs.engrampa’ directly" pkgs.engrampa; # Added on 2026-02-08
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue