From 0cd55983086d188c0f59e4a4f3132e29ea32823e Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 17 Apr 2022 21:19:17 -0300 Subject: [PATCH 1/4] emulators: reorder all-packages.nix Merely cosmetical. --- pkgs/top-level/all-packages.nix | 493 +++++++++++++++++--------------- 1 file changed, 256 insertions(+), 237 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e6aadc95f12..174a07af7177 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -277,12 +277,8 @@ with pkgs; catatonit = callPackage ../applications/virtualization/catatonit { }; - cen64 = callPackage ../applications/emulators/cen64 { }; - btdu = callPackage ../tools/misc/btdu { }; - uxn = callPackage ../applications/emulators/uxn { }; - cereal = callPackage ../development/libraries/cereal { }; certgraph = callPackage ../tools/security/certgraph { }; @@ -413,8 +409,6 @@ with pkgs; protoc-gen-validate = callPackage ../development/tools/protoc-gen-validate { }; - proton-caller = callPackage ../applications/emulators/proton-caller { }; - ptags = callPackage ../development/tools/misc/ptags { }; ptouch-print = callPackage ../misc/ptouch-print { }; @@ -1194,6 +1188,262 @@ with pkgs; breitbandmessung = callPackage ../applications/networking/breitbandmessung { }; + ### APPLICATIONS/EMULATORS + + atari800 = callPackage ../applications/emulators/atari800 { }; + + ataripp = callPackage ../applications/emulators/atari++ { }; + + attract-mode = callPackage ../applications/emulators/attract-mode { }; + + basiliskii = callPackage ../applications/emulators/basiliskii { }; + + bochs = callPackage ../applications/emulators/bochs { + wxGTK = wxGTK30; + }; + + caprice32 = callPackage ../applications/emulators/caprice32 { }; + + ccemux = callPackage ../applications/emulators/ccemux { }; + + cdemu-client = callPackage ../applications/emulators/cdemu/client.nix { }; + + cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { }; + + cen64 = callPackage ../applications/emulators/cen64 { }; + + citra = libsForQt5.callPackage ../applications/emulators/citra { }; + + collapseos-cvm = callPackage ../applications/emulators/collapseos-cvm { }; + + craftos-pc = callPackage ../applications/emulators/craftos-pc { }; + + darcnes = callPackage ../applications/emulators/darcnes { }; + + desmume = callPackage ../applications/emulators/desmume { }; + + dgen-sdl = callPackage ../applications/emulators/dgen-sdl { }; + + dlx = callPackage ../applications/emulators/dlx { }; + + dosbox = callPackage ../applications/emulators/dosbox { }; + + dosbox-staging = callPackage ../applications/emulators/dosbox-staging { }; + + duckstation = libsForQt5.callPackage ../applications/emulators/duckstation {}; + + dynamips = callPackage ../applications/emulators/dynamips { }; + + emu2 = callPackage ../applications/emulators/emu2 { }; + + emulationstation = callPackage ../applications/emulators/emulationstation { }; + + fceux = libsForQt5.callPackage ../applications/emulators/fceux { }; + + firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { }; + + flycast = callPackage ../applications/emulators/flycast { }; + + fsuae = callPackage ../applications/emulators/fs-uae { }; + + fsuae-launcher = callPackage ../applications/emulators/fs-uae/launcher.nix { }; + + fuse-emulator = callPackage ../applications/emulators/fuse-emulator {}; + + gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { }; + + gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { }; + + goldberg-emu = callPackage ../applications/emulators/goldberg-emu { }; + + gxemul = callPackage ../applications/emulators/gxemul { }; + + hatari = callPackage ../applications/emulators/hatari { }; + + hercules = callPackage ../applications/emulators/hercules { }; + + image-analyzer = callPackage ../applications/emulators/cdemu/analyzer.nix { }; + + kega-fusion = pkgsi686Linux.callPackage ../applications/emulators/kega-fusion { }; + + lambda-delta = callPackage ../applications/emulators/lambda-delta { }; + + libdsk = callPackage ../applications/emulators/libdsk { }; + + libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { }; + + maiko = callPackage ../applications/emulators/maiko { + inherit (xorg) libX11; + }; + + mame = libsForQt514.callPackage ../applications/emulators/mame { + inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; + }; + + mednafen = callPackage ../applications/emulators/mednafen { + inherit (darwin) libiconv; + }; + + mednafen-server = callPackage ../applications/emulators/mednafen/server.nix { }; + + mednaffe = callPackage ../applications/emulators/mednaffe { }; + + melonDS = libsForQt5.callPackage ../applications/emulators/melonDS { }; + + mgba = libsForQt5.callPackage ../applications/emulators/mgba { }; + + mupen64plus = callPackage ../applications/emulators/mupen64plus { }; + + nestopia = callPackage ../applications/emulators/nestopia { }; + + np2kai = callPackage ../applications/emulators/np2kai { }; + + oberon-risc-emu = callPackage ../applications/emulators/oberon-risc-emu { }; + + openmsx = callPackage ../applications/emulators/openmsx { + python = python3; + }; + + pcem = callPackage ../applications/emulators/pcem { }; + + pcsx2 = callPackage ../applications/emulators/pcsx2 { + wxGTK = wxGTK30-gtk3; + }; + + pcsxr = callPackage ../applications/emulators/pcsxr { }; + + ppsspp = libsForQt5.callPackage ../applications/emulators/ppsspp { }; + + proton-caller = callPackage ../applications/emulators/proton-caller { }; + + punes = libsForQt5.callPackage ../applications/emulators/punes { }; + + py65 = python3Packages.callPackage ../applications/emulators/py65 { }; + + resim = callPackage ../applications/emulators/resim {}; + + retrofe = callPackage ../applications/emulators/retrofe { }; + + rpcs3 = libsForQt5.callPackage ../applications/emulators/rpcs3 { }; + + ruffle = callPackage ../applications/emulators/ruffle { }; + + ryujinx = callPackage ../applications/emulators/ryujinx { }; + + sameboy = callPackage ../applications/emulators/sameboy { }; + + simh = callPackage ../applications/emulators/simh { }; + + simplenes = callPackage ../applications/emulators/simplenes { }; + + snes9x-gtk = callPackage ../applications/emulators/snes9x-gtk { }; + + stella = callPackage ../applications/emulators/stella { }; + + termtekst = callPackage ../applications/emulators/termtekst { }; + + tilem = callPackage ../applications/emulators/tilem { }; + + tiny8086 = callPackage ../applications/emulators/tiny8086 { }; + + tinyemu = callPackage ../applications/emulators/tinyemu { }; + + uae = callPackage ../applications/emulators/uae { }; + + uxn = callPackage ../applications/emulators/uxn { }; + + vbam = callPackage ../applications/emulators/vbam { }; + + vice = callPackage ../applications/emulators/vice { }; + + winetricks = callPackage ../applications/emulators/wine/winetricks.nix { + inherit (gnome) zenity; + }; + + xcpc = callPackage ../applications/emulators/xcpc { }; + + yapesdl = callPackage ../applications/emulators/yapesdl { }; + + zesarux = callPackage ../applications/emulators/zesarux { }; + + zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { }; + + ### APPLICATIONS/EMULATORS/BSNES + + ares = callPackage ../applications/emulators/ares { }; + + bsnes-hd = callPackage ../applications/emulators/bsnes-hd { + inherit (gnome2) gtksourceview; + inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL; + }; + + higan = callPackage ../applications/emulators/higan { }; + + ### APPLICATIONS/EMULATORS/DOLPHIN-EMU + + dolphin-emu = callPackage ../applications/emulators/dolphin-emu { }; + + dolphin-emu-beta = qt5.callPackage ../applications/emulators/dolphin-emu/master.nix { + inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; + }; + + dolphin-emu-primehack = qt5.callPackage ../applications/emulators/dolphin-emu/primehack.nix { + inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; + }; + + ### APPLICATIONS/EMULATORS/RETROARCH + + retroarchBare = callPackage ../applications/emulators/retroarch { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) AppKit Foundation; + }; + + retroarchFull = retroarch.override { + cores = builtins.filter + # Remove cores not supported on platform + (c: c ? libretroCore && (lib.meta.availableOn stdenv.hostPlatform c)) + (builtins.attrValues libretro); + }; + + wrapRetroArch = { retroarch }: + callPackage ../applications/emulators/retroarch/wrapper.nix + { inherit retroarch; }; + + retroarch = wrapRetroArch { retroarch = retroarchBare; }; + + libretro = recurseIntoAttrs + (callPackage ../applications/emulators/retroarch/cores.nix { + retroarch = retroarchBare; + }); + + kodi-retroarch-advanced-launchers = + callPackage ../applications/emulators/retroarch/kodi-advanced-launchers.nix { }; + + ### APPLICATIONS/EMULATORS/YUZU + + yuzu-mainline = import ../applications/emulators/yuzu { + branch = "mainline"; + inherit libsForQt5 fetchFromGitHub; + }; + yuzu-ea = import ../applications/emulators/yuzu { + branch = "early-access"; + inherit libsForQt5 fetchFromGitHub; + }; + + ### APPLICATIONS/EMULATORS/COMMANDERX16 + + x16-emulator = callPackage ../applications/emulators/commanderx16/emulator.nix { }; + x16-rom = callPackage ../applications/emulators/commanderx16/rom.nix { }; + x16-run = (callPackage ../applications/emulators/commanderx16/run.nix { }) { + emulator = x16-emulator; + rom = x16-rom; + }; + + yabause = libsForQt5.callPackage ../applications/emulators/yabause { + freeglut = null; + openal = null; + }; + ### APPLICATIONS/TERMINAL-EMULATORS alacritty = callPackage ../applications/terminal-emulators/alacritty { @@ -2409,10 +2659,6 @@ with pkgs; boca = callPackage ../development/libraries/boca { }; - bochs = callPackage ../applications/emulators/bochs { - wxGTK = wxGTK30; - }; - bubblewrap = callPackage ../tools/admin/bubblewrap { }; borgbackup = callPackage ../tools/backup/borgbackup { }; @@ -2467,10 +2713,6 @@ with pkgs; breakpointHook = assert stdenv.isLinux; makeSetupHook { } ../build-support/setup-hooks/breakpoint-hook.sh; - py65 = python3Packages.callPackage ../applications/emulators/py65 { }; - - simh = callPackage ../applications/emulators/simh { }; - btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; btrfs-snap = callPackage ../tools/filesystems/btrfs-snap { }; @@ -2592,20 +2834,10 @@ with pkgs; cde = callPackage ../tools/package-management/cde { }; - cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { }; - - cdemu-client = callPackage ../applications/emulators/cdemu/client.nix { }; - ceres-solver = callPackage ../development/libraries/ceres-solver { gflags = null; # only required for examples/tests }; - craftos-pc = callPackage ../applications/emulators/craftos-pc { }; - - gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { }; - - image-analyzer = callPackage ../applications/emulators/cdemu/analyzer.nix { }; - cbor-diag = callPackage ../development/tools/cbor-diag { }; cassowary = callPackage ../tools/networking/cassowary { }; @@ -2995,10 +3227,6 @@ with pkgs; djv = callPackage ../applications/graphics/djv { }; - dlx = callPackage ../applications/emulators/dlx { }; - - dgen-sdl = callPackage ../applications/emulators/dgen-sdl { }; - dnschef = python3Packages.callPackage ../tools/networking/dnschef { }; doitlive = callPackage ../tools/misc/doitlive { }; @@ -3816,8 +4044,6 @@ with pkgs; ropgadget = with python3Packages; toPythonApplication ropgadget; - ryujinx = callPackage ../applications/emulators/ryujinx { }; - scour = with python3Packages; toPythonApplication scour; s2png = callPackage ../tools/graphics/s2png { }; @@ -3840,8 +4066,6 @@ with pkgs; simg2img = callPackage ../tools/filesystems/simg2img { }; - simplenes = callPackage ../applications/emulators/simplenes { }; - snippetpixie = callPackage ../tools/text/snippetpixie { }; snowcat = callPackage ../tools/security/snowcat { }; @@ -4298,8 +4522,6 @@ with pkgs; citrix_workspace_21_12_0 ; - citra = libsForQt5.callPackage ../applications/emulators/citra { }; - cmigemo = callPackage ../tools/text/cmigemo { }; cmst = libsForQt5.callPackage ../tools/networking/cmst { }; @@ -4910,14 +5132,6 @@ with pkgs; dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { }; - dolphin-emu = callPackage ../applications/emulators/dolphin-emu { }; - dolphin-emu-beta = qt5.callPackage ../applications/emulators/dolphin-emu/master.nix { - inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; - }; - dolphin-emu-primehack = qt5.callPackage ../applications/emulators/dolphin-emu/primehack.nix { - inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; - }; - domoticz = callPackage ../servers/domoticz { }; doomseeker = qt5.callPackage ../applications/misc/doomseeker { }; @@ -5524,8 +5738,6 @@ with pkgs; fio = callPackage ../tools/system/fio { }; - firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { }; - flamerobin = callPackage ../applications/misc/flamerobin { }; flashrom = callPackage ../tools/misc/flashrom { }; @@ -7513,8 +7725,6 @@ with pkgs; node2nix = nodePackages.node2nix; - np2kai = callPackage ../applications/emulators/np2kai { }; - openipmi = callPackage ../tools/system/openipmi { }; ox = callPackage ../applications/editors/ox { }; @@ -7942,14 +8152,6 @@ with pkgs; mdp = callPackage ../applications/misc/mdp { }; - mednafen = callPackage ../applications/emulators/mednafen { - inherit (darwin) libiconv; - }; - - mednafen-server = callPackage ../applications/emulators/mednafen/server.nix { }; - - mednaffe = callPackage ../applications/emulators/mednaffe { }; - megacli = callPackage ../tools/misc/megacli { }; megatools = callPackage ../tools/networking/megatools { }; @@ -7964,8 +8166,6 @@ with pkgs; mfoc = callPackage ../tools/security/mfoc { }; - mgba = libsForQt5.callPackage ../applications/emulators/mgba { }; - microdnf = callPackage ../tools/package-management/microdnf { }; microplane = callPackage ../tools/misc/microplane { }; @@ -8184,8 +8384,6 @@ with pkgs; nerdfonts = callPackage ../data/fonts/nerdfonts { }; - nestopia = callPackage ../applications/emulators/nestopia { }; - netatalk = callPackage ../tools/filesystems/netatalk { }; netavark = callPackage ../tools/networking/netavark { }; @@ -9636,8 +9834,6 @@ with pkgs; rubocop = rubyPackages.rubocop; - ruffle = callPackage ../applications/emulators/ruffle { }; - runningx = callPackage ../tools/X11/runningx { }; rund = callPackage ../development/tools/rund { }; @@ -10516,8 +10712,6 @@ with pkgs; tiledb = callPackage ../development/libraries/tiledb { }; - tilem = callPackage ../applications/emulators/tilem { }; - timemachine = callPackage ../applications/audio/timemachine { }; timelapse-deflicker = callPackage ../applications/graphics/timelapse-deflicker { }; @@ -10540,10 +10734,6 @@ with pkgs; tinycbor = callPackage ../development/libraries/tinycbor { }; - tiny8086 = callPackage ../applications/emulators/tiny8086 { }; - - tinyemu = callPackage ../applications/emulators/tinyemu { }; - tinyfecvpn = callPackage ../tools/networking/tinyfecvpn { }; tinygltf = callPackage ../development/libraries/tinygltf { }; @@ -12117,8 +12307,6 @@ with pkgs; flasm = callPackage ../development/compilers/flasm { }; - flycast = callPackage ../applications/emulators/flycast { }; - flyctl = callPackage ../development/web/flyctl { }; fluidd = callPackage ../applications/misc/fluidd { }; @@ -14340,7 +14528,6 @@ with pkgs; mspdebug = callPackage ../development/misc/msp430/mspdebug.nix { }; vc4-newlib = callPackage ../development/misc/vc4/newlib.nix {}; - resim = callPackage ../applications/emulators/resim {}; or1k-newlib = callPackage ../development/misc/or1k/newlib.nix {}; @@ -16650,8 +16837,6 @@ with pkgs; duckdb = callPackage ../development/libraries/duckdb {}; - duckstation = libsForQt5.callPackage ../applications/emulators/duckstation {}; - easyloggingpp = callPackage ../development/libraries/easyloggingpp {}; eccodes = callPackage ../development/libraries/eccodes { @@ -18579,8 +18764,6 @@ with pkgs; hdf5 = hdf5_1_10; }; - libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { }; - libmkv = callPackage ../development/libraries/libmkv { }; libmms = callPackage ../development/libraries/libmms { }; @@ -24487,8 +24670,6 @@ with pkgs; fonts = [ "Terminus" ]; }; - termtekst = callPackage ../applications/emulators/termtekst { }; - tex-gyre = callPackages ../data/fonts/tex-gyre { }; tex-gyre-math = callPackages ../data/fonts/tex-gyre-math { }; @@ -25456,8 +25637,6 @@ with pkgs; dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { }; - dynamips = callPackage ../applications/emulators/dynamips { }; - exploitdb = callPackage ../tools/security/exploitdb { }; evilwm = callPackage ../applications/window-managers/evilwm { @@ -25915,8 +26094,6 @@ with pkgs; tuigreet = callPackage ../os-specific/linux/tuigreet { }; }; - goldberg-emu = callPackage ../applications/emulators/goldberg-emu { }; - goldendict = libsForQt5.callPackage ../applications/misc/goldendict { inherit (darwin) libiconv; }; @@ -26517,8 +26694,6 @@ with pkgs; herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; - hercules = callPackage ../applications/emulators/hercules { }; - hexchat = callPackage ../applications/networking/irc/hexchat { }; hexcurse = callPackage ../applications/editors/hexcurse { }; @@ -27065,8 +27240,6 @@ with pkgs; kdevelop = libsForQt5.callPackage ../applications/editors/kdevelop5/wrapper.nix { }; - kega-fusion = pkgsi686Linux.callPackage ../applications/emulators/kega-fusion { }; - kepubify = callPackage ../tools/misc/kepubify { }; kermit = callPackage ../tools/misc/kermit { }; @@ -27260,8 +27433,6 @@ with pkgs; kvirc = libsForQt514.callPackage ../applications/networking/irc/kvirc { }; - lambda-delta = callPackage ../applications/emulators/lambda-delta { }; - lame = callPackage ../development/libraries/lame { }; labwc = callPackage ../applications/window-managers/labwc { @@ -27393,8 +27564,6 @@ with pkgs; lighttable = callPackage ../applications/editors/lighttable {}; - libdsk = callPackage ../applications/emulators/libdsk { }; - liblinphone = callPackage ../development/libraries/liblinphone { }; links2 = callPackage ../applications/networking/browsers/links2 { }; @@ -27585,8 +27754,6 @@ with pkgs; melody = callPackage ../tools/misc/melody { }; - melonDS = libsForQt5.callPackage ../applications/emulators/melonDS { }; - meme-image-generator = callPackage ../applications/graphics/meme-image-generator { }; meme-suite = callPackage ../applications/science/biology/meme-suite { }; @@ -28243,8 +28410,6 @@ with pkgs; obconf = callPackage ../tools/X11/obconf { }; - oberon-risc-emu = callPackage ../applications/emulators/oberon-risc-emu { }; - gnome-obfuscate = callPackage ../applications/graphics/gnome-obfuscate { }; obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { @@ -28412,12 +28577,6 @@ with pkgs; pcloud = callPackage ../applications/networking/pcloud { }; - pcsxr = callPackage ../applications/emulators/pcsxr { }; - - pcsx2 = callPackage ../applications/emulators/pcsx2 { - wxGTK = wxGTK30-gtk3; - }; - jpsxdec = callPackage ../tools/games/jpsxdec { jdk = openjdk8; }; @@ -28944,8 +29103,6 @@ with pkgs; rootlesskit = callPackage ../tools/virtualization/rootlesskit {}; - rpcs3 = libsForQt5.callPackage ../applications/emulators/rpcs3 { }; - rsclock = callPackage ../applications/misc/rsclock { }; rstudio = libsForQt5.callPackage ../applications/editors/rstudio { @@ -28985,8 +29142,6 @@ with pkgs; sacc = callPackage ../applications/networking/gopher/sacc { }; - sameboy = callPackage ../applications/emulators/sameboy { }; - sayonara = libsForQt514.callPackage ../applications/audio/sayonara { }; sbagen = callPackage ../applications/misc/sbagen { }; @@ -29123,8 +29278,6 @@ with pkgs; curses = ncurses; }; - stella = callPackage ../applications/emulators/stella { }; - linuxstopmotion = libsForQt5.callPackage ../applications/video/linuxstopmotion { }; sweethome3d = recurseIntoAttrs ( @@ -30260,9 +30413,6 @@ with pkgs; kodi-cli = callPackage ../tools/misc/kodi-cli { }; - kodi-retroarch-advanced-launchers = - callPackage ../applications/emulators/retroarch/kodi-advanced-launchers.nix { }; - xca = libsForQt5.callPackage ../applications/misc/xca { }; xcalib = callPackage ../tools/X11/xcalib { }; @@ -32752,8 +32902,6 @@ with pkgs; crypto-org-wallet = callPackage ../applications/blockchains/crypto-org-wallet { }; - caprice32 = callPackage ../applications/emulators/caprice32 { }; - cubicle = callPackage ../applications/science/logic/cubicle { ocamlPackages = ocaml-ng.ocamlPackages_4_05; }; @@ -33277,12 +33425,6 @@ with pkgs; antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { }; - ares = callPackage ../applications/emulators/ares { }; - - atari800 = callPackage ../applications/emulators/atari800 { }; - - ataripp = callPackage ../applications/emulators/atari++ { }; - atlantis = callPackage ../applications/networking/cluster/atlantis { }; fn-cli = callPackage ../applications/networking/cluster/fn-cli { }; @@ -33297,14 +33439,10 @@ with pkgs; argononed = callPackage ../misc/drivers/argononed { }; - attract-mode = callPackage ../applications/emulators/attract-mode { }; - autotiling = python3Packages.callPackage ../misc/autotiling { }; avell-unofficial-control-center = python3Packages.callPackage ../applications/misc/avell-unofficial-control-center { }; - basiliskii = callPackage ../applications/emulators/basiliskii { }; - beep = callPackage ../misc/beep { }; bees = callPackage ../tools/filesystems/bees { }; @@ -33321,8 +33459,6 @@ with pkgs; calaos_installer = libsForQt5.callPackage ../misc/calaos/installer {}; - ccemux = callPackage ../applications/emulators/ccemux { }; - click = callPackage ../applications/networking/cluster/click { }; clinfo = callPackage ../tools/system/clinfo { @@ -33331,8 +33467,6 @@ with pkgs; clpeak = callPackage ../tools/misc/clpeak { }; - collapseos-cvm = callPackage ../applications/emulators/collapseos-cvm { }; - cups = callPackage ../misc/cups { }; cups-filters = callPackage ../misc/cups/filters.nix { }; @@ -33403,14 +33537,10 @@ with pkgs; cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { }; - darcnes = callPackage ../applications/emulators/darcnes { }; - darling-dmg = callPackage ../tools/filesystems/darling-dmg { }; depotdownloader = callPackage ../tools/misc/depotdownloader { }; - desmume = callPackage ../applications/emulators/desmume { }; - dbacl = callPackage ../tools/misc/dbacl { }; dblatex = callPackage ../tools/typesetting/tex/dblatex { }; @@ -33423,14 +33553,8 @@ with pkgs; dockutil = callPackage ../os-specific/darwin/dockutil { }; - dosbox = callPackage ../applications/emulators/dosbox { }; - - dosbox-staging = callPackage ../applications/emulators/dosbox-staging { }; - eiciel = callPackage ../tools/filesystems/eiciel { }; - emu2 = callPackage ../applications/emulators/emu2 { }; - apt = callPackage ../tools/package-management/apt { }; dpkg = callPackage ../tools/package-management/dpkg { }; @@ -33443,8 +33567,6 @@ with pkgs; ecdsatool = callPackage ../tools/security/ecdsatool { }; - emulationstation = callPackage ../applications/emulators/emulationstation { }; - electricsheep = callPackage ../misc/screensavers/electricsheep { }; aaphoto = callPackage ../tools/graphics/aaphoto {}; @@ -33485,8 +33607,6 @@ with pkgs; faustStk = callPackage ../applications/audio/faustStk { }; - fceux = libsForQt5.callPackage ../applications/emulators/fceux { }; - flockit = callPackage ../tools/backup/flockit { }; fahclient = callPackage ../applications/science/misc/foldingathome/client.nix {}; @@ -33501,8 +33621,6 @@ with pkgs; foomatic-filters = callPackage ../misc/drivers/foomatic-filters {}; - fuse-emulator = callPackage ../applications/emulators/fuse-emulator {}; - gajim = callPackage ../applications/networking/instant-messengers/gajim { inherit (gst_all_1) gstreamer gst-plugins-base gst-libav; gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; @@ -33510,8 +33628,6 @@ with pkgs; gammu = callPackage ../applications/misc/gammu { }; - gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { }; - ghostscript = callPackage ../misc/ghostscript { }; ghostscriptX = ghostscript.override { @@ -33538,10 +33654,6 @@ with pkgs; gummy = callPackage ../tools/misc/gummy { }; - gxemul = callPackage ../applications/emulators/gxemul { }; - - hatari = callPackage ../applications/emulators/hatari { }; - hck = callPackage ../tools/text/hck { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; @@ -33655,18 +33767,12 @@ with pkgs; loop = callPackage ../tools/misc/loop { }; - maiko = callPackage ../applications/emulators/maiko { inherit (xorg) libX11; }; - mailcore2 = callPackage ../development/libraries/mailcore2 { icu = icu58; }; mamba = callPackage ../applications/audio/mamba { }; - mame = libsForQt514.callPackage ../applications/emulators/mame { - inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; - }; - martyr = callPackage ../development/libraries/martyr { }; mas = callPackage ../os-specific/darwin/mas { }; @@ -33683,8 +33789,6 @@ with pkgs; morph = callPackage ../tools/package-management/morph { }; - mupen64plus = callPackage ../applications/emulators/mupen64plus { }; - muse = libsForQt5.callPackage ../applications/audio/muse { }; musly = callPackage ../applications/audio/musly { }; @@ -34021,8 +34125,6 @@ with pkgs; OSCAR = qt5.callPackage ../applications/misc/OSCAR { }; - pcem = callPackage ../applications/emulators/pcem { }; - pgmanage = callPackage ../applications/misc/pgmanage { }; pgadmin4 = callPackage ../tools/admin/pgadmin { }; @@ -34049,14 +34151,10 @@ with pkgs; pounce = callPackage ../servers/pounce { }; - ppsspp = libsForQt5.callPackage ../applications/emulators/ppsspp { }; - pt = callPackage ../applications/misc/pt { }; protocol = python3Packages.callPackage ../applications/networking/protocol { }; - punes = libsForQt5.callPackage ../applications/emulators/punes { }; - pykms = callPackage ../tools/networking/pykms { }; pyupgrade = with python3Packages; toPythonApplication pyupgrade; @@ -34065,12 +34163,6 @@ with pkgs; pwntools = with python3Packages; toPythonApplication pwntools; - uae = callPackage ../applications/emulators/uae { }; - - fsuae = callPackage ../applications/emulators/fs-uae { }; - - fsuae-launcher = callPackage ../applications/emulators/fs-uae/launcher.nix { }; - putty = callPackage ../applications/networking/remote/putty { gtk2 = gtk2-x11; }; @@ -34099,30 +34191,6 @@ with pkgs; renderizer = callPackage ../development/tools/renderizer {}; - retroarchBare = callPackage ../applications/emulators/retroarch { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) AppKit Foundation; - }; - - wrapRetroArch = { retroarch }: callPackage ../applications/emulators/retroarch/wrapper.nix { - inherit retroarch; - }; - - retroarch = wrapRetroArch { retroarch = retroarchBare; }; - - retroarchFull = retroarch.override { - cores = builtins.filter - # Remove cores not supported on platform - (c: c ? libretroCore && (lib.meta.availableOn stdenv.hostPlatform c)) - (builtins.attrValues libretro); - }; - - libretro = recurseIntoAttrs (callPackage ../applications/emulators/retroarch/cores.nix { - retroarch = retroarchBare; - }); - - retrofe = callPackage ../applications/emulators/retrofe { }; - rfc-bibtex = python3Packages.callPackage ../development/python-modules/rfc-bibtex { }; pick-colour-picker = python3Packages.callPackage ../applications/graphics/pick-colour-picker { @@ -34430,12 +34498,8 @@ with pkgs; vazir-fonts = callPackage ../data/fonts/vazir-fonts { }; - vbam = callPackage ../applications/emulators/vbam { }; - vgmstream = callPackage ../applications/audio/vgmstream { }; - vice = callPackage ../applications/emulators/vice { }; - viddy = callPackage ../tools/misc/viddy { }; ViennaRNA = callPackage ../applications/science/molecular-dynamics/viennarna { }; @@ -34532,10 +34596,6 @@ with pkgs; wineRelease = "wayland"; }); - winetricks = callPackage ../applications/emulators/wine/winetricks.nix { - inherit (gnome) zenity; - }; - wishbone-tool = callPackage ../development/tools/misc/wishbone-tool { }; with-shell = callPackage ../applications/misc/with-shell { }; @@ -34624,11 +34684,6 @@ with pkgs; yabai = callPackage ../os-specific/darwin/yabai { }; - yabause = libsForQt5.callPackage ../applications/emulators/yabause { - freeglut = null; - openal = null; - }; - yacreader = libsForQt5.callPackage ../applications/graphics/yacreader { }; yadm = callPackage ../applications/version-management/yadm { }; @@ -34647,15 +34702,6 @@ with pkgs; yaxg = callPackage ../tools/graphics/yaxg {}; - yuzu-mainline = import ../applications/emulators/yuzu { - branch = "mainline"; - inherit libsForQt5 fetchFromGitHub; - }; - yuzu-ea = import ../applications/emulators/yuzu { - branch = "early-access"; - inherit libsForQt5 fetchFromGitHub; - }; - zap = callPackage ../tools/networking/zap { }; zigbee2mqtt = callPackage ../servers/zigbee2mqtt { }; @@ -34674,38 +34720,12 @@ with pkgs; zoneminder = callPackage ../servers/zoneminder { }; - zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { }; - xcp = callPackage ../tools/misc/xcp { }; - xcpc = callPackage ../applications/emulators/xcpc { }; - zxcvbn-c = callPackage ../development/libraries/zxcvbn-c { }; zxing-cpp = callPackage ../development/libraries/zxing-cpp { }; - snes9x-gtk = callPackage ../applications/emulators/snes9x-gtk { }; - - openmsx = callPackage ../applications/emulators/openmsx { - python = python3; - }; - - higan = callPackage ../applications/emulators/higan { }; - - bsnes-hd = callPackage ../applications/emulators/bsnes-hd { - inherit (gnome2) gtksourceview; - inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL; - }; - - yapesdl = callPackage ../applications/emulators/yapesdl { }; - - x16-emulator = callPackage ../applications/emulators/commanderx16/emulator.nix { }; - x16-rom = callPackage ../applications/emulators/commanderx16/rom.nix { }; - x16-run = (callPackage ../applications/emulators/commanderx16/run.nix { }) { - emulator = x16-emulator; - rom = x16-rom; - }; - bullet = callPackage ../development/libraries/bullet { inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }; @@ -35065,7 +35085,6 @@ with pkgs; xsos = callPackage ../os-specific/linux/xsos { }; - zesarux = callPackage ../applications/emulators/zesarux { }; zk = callPackage ../applications/office/zk {}; From af8c5237d86073a60f19adc679cf617f1f9342fe Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 17 Apr 2022 23:09:49 -0300 Subject: [PATCH 2/4] ares: move to bsnes/ subdir --- pkgs/applications/emulators/{ => bsnes}/ares/default.nix | 0 pkgs/applications/emulators/{ => bsnes}/ares/fix-ruby.patch | 0 pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/emulators/{ => bsnes}/ares/default.nix (100%) rename pkgs/applications/emulators/{ => bsnes}/ares/fix-ruby.patch (100%) diff --git a/pkgs/applications/emulators/ares/default.nix b/pkgs/applications/emulators/bsnes/ares/default.nix similarity index 100% rename from pkgs/applications/emulators/ares/default.nix rename to pkgs/applications/emulators/bsnes/ares/default.nix diff --git a/pkgs/applications/emulators/ares/fix-ruby.patch b/pkgs/applications/emulators/bsnes/ares/fix-ruby.patch similarity index 100% rename from pkgs/applications/emulators/ares/fix-ruby.patch rename to pkgs/applications/emulators/bsnes/ares/fix-ruby.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 174a07af7177..8197b3aaa491 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1370,7 +1370,7 @@ with pkgs; ### APPLICATIONS/EMULATORS/BSNES - ares = callPackage ../applications/emulators/ares { }; + ares = callPackage ../applications/emulators/bsnes/ares { }; bsnes-hd = callPackage ../applications/emulators/bsnes-hd { inherit (gnome2) gtksourceview; From a6035820148b2e645166422d26596ef6bffcec1a Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 17 Apr 2022 23:11:10 -0300 Subject: [PATCH 3/4] bsnes-hd: move to bsnes/ subdir --- pkgs/applications/emulators/{ => bsnes}/bsnes-hd/default.nix | 0 .../{ => bsnes}/bsnes-hd/macos-copy-app-to-prefix.patch | 0 .../{ => bsnes}/bsnes-hd/macos-replace-sips-with-png2icns.patch | 0 pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/emulators/{ => bsnes}/bsnes-hd/default.nix (100%) rename pkgs/applications/emulators/{ => bsnes}/bsnes-hd/macos-copy-app-to-prefix.patch (100%) rename pkgs/applications/emulators/{ => bsnes}/bsnes-hd/macos-replace-sips-with-png2icns.patch (100%) diff --git a/pkgs/applications/emulators/bsnes-hd/default.nix b/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix similarity index 100% rename from pkgs/applications/emulators/bsnes-hd/default.nix rename to pkgs/applications/emulators/bsnes/bsnes-hd/default.nix diff --git a/pkgs/applications/emulators/bsnes-hd/macos-copy-app-to-prefix.patch b/pkgs/applications/emulators/bsnes/bsnes-hd/macos-copy-app-to-prefix.patch similarity index 100% rename from pkgs/applications/emulators/bsnes-hd/macos-copy-app-to-prefix.patch rename to pkgs/applications/emulators/bsnes/bsnes-hd/macos-copy-app-to-prefix.patch diff --git a/pkgs/applications/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch b/pkgs/applications/emulators/bsnes/bsnes-hd/macos-replace-sips-with-png2icns.patch similarity index 100% rename from pkgs/applications/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch rename to pkgs/applications/emulators/bsnes/bsnes-hd/macos-replace-sips-with-png2icns.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8197b3aaa491..927e4645e49f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1372,7 +1372,7 @@ with pkgs; ares = callPackage ../applications/emulators/bsnes/ares { }; - bsnes-hd = callPackage ../applications/emulators/bsnes-hd { + bsnes-hd = callPackage ../applications/emulators/bsnes/bsnes-hd { inherit (gnome2) gtksourceview; inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL; }; From d575f86479128f03983ef38f32d4e0856669c4a1 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 17 Apr 2022 23:14:25 -0300 Subject: [PATCH 4/4] higan: move to bsnes/ subdir --- .../emulators/{ => bsnes}/higan/001-include-cmath.patch | 0 .../emulators/{ => bsnes}/higan/002-sips-to-png2icns.patch | 0 pkgs/applications/emulators/{ => bsnes}/higan/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/applications/emulators/{ => bsnes}/higan/001-include-cmath.patch (100%) rename pkgs/applications/emulators/{ => bsnes}/higan/002-sips-to-png2icns.patch (100%) rename pkgs/applications/emulators/{ => bsnes}/higan/default.nix (100%) diff --git a/pkgs/applications/emulators/higan/001-include-cmath.patch b/pkgs/applications/emulators/bsnes/higan/001-include-cmath.patch similarity index 100% rename from pkgs/applications/emulators/higan/001-include-cmath.patch rename to pkgs/applications/emulators/bsnes/higan/001-include-cmath.patch diff --git a/pkgs/applications/emulators/higan/002-sips-to-png2icns.patch b/pkgs/applications/emulators/bsnes/higan/002-sips-to-png2icns.patch similarity index 100% rename from pkgs/applications/emulators/higan/002-sips-to-png2icns.patch rename to pkgs/applications/emulators/bsnes/higan/002-sips-to-png2icns.patch diff --git a/pkgs/applications/emulators/higan/default.nix b/pkgs/applications/emulators/bsnes/higan/default.nix similarity index 100% rename from pkgs/applications/emulators/higan/default.nix rename to pkgs/applications/emulators/bsnes/higan/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 927e4645e49f..06cdb49f1ab4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1377,7 +1377,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL; }; - higan = callPackage ../applications/emulators/higan { }; + higan = callPackage ../applications/emulators/bsnes/higan { }; ### APPLICATIONS/EMULATORS/DOLPHIN-EMU