Merge pull request #171968 from AndersonTorres/reorder-desktops

all-packages.nix: reorder desktops/
This commit is contained in:
Anderson Torres 2022-05-07 15:03:39 -03:00 committed by GitHub
commit 7fc3b44deb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -6418,8 +6418,6 @@ with pkgs;
gnirehtet = callPackage ../tools/networking/gnirehtet { };
gnome-2048 = callPackage ../desktops/gnome/games/gnome-2048 { };
gnome-builder = callPackage ../applications/editors/gnome-builder { };
gnome-desktop = callPackage ../development/libraries/gnome-desktop { };
@ -9145,8 +9143,6 @@ with pkgs;
pamtester = callPackage ../tools/security/pamtester { };
pantheon-tweaks = callPackage ../desktops/pantheon/third-party/pantheon-tweaks { };
paperless-ngx = callPackage ../applications/office/paperless-ngx { };
paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { };
@ -11704,8 +11700,6 @@ with pkgs;
chase = callPackage ../tools/system/chase { };
wingpanel-indicator-ayatana = callPackage ../desktops/pantheon/third-party/wingpanel-indicator-ayatana { };
wimlib = callPackage ../tools/archivers/wimlib { };
wipe = callPackage ../tools/security/wipe { };
@ -14213,25 +14207,6 @@ with pkgs;
nodejs = nodejs_latest;
};
lxappearance = callPackage ../desktops/lxde/core/lxappearance { };
lxappearance-gtk2 = callPackage ../desktops/lxde/core/lxappearance {
gtk2 = gtk2-x11;
withGtk3 = false;
};
lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { };
lxpanel = callPackage ../desktops/lxde/core/lxpanel {
gtk2 = gtk2-x11;
};
lxtask = callPackage ../desktops/lxde/core/lxtask { };
lxrandr = callPackage ../desktops/lxde/core/lxrandr { };
lxsession = callPackage ../desktops/lxde/core/lxsession { };
kona = callPackage ../development/interpreters/kona {};
lolcode = callPackage ../development/interpreters/lolcode { };
@ -15545,8 +15520,6 @@ with pkgs;
gnumake = callPackage ../development/tools/build-managers/gnumake { };
gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { };
gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep {});
gob2 = callPackage ../development/tools/misc/gob2 { };
gocd-agent = callPackage ../development/tools/continuous-integration/gocd-agent { };
@ -29738,8 +29711,6 @@ with pkgs;
surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; };
surf-display = callPackage ../desktops/surf-display { };
surge = callPackage ../applications/audio/surge {
inherit (gnome) zenity;
git = gitMinimal;
@ -32473,12 +32444,21 @@ with pkgs;
wyvern = callPackage ../games/wyvern { };
hsetroot = callPackage ../tools/X11/hsetroot { };
imwheel = callPackage ../tools/X11/imwheel { };
kakasi = callPackage ../tools/text/kakasi { };
### DESKTOP ENVIRONMENTS
arcan = recurseIntoAttrs (callPackage ../desktops/arcan {
callPackage = newScope arcan;
});
cdesktopenv = callPackage ../desktops/cdesktopenv { };
cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { });
inherit (cinnamon) mint-x-icons mint-y-icons;
enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment {
@ -32503,14 +32483,35 @@ with pkgs;
gnome-tour = callPackage ../desktops/gnome/core/gnome-tour { };
hsetroot = callPackage ../tools/X11/hsetroot { };
chrome-gnome-shell = callPackage ../desktops/gnome/extensions/chrome-gnome-shell { };
imwheel = callPackage ../tools/X11/imwheel { };
gnome-2048 = callPackage ../desktops/gnome/games/gnome-2048 { };
kakasi = callPackage ../tools/text/kakasi { };
gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep { });
lumina = recurseIntoAttrs (callPackage ../desktops/lumina { });
### DESKTOPS/LXDE
lxappearance = callPackage ../desktops/lxde/core/lxappearance { };
lxappearance-gtk2 = callPackage ../desktops/lxde/core/lxappearance {
gtk2 = gtk2-x11;
withGtk3 = false;
};
lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { };
lxpanel = callPackage ../desktops/lxde/core/lxpanel {
gtk2 = gtk2-x11;
};
lxrandr = callPackage ../desktops/lxde/core/lxrandr { };
lxsession = callPackage ../desktops/lxde/core/lxsession { };
lxtask = callPackage ../desktops/lxde/core/lxtask { };
lxqt = recurseIntoAttrs (import ../desktops/lxqt {
inherit pkgs;
inherit (lib) makeScope;
@ -32521,6 +32522,18 @@ with pkgs;
pantheon = recurseIntoAttrs (callPackage ../desktops/pantheon { });
pantheon-tweaks = callPackage ../desktops/pantheon/third-party/pantheon-tweaks { };
wingpanel-indicator-ayatana = callPackage ../desktops/pantheon/third-party/wingpanel-indicator-ayatana { };
rox-filer = callPackage ../desktops/rox/rox-filer {
gtk = gtk2;
};
surf-display = callPackage ../desktops/surf-display { };
xfce = recurseIntoAttrs (callPackage ../desktops/xfce { });
plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { };
plasma-theme-switcher = libsForQt5.callPackage ../applications/misc/plasma-theme-switcher {};
@ -32539,16 +32552,6 @@ with pkgs;
gnome-themes-extra = gnome.gnome-themes-extra;
rox-filer = callPackage ../desktops/rox/rox-filer {
gtk = gtk2;
};
arcan = recurseIntoAttrs (callPackage ../desktops/arcan {
callPackage = newScope arcan;
});
xfce = recurseIntoAttrs (callPackage ../desktops/xfce { });
xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { };
### SCIENCE/CHEMISTY
@ -35097,8 +35100,6 @@ with pkgs;
chrome-export = callPackage ../tools/misc/chrome-export {};
chrome-gnome-shell = callPackage ../desktops/gnome/extensions/chrome-gnome-shell {};
chrome-token-signing = libsForQt5.callPackage ../tools/security/chrome-token-signing {};
NSPlist = callPackage ../development/libraries/NSPlist {};