cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

xfce: run nixpkgs-fmt

Browse source 
xfce: do not use 'with self;'

using 'with' can sometimes be confusing so i prefer to not use it
This commit is contained in:
Artturin 2022-11-05 23:11:39 +02:00
parent 5568a4d25c
commit d16405fb97
1 changed files with 94 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

183
pkgs/desktops/xfce/default.nix
View file

@ -16,178 +16,183 @@ let
selfBuildHost = pkgsBuildHost.xfce; selfBuildHost = pkgsBuildHost.xfce;
selfBuildTarget = pkgsBuildTarget.xfce; selfBuildTarget = pkgsBuildTarget.xfce;
selfHostHost = pkgsHostHost.xfce; selfHostHost = pkgsHostHost.xfce;
selfTargetTarget = pkgsTargetTarget.xfce or {}; selfTargetTarget = pkgsTargetTarget.xfce or { };
}; };
keep = _self: { }; keep = _self: { };
extra = _spliced0: {}; extra = _spliced0: { };
in lib.makeScopeWithSplicing in
lib.makeScopeWithSplicing
splicePackages splicePackages
newScope newScope
otherSplices otherSplices
keep keep
extra extra
(self: with self; { (self:
#### NixOS support let
inherit (self) callPackage;
in
{
#### NixOS support
genericUpdater = pkgs.genericUpdater; genericUpdater = pkgs.genericUpdater;
mkXfceDerivation = callPackage ./mkXfceDerivation.nix { }; mkXfceDerivation = callPackage ./mkXfceDerivation.nix { };
automakeAddFlags = pkgs.makeSetupHook { } ./automakeAddFlags.sh; automakeAddFlags = pkgs.makeSetupHook { } ./automakeAddFlags.sh;
#### CORE #### CORE
exo = callPackage ./core/exo { }; exo = callPackage ./core/exo { };
garcon = callPackage ./core/garcon { }; garcon = callPackage ./core/garcon { };
libxfce4ui = callPackage ./core/libxfce4ui { }; libxfce4ui = callPackage ./core/libxfce4ui { };
libxfce4util = callPackage ./core/libxfce4util { }; libxfce4util = callPackage ./core/libxfce4util { };
thunar = callPackage ./core/thunar { thunar = callPackage ./core/thunar {
thunarPlugins = []; thunarPlugins = [ ];
}; };
thunar-volman = callPackage ./core/thunar-volman { }; thunar-volman = callPackage ./core/thunar-volman { };
thunar-archive-plugin = callPackage ./thunar-plugins/archive { }; thunar-archive-plugin = callPackage ./thunar-plugins/archive { };
thunar-dropbox-plugin = callPackage ./thunar-plugins/dropbox { }; thunar-dropbox-plugin = callPackage ./thunar-plugins/dropbox { };
thunar-media-tags-plugin = callPackage ./thunar-plugins/media-tags { }; thunar-media-tags-plugin = callPackage ./thunar-plugins/media-tags { };
tumbler = callPackage ./core/tumbler { }; tumbler = callPackage ./core/tumbler { };
xfce4-panel = callPackage ./core/xfce4-panel { }; xfce4-panel = callPackage ./core/xfce4-panel { };
xfce4-session = callPackage ./core/xfce4-session { }; xfce4-session = callPackage ./core/xfce4-session { };
xfce4-settings = callPackage ./core/xfce4-settings { }; xfce4-settings = callPackage ./core/xfce4-settings { };
xfce4-power-manager = callPackage ./core/xfce4-power-manager { }; xfce4-power-manager = callPackage ./core/xfce4-power-manager { };
xfconf = callPackage ./core/xfconf { }; xfconf = callPackage ./core/xfconf { };
xfdesktop = callPackage ./core/xfdesktop { }; xfdesktop = callPackage ./core/xfdesktop { };
xfwm4 = callPackage ./core/xfwm4 { }; xfwm4 = callPackage ./core/xfwm4 { };
xfce4-appfinder = callPackage ./core/xfce4-appfinder { }; xfce4-appfinder = callPackage ./core/xfce4-appfinder { };
xfce4-dev-tools = callPackage ./core/xfce4-dev-tools { xfce4-dev-tools = callPackage ./core/xfce4-dev-tools {
mkXfceDerivation = mkXfceDerivation.override { mkXfceDerivation = self.mkXfceDerivation.override {
xfce4-dev-tools = null; xfce4-dev-tools = null;
}; };
}; };
#### APPLICATIONS #### APPLICATIONS
catfish = callPackage ./applications/catfish { }; catfish = callPackage ./applications/catfish { };
gigolo = callPackage ./applications/gigolo { }; gigolo = callPackage ./applications/gigolo { };
mousepad = callPackage ./applications/mousepad { }; mousepad = callPackage ./applications/mousepad { };
orage = callPackage ./applications/orage { }; orage = callPackage ./applications/orage { };
parole = callPackage ./applications/parole { }; parole = callPackage ./applications/parole { };
ristretto = callPackage ./applications/ristretto { }; ristretto = callPackage ./applications/ristretto { };
xfce4-taskmanager = callPackage ./applications/xfce4-taskmanager { }; xfce4-taskmanager = callPackage ./applications/xfce4-taskmanager { };
xfce4-dict = callPackage ./applications/xfce4-dict { }; xfce4-dict = callPackage ./applications/xfce4-dict { };
xfce4-terminal = callPackage ./applications/xfce4-terminal { }; xfce4-terminal = callPackage ./applications/xfce4-terminal { };
xfce4-screensaver = callPackage ./applications/xfce4-screensaver { }; xfce4-screensaver = callPackage ./applications/xfce4-screensaver { };
xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter { xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter {
inherit (pkgs.gnome) libsoup; inherit (pkgs.gnome) libsoup;
}; };
xfdashboard = callPackage ./applications/xfdashboard {}; xfdashboard = callPackage ./applications/xfdashboard { };
xfce4-volumed-pulse = callPackage ./applications/xfce4-volumed-pulse { }; xfce4-volumed-pulse = callPackage ./applications/xfce4-volumed-pulse { };
xfce4-notifyd = callPackage ./applications/xfce4-notifyd { }; xfce4-notifyd = callPackage ./applications/xfce4-notifyd { };
xfburn = callPackage ./applications/xfburn { }; xfburn = callPackage ./applications/xfburn { };
xfce4-panel-profiles = callPackage ./applications/xfce4-panel-profiles { }; xfce4-panel-profiles = callPackage ./applications/xfce4-panel-profiles { };
#### ART #### ART
xfce4-icon-theme = callPackage ./art/xfce4-icon-theme { }; xfce4-icon-theme = callPackage ./art/xfce4-icon-theme { };
xfwm4-themes = callPackage ./art/xfwm4-themes { }; xfwm4-themes = callPackage ./art/xfwm4-themes { };
#### PANEL PLUGINS #### PANEL PLUGINS
xfce4-battery-plugin = callPackage ./panel-plugins/xfce4-battery-plugin { }; xfce4-battery-plugin = callPackage ./panel-plugins/xfce4-battery-plugin { };
xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin { }; xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin { };
xfce4-cpufreq-plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin { }; xfce4-cpufreq-plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin { };
xfce4-cpugraph-plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin { }; xfce4-cpugraph-plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin { };
xfce4-datetime-plugin = callPackage ./panel-plugins/xfce4-datetime-plugin { }; xfce4-datetime-plugin = callPackage ./panel-plugins/xfce4-datetime-plugin { };
xfce4-dockbarx-plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin { }; xfce4-dockbarx-plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin { };
xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin { }; xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin { };
xfce4-eyes-plugin = callPackage ./panel-plugins/xfce4-eyes-plugin { }; xfce4-eyes-plugin = callPackage ./panel-plugins/xfce4-eyes-plugin { };
xfce4-fsguard-plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin { }; xfce4-fsguard-plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin { };
xfce4-genmon-plugin = callPackage ./panel-plugins/xfce4-genmon-plugin { }; xfce4-genmon-plugin = callPackage ./panel-plugins/xfce4-genmon-plugin { };
xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin { }; xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin { };
xfce4-i3-workspaces-plugin = callPackage ./panel-plugins/xfce4-i3-workspaces-plugin { }; xfce4-i3-workspaces-plugin = callPackage ./panel-plugins/xfce4-i3-workspaces-plugin { };
xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin { }; xfce4-namebar-plugin = callPackage ./panel-plugins/xfce4-namebar-plugin { };
xfce4-netload-plugin = callPackage ./panel-plugins/xfce4-netload-plugin { }; xfce4-netload-plugin = callPackage ./panel-plugins/xfce4-netload-plugin { };
xfce4-notes-plugin = callPackage ./panel-plugins/xfce4-notes-plugin { }; xfce4-notes-plugin = callPackage ./panel-plugins/xfce4-notes-plugin { };
xfce4-mailwatch-plugin = callPackage ./panel-plugins/xfce4-mailwatch-plugin { }; xfce4-mailwatch-plugin = callPackage ./panel-plugins/xfce4-mailwatch-plugin { };
xfce4-mpc-plugin = callPackage ./panel-plugins/xfce4-mpc-plugin { }; xfce4-mpc-plugin = callPackage ./panel-plugins/xfce4-mpc-plugin { };
xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin { }; xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin { };
xfce4-systemload-plugin = callPackage ./panel-plugins/xfce4-systemload-plugin { }; xfce4-systemload-plugin = callPackage ./panel-plugins/xfce4-systemload-plugin { };
xfce4-time-out-plugin = callPackage ./panel-plugins/xfce4-time-out-plugin { }; xfce4-time-out-plugin = callPackage ./panel-plugins/xfce4-time-out-plugin { };
xfce4-timer-plugin = callPackage ./panel-plugins/xfce4-timer-plugin { }; xfce4-timer-plugin = callPackage ./panel-plugins/xfce4-timer-plugin { };
xfce4-verve-plugin = callPackage ./panel-plugins/xfce4-verve-plugin { }; xfce4-verve-plugin = callPackage ./panel-plugins/xfce4-verve-plugin { };
xfce4-xkb-plugin = callPackage ./panel-plugins/xfce4-xkb-plugin { }; xfce4-xkb-plugin = callPackage ./panel-plugins/xfce4-xkb-plugin { };
xfce4-weather-plugin = callPackage ./panel-plugins/xfce4-weather-plugin { }; xfce4-weather-plugin = callPackage ./panel-plugins/xfce4-weather-plugin { };
xfce4-whiskermenu-plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin { }; xfce4-whiskermenu-plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin { };
xfce4-windowck-plugin = callPackage ./panel-plugins/xfce4-windowck-plugin { }; xfce4-windowck-plugin = callPackage ./panel-plugins/xfce4-windowck-plugin { };
xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin { }; xfce4-pulseaudio-plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin { };
} // lib.optionalAttrs config.allowAliases { } // lib.optionalAttrs config.allowAliases {
#### ALIASES #### ALIASES
xinitrc = xfce4-session.xinitrc; # added 2019-11-04 xinitrc = self.xfce4-session.xinitrc; # added 2019-11-04
thunar-bare = thunar.override { thunarPlugins = []; }; # added 2019-11-04 thunar-bare = self.thunar.override { thunarPlugins = [ ]; }; # added 2019-11-04
}) // lib.optionalAttrs config.allowAliases { }) // lib.optionalAttrs config.allowAliases {
#### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope. #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope.
terminal = throw "xfce.terminal has been removed, use xfce.xfce4-terminal instead"; # added 2022-05-24 terminal = throw "xfce.terminal has been removed, use xfce.xfce4-terminal instead"; # added 2022-05-24