diff --git a/pkgs/misc/emulators/ares/default.nix b/pkgs/applications/emulators/ares/default.nix similarity index 100% rename from pkgs/misc/emulators/ares/default.nix rename to pkgs/applications/emulators/ares/default.nix diff --git a/pkgs/misc/emulators/ares/fix-ruby.patch b/pkgs/applications/emulators/ares/fix-ruby.patch similarity index 100% rename from pkgs/misc/emulators/ares/fix-ruby.patch rename to pkgs/applications/emulators/ares/fix-ruby.patch diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/applications/emulators/atari++/default.nix similarity index 100% rename from pkgs/misc/emulators/atari++/default.nix rename to pkgs/applications/emulators/atari++/default.nix diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/applications/emulators/atari800/default.nix similarity index 100% rename from pkgs/misc/emulators/atari800/default.nix rename to pkgs/applications/emulators/atari800/default.nix diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/pkgs/applications/emulators/attract-mode/default.nix similarity index 100% rename from pkgs/misc/emulators/attract-mode/default.nix rename to pkgs/applications/emulators/attract-mode/default.nix diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/emulators/bochs/default.nix similarity index 100% rename from pkgs/applications/virtualization/bochs/default.nix rename to pkgs/applications/emulators/bochs/default.nix diff --git a/pkgs/misc/emulators/bsnes-hd/default.nix b/pkgs/applications/emulators/bsnes-hd/default.nix similarity index 100% rename from pkgs/misc/emulators/bsnes-hd/default.nix rename to pkgs/applications/emulators/bsnes-hd/default.nix diff --git a/pkgs/misc/emulators/bsnes-hd/macos-copy-app-to-prefix.patch b/pkgs/applications/emulators/bsnes-hd/macos-copy-app-to-prefix.patch similarity index 100% rename from pkgs/misc/emulators/bsnes-hd/macos-copy-app-to-prefix.patch rename to pkgs/applications/emulators/bsnes-hd/macos-copy-app-to-prefix.patch diff --git a/pkgs/misc/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch b/pkgs/applications/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch similarity index 100% rename from pkgs/misc/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch rename to pkgs/applications/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch diff --git a/pkgs/misc/emulators/caprice32/default.nix b/pkgs/applications/emulators/caprice32/default.nix similarity index 100% rename from pkgs/misc/emulators/caprice32/default.nix rename to pkgs/applications/emulators/caprice32/default.nix diff --git a/pkgs/misc/emulators/caprice32/string.patch b/pkgs/applications/emulators/caprice32/string.patch similarity index 100% rename from pkgs/misc/emulators/caprice32/string.patch rename to pkgs/applications/emulators/caprice32/string.patch diff --git a/pkgs/misc/emulators/ccemux/default.nix b/pkgs/applications/emulators/ccemux/default.nix similarity index 100% rename from pkgs/misc/emulators/ccemux/default.nix rename to pkgs/applications/emulators/ccemux/default.nix diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/applications/emulators/cdemu/analyzer.nix similarity index 100% rename from pkgs/misc/emulators/cdemu/analyzer.nix rename to pkgs/applications/emulators/cdemu/analyzer.nix diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/applications/emulators/cdemu/base.nix similarity index 100% rename from pkgs/misc/emulators/cdemu/base.nix rename to pkgs/applications/emulators/cdemu/base.nix diff --git a/pkgs/misc/emulators/cdemu/client.nix b/pkgs/applications/emulators/cdemu/client.nix similarity index 100% rename from pkgs/misc/emulators/cdemu/client.nix rename to pkgs/applications/emulators/cdemu/client.nix diff --git a/pkgs/misc/emulators/cdemu/daemon.nix b/pkgs/applications/emulators/cdemu/daemon.nix similarity index 100% rename from pkgs/misc/emulators/cdemu/daemon.nix rename to pkgs/applications/emulators/cdemu/daemon.nix diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/applications/emulators/cdemu/gui.nix similarity index 100% rename from pkgs/misc/emulators/cdemu/gui.nix rename to pkgs/applications/emulators/cdemu/gui.nix diff --git a/pkgs/misc/emulators/cdemu/libmirage.nix b/pkgs/applications/emulators/cdemu/libmirage.nix similarity index 100% rename from pkgs/misc/emulators/cdemu/libmirage.nix rename to pkgs/applications/emulators/cdemu/libmirage.nix diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/applications/emulators/cdemu/vhba.nix similarity index 100% rename from pkgs/misc/emulators/cdemu/vhba.nix rename to pkgs/applications/emulators/cdemu/vhba.nix diff --git a/pkgs/misc/emulators/cen64/default.nix b/pkgs/applications/emulators/cen64/default.nix similarity index 100% rename from pkgs/misc/emulators/cen64/default.nix rename to pkgs/applications/emulators/cen64/default.nix diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/applications/emulators/citra/default.nix similarity index 100% rename from pkgs/misc/emulators/citra/default.nix rename to pkgs/applications/emulators/citra/default.nix diff --git a/pkgs/misc/emulators/commanderx16/emulator.nix b/pkgs/applications/emulators/commanderx16/emulator.nix similarity index 100% rename from pkgs/misc/emulators/commanderx16/emulator.nix rename to pkgs/applications/emulators/commanderx16/emulator.nix diff --git a/pkgs/misc/emulators/commanderx16/rom.nix b/pkgs/applications/emulators/commanderx16/rom.nix similarity index 100% rename from pkgs/misc/emulators/commanderx16/rom.nix rename to pkgs/applications/emulators/commanderx16/rom.nix diff --git a/pkgs/misc/emulators/commanderx16/run.nix b/pkgs/applications/emulators/commanderx16/run.nix similarity index 100% rename from pkgs/misc/emulators/commanderx16/run.nix rename to pkgs/applications/emulators/commanderx16/run.nix diff --git a/pkgs/misc/emulators/craftos-pc/default.nix b/pkgs/applications/emulators/craftos-pc/default.nix similarity index 100% rename from pkgs/misc/emulators/craftos-pc/default.nix rename to pkgs/applications/emulators/craftos-pc/default.nix diff --git a/pkgs/misc/emulators/darcnes/default.nix b/pkgs/applications/emulators/darcnes/default.nix similarity index 100% rename from pkgs/misc/emulators/darcnes/default.nix rename to pkgs/applications/emulators/darcnes/default.nix diff --git a/pkgs/misc/emulators/darcnes/label.patch b/pkgs/applications/emulators/darcnes/label.patch similarity index 100% rename from pkgs/misc/emulators/darcnes/label.patch rename to pkgs/applications/emulators/darcnes/label.patch diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/applications/emulators/desmume/default.nix similarity index 100% rename from pkgs/misc/emulators/desmume/default.nix rename to pkgs/applications/emulators/desmume/default.nix diff --git a/pkgs/misc/emulators/dgen-sdl/default.nix b/pkgs/applications/emulators/dgen-sdl/default.nix similarity index 100% rename from pkgs/misc/emulators/dgen-sdl/default.nix rename to pkgs/applications/emulators/dgen-sdl/default.nix diff --git a/pkgs/misc/emulators/dlx/default.nix b/pkgs/applications/emulators/dlx/default.nix similarity index 100% rename from pkgs/misc/emulators/dlx/default.nix rename to pkgs/applications/emulators/dlx/default.nix diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix similarity index 100% rename from pkgs/misc/emulators/dolphin-emu/default.nix rename to pkgs/applications/emulators/dolphin-emu/default.nix diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/applications/emulators/dolphin-emu/master.nix similarity index 100% rename from pkgs/misc/emulators/dolphin-emu/master.nix rename to pkgs/applications/emulators/dolphin-emu/master.nix diff --git a/pkgs/misc/emulators/dolphin-emu/primehack.nix b/pkgs/applications/emulators/dolphin-emu/primehack.nix similarity index 100% rename from pkgs/misc/emulators/dolphin-emu/primehack.nix rename to pkgs/applications/emulators/dolphin-emu/primehack.nix diff --git a/pkgs/misc/emulators/dosbox-staging/default.nix b/pkgs/applications/emulators/dosbox-staging/default.nix similarity index 100% rename from pkgs/misc/emulators/dosbox-staging/default.nix rename to pkgs/applications/emulators/dosbox-staging/default.nix diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/applications/emulators/dosbox/default.nix similarity index 100% rename from pkgs/misc/emulators/dosbox/default.nix rename to pkgs/applications/emulators/dosbox/default.nix diff --git a/pkgs/misc/emulators/duckstation/default.nix b/pkgs/applications/emulators/duckstation/default.nix similarity index 100% rename from pkgs/misc/emulators/duckstation/default.nix rename to pkgs/applications/emulators/duckstation/default.nix diff --git a/pkgs/applications/virtualization/dynamips/default.nix b/pkgs/applications/emulators/dynamips/default.nix similarity index 83% rename from pkgs/applications/virtualization/dynamips/default.nix rename to pkgs/applications/emulators/dynamips/default.nix index 7f3320101530..26ff779ba05a 100644 --- a/pkgs/applications/virtualization/dynamips/default.nix +++ b/pkgs/applications/emulators/dynamips/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libelf, libpcap }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, libelf +, libpcap +}: stdenv.mkDerivation rec { pname = "dynamips"; @@ -8,7 +14,7 @@ stdenv.mkDerivation rec { owner = "GNS3"; repo = pname; rev = "v${version}"; - sha256 = "0pvdqs6kjz0x0wqb5f1k3r25dg82wssm7wz4psm0m6bxsvf5l0i5"; + hash = "sha256-JQJa3NZ9mQqqvuTzU7XmAr1WRB4zuLIwBx18OY3GbV8="; }; nativeBuildInputs = [ cmake ]; @@ -17,12 +23,12 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DDYNAMIPS_CODE=stable" ]; meta = with lib; { + inherit (src.meta) homepage; description = "A Cisco router emulator"; longDescription = '' Dynamips is an emulator computer program that was written to emulate Cisco routers. ''; - inherit (src.meta) homepage; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/misc/emulators/emu2/default.nix b/pkgs/applications/emulators/emu2/default.nix similarity index 100% rename from pkgs/misc/emulators/emu2/default.nix rename to pkgs/applications/emulators/emu2/default.nix diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/applications/emulators/emulationstation/default.nix similarity index 100% rename from pkgs/misc/emulators/emulationstation/default.nix rename to pkgs/applications/emulators/emulationstation/default.nix diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/applications/emulators/epsxe/default.nix similarity index 100% rename from pkgs/misc/emulators/epsxe/default.nix rename to pkgs/applications/emulators/epsxe/default.nix diff --git a/pkgs/misc/emulators/fakenes/build.patch b/pkgs/applications/emulators/fakenes/build.patch similarity index 100% rename from pkgs/misc/emulators/fakenes/build.patch rename to pkgs/applications/emulators/fakenes/build.patch diff --git a/pkgs/misc/emulators/fakenes/default.nix b/pkgs/applications/emulators/fakenes/default.nix similarity index 100% rename from pkgs/misc/emulators/fakenes/default.nix rename to pkgs/applications/emulators/fakenes/default.nix diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/applications/emulators/fceux/default.nix similarity index 100% rename from pkgs/misc/emulators/fceux/default.nix rename to pkgs/applications/emulators/fceux/default.nix diff --git a/pkgs/misc/emulators/firebird-emu/default.nix b/pkgs/applications/emulators/firebird-emu/default.nix similarity index 100% rename from pkgs/misc/emulators/firebird-emu/default.nix rename to pkgs/applications/emulators/firebird-emu/default.nix diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/applications/emulators/fs-uae/default.nix similarity index 100% rename from pkgs/misc/emulators/fs-uae/default.nix rename to pkgs/applications/emulators/fs-uae/default.nix diff --git a/pkgs/misc/emulators/fs-uae/launcher.nix b/pkgs/applications/emulators/fs-uae/launcher.nix similarity index 100% rename from pkgs/misc/emulators/fs-uae/launcher.nix rename to pkgs/applications/emulators/fs-uae/launcher.nix diff --git a/pkgs/misc/emulators/fuse-emulator/default.nix b/pkgs/applications/emulators/fuse-emulator/default.nix similarity index 100% rename from pkgs/misc/emulators/fuse-emulator/default.nix rename to pkgs/applications/emulators/fuse-emulator/default.nix diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/applications/emulators/gens-gs/default.nix similarity index 100% rename from pkgs/misc/emulators/gens-gs/default.nix rename to pkgs/applications/emulators/gens-gs/default.nix diff --git a/pkgs/misc/emulators/gxemul/0001-fix-attributes.patch b/pkgs/applications/emulators/gxemul/0001-fix-attributes.patch similarity index 100% rename from pkgs/misc/emulators/gxemul/0001-fix-attributes.patch rename to pkgs/applications/emulators/gxemul/0001-fix-attributes.patch diff --git a/pkgs/misc/emulators/gxemul/default.nix b/pkgs/applications/emulators/gxemul/default.nix similarity index 100% rename from pkgs/misc/emulators/gxemul/default.nix rename to pkgs/applications/emulators/gxemul/default.nix diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/applications/emulators/hatari/default.nix similarity index 100% rename from pkgs/misc/emulators/hatari/default.nix rename to pkgs/applications/emulators/hatari/default.nix diff --git a/pkgs/applications/virtualization/hercules/default.nix b/pkgs/applications/emulators/hercules/default.nix similarity index 57% rename from pkgs/applications/virtualization/hercules/default.nix rename to pkgs/applications/emulators/hercules/default.nix index f33055baacbc..67506d36b63c 100644 --- a/pkgs/applications/virtualization/hercules/default.nix +++ b/pkgs/applications/emulators/hercules/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +}: stdenv.mkDerivation rec { pname = "hercules"; @@ -10,8 +13,14 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "IBM mainframe emulator"; homepage = "http://www.hercules-390.eu"; + description = "IBM mainframe emulator"; + longDescription = '' + Hercules is an open source software implementation of the mainframe + System/370 and ESA/390 architectures, in addition to the latest 64-bit + z/Architecture. Hercules runs under Linux, Windows, Solaris, FreeBSD, and + Mac OS X. + ''; license = licenses.qpl; maintainers = [ maintainers.anna328p ]; }; diff --git a/pkgs/misc/emulators/higan/001-include-cmath.patch b/pkgs/applications/emulators/higan/001-include-cmath.patch similarity index 100% rename from pkgs/misc/emulators/higan/001-include-cmath.patch rename to pkgs/applications/emulators/higan/001-include-cmath.patch diff --git a/pkgs/misc/emulators/higan/002-sips-to-png2icns.patch b/pkgs/applications/emulators/higan/002-sips-to-png2icns.patch similarity index 100% rename from pkgs/misc/emulators/higan/002-sips-to-png2icns.patch rename to pkgs/applications/emulators/higan/002-sips-to-png2icns.patch diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/applications/emulators/higan/default.nix similarity index 100% rename from pkgs/misc/emulators/higan/default.nix rename to pkgs/applications/emulators/higan/default.nix diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/pkgs/applications/emulators/kega-fusion/default.nix similarity index 100% rename from pkgs/misc/emulators/kega-fusion/default.nix rename to pkgs/applications/emulators/kega-fusion/default.nix diff --git a/pkgs/misc/emulators/lambda-delta/default.nix b/pkgs/applications/emulators/lambda-delta/default.nix similarity index 100% rename from pkgs/misc/emulators/lambda-delta/default.nix rename to pkgs/applications/emulators/lambda-delta/default.nix diff --git a/pkgs/misc/emulators/libdsk/default.nix b/pkgs/applications/emulators/libdsk/default.nix similarity index 100% rename from pkgs/misc/emulators/libdsk/default.nix rename to pkgs/applications/emulators/libdsk/default.nix diff --git a/pkgs/misc/emulators/maiko/default.nix b/pkgs/applications/emulators/maiko/default.nix similarity index 100% rename from pkgs/misc/emulators/maiko/default.nix rename to pkgs/applications/emulators/maiko/default.nix diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix similarity index 100% rename from pkgs/misc/emulators/mame/default.nix rename to pkgs/applications/emulators/mame/default.nix diff --git a/pkgs/misc/emulators/mame/emuopts.patch b/pkgs/applications/emulators/mame/emuopts.patch similarity index 100% rename from pkgs/misc/emulators/mame/emuopts.patch rename to pkgs/applications/emulators/mame/emuopts.patch diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/applications/emulators/mednafen/default.nix similarity index 100% rename from pkgs/misc/emulators/mednafen/default.nix rename to pkgs/applications/emulators/mednafen/default.nix diff --git a/pkgs/misc/emulators/mednafen/server.nix b/pkgs/applications/emulators/mednafen/server.nix similarity index 100% rename from pkgs/misc/emulators/mednafen/server.nix rename to pkgs/applications/emulators/mednafen/server.nix diff --git a/pkgs/misc/emulators/mednaffe/default.nix b/pkgs/applications/emulators/mednaffe/default.nix similarity index 100% rename from pkgs/misc/emulators/mednaffe/default.nix rename to pkgs/applications/emulators/mednaffe/default.nix diff --git a/pkgs/misc/emulators/melonDS/default.nix b/pkgs/applications/emulators/melonDS/default.nix similarity index 100% rename from pkgs/misc/emulators/melonDS/default.nix rename to pkgs/applications/emulators/melonDS/default.nix diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/applications/emulators/mgba/default.nix similarity index 100% rename from pkgs/misc/emulators/mgba/default.nix rename to pkgs/applications/emulators/mgba/default.nix diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/applications/emulators/mupen64plus/default.nix similarity index 100% rename from pkgs/misc/emulators/mupen64plus/default.nix rename to pkgs/applications/emulators/mupen64plus/default.nix diff --git a/pkgs/misc/emulators/nestopia/build-fix.patch b/pkgs/applications/emulators/nestopia/build-fix.patch similarity index 100% rename from pkgs/misc/emulators/nestopia/build-fix.patch rename to pkgs/applications/emulators/nestopia/build-fix.patch diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/applications/emulators/nestopia/default.nix similarity index 100% rename from pkgs/misc/emulators/nestopia/default.nix rename to pkgs/applications/emulators/nestopia/default.nix diff --git a/pkgs/misc/emulators/nestopia/gcc6.patch b/pkgs/applications/emulators/nestopia/gcc6.patch similarity index 100% rename from pkgs/misc/emulators/nestopia/gcc6.patch rename to pkgs/applications/emulators/nestopia/gcc6.patch diff --git a/pkgs/misc/emulators/np2kai/default.nix b/pkgs/applications/emulators/np2kai/default.nix similarity index 100% rename from pkgs/misc/emulators/np2kai/default.nix rename to pkgs/applications/emulators/np2kai/default.nix diff --git a/pkgs/misc/emulators/oberon-risc-emu/default.nix b/pkgs/applications/emulators/oberon-risc-emu/default.nix similarity index 100% rename from pkgs/misc/emulators/oberon-risc-emu/default.nix rename to pkgs/applications/emulators/oberon-risc-emu/default.nix diff --git a/pkgs/misc/emulators/openmsx/custom-nix.mk b/pkgs/applications/emulators/openmsx/custom-nix.mk similarity index 100% rename from pkgs/misc/emulators/openmsx/custom-nix.mk rename to pkgs/applications/emulators/openmsx/custom-nix.mk diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/applications/emulators/openmsx/default.nix similarity index 100% rename from pkgs/misc/emulators/openmsx/default.nix rename to pkgs/applications/emulators/openmsx/default.nix diff --git a/pkgs/misc/emulators/pcem/default.nix b/pkgs/applications/emulators/pcem/default.nix similarity index 100% rename from pkgs/misc/emulators/pcem/default.nix rename to pkgs/applications/emulators/pcem/default.nix diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/applications/emulators/pcsx2/default.nix similarity index 100% rename from pkgs/misc/emulators/pcsx2/default.nix rename to pkgs/applications/emulators/pcsx2/default.nix diff --git a/pkgs/misc/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch b/pkgs/applications/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch similarity index 100% rename from pkgs/misc/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch rename to pkgs/applications/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/pkgs/applications/emulators/pcsxr/default.nix similarity index 100% rename from pkgs/misc/emulators/pcsxr/default.nix rename to pkgs/applications/emulators/pcsxr/default.nix diff --git a/pkgs/misc/emulators/pcsxr/uncompress2.patch b/pkgs/applications/emulators/pcsxr/uncompress2.patch similarity index 100% rename from pkgs/misc/emulators/pcsxr/uncompress2.patch rename to pkgs/applications/emulators/pcsxr/uncompress2.patch diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/applications/emulators/ppsspp/default.nix similarity index 100% rename from pkgs/misc/emulators/ppsspp/default.nix rename to pkgs/applications/emulators/ppsspp/default.nix diff --git a/pkgs/misc/emulators/proton-caller/default.nix b/pkgs/applications/emulators/proton-caller/default.nix similarity index 100% rename from pkgs/misc/emulators/proton-caller/default.nix rename to pkgs/applications/emulators/proton-caller/default.nix diff --git a/pkgs/misc/emulators/punes/default.nix b/pkgs/applications/emulators/punes/default.nix similarity index 100% rename from pkgs/misc/emulators/punes/default.nix rename to pkgs/applications/emulators/punes/default.nix diff --git a/pkgs/misc/emulators/py65/default.nix b/pkgs/applications/emulators/py65/default.nix similarity index 100% rename from pkgs/misc/emulators/py65/default.nix rename to pkgs/applications/emulators/py65/default.nix diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/applications/emulators/qmc2/default.nix similarity index 100% rename from pkgs/misc/emulators/qmc2/default.nix rename to pkgs/applications/emulators/qmc2/default.nix diff --git a/pkgs/misc/emulators/reicast/default.nix b/pkgs/applications/emulators/reicast/default.nix similarity index 100% rename from pkgs/misc/emulators/reicast/default.nix rename to pkgs/applications/emulators/reicast/default.nix diff --git a/pkgs/misc/emulators/resim/default.nix b/pkgs/applications/emulators/resim/default.nix similarity index 100% rename from pkgs/misc/emulators/resim/default.nix rename to pkgs/applications/emulators/resim/default.nix diff --git a/pkgs/misc/emulators/retroarch/0001-Disable-menu_show_core_updater.patch b/pkgs/applications/emulators/retroarch/0001-Disable-menu_show_core_updater.patch similarity index 100% rename from pkgs/misc/emulators/retroarch/0001-Disable-menu_show_core_updater.patch rename to pkgs/applications/emulators/retroarch/0001-Disable-menu_show_core_updater.patch diff --git a/pkgs/misc/emulators/retroarch/0002-Use-fixed-paths-on-libretro_info_path.patch b/pkgs/applications/emulators/retroarch/0002-Use-fixed-paths-on-libretro_info_path.patch similarity index 100% rename from pkgs/misc/emulators/retroarch/0002-Use-fixed-paths-on-libretro_info_path.patch rename to pkgs/applications/emulators/retroarch/0002-Use-fixed-paths-on-libretro_info_path.patch diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix similarity index 100% rename from pkgs/misc/emulators/retroarch/cores.nix rename to pkgs/applications/emulators/retroarch/cores.nix diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix similarity index 100% rename from pkgs/misc/emulators/retroarch/default.nix rename to pkgs/applications/emulators/retroarch/default.nix diff --git a/pkgs/misc/emulators/retroarch/disable-menu-show-core-updater.patch b/pkgs/applications/emulators/retroarch/disable-menu-show-core-updater.patch similarity index 100% rename from pkgs/misc/emulators/retroarch/disable-menu-show-core-updater.patch rename to pkgs/applications/emulators/retroarch/disable-menu-show-core-updater.patch diff --git a/pkgs/misc/emulators/retroarch/fix-config.patch b/pkgs/applications/emulators/retroarch/fix-config.patch similarity index 100% rename from pkgs/misc/emulators/retroarch/fix-config.patch rename to pkgs/applications/emulators/retroarch/fix-config.patch diff --git a/pkgs/misc/emulators/retroarch/fix-libretro-paths.patch b/pkgs/applications/emulators/retroarch/fix-libretro-paths.patch similarity index 100% rename from pkgs/misc/emulators/retroarch/fix-libretro-paths.patch rename to pkgs/applications/emulators/retroarch/fix-libretro-paths.patch diff --git a/pkgs/misc/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json similarity index 100% rename from pkgs/misc/emulators/retroarch/hashes.json rename to pkgs/applications/emulators/retroarch/hashes.json diff --git a/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix b/pkgs/applications/emulators/retroarch/kodi-advanced-launchers.nix similarity index 100% rename from pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix rename to pkgs/applications/emulators/retroarch/kodi-advanced-launchers.nix diff --git a/pkgs/misc/emulators/retroarch/update.py b/pkgs/applications/emulators/retroarch/update.py similarity index 100% rename from pkgs/misc/emulators/retroarch/update.py rename to pkgs/applications/emulators/retroarch/update.py diff --git a/pkgs/misc/emulators/retroarch/wrapper.nix b/pkgs/applications/emulators/retroarch/wrapper.nix similarity index 100% rename from pkgs/misc/emulators/retroarch/wrapper.nix rename to pkgs/applications/emulators/retroarch/wrapper.nix diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/applications/emulators/retrofe/default.nix similarity index 100% rename from pkgs/misc/emulators/retrofe/default.nix rename to pkgs/applications/emulators/retrofe/default.nix diff --git a/pkgs/misc/emulators/retrofe/include-paths.patch b/pkgs/applications/emulators/retrofe/include-paths.patch similarity index 100% rename from pkgs/misc/emulators/retrofe/include-paths.patch rename to pkgs/applications/emulators/retrofe/include-paths.patch diff --git a/pkgs/misc/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch b/pkgs/applications/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch similarity index 100% rename from pkgs/misc/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch rename to pkgs/applications/emulators/rpcs3/0001-llvm-ExecutionEngine-IntelJITEvents-only-use-ITTAPI_.patch diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix similarity index 100% rename from pkgs/misc/emulators/rpcs3/default.nix rename to pkgs/applications/emulators/rpcs3/default.nix diff --git a/pkgs/misc/emulators/rpcs3/update.sh b/pkgs/applications/emulators/rpcs3/update.sh similarity index 100% rename from pkgs/misc/emulators/rpcs3/update.sh rename to pkgs/applications/emulators/rpcs3/update.sh diff --git a/pkgs/misc/emulators/ruffle/default.nix b/pkgs/applications/emulators/ruffle/default.nix similarity index 100% rename from pkgs/misc/emulators/ruffle/default.nix rename to pkgs/applications/emulators/ruffle/default.nix diff --git a/pkgs/misc/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix similarity index 100% rename from pkgs/misc/emulators/ryujinx/default.nix rename to pkgs/applications/emulators/ryujinx/default.nix diff --git a/pkgs/misc/emulators/ryujinx/deps.nix b/pkgs/applications/emulators/ryujinx/deps.nix similarity index 100% rename from pkgs/misc/emulators/ryujinx/deps.nix rename to pkgs/applications/emulators/ryujinx/deps.nix diff --git a/pkgs/misc/emulators/ryujinx/log.patch b/pkgs/applications/emulators/ryujinx/log.patch similarity index 100% rename from pkgs/misc/emulators/ryujinx/log.patch rename to pkgs/applications/emulators/ryujinx/log.patch diff --git a/pkgs/misc/emulators/ryujinx/updater.sh b/pkgs/applications/emulators/ryujinx/updater.sh similarity index 100% rename from pkgs/misc/emulators/ryujinx/updater.sh rename to pkgs/applications/emulators/ryujinx/updater.sh diff --git a/pkgs/misc/emulators/sameboy/default.nix b/pkgs/applications/emulators/sameboy/default.nix similarity index 100% rename from pkgs/misc/emulators/sameboy/default.nix rename to pkgs/applications/emulators/sameboy/default.nix diff --git a/pkgs/misc/emulators/simh/default.nix b/pkgs/applications/emulators/simh/default.nix similarity index 100% rename from pkgs/misc/emulators/simh/default.nix rename to pkgs/applications/emulators/simh/default.nix diff --git a/pkgs/misc/emulators/simplenes/default.nix b/pkgs/applications/emulators/simplenes/default.nix similarity index 100% rename from pkgs/misc/emulators/simplenes/default.nix rename to pkgs/applications/emulators/simplenes/default.nix diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/applications/emulators/snes9x-gtk/default.nix similarity index 100% rename from pkgs/misc/emulators/snes9x-gtk/default.nix rename to pkgs/applications/emulators/snes9x-gtk/default.nix diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/applications/emulators/stella/default.nix similarity index 100% rename from pkgs/misc/emulators/stella/default.nix rename to pkgs/applications/emulators/stella/default.nix diff --git a/pkgs/misc/emulators/termtekst/default.nix b/pkgs/applications/emulators/termtekst/default.nix similarity index 100% rename from pkgs/misc/emulators/termtekst/default.nix rename to pkgs/applications/emulators/termtekst/default.nix diff --git a/pkgs/misc/emulators/tilem/default.nix b/pkgs/applications/emulators/tilem/default.nix similarity index 100% rename from pkgs/misc/emulators/tilem/default.nix rename to pkgs/applications/emulators/tilem/default.nix diff --git a/pkgs/applications/virtualization/tiny8086/default.nix b/pkgs/applications/emulators/tiny8086/default.nix similarity index 83% rename from pkgs/applications/virtualization/tiny8086/default.nix rename to pkgs/applications/emulators/tiny8086/default.nix index 60d69432cde6..a0cc6bd7929b 100644 --- a/pkgs/applications/virtualization/tiny8086/default.nix +++ b/pkgs/applications/emulators/tiny8086/default.nix @@ -24,32 +24,33 @@ stdenv.mkDerivation rec { makeFlags = [ "8086tiny" ]; postBuild = lib.optionalString localBios '' - ( - cd bios_source - nasm -f bin bios.asm -o bios - ) + pushd bios_source + nasm -f bin bios.asm -o bios + popd ''; installPhase = '' - mkdir -p $out/bin $out/share/8086tiny $out/share/doc/8086tiny/images + runHook preInstall + mkdir -p $out/bin $out/share/8086tiny $out/share/doc/8086tiny/images install -m 755 8086tiny $out/bin install -m 644 fd.img $out/share/8086tiny/8086tiny-floppy.img install -m 644 bios_source/bios.asm $out/share/8086tiny/8086tiny-bios-src.asm install -m 644 docs/8086tiny.css $out/share/doc/8086tiny install -m 644 docs/doc.html $out/share/doc/$name - for i in docs/images/\*.gif; do - install -m 644 $i $out/share/doc/8086tiny/images + for image in docs/images/\*.gif; do + install -m 644 $image $out/share/doc/8086tiny/images done - ${if localBios then - "install -m 644 bios_source/bios $out/share/8086tiny/8086tiny-bios" - else - "install -m 644 bios $out/share/8086tiny/8086tiny-bios"} + install -m 644 ${lib.optionalString localBios "bios_source/"}bios \ + $out/share/8086tiny/8086tiny-bios + + runHook postInstall ''; meta = with lib; { + homepage = "https://github.com/adriancable/8086tiny"; description = "An open-source small 8086 emulator"; longDescription = '' 8086tiny is a tiny, open-source (MIT), portable (little-endian hosts) @@ -60,7 +61,6 @@ stdenv.mkDerivation rec { 8086tiny is based on an IOCCC 2013 winning entry. In fact that is the "unobfuscated" version :) ''; - homepage = "https://github.com/adriancable/8086tiny"; license = licenses.mit; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/emulators/tinyemu/default.nix b/pkgs/applications/emulators/tinyemu/default.nix new file mode 100644 index 000000000000..c32fd24fe477 --- /dev/null +++ b/pkgs/applications/emulators/tinyemu/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchurl +, SDL +, curl +, openssl +}: + +stdenv.mkDerivation rec { + pname = "tinyemu"; + version = "2019-12-21"; + + src = fetchurl { + url = "https://bellard.org/tinyemu/${pname}-${version}.tar.gz"; + hash = "sha256-voNR8hIYGbMXL87c5csYJvoSyH2ht+2Y8mnT6AKgVVU="; + }; + + buildInputs = [ + SDL + curl + openssl + ]; + + makeFlags = [ "DESTDIR=$(out)" "bindir=/bin" ]; + + preInstall = '' + mkdir -p "$out/bin" + ''; + + meta = with lib; { + homepage = "https://bellard.org/tinyemu/"; + description = "A system emulator for the RISC-V and x86 architectures"; + longDescription = '' + TinyEMU is a system emulator for the RISC-V and x86 architectures. Its + purpose is to be small and simple while being complete. + ''; + license = with licenses; [ mit bsd2 ]; + maintainers = with maintainers; [ jhhuh AndersonTorres ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/applications/emulators/uae/default.nix similarity index 100% rename from pkgs/misc/emulators/uae/default.nix rename to pkgs/applications/emulators/uae/default.nix diff --git a/pkgs/misc/emulators/uxn/default.nix b/pkgs/applications/emulators/uxn/default.nix similarity index 100% rename from pkgs/misc/emulators/uxn/default.nix rename to pkgs/applications/emulators/uxn/default.nix diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/applications/emulators/vbam/default.nix similarity index 100% rename from pkgs/misc/emulators/vbam/default.nix rename to pkgs/applications/emulators/vbam/default.nix diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/applications/emulators/vice/default.nix similarity index 100% rename from pkgs/misc/emulators/vice/default.nix rename to pkgs/applications/emulators/vice/default.nix diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix similarity index 100% rename from pkgs/misc/emulators/wine/base.nix rename to pkgs/applications/emulators/wine/base.nix diff --git a/pkgs/misc/emulators/wine/builder-wow.sh b/pkgs/applications/emulators/wine/builder-wow.sh similarity index 100% rename from pkgs/misc/emulators/wine/builder-wow.sh rename to pkgs/applications/emulators/wine/builder-wow.sh diff --git a/pkgs/misc/emulators/wine/cert-path.patch b/pkgs/applications/emulators/wine/cert-path.patch similarity index 100% rename from pkgs/misc/emulators/wine/cert-path.patch rename to pkgs/applications/emulators/wine/cert-path.patch diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix similarity index 100% rename from pkgs/misc/emulators/wine/default.nix rename to pkgs/applications/emulators/wine/default.nix diff --git a/pkgs/misc/emulators/wine/fonts.nix b/pkgs/applications/emulators/wine/fonts.nix similarity index 100% rename from pkgs/misc/emulators/wine/fonts.nix rename to pkgs/applications/emulators/wine/fonts.nix diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/applications/emulators/wine/packages.nix similarity index 100% rename from pkgs/misc/emulators/wine/packages.nix rename to pkgs/applications/emulators/wine/packages.nix diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix similarity index 100% rename from pkgs/misc/emulators/wine/sources.nix rename to pkgs/applications/emulators/wine/sources.nix diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/applications/emulators/wine/staging.nix similarity index 100% rename from pkgs/misc/emulators/wine/staging.nix rename to pkgs/applications/emulators/wine/staging.nix diff --git a/pkgs/misc/emulators/wine/util.nix b/pkgs/applications/emulators/wine/util.nix similarity index 100% rename from pkgs/misc/emulators/wine/util.nix rename to pkgs/applications/emulators/wine/util.nix diff --git a/pkgs/misc/emulators/wine/vkd3d.nix b/pkgs/applications/emulators/wine/vkd3d.nix similarity index 100% rename from pkgs/misc/emulators/wine/vkd3d.nix rename to pkgs/applications/emulators/wine/vkd3d.nix diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/applications/emulators/wine/winetricks.nix similarity index 100% rename from pkgs/misc/emulators/wine/winetricks.nix rename to pkgs/applications/emulators/wine/winetricks.nix diff --git a/pkgs/misc/emulators/xcpc/default.nix b/pkgs/applications/emulators/xcpc/default.nix similarity index 100% rename from pkgs/misc/emulators/xcpc/default.nix rename to pkgs/applications/emulators/xcpc/default.nix diff --git a/pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch b/pkgs/applications/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch similarity index 100% rename from pkgs/misc/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch rename to pkgs/applications/emulators/yabause/0001-Fixes-for-Qt-5.11-upgrade.patch diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/applications/emulators/yabause/default.nix similarity index 100% rename from pkgs/misc/emulators/yabause/default.nix rename to pkgs/applications/emulators/yabause/default.nix diff --git a/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.patch b/pkgs/applications/emulators/yabause/linkage-rwx-linux-elf.patch similarity index 100% rename from pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.patch rename to pkgs/applications/emulators/yabause/linkage-rwx-linux-elf.patch diff --git a/pkgs/misc/emulators/yapesdl/default.nix b/pkgs/applications/emulators/yapesdl/default.nix similarity index 100% rename from pkgs/misc/emulators/yapesdl/default.nix rename to pkgs/applications/emulators/yapesdl/default.nix diff --git a/pkgs/misc/emulators/yuzu/base.nix b/pkgs/applications/emulators/yuzu/base.nix similarity index 100% rename from pkgs/misc/emulators/yuzu/base.nix rename to pkgs/applications/emulators/yuzu/base.nix diff --git a/pkgs/misc/emulators/yuzu/default.nix b/pkgs/applications/emulators/yuzu/default.nix similarity index 100% rename from pkgs/misc/emulators/yuzu/default.nix rename to pkgs/applications/emulators/yuzu/default.nix diff --git a/pkgs/misc/emulators/zesarux/default.nix b/pkgs/applications/emulators/zesarux/default.nix similarity index 100% rename from pkgs/misc/emulators/zesarux/default.nix rename to pkgs/applications/emulators/zesarux/default.nix diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/applications/emulators/zsnes/default.nix similarity index 100% rename from pkgs/misc/emulators/zsnes/default.nix rename to pkgs/applications/emulators/zsnes/default.nix diff --git a/pkgs/applications/virtualization/tinyemu/default.nix b/pkgs/applications/virtualization/tinyemu/default.nix deleted file mode 100644 index 17cee52a64e0..000000000000 --- a/pkgs/applications/virtualization/tinyemu/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchurl, openssl, curl, SDL }: - -stdenv.mkDerivation rec { - pname = "tinyemu"; - version = "2018-09-23"; - src = fetchurl { - url = "https://bellard.org/tinyemu/${pname}-${version}.tar.gz"; - sha256 = "0d6payyqf4lpvmmzvlpq1i8wpbg4sf3h6llsw0xnqdgq3m9dan4v"; - }; - buildInputs = [ openssl curl SDL ]; - makeFlags = [ "DESTDIR=$(out)" "bindir=/bin" ]; - preInstall = '' - mkdir -p "$out/bin" - ''; - meta = { - homepage = "https://bellard.org/tinyemu/"; - description = "A system emulator for the RISC-V and x86 architectures"; - longDescription = "TinyEMU is a system emulator for the RISC-V and x86 architectures. Its purpose is to be small and simple while being complete."; - license = with lib.licenses; [ mit bsd2 ]; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ jhhuh ]; - }; -} diff --git a/pkgs/servers/nosql/eventstore/create-deps.sh b/pkgs/servers/nosql/eventstore/create-deps.sh index 8001fea4d26f..afeee592de3d 100755 --- a/pkgs/servers/nosql/eventstore/create-deps.sh +++ b/pkgs/servers/nosql/eventstore/create-deps.sh @@ -8,7 +8,7 @@ set -euo pipefail # this script is inspired: # - pkgs/servers/nosql/eventstore/create-deps.sh # - pkgs/development/dotnet-modules/python-language-server/create_deps.sh -# - pkgs/misc/emulators/ryujinx/updater.sh +# - pkgs/applications/emulators/ryujinx/updater.sh cd "$(dirname "${BASH_SOURCE[0]}")" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 083053a09086..0176033cf62a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -255,11 +255,11 @@ with pkgs; catatonit = callPackage ../applications/virtualization/catatonit { }; - cen64 = callPackage ../misc/emulators/cen64 { }; + cen64 = callPackage ../applications/emulators/cen64 { }; btdu = callPackage ../tools/misc/btdu { }; - uxn = callPackage ../misc/emulators/uxn { }; + uxn = callPackage ../applications/emulators/uxn { }; cereal = callPackage ../development/libraries/cereal { }; @@ -377,7 +377,7 @@ with pkgs; protoc-gen-twirp_typescript = callPackage ../development/tools/protoc-gen-twirp_typescript { }; - proton-caller = callPackage ../misc/emulators/proton-caller { }; + proton-caller = callPackage ../applications/emulators/proton-caller { }; ptags = callPackage ../development/tools/misc/ptags { }; @@ -2313,7 +2313,7 @@ with pkgs; boca = callPackage ../development/libraries/boca { }; - bochs = callPackage ../applications/virtualization/bochs { + bochs = callPackage ../applications/emulators/bochs { wxGTK = wxGTK30; }; @@ -2369,9 +2369,9 @@ with pkgs; breakpointHook = assert stdenv.isLinux; makeSetupHook { } ../build-support/setup-hooks/breakpoint-hook.sh; - py65 = python3Packages.callPackage ../misc/emulators/py65 { }; + py65 = python3Packages.callPackage ../applications/emulators/py65 { }; - simh = callPackage ../misc/emulators/simh { }; + simh = callPackage ../applications/emulators/simh { }; btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; @@ -2496,19 +2496,19 @@ with pkgs; cde = callPackage ../tools/package-management/cde { }; - cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { }; + cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { }; - cdemu-client = callPackage ../misc/emulators/cdemu/client.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 ../misc/emulators/craftos-pc { }; + craftos-pc = callPackage ../applications/emulators/craftos-pc { }; - gcdemu = callPackage ../misc/emulators/cdemu/gui.nix { }; + gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { }; - image-analyzer = callPackage ../misc/emulators/cdemu/analyzer.nix { }; + image-analyzer = callPackage ../applications/emulators/cdemu/analyzer.nix { }; cbor-diag = callPackage ../development/tools/cbor-diag { }; @@ -2876,9 +2876,9 @@ with pkgs; djv = callPackage ../applications/graphics/djv { }; - dlx = callPackage ../misc/emulators/dlx { }; + dlx = callPackage ../applications/emulators/dlx { }; - dgen-sdl = callPackage ../misc/emulators/dgen-sdl { }; + dgen-sdl = callPackage ../applications/emulators/dgen-sdl { }; dnschef = python3Packages.callPackage ../tools/networking/dnschef { }; @@ -3673,7 +3673,7 @@ with pkgs; ropgadget = with python3Packages; toPythonApplication ropgadget; - ryujinx = callPackage ../misc/emulators/ryujinx { }; + ryujinx = callPackage ../applications/emulators/ryujinx { }; scour = with python3Packages; toPythonApplication scour; @@ -3695,7 +3695,7 @@ with pkgs; simg2img = callPackage ../tools/filesystems/simg2img { }; - simplenes = callPackage ../misc/emulators/simplenes { }; + simplenes = callPackage ../applications/emulators/simplenes { }; snippetpixie = callPackage ../tools/text/snippetpixie { }; @@ -4161,7 +4161,7 @@ with pkgs; citrix_workspace_21_12_0 ; - citra = libsForQt5.callPackage ../misc/emulators/citra { }; + citra = libsForQt5.callPackage ../applications/emulators/citra { }; cmigemo = callPackage ../tools/text/cmigemo { }; @@ -4789,11 +4789,11 @@ with pkgs; dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { }; - dolphin-emu = callPackage ../misc/emulators/dolphin-emu { }; - dolphin-emu-beta = qt5.callPackage ../misc/emulators/dolphin-emu/master.nix { + 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 ../misc/emulators/dolphin-emu/primehack.nix { + dolphin-emu-primehack = qt5.callPackage ../applications/emulators/dolphin-emu/primehack.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; }; @@ -5171,7 +5171,7 @@ with pkgs; epstool = callPackage ../tools/graphics/epstool { }; - epsxe = callPackage ../misc/emulators/epsxe { }; + epsxe = callPackage ../applications/emulators/epsxe { }; escrotum = callPackage ../tools/graphics/escrotum { }; @@ -5391,7 +5391,7 @@ with pkgs; fio = callPackage ../tools/system/fio { }; - firebird-emu = libsForQt5.callPackage ../misc/emulators/firebird-emu { }; + firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { }; flamerobin = callPackage ../applications/misc/flamerobin { }; @@ -7363,7 +7363,7 @@ with pkgs; nodejs = nodejs-14_x; }; - np2kai = callPackage ../misc/emulators/np2kai { }; + np2kai = callPackage ../applications/emulators/np2kai { }; openipmi = callPackage ../tools/system/openipmi { }; @@ -7794,11 +7794,11 @@ with pkgs; mdp = callPackage ../applications/misc/mdp { }; - mednafen = callPackage ../misc/emulators/mednafen { }; + mednafen = callPackage ../applications/emulators/mednafen { }; - mednafen-server = callPackage ../misc/emulators/mednafen/server.nix { }; + mednafen-server = callPackage ../applications/emulators/mednafen/server.nix { }; - mednaffe = callPackage ../misc/emulators/mednaffe { }; + mednaffe = callPackage ../applications/emulators/mednaffe { }; megacli = callPackage ../tools/misc/megacli { }; @@ -7814,7 +7814,7 @@ with pkgs; mfoc = callPackage ../tools/security/mfoc { }; - mgba = libsForQt5.callPackage ../misc/emulators/mgba { }; + mgba = libsForQt5.callPackage ../applications/emulators/mgba { }; microdnf = callPackage ../tools/package-management/microdnf { }; @@ -8034,7 +8034,7 @@ with pkgs; nerdfonts = callPackage ../data/fonts/nerdfonts { }; - nestopia = callPackage ../misc/emulators/nestopia { }; + nestopia = callPackage ../applications/emulators/nestopia { }; netatalk = callPackage ../tools/filesystems/netatalk { }; @@ -9274,7 +9274,7 @@ with pkgs; repseek = callPackage ../applications/science/biology/repseek { }; - reicast = callPackage ../misc/emulators/reicast { }; + reicast = callPackage ../applications/emulators/reicast { }; reredirect = callPackage ../tools/misc/reredirect { }; @@ -9460,7 +9460,7 @@ with pkgs; rubocop = rubyPackages.rubocop; - ruffle = callPackage ../misc/emulators/ruffle { }; + ruffle = callPackage ../applications/emulators/ruffle { }; runningx = callPackage ../tools/X11/runningx { }; @@ -10312,7 +10312,7 @@ with pkgs; tiledb = callPackage ../development/libraries/tiledb { }; - tilem = callPackage ../misc/emulators/tilem { }; + tilem = callPackage ../applications/emulators/tilem { }; timemachine = callPackage ../applications/audio/timemachine { }; @@ -10336,9 +10336,9 @@ with pkgs; tinycbor = callPackage ../development/libraries/tinycbor { }; - tiny8086 = callPackage ../applications/virtualization/tiny8086 { }; + tiny8086 = callPackage ../applications/emulators/tiny8086 { }; - tinyemu = callPackage ../applications/virtualization/tinyemu { }; + tinyemu = callPackage ../applications/emulators/tinyemu { }; tinyfecvpn = callPackage ../tools/networking/tinyfecvpn { }; @@ -14094,7 +14094,7 @@ with pkgs; mspdebug = callPackage ../development/misc/msp430/mspdebug.nix { }; vc4-newlib = callPackage ../development/misc/vc4/newlib.nix {}; - resim = callPackage ../misc/emulators/resim {}; + resim = callPackage ../applications/emulators/resim {}; or1k-newlib = callPackage ../development/misc/or1k/newlib.nix {}; @@ -16379,7 +16379,7 @@ with pkgs; duckdb = callPackage ../development/libraries/duckdb {}; - duckstation = libsForQt5.callPackage ../misc/emulators/duckstation {}; + duckstation = libsForQt5.callPackage ../applications/emulators/duckstation {}; easyloggingpp = callPackage ../development/libraries/easyloggingpp {}; @@ -18331,7 +18331,7 @@ with pkgs; hdf5 = hdf5_1_10; }; - libmirage = callPackage ../misc/emulators/cdemu/libmirage.nix { }; + libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { }; libmkv = callPackage ../development/libraries/libmkv { }; @@ -24055,7 +24055,7 @@ with pkgs; poppler_data = callPackage ../data/misc/poppler-data { }; - qmc2 = libsForQt514.callPackage ../misc/emulators/qmc2 { }; + qmc2 = libsForQt514.callPackage ../applications/emulators/qmc2 { }; quattrocento = callPackage ../data/fonts/quattrocento {}; @@ -24162,7 +24162,7 @@ with pkgs; fonts = [ "Terminus" ]; }; - termtekst = callPackage ../misc/emulators/termtekst { }; + termtekst = callPackage ../applications/emulators/termtekst { }; tex-gyre = callPackages ../data/fonts/tex-gyre { }; @@ -25129,7 +25129,7 @@ with pkgs; dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { }; - dynamips = callPackage ../applications/virtualization/dynamips { }; + dynamips = callPackage ../applications/emulators/dynamips { }; exploitdb = callPackage ../tools/security/exploitdb { }; @@ -26173,7 +26173,7 @@ with pkgs; herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; - hercules = callPackage ../applications/virtualization/hercules { }; + hercules = callPackage ../applications/emulators/hercules { }; hexchat = callPackage ../applications/networking/irc/hexchat { }; @@ -26713,7 +26713,7 @@ with pkgs; kdevelop = libsForQt5.callPackage ../applications/editors/kdevelop5/wrapper.nix { }; - kega-fusion = pkgsi686Linux.callPackage ../misc/emulators/kega-fusion { }; + kega-fusion = pkgsi686Linux.callPackage ../applications/emulators/kega-fusion { }; kepubify = callPackage ../tools/misc/kepubify { }; @@ -26885,7 +26885,7 @@ with pkgs; kvirc = libsForQt514.callPackage ../applications/networking/irc/kvirc { }; - lambda-delta = callPackage ../misc/emulators/lambda-delta { }; + lambda-delta = callPackage ../applications/emulators/lambda-delta { }; lame = callPackage ../development/libraries/lame { }; @@ -27018,7 +27018,7 @@ with pkgs; lighttable = callPackage ../applications/editors/lighttable {}; - libdsk = callPackage ../misc/emulators/libdsk { }; + libdsk = callPackage ../applications/emulators/libdsk { }; liblinphone = callPackage ../development/libraries/liblinphone { }; @@ -27203,7 +27203,7 @@ with pkgs; melmatcheq.lv2 = callPackage ../applications/audio/melmatcheq.lv2 { }; - melonDS = libsForQt5.callPackage ../misc/emulators/melonDS { }; + melonDS = libsForQt5.callPackage ../applications/emulators/melonDS { }; meme-image-generator = callPackage ../applications/graphics/meme-image-generator { }; @@ -27849,7 +27849,7 @@ with pkgs; obconf = callPackage ../tools/X11/obconf { }; - oberon-risc-emu = callPackage ../misc/emulators/oberon-risc-emu { }; + oberon-risc-emu = callPackage ../applications/emulators/oberon-risc-emu { }; obs-studio = libsForQt5.callPackage ../applications/video/obs-studio {}; obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {}); @@ -28000,9 +28000,9 @@ with pkgs; pcloud = callPackage ../applications/networking/pcloud { }; - pcsxr = callPackage ../misc/emulators/pcsxr { }; + pcsxr = callPackage ../applications/emulators/pcsxr { }; - pcsx2 = callPackage ../misc/emulators/pcsx2 { + pcsx2 = callPackage ../applications/emulators/pcsx2 { wxGTK = wxGTK30-gtk3; }; @@ -28532,7 +28532,7 @@ with pkgs; rootlesskit = callPackage ../tools/virtualization/rootlesskit {}; - rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { }; + rpcs3 = libsForQt5.callPackage ../applications/emulators/rpcs3 { }; rsclock = callPackage ../applications/misc/rsclock { }; @@ -28573,7 +28573,7 @@ with pkgs; sacc = callPackage ../applications/networking/gopher/sacc { }; - sameboy = callPackage ../misc/emulators/sameboy { }; + sameboy = callPackage ../applications/emulators/sameboy { }; sayonara = libsForQt514.callPackage ../applications/audio/sayonara { }; @@ -28703,7 +28703,7 @@ with pkgs; curses = ncurses; }; - stella = callPackage ../misc/emulators/stella { }; + stella = callPackage ../applications/emulators/stella { }; linuxstopmotion = libsForQt5.callPackage ../applications/video/linuxstopmotion { }; @@ -29821,7 +29821,7 @@ with pkgs; kodi-cli = callPackage ../tools/misc/kodi-cli { }; kodi-retroarch-advanced-launchers = - callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix { }; + callPackage ../applications/emulators/retroarch/kodi-advanced-launchers.nix { }; xca = libsForQt5.callPackage ../applications/misc/xca { }; @@ -32269,7 +32269,7 @@ with pkgs; crypto-org-wallet = callPackage ../applications/blockchains/crypto-org-wallet { }; - caprice32 = callPackage ../misc/emulators/caprice32 { }; + caprice32 = callPackage ../applications/emulators/caprice32 { }; cubicle = callPackage ../applications/science/logic/cubicle { ocamlPackages = ocaml-ng.ocamlPackages_4_05; @@ -32782,11 +32782,11 @@ with pkgs; antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { }; - ares = callPackage ../misc/emulators/ares { }; + ares = callPackage ../applications/emulators/ares { }; - atari800 = callPackage ../misc/emulators/atari800 { }; + atari800 = callPackage ../applications/emulators/atari800 { }; - ataripp = callPackage ../misc/emulators/atari++ { }; + ataripp = callPackage ../applications/emulators/atari++ { }; atlantis = callPackage ../applications/networking/cluster/atlantis { }; @@ -32800,7 +32800,7 @@ with pkgs; swt = swt_jdk8; }; - attract-mode = callPackage ../misc/emulators/attract-mode { }; + attract-mode = callPackage ../applications/emulators/attract-mode { }; autotiling = python3Packages.callPackage ../misc/autotiling { }; @@ -32822,7 +32822,7 @@ with pkgs; calaos_installer = libsForQt5.callPackage ../misc/calaos/installer {}; - ccemux = callPackage ../misc/emulators/ccemux { }; + ccemux = callPackage ../applications/emulators/ccemux { }; click = callPackage ../applications/networking/cluster/click { }; @@ -32900,13 +32900,13 @@ with pkgs; cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { }; - darcnes = callPackage ../misc/emulators/darcnes { }; + darcnes = callPackage ../applications/emulators/darcnes { }; darling-dmg = callPackage ../tools/filesystems/darling-dmg { }; depotdownloader = callPackage ../tools/misc/depotdownloader { }; - desmume = callPackage ../misc/emulators/desmume { }; + desmume = callPackage ../applications/emulators/desmume { }; dbacl = callPackage ../tools/misc/dbacl { }; @@ -32922,11 +32922,11 @@ with pkgs; dell-530cdn = callPackage ../misc/drivers/dell-530cdn {}; - dosbox = callPackage ../misc/emulators/dosbox { }; + dosbox = callPackage ../applications/emulators/dosbox { }; - dosbox-staging = callPackage ../misc/emulators/dosbox-staging { }; + dosbox-staging = callPackage ../applications/emulators/dosbox-staging { }; - emu2 = callPackage ../misc/emulators/emu2 { }; + emu2 = callPackage ../applications/emulators/emu2 { }; apt = callPackage ../tools/package-management/apt { }; @@ -32938,7 +32938,7 @@ with pkgs; ecdsatool = callPackage ../tools/security/ecdsatool { }; - emulationstation = callPackage ../misc/emulators/emulationstation { }; + emulationstation = callPackage ../applications/emulators/emulationstation { }; electricsheep = callPackage ../misc/screensavers/electricsheep { }; @@ -32948,7 +32948,7 @@ with pkgs; glee = callPackage ../tools/graphics/glee { }; - fakenes = callPackage ../misc/emulators/fakenes { }; + fakenes = callPackage ../applications/emulators/fakenes { }; faust = res.faust2; @@ -32982,7 +32982,7 @@ with pkgs; faustStk = callPackage ../applications/audio/faustStk { }; - fceux = libsForQt5.callPackage ../misc/emulators/fceux { }; + fceux = libsForQt5.callPackage ../applications/emulators/fceux { }; flockit = callPackage ../tools/backup/flockit { }; @@ -32998,7 +32998,7 @@ with pkgs; foomatic-filters = callPackage ../misc/drivers/foomatic-filters {}; - fuse-emulator = callPackage ../misc/emulators/fuse-emulator {}; + fuse-emulator = callPackage ../applications/emulators/fuse-emulator {}; gajim = callPackage ../applications/networking/instant-messengers/gajim { inherit (gst_all_1) gstreamer gst-plugins-base gst-libav; @@ -33007,7 +33007,7 @@ with pkgs; gammu = callPackage ../applications/misc/gammu { }; - gensgs = pkgsi686Linux.callPackage ../misc/emulators/gens-gs { }; + gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { }; ghostscript = callPackage ../misc/ghostscript { }; @@ -33033,9 +33033,9 @@ with pkgs; gummi = callPackage ../applications/misc/gummi { }; - gxemul = callPackage ../misc/emulators/gxemul { }; + gxemul = callPackage ../applications/emulators/gxemul { }; - hatari = callPackage ../misc/emulators/hatari { }; + hatari = callPackage ../applications/emulators/hatari { }; hck = callPackage ../tools/text/hck { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; @@ -33146,7 +33146,7 @@ with pkgs; loop = callPackage ../tools/misc/loop { }; - maiko = callPackage ../misc/emulators/maiko { inherit (xorg) libX11; }; + maiko = callPackage ../applications/emulators/maiko { inherit (xorg) libX11; }; mailcore2 = callPackage ../development/libraries/mailcore2 { icu = icu58; @@ -33154,7 +33154,7 @@ with pkgs; mamba = callPackage ../applications/audio/mamba { }; - mame = libsForQt514.callPackage ../misc/emulators/mame { + mame = libsForQt514.callPackage ../applications/emulators/mame { inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; }; @@ -33174,7 +33174,7 @@ with pkgs; morph = callPackage ../tools/package-management/morph { }; - mupen64plus = callPackage ../misc/emulators/mupen64plus { }; + mupen64plus = callPackage ../applications/emulators/mupen64plus { }; muse = libsForQt5.callPackage ../applications/audio/muse { }; @@ -33511,7 +33511,7 @@ with pkgs; OSCAR = qt5.callPackage ../applications/misc/OSCAR { }; - pcem = callPackage ../misc/emulators/pcem { }; + pcem = callPackage ../applications/emulators/pcem { }; pgmanage = callPackage ../applications/misc/pgmanage { }; @@ -33541,13 +33541,13 @@ with pkgs; pounce = callPackage ../servers/pounce { }; - ppsspp = libsForQt5.callPackage ../misc/emulators/ppsspp { }; + ppsspp = libsForQt5.callPackage ../applications/emulators/ppsspp { }; pt = callPackage ../applications/misc/pt { }; protocol = python3Packages.callPackage ../applications/networking/protocol { }; - punes = libsForQt5.callPackage ../misc/emulators/punes { }; + punes = libsForQt5.callPackage ../applications/emulators/punes { }; pykms = callPackage ../tools/networking/pykms { }; @@ -33557,11 +33557,11 @@ with pkgs; pwntools = with python3Packages; toPythonApplication pwntools; - uae = callPackage ../misc/emulators/uae { }; + uae = callPackage ../applications/emulators/uae { }; - fsuae = callPackage ../misc/emulators/fs-uae { }; + fsuae = callPackage ../applications/emulators/fs-uae { }; - fsuae-launcher = callPackage ../misc/emulators/fs-uae/launcher.nix { }; + fsuae-launcher = callPackage ../applications/emulators/fs-uae/launcher.nix { }; putty = callPackage ../applications/networking/remote/putty { gtk2 = gtk2-x11; @@ -33587,12 +33587,12 @@ with pkgs; renderizer = callPackage ../development/tools/renderizer {}; - retroarchBare = callPackage ../misc/emulators/retroarch { + retroarchBare = callPackage ../applications/emulators/retroarch { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) AppKit Foundation; }; - wrapRetroArch = { retroarch }: callPackage ../misc/emulators/retroarch/wrapper.nix { + wrapRetroArch = { retroarch }: callPackage ../applications/emulators/retroarch/wrapper.nix { inherit retroarch; }; @@ -33605,11 +33605,11 @@ with pkgs; (builtins.attrValues libretro); }; - libretro = recurseIntoAttrs (callPackage ../misc/emulators/retroarch/cores.nix { + libretro = recurseIntoAttrs (callPackage ../applications/emulators/retroarch/cores.nix { retroarch = retroarchBare; }); - retrofe = callPackage ../misc/emulators/retrofe { }; + retrofe = callPackage ../applications/emulators/retrofe { }; rfc-bibtex = python3Packages.callPackage ../development/python-modules/rfc-bibtex { }; @@ -33918,11 +33918,11 @@ with pkgs; vazir-fonts = callPackage ../data/fonts/vazir-fonts { }; - vbam = callPackage ../misc/emulators/vbam { }; + vbam = callPackage ../applications/emulators/vbam { }; vgmstream = callPackage ../applications/audio/vgmstream { }; - vice = callPackage ../misc/emulators/vice { }; + vice = callPackage ../applications/emulators/vice { }; viddy = callPackage ../tools/misc/viddy { }; @@ -34022,7 +34022,7 @@ with pkgs; wineRelease = "wayland"; }); - winetricks = callPackage ../misc/emulators/wine/winetricks.nix { + winetricks = callPackage ../applications/emulators/wine/winetricks.nix { inherit (gnome) zenity; }; @@ -34112,7 +34112,7 @@ with pkgs; yabai = callPackage ../os-specific/darwin/yabai { }; - yabause = libsForQt5.callPackage ../misc/emulators/yabause { + yabause = libsForQt5.callPackage ../applications/emulators/yabause { freeglut = null; openal = null; }; @@ -34135,11 +34135,11 @@ with pkgs; yaxg = callPackage ../tools/graphics/yaxg {}; - yuzu-mainline = import ../misc/emulators/yuzu { + yuzu-mainline = import ../applications/emulators/yuzu { branch = "mainline"; inherit libsForQt5 fetchFromGitHub; }; - yuzu-ea = import ../misc/emulators/yuzu { + yuzu-ea = import ../applications/emulators/yuzu { branch = "early-access"; inherit libsForQt5 fetchFromGitHub; }; @@ -34162,34 +34162,34 @@ with pkgs; zoneminder = callPackage ../servers/zoneminder { }; - zsnes = pkgsi686Linux.callPackage ../misc/emulators/zsnes { }; + zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { }; xcp = callPackage ../tools/misc/xcp { }; - xcpc = callPackage ../misc/emulators/xcpc { }; + xcpc = callPackage ../applications/emulators/xcpc { }; zxcvbn-c = callPackage ../development/libraries/zxcvbn-c { }; zxing-cpp = callPackage ../development/libraries/zxing-cpp { }; - snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { }; + snes9x-gtk = callPackage ../applications/emulators/snes9x-gtk { }; - openmsx = callPackage ../misc/emulators/openmsx { + openmsx = callPackage ../applications/emulators/openmsx { python = python3; }; - higan = callPackage ../misc/emulators/higan { }; + higan = callPackage ../applications/emulators/higan { }; - bsnes-hd = callPackage ../misc/emulators/bsnes-hd { + bsnes-hd = callPackage ../applications/emulators/bsnes-hd { inherit (gnome2) gtksourceview; inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL; }; - yapesdl = callPackage ../misc/emulators/yapesdl { }; + yapesdl = callPackage ../applications/emulators/yapesdl { }; - x16-emulator = callPackage ../misc/emulators/commanderx16/emulator.nix { }; - x16-rom = callPackage ../misc/emulators/commanderx16/rom.nix { }; - x16-run = (callPackage ../misc/emulators/commanderx16/run.nix { }) { + 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; }; @@ -34549,7 +34549,7 @@ with pkgs; xsos = callPackage ../os-specific/linux/xsos { }; - zesarux = callPackage ../misc/emulators/zesarux { }; + zesarux = callPackage ../applications/emulators/zesarux { }; zk = callPackage ../applications/office/zk {}; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 3e38ce116a45..65a81e82a096 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -438,7 +438,7 @@ in { veikk-linux-driver = callPackage ../os-specific/linux/veikk-linux-driver { }; vendor-reset = callPackage ../os-specific/linux/vendor-reset { }; - vhba = callPackage ../misc/emulators/cdemu/vhba.nix { }; + vhba = callPackage ../applications/emulators/cdemu/vhba.nix { }; virtualbox = callPackage ../os-specific/linux/virtualbox { virtualbox = pkgs.virtualboxHardened; diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index 4f993bdf082c..62a2278bd4f1 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -1,8 +1,8 @@ { stdenv, config, callPackage, wineBuild }: rec { - fonts = callPackage ../misc/emulators/wine/fonts.nix {}; - minimal = callPackage ../misc/emulators/wine { + fonts = callPackage ../applications/emulators/wine/fonts.nix {}; + minimal = callPackage ../applications/emulators/wine { wineRelease = config.wine.release or "stable"; inherit wineBuild; };