Merge pull request #155263 from AndersonTorres/new-games

all-packages.nix: reordering expressions
This commit is contained in:
Anderson Torres 2022-01-18 14:20:30 -03:00 committed by GitHub
commit 271e516509
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -30263,6 +30263,22 @@ with pkgs;
drumkv1 = libsForQt5.callPackage ../applications/audio/drumkv1 { }; drumkv1 = libsForQt5.callPackage ../applications/audio/drumkv1 { };
gshhg-gmt = callPackage ../applications/gis/gmt/gshhg.nix { };
eureka-editor = callPackage ../applications/misc/eureka-editor { };
eureka-ideas = callPackage ../applications/misc/eureka-ideas {
inherit (darwin.apple_sdk.frameworks) Security;
};
fava = callPackage ../applications/office/fava {};
nux = callPackage ../tools/misc/nux { };
tts = callPackage ../tools/audio/tts { };
fslint = callPackage ../applications/misc/fslint { };
### GAMES ### GAMES
_1oom = callPackage ../games/1oom { }; _1oom = callPackage ../games/1oom { };
@ -30285,7 +30301,7 @@ with pkgs;
blockattack = callPackage ../games/blockattack { } ; blockattack = callPackage ../games/blockattack { } ;
colobot = callPackage ../games/colobot {}; colobot = callPackage ../games/colobot { };
doom-bcc = callPackage ../games/zdoom/bcc-git.nix { }; doom-bcc = callPackage ../games/zdoom/bcc-git.nix { };
@ -30380,7 +30396,7 @@ with pkgs;
amoeba = callPackage ../games/amoeba { }; amoeba = callPackage ../games/amoeba { };
amoeba-data = callPackage ../games/amoeba/data.nix { }; amoeba-data = callPackage ../games/amoeba/data.nix { };
andyetitmoves = callPackage ../games/andyetitmoves {}; andyetitmoves = callPackage ../games/andyetitmoves { };
angband = callPackage ../games/angband { }; angband = callPackage ../games/angband { };
@ -30393,7 +30409,7 @@ with pkgs;
armagetronad-dedicated = callPackage ../games/armagetronad { dedicatedServer = true; }; armagetronad-dedicated = callPackage ../games/armagetronad { dedicatedServer = true; };
arena = callPackage ../games/arena {}; arena = callPackage ../games/arena { };
arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis { }; arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis { };
@ -30407,17 +30423,17 @@ with pkgs;
astromenace = callPackage ../games/astromenace { }; astromenace = callPackage ../games/astromenace { };
atanks = callPackage ../games/atanks {}; atanks = callPackage ../games/atanks { };
azimuth = callPackage ../games/azimuth {}; azimuth = callPackage ../games/azimuth { };
ballAndPaddle = callPackage ../games/ball-and-paddle { ballAndPaddle = callPackage ../games/ball-and-paddle {
guile = guile_1_8; guile = guile_1_8;
}; };
banner = callPackage ../games/banner {}; banner = callPackage ../games/banner { };
bastet = callPackage ../games/bastet {}; bastet = callPackage ../games/bastet { };
black-hole-solver = callPackage ../games/black-hole-solver { black-hole-solver = callPackage ../games/black-hole-solver {
inherit (perlPackages) PathTiny; inherit (perlPackages) PathTiny;
@ -30502,12 +30518,12 @@ with pkgs;
inherit (import ../games/crossfire pkgs) inherit (import ../games/crossfire pkgs)
crossfire-server crossfire-arch crossfire-maps crossfire-client; crossfire-server crossfire-arch crossfire-maps crossfire-client;
crrcsim = callPackage ../games/crrcsim {}; crrcsim = callPackage ../games/crrcsim { };
curseofwar = callPackage ../games/curseofwar { SDL = null; }; curseofwar = callPackage ../games/curseofwar { SDL = null; };
curseofwar-sdl = callPackage ../games/curseofwar { ncurses = null; }; curseofwar-sdl = callPackage ../games/curseofwar { ncurses = null; };
cutemaze = libsForQt5.callPackage ../games/cutemaze {}; cutemaze = libsForQt5.callPackage ../games/cutemaze { };
cuyo = callPackage ../games/cuyo { }; cuyo = callPackage ../games/cuyo { };
@ -30522,7 +30538,7 @@ with pkgs;
}; };
}; };
dhewm3 = callPackage ../games/dhewm3 {}; dhewm3 = callPackage ../games/dhewm3 { };
domination = callPackage ../games/domination { }; domination = callPackage ../games/domination { };
@ -30570,12 +30586,6 @@ with pkgs;
eternity = callPackage ../games/eternity-engine { }; eternity = callPackage ../games/eternity-engine { };
eureka-editor = callPackage ../applications/misc/eureka-editor { };
eureka-ideas = callPackage ../applications/misc/eureka-ideas {
inherit (darwin.apple_sdk.frameworks) Security;
};
extremetuxracer = callPackage ../games/extremetuxracer { extremetuxracer = callPackage ../games/extremetuxracer {
libpng = libpng12; libpng = libpng12;
}; };
@ -30604,13 +30614,11 @@ with pkgs;
factorio-utils = callPackage ../games/factorio/utils.nix { }; factorio-utils = callPackage ../games/factorio/utils.nix { };
fairymax = callPackage ../games/fairymax {}; fairymax = callPackage ../games/fairymax { };
fava = callPackage ../applications/office/fava {}; fheroes2 = callPackage ../games/fheroes2 { };
fheroes2 = callPackage ../games/fheroes2 {}; fish-fillets-ng = callPackage ../games/fish-fillets-ng { };
fish-fillets-ng = callPackage ../games/fish-fillets-ng {};
fishfight = callPackage ../games/fishfight { fishfight = callPackage ../games/fishfight {
inherit (xorg) libX11 libXi; inherit (xorg) libX11 libXi;
@ -30656,8 +30664,6 @@ with pkgs;
}; };
}; };
fslint = callPackage ../applications/misc/fslint {};
galaxis = callPackage ../games/galaxis { }; galaxis = callPackage ../games/galaxis { };
gambatte = callPackage ../games/gambatte { }; gambatte = callPackage ../games/gambatte { };
@ -30676,9 +30682,9 @@ with pkgs;
gemrb = callPackage ../games/gemrb { }; gemrb = callPackage ../games/gemrb { };
gimx = callPackage ../games/gimx {}; gimx = callPackage ../games/gimx { };
gl117 = callPackage ../games/gl-117 {}; gl117 = callPackage ../games/gl-117 { };
globulation2 = callPackage ../games/globulation { globulation2 = callPackage ../games/globulation {
boost = boost155; boost = boost155;
@ -30704,13 +30710,11 @@ with pkgs;
gnushogi = callPackage ../games/gnushogi { }; gnushogi = callPackage ../games/gnushogi { };
gogui = callPackage ../games/gogui {}; gogui = callPackage ../games/gogui { };
gscrabble = python3Packages.callPackage ../games/gscrabble {}; gscrabble = python3Packages.callPackage ../games/gscrabble { };
gshogi = python3Packages.callPackage ../games/gshogi {}; gshogi = python3Packages.callPackage ../games/gshogi { };
gshhg-gmt = callPackage ../applications/gis/gmt/gshhg.nix { };
qtads = qt5.callPackage ../games/qtads { }; qtads = qt5.callPackage ../games/qtads { };
@ -30724,7 +30728,7 @@ with pkgs;
gtypist = callPackage ../games/gtypist { }; gtypist = callPackage ../games/gtypist { };
gweled = callPackage ../games/gweled {}; gweled = callPackage ../games/gweled { };
gzdoom = callPackage ../games/gzdoom { }; gzdoom = callPackage ../games/gzdoom { };
@ -30772,7 +30776,7 @@ with pkgs;
enableGPU = false; enableGPU = false;
}; };
klavaro = callPackage ../games/klavaro {}; klavaro = callPackage ../games/klavaro { };
kobodeluxe = callPackage ../games/kobodeluxe { }; kobodeluxe = callPackage ../games/kobodeluxe { };
@ -30794,7 +30798,7 @@ with pkgs;
liberation-circuit = callPackage ../games/liberation-circuit { }; liberation-circuit = callPackage ../games/liberation-circuit { };
lincity = callPackage ../games/lincity {}; lincity = callPackage ../games/lincity { };
lincity_ng = callPackage ../games/lincity/ng.nix { lincity_ng = callPackage ../games/lincity/ng.nix {
# https://github.com/lincity-ng/lincity-ng/issues/25 # https://github.com/lincity-ng/lincity-ng/issues/25
@ -30808,7 +30812,7 @@ with pkgs;
liquidwar5 = callPackage ../games/liquidwar/5.nix { liquidwar5 = callPackage ../games/liquidwar/5.nix {
}; };
lugaru = callPackage ../games/lugaru {}; lugaru = callPackage ../games/lugaru { };
macopix = callPackage ../games/macopix { macopix = callPackage ../games/macopix {
gtk = gtk2; gtk = gtk2;
@ -30820,7 +30824,7 @@ with pkgs;
mars = callPackage ../games/mars { }; mars = callPackage ../games/mars { };
megaglest = callPackage ../games/megaglest {}; megaglest = callPackage ../games/megaglest { };
methane = callPackage ../games/methane { }; methane = callPackage ../games/methane { };
@ -30843,7 +30847,7 @@ with pkgs;
minecraftServers = import ../games/minecraft-servers { inherit callPackage lib javaPackages; }; minecraftServers = import ../games/minecraft-servers { inherit callPackage lib javaPackages; };
minecraft-server = minecraftServers.vanilla; # backwards compatibility minecraft-server = minecraftServers.vanilla; # backwards compatibility
moon-buggy = callPackage ../games/moon-buggy {}; moon-buggy = callPackage ../games/moon-buggy { };
inherit (callPackages ../games/minetest { inherit (callPackages ../games/minetest {
inherit (darwin) libiconv; inherit (darwin) libiconv;
@ -30889,8 +30893,6 @@ with pkgs;
nexuiz = callPackage ../games/nexuiz { }; nexuiz = callPackage ../games/nexuiz { };
nux = callPackage ../tools/misc/nux { };
ninvaders = callPackage ../games/ninvaders { }; ninvaders = callPackage ../games/ninvaders { };
njam = callPackage ../games/njam { }; njam = callPackage ../games/njam { };
@ -30927,7 +30929,7 @@ with pkgs;
portmod = callPackage ../games/portmod { }; portmod = callPackage ../games/portmod { };
tlauncher = callPackage ../games/tlauncher {}; tlauncher = callPackage ../games/tlauncher { };
tr-patcher = callPackage ../games/tr-patcher { }; tr-patcher = callPackage ../games/tr-patcher { };
@ -30955,8 +30957,8 @@ with pkgs;
static = true; static = true;
}; };
}; };
openttd-grfcodec = callPackage ../games/openttd/grfcodec.nix {}; openttd-grfcodec = callPackage ../games/openttd/grfcodec.nix { };
openttd-nml = callPackage ../games/openttd/nml.nix {}; openttd-nml = callPackage ../games/openttd/nml.nix { };
opentyrian = callPackage ../games/opentyrian { }; opentyrian = callPackage ../games/opentyrian { };
@ -30978,7 +30980,7 @@ with pkgs;
pinball = callPackage ../games/pinball { }; pinball = callPackage ../games/pinball { };
pingus = callPackage ../games/pingus {}; pingus = callPackage ../games/pingus { };
pioneer = callPackage ../games/pioneer { }; pioneer = callPackage ../games/pioneer { };
@ -31022,7 +31024,7 @@ with pkgs;
ioquake3 = callPackage ../games/quake3/ioquake { }; ioquake3 = callPackage ../games/quake3/ioquake { };
quake3e = callPackage ../games/quake3/quake3e { }; quake3e = callPackage ../games/quake3/quake3e { };
quantumminigolf = callPackage ../games/quantumminigolf {}; quantumminigolf = callPackage ../games/quantumminigolf { };
r2mod_cli = callPackage ../games/r2mod_cli { }; r2mod_cli = callPackage ../games/r2mod_cli { };
@ -31073,7 +31075,7 @@ with pkgs;
openjdk = openjdk8; openjdk = openjdk8;
}; };
sauerbraten = callPackage ../games/sauerbraten {}; sauerbraten = callPackage ../games/sauerbraten { };
scid = callPackage ../games/scid { scid = callPackage ../games/scid {
tcl = tcl-8_5; tcl = tcl-8_5;
@ -31146,7 +31148,7 @@ with pkgs;
ssl-cert-check = callPackage ../tools/admin/ssl-cert-check { }; ssl-cert-check = callPackage ../tools/admin/ssl-cert-check { };
stardust = callPackage ../games/stardust {}; stardust = callPackage ../games/stardust { };
starspace = callPackage ../applications/science/machine-learning/starspace { }; starspace = callPackage ../applications/science/machine-learning/starspace { };
@ -31248,8 +31250,6 @@ with pkgs;
tremulous = callPackage ../games/tremulous { }; tremulous = callPackage ../games/tremulous { };
tts = callPackage ../tools/audio/tts { };
tumiki-fighters = callPackage ../games/tumiki-fighters { }; tumiki-fighters = callPackage ../games/tumiki-fighters { };
tuxpaint = callPackage ../games/tuxpaint { }; tuxpaint = callPackage ../games/tuxpaint { };
@ -31392,8 +31392,8 @@ with pkgs;
xpilot-ng = callPackage ../games/xpilot { }; xpilot-ng = callPackage ../games/xpilot { };
bloodspilot-server = callPackage ../games/xpilot/bloodspilot-server.nix {}; bloodspilot-server = callPackage ../games/xpilot/bloodspilot-server.nix { };
bloodspilot-client = callPackage ../games/xpilot/bloodspilot-client.nix {}; bloodspilot-client = callPackage ../games/xpilot/bloodspilot-client.nix { };
xskat = callPackage ../games/xskat { }; xskat = callPackage ../games/xskat { };
@ -31442,6 +31442,10 @@ with pkgs;
_0verkill = callPackage ../games/0verkill { }; _0verkill = callPackage ../games/0verkill { };
hhexen = callPackage ../games/hhexen { };
wyvern = callPackage ../games/wyvern { };
### DESKTOP ENVIRONMENTS ### DESKTOP ENVIRONMENTS
cdesktopenv = callPackage ../desktops/cdesktopenv { }; cdesktopenv = callPackage ../desktops/cdesktopenv { };
@ -31471,8 +31475,6 @@ with pkgs;
gnome-tour = callPackage ../desktops/gnome/core/gnome-tour { }; gnome-tour = callPackage ../desktops/gnome/core/gnome-tour { };
hhexen = callPackage ../games/hhexen { };
hsetroot = callPackage ../tools/X11/hsetroot { }; hsetroot = callPackage ../tools/X11/hsetroot { };
imwheel = callPackage ../tools/X11/imwheel { }; imwheel = callPackage ../tools/X11/imwheel { };
@ -33860,8 +33862,6 @@ with pkgs;
wxGTK = wxGTK30; wxGTK = wxGTK30;
}; };
wyvern = callPackage ../games/wyvern { };
x11idle = callPackage ../tools/misc/x11idle {}; x11idle = callPackage ../tools/misc/x11idle {};
x11docker = callPackage ../applications/virtualization/x11docker { }; x11docker = callPackage ../applications/virtualization/x11docker { };