From 2bb3a9da24ca60d9f5bed69f679a1ec50dbdf997 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 27 Oct 2020 22:38:58 -0300 Subject: [PATCH] A directory-category for terminal emulators This is a mostly cosmetical commit, in the sense it doesn't change the contents of any package, but reorganizes the overall Nixpkgs expressions. Terminal emulators are an ubiquitous tool for any Unix user; even the beginners are routinely familiarized to it. And, manifestly, there are many implementations of terminal emulators out there, from those traditionally made in C and C++ to those written in Haskell and Go. Terminal emulators deserve more highlight. This commit does that by creating a category for them. --- doc/contributing/coding-conventions.xml | 10 +++ .../alacritty/default.nix | 0 .../aminal/default.nix | 0 .../cool-retro-term/default.nix | 0 .../eterm/default.nix | 0 .../evilvte/default.nix | 0 .../foot/default.nix | 0 .../guake/default.nix | 0 .../havoc/default.nix | 0 .../hyper/default.nix | 0 .../iterm2/default.nix | 0 .../iterm2/disable_updates.patch | 0 .../kitty/default.nix | 0 .../kitty/fix-paths.patch | 0 .../lilyterm/default.nix | 0 .../lxterminal/default.nix | 0 .../respect-xml-catalog-files-var.patch | 0 .../microcom/default.nix | 0 .../mlterm/default.nix | 0 .../mrxvt/default.nix | 0 .../nimmm/default.nix | 0 .../roxterm/default.nix | 0 .../rxvt-unicode-plugins/default.nix | 0 .../default.nix | 0 .../urxvt-bidi/default.nix | 0 .../urxvt-font-size/default.nix | 0 .../urxvt-perl/default.nix | 0 .../urxvt-perls/default.nix | 0 .../urxvt-resize-font/default.nix | 0 .../urxvt-tabbedex/default.nix | 0 .../urxvt-theme-switch/default.nix | 0 .../urxvt-vtwheel/default.nix | 0 .../rxvt-unicode/default.nix | 0 .../patches/256-color-resources.patch | 0 .../patches/9.06-font-width.patch | 0 .../rxvt-unicode/patches/makefile-phony.patch | 0 .../rxvt-unicode/wrapper.nix | 0 .../rxvt/default.nix | 0 .../sakura/default.nix | 0 .../st/default.nix | 0 .../{misc => terminal-emulators}/st/xst.nix | 0 .../stupidterm/default.nix | 0 .../terminator/default.nix | 0 .../terminus/default.nix | 0 .../termite/add_errno_header.patch | 0 .../termite/default.nix | 0 .../termite/remove_ldflags_macos.patch | 0 .../termite/url_regexp_trailing.patch | 0 .../termite/wrapper.nix | 0 .../termonad/default.nix | 0 .../tilda/default.nix | 0 .../tilix/default.nix | 0 .../wayst/default.nix | 0 .../wayst/utf8proc.patch | 0 .../x3270/default.nix | 0 .../xterm/default.nix | 0 .../xterm/sixel-256.support.patch | 0 .../xtermcontrol/default.nix | 0 .../yaft/default.nix | 0 pkgs/top-level/all-packages.nix | 76 +++++++++---------- 60 files changed, 48 insertions(+), 38 deletions(-) rename pkgs/applications/{misc => terminal-emulators}/alacritty/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/aminal/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/cool-retro-term/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/eterm/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/evilvte/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/foot/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/guake/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/havoc/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/hyper/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/iterm2/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/iterm2/disable_updates.patch (100%) rename pkgs/applications/{misc => terminal-emulators}/kitty/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/kitty/fix-paths.patch (100%) rename pkgs/applications/{misc => terminal-emulators}/lilyterm/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/lxterminal/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/lxterminal/respect-xml-catalog-files-var.patch (100%) rename pkgs/applications/{misc => terminal-emulators}/microcom/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/mlterm/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/mrxvt/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/nimmm/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/roxterm/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/urxvt-bidi/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/urxvt-font-size/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/urxvt-perl/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/urxvt-perls/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/urxvt-resize-font/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/urxvt-tabbedex/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/urxvt-theme-switch/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode-plugins/urxvt-vtwheel/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode/patches/256-color-resources.patch (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode/patches/9.06-font-width.patch (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode/patches/makefile-phony.patch (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt-unicode/wrapper.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/rxvt/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/sakura/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/st/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/st/xst.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/stupidterm/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/terminator/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/terminus/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/termite/add_errno_header.patch (100%) rename pkgs/applications/{misc => terminal-emulators}/termite/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/termite/remove_ldflags_macos.patch (100%) rename pkgs/applications/{misc => terminal-emulators}/termite/url_regexp_trailing.patch (100%) rename pkgs/applications/{misc => terminal-emulators}/termite/wrapper.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/termonad/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/tilda/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/tilix/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/wayst/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/wayst/utf8proc.patch (100%) rename pkgs/applications/{misc => terminal-emulators}/x3270/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/xterm/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/xterm/sixel-256.support.patch (100%) rename pkgs/applications/{misc => terminal-emulators}/xtermcontrol/default.nix (100%) rename pkgs/applications/{misc => terminal-emulators}/yaft/default.nix (100%) diff --git a/doc/contributing/coding-conventions.xml b/doc/contributing/coding-conventions.xml index fcb6501f6159..e587275a6383 100644 --- a/doc/contributing/coding-conventions.xml +++ b/doc/contributing/coding-conventions.xml @@ -522,6 +522,16 @@ args.stdenv.mkDerivation (args // { + + + If it’s a terminal emulator: + + + + applications/terminal-emulators (e.g. alacritty or rxvt or termite) + + + If it’s for video playback / editing: diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix similarity index 100% rename from pkgs/applications/misc/alacritty/default.nix rename to pkgs/applications/terminal-emulators/alacritty/default.nix diff --git a/pkgs/applications/misc/aminal/default.nix b/pkgs/applications/terminal-emulators/aminal/default.nix similarity index 100% rename from pkgs/applications/misc/aminal/default.nix rename to pkgs/applications/terminal-emulators/aminal/default.nix diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix similarity index 100% rename from pkgs/applications/misc/cool-retro-term/default.nix rename to pkgs/applications/terminal-emulators/cool-retro-term/default.nix diff --git a/pkgs/applications/misc/eterm/default.nix b/pkgs/applications/terminal-emulators/eterm/default.nix similarity index 100% rename from pkgs/applications/misc/eterm/default.nix rename to pkgs/applications/terminal-emulators/eterm/default.nix diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/terminal-emulators/evilvte/default.nix similarity index 100% rename from pkgs/applications/misc/evilvte/default.nix rename to pkgs/applications/terminal-emulators/evilvte/default.nix diff --git a/pkgs/applications/misc/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix similarity index 100% rename from pkgs/applications/misc/foot/default.nix rename to pkgs/applications/terminal-emulators/foot/default.nix diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix similarity index 100% rename from pkgs/applications/misc/guake/default.nix rename to pkgs/applications/terminal-emulators/guake/default.nix diff --git a/pkgs/applications/misc/havoc/default.nix b/pkgs/applications/terminal-emulators/havoc/default.nix similarity index 100% rename from pkgs/applications/misc/havoc/default.nix rename to pkgs/applications/terminal-emulators/havoc/default.nix diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/terminal-emulators/hyper/default.nix similarity index 100% rename from pkgs/applications/misc/hyper/default.nix rename to pkgs/applications/terminal-emulators/hyper/default.nix diff --git a/pkgs/applications/misc/iterm2/default.nix b/pkgs/applications/terminal-emulators/iterm2/default.nix similarity index 100% rename from pkgs/applications/misc/iterm2/default.nix rename to pkgs/applications/terminal-emulators/iterm2/default.nix diff --git a/pkgs/applications/misc/iterm2/disable_updates.patch b/pkgs/applications/terminal-emulators/iterm2/disable_updates.patch similarity index 100% rename from pkgs/applications/misc/iterm2/disable_updates.patch rename to pkgs/applications/terminal-emulators/iterm2/disable_updates.patch diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix similarity index 100% rename from pkgs/applications/misc/kitty/default.nix rename to pkgs/applications/terminal-emulators/kitty/default.nix diff --git a/pkgs/applications/misc/kitty/fix-paths.patch b/pkgs/applications/terminal-emulators/kitty/fix-paths.patch similarity index 100% rename from pkgs/applications/misc/kitty/fix-paths.patch rename to pkgs/applications/terminal-emulators/kitty/fix-paths.patch diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/terminal-emulators/lilyterm/default.nix similarity index 100% rename from pkgs/applications/misc/lilyterm/default.nix rename to pkgs/applications/terminal-emulators/lilyterm/default.nix diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/terminal-emulators/lxterminal/default.nix similarity index 100% rename from pkgs/applications/misc/lxterminal/default.nix rename to pkgs/applications/terminal-emulators/lxterminal/default.nix diff --git a/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch b/pkgs/applications/terminal-emulators/lxterminal/respect-xml-catalog-files-var.patch similarity index 100% rename from pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch rename to pkgs/applications/terminal-emulators/lxterminal/respect-xml-catalog-files-var.patch diff --git a/pkgs/applications/misc/microcom/default.nix b/pkgs/applications/terminal-emulators/microcom/default.nix similarity index 100% rename from pkgs/applications/misc/microcom/default.nix rename to pkgs/applications/terminal-emulators/microcom/default.nix diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix similarity index 100% rename from pkgs/applications/misc/mlterm/default.nix rename to pkgs/applications/terminal-emulators/mlterm/default.nix diff --git a/pkgs/applications/misc/mrxvt/default.nix b/pkgs/applications/terminal-emulators/mrxvt/default.nix similarity index 100% rename from pkgs/applications/misc/mrxvt/default.nix rename to pkgs/applications/terminal-emulators/mrxvt/default.nix diff --git a/pkgs/applications/misc/nimmm/default.nix b/pkgs/applications/terminal-emulators/nimmm/default.nix similarity index 100% rename from pkgs/applications/misc/nimmm/default.nix rename to pkgs/applications/terminal-emulators/nimmm/default.nix diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/terminal-emulators/roxterm/default.nix similarity index 100% rename from pkgs/applications/misc/roxterm/default.nix rename to pkgs/applications/terminal-emulators/roxterm/default.nix diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt-unicode-plugins/default.nix rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/default.nix diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-autocomplete-all-the-things/default.nix diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-bidi/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt-unicode-plugins/urxvt-bidi/default.nix rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-font-size/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt-unicode-plugins/urxvt-font-size/default.nix rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perl/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perl/default.nix rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perls/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perls/default.nix diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-resize-font/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-resize-font/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt-unicode-plugins/urxvt-resize-font/default.nix rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-resize-font/default.nix diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt-unicode-plugins/urxvt-tabbedex/default.nix rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-theme-switch/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt-unicode-plugins/urxvt-theme-switch/default.nix rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix rename to pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix diff --git a/pkgs/applications/misc/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt-unicode/default.nix rename to pkgs/applications/terminal-emulators/rxvt-unicode/default.nix diff --git a/pkgs/applications/misc/rxvt-unicode/patches/256-color-resources.patch b/pkgs/applications/terminal-emulators/rxvt-unicode/patches/256-color-resources.patch similarity index 100% rename from pkgs/applications/misc/rxvt-unicode/patches/256-color-resources.patch rename to pkgs/applications/terminal-emulators/rxvt-unicode/patches/256-color-resources.patch diff --git a/pkgs/applications/misc/rxvt-unicode/patches/9.06-font-width.patch b/pkgs/applications/terminal-emulators/rxvt-unicode/patches/9.06-font-width.patch similarity index 100% rename from pkgs/applications/misc/rxvt-unicode/patches/9.06-font-width.patch rename to pkgs/applications/terminal-emulators/rxvt-unicode/patches/9.06-font-width.patch diff --git a/pkgs/applications/misc/rxvt-unicode/patches/makefile-phony.patch b/pkgs/applications/terminal-emulators/rxvt-unicode/patches/makefile-phony.patch similarity index 100% rename from pkgs/applications/misc/rxvt-unicode/patches/makefile-phony.patch rename to pkgs/applications/terminal-emulators/rxvt-unicode/patches/makefile-phony.patch diff --git a/pkgs/applications/misc/rxvt-unicode/wrapper.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix similarity index 100% rename from pkgs/applications/misc/rxvt-unicode/wrapper.nix rename to pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix diff --git a/pkgs/applications/misc/rxvt/default.nix b/pkgs/applications/terminal-emulators/rxvt/default.nix similarity index 100% rename from pkgs/applications/misc/rxvt/default.nix rename to pkgs/applications/terminal-emulators/rxvt/default.nix diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/terminal-emulators/sakura/default.nix similarity index 100% rename from pkgs/applications/misc/sakura/default.nix rename to pkgs/applications/terminal-emulators/sakura/default.nix diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/terminal-emulators/st/default.nix similarity index 100% rename from pkgs/applications/misc/st/default.nix rename to pkgs/applications/terminal-emulators/st/default.nix diff --git a/pkgs/applications/misc/st/xst.nix b/pkgs/applications/terminal-emulators/st/xst.nix similarity index 100% rename from pkgs/applications/misc/st/xst.nix rename to pkgs/applications/terminal-emulators/st/xst.nix diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/terminal-emulators/stupidterm/default.nix similarity index 100% rename from pkgs/applications/misc/stupidterm/default.nix rename to pkgs/applications/terminal-emulators/stupidterm/default.nix diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/terminal-emulators/terminator/default.nix similarity index 100% rename from pkgs/applications/misc/terminator/default.nix rename to pkgs/applications/terminal-emulators/terminator/default.nix diff --git a/pkgs/applications/misc/terminus/default.nix b/pkgs/applications/terminal-emulators/terminus/default.nix similarity index 100% rename from pkgs/applications/misc/terminus/default.nix rename to pkgs/applications/terminal-emulators/terminus/default.nix diff --git a/pkgs/applications/misc/termite/add_errno_header.patch b/pkgs/applications/terminal-emulators/termite/add_errno_header.patch similarity index 100% rename from pkgs/applications/misc/termite/add_errno_header.patch rename to pkgs/applications/terminal-emulators/termite/add_errno_header.patch diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/terminal-emulators/termite/default.nix similarity index 100% rename from pkgs/applications/misc/termite/default.nix rename to pkgs/applications/terminal-emulators/termite/default.nix diff --git a/pkgs/applications/misc/termite/remove_ldflags_macos.patch b/pkgs/applications/terminal-emulators/termite/remove_ldflags_macos.patch similarity index 100% rename from pkgs/applications/misc/termite/remove_ldflags_macos.patch rename to pkgs/applications/terminal-emulators/termite/remove_ldflags_macos.patch diff --git a/pkgs/applications/misc/termite/url_regexp_trailing.patch b/pkgs/applications/terminal-emulators/termite/url_regexp_trailing.patch similarity index 100% rename from pkgs/applications/misc/termite/url_regexp_trailing.patch rename to pkgs/applications/terminal-emulators/termite/url_regexp_trailing.patch diff --git a/pkgs/applications/misc/termite/wrapper.nix b/pkgs/applications/terminal-emulators/termite/wrapper.nix similarity index 100% rename from pkgs/applications/misc/termite/wrapper.nix rename to pkgs/applications/terminal-emulators/termite/wrapper.nix diff --git a/pkgs/applications/misc/termonad/default.nix b/pkgs/applications/terminal-emulators/termonad/default.nix similarity index 100% rename from pkgs/applications/misc/termonad/default.nix rename to pkgs/applications/terminal-emulators/termonad/default.nix diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/terminal-emulators/tilda/default.nix similarity index 100% rename from pkgs/applications/misc/tilda/default.nix rename to pkgs/applications/terminal-emulators/tilda/default.nix diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/terminal-emulators/tilix/default.nix similarity index 100% rename from pkgs/applications/misc/tilix/default.nix rename to pkgs/applications/terminal-emulators/tilix/default.nix diff --git a/pkgs/applications/misc/wayst/default.nix b/pkgs/applications/terminal-emulators/wayst/default.nix similarity index 100% rename from pkgs/applications/misc/wayst/default.nix rename to pkgs/applications/terminal-emulators/wayst/default.nix diff --git a/pkgs/applications/misc/wayst/utf8proc.patch b/pkgs/applications/terminal-emulators/wayst/utf8proc.patch similarity index 100% rename from pkgs/applications/misc/wayst/utf8proc.patch rename to pkgs/applications/terminal-emulators/wayst/utf8proc.patch diff --git a/pkgs/applications/misc/x3270/default.nix b/pkgs/applications/terminal-emulators/x3270/default.nix similarity index 100% rename from pkgs/applications/misc/x3270/default.nix rename to pkgs/applications/terminal-emulators/x3270/default.nix diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix similarity index 100% rename from pkgs/applications/misc/xterm/default.nix rename to pkgs/applications/terminal-emulators/xterm/default.nix diff --git a/pkgs/applications/misc/xterm/sixel-256.support.patch b/pkgs/applications/terminal-emulators/xterm/sixel-256.support.patch similarity index 100% rename from pkgs/applications/misc/xterm/sixel-256.support.patch rename to pkgs/applications/terminal-emulators/xterm/sixel-256.support.patch diff --git a/pkgs/applications/misc/xtermcontrol/default.nix b/pkgs/applications/terminal-emulators/xtermcontrol/default.nix similarity index 100% rename from pkgs/applications/misc/xtermcontrol/default.nix rename to pkgs/applications/terminal-emulators/xtermcontrol/default.nix diff --git a/pkgs/applications/misc/yaft/default.nix b/pkgs/applications/terminal-emulators/yaft/default.nix similarity index 100% rename from pkgs/applications/misc/yaft/default.nix rename to pkgs/applications/terminal-emulators/yaft/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a81c1fcf146..ad7eb42b128d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -669,7 +669,7 @@ in albert = libsForQt5.callPackage ../applications/misc/albert {}; - alacritty = callPackage ../applications/misc/alacritty { + alacritty = callPackage ../applications/terminal-emulators/alacritty { inherit (xorg) libXcursor libXxf86vm libXi; inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; }; @@ -2976,7 +2976,7 @@ in cpcfs = callPackage ../tools/filesystems/cpcfs { }; - cool-retro-term = libsForQt5.callPackage ../applications/misc/cool-retro-term { }; + cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; coreutils = callPackage ../tools/misc/coreutils { }; coreutils-full = coreutils.override { minimal = false; }; @@ -3431,7 +3431,7 @@ in wayland-utils = callPackage ../tools/wayland/wayland-utils { }; - wayst = callPackage ../applications/misc/wayst { }; + wayst = callPackage ../applications/terminal-emulators/wayst { }; wev = callPackage ../tools/misc/wev { }; @@ -5477,7 +5477,7 @@ in mgba = libsForQt5.callPackage ../misc/emulators/mgba { }; - microcom = callPackage ../applications/misc/microcom { }; + microcom = callPackage ../applications/terminal-emulators/microcom { }; microserver = callPackage ../servers/microserver { }; @@ -5830,7 +5830,7 @@ in nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {}; - nimmm = callPackage ../applications/misc/nimmm { }; + nimmm = callPackage ../applications/terminal-emulators/nimmm { }; nitrogen = callPackage ../tools/X11/nitrogen {}; @@ -7445,7 +7445,7 @@ in tikzit = libsForQt5.callPackage ../tools/typesetting/tikzit { }; - tilix = callPackage ../applications/misc/tilix { }; + tilix = callPackage ../applications/terminal-emulators/tilix { }; tinc_pre = callPackage ../tools/networking/tinc/pre.nix {}; @@ -8160,7 +8160,7 @@ in clipnotify = callPackage ../tools/misc/clipnotify { }; - x3270 = callPackage ../applications/misc/x3270 { }; + x3270 = callPackage ../applications/terminal-emulators/x3270 { }; xclip = callPackage ../tools/misc/xclip { }; @@ -8248,7 +8248,7 @@ in yafaray-core = callPackage ../tools/graphics/yafaray-core { }; - yaft = callPackage ../applications/misc/yaft { }; + yaft = callPackage ../applications/terminal-emulators/yaft { }; yarn = callPackage ../development/tools/yarn { }; @@ -20520,7 +20520,7 @@ in esniper = callPackage ../applications/networking/esniper { }; - eterm = callPackage ../applications/misc/eterm { }; + eterm = callPackage ../applications/terminal-emulators/eterm { }; eteroj.lv2 = libsForQt5.callPackage ../applications/audio/eteroj.lv2 { }; @@ -20528,7 +20528,7 @@ in etherape = callPackage ../applications/networking/sniffers/etherape { }; - evilvte = callPackage ../applications/misc/evilvte (config.evilvte or {}); + evilvte = callPackage ../applications/terminal-emulators/evilvte (config.evilvte or {}); evilpixie = libsForQt514.callPackage ../applications/graphics/evilpixie { }; @@ -20634,7 +20634,7 @@ in foo-yc20 = callPackage ../applications/audio/foo-yc20 { }; - foot = callPackage ../applications/misc/foot { }; + foot = callPackage ../applications/terminal-emulators/foot { }; fossil = callPackage ../applications/version-management/fossil { }; @@ -20927,7 +20927,7 @@ in gcalcli = callPackage ../applications/misc/gcalcli { }; - havoc = callPackage ../applications/misc/havoc { }; + havoc = callPackage ../applications/terminal-emulators/havoc { }; vcal = callPackage ../applications/misc/vcal { }; @@ -21146,7 +21146,7 @@ in gtk2fontsel = callPackage ../applications/misc/gtk2fontsel { }; - guake = callPackage ../applications/misc/guake { }; + guake = callPackage ../applications/terminal-emulators/guake { }; guardian-agent = callPackage ../tools/networking/guardian-agent { }; @@ -21250,7 +21250,7 @@ in hydroxide = callPackage ../applications/networking/hydroxide { }; - hyper = callPackage ../applications/misc/hyper { }; + hyper = callPackage ../applications/terminal-emulators/hyper { }; hyper-haskell-server-with-packages = callPackage ../development/tools/haskell/hyper-haskell/server.nix { inherit (haskellPackages) ghcWithPackages; @@ -21695,7 +21695,7 @@ in ffmpeg = ffmpeg_2; }; - kitty = callPackage ../applications/misc/kitty { + kitty = callPackage ../applications/terminal-emulators/kitty { harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL; }; @@ -21929,7 +21929,7 @@ in jftui = callPackage ../applications/video/jftui { }; - lilyterm = callPackage ../applications/misc/lilyterm { + lilyterm = callPackage ../applications/terminal-emulators/lilyterm { inherit (gnome2) vte; gtk = gtk2; flavour = "stable"; @@ -22259,7 +22259,7 @@ in mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { }; - mrxvt = callPackage ../applications/misc/mrxvt { }; + mrxvt = callPackage ../applications/terminal-emulators/mrxvt { }; mtpaint = callPackage ../applications/graphics/mtpaint { }; @@ -23210,13 +23210,13 @@ in runc = callPackage ../applications/virtualization/runc {}; - rxvt = callPackage ../applications/misc/rxvt { }; + rxvt = callPackage ../applications/terminal-emulators/rxvt { }; - rxvt-unicode = callPackage ../applications/misc/rxvt-unicode/wrapper.nix { }; + rxvt-unicode = callPackage ../applications/terminal-emulators/rxvt-unicode/wrapper.nix { }; - rxvt-unicode-unwrapped = callPackage ../applications/misc/rxvt-unicode { }; + rxvt-unicode-unwrapped = callPackage ../applications/terminal-emulators/rxvt-unicode { }; - rxvt-unicode-plugins = import ../applications/misc/rxvt-unicode-plugins { inherit callPackage; }; + rxvt-unicode-plugins = import ../applications/terminal-emulators/rxvt-unicode-plugins { inherit callPackage; }; uade123 = callPackage ../applications/audio/uade123 {}; @@ -23226,7 +23226,7 @@ in sacc = callPackage ../applications/networking/gopher/sacc { }; - sakura = callPackage ../applications/misc/sakura { }; + sakura = callPackage ../applications/terminal-emulators/sakura { }; sameboy = callPackage ../misc/emulators/sameboy { }; @@ -23324,7 +23324,7 @@ in ncurses = ncurses5; }; - stupidterm = callPackage ../applications/misc/stupidterm { + stupidterm = callPackage ../applications/terminal-emulators/stupidterm { gtk = gtk3; }; @@ -23338,13 +23338,13 @@ in sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { }; - st = callPackage ../applications/misc/st { + st = callPackage ../applications/terminal-emulators/st { conf = config.st.conf or null; patches = config.st.patches or []; extraLibs = config.st.extraLibs or []; }; - xst = callPackage ../applications/misc/st/xst.nix { }; + xst = callPackage ../applications/terminal-emulators/st/xst.nix { }; stag = callPackage ../applications/misc/stag { curses = ncurses; @@ -23678,21 +23678,21 @@ in terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; - terminator = callPackage ../applications/misc/terminator { }; + terminator = callPackage ../applications/terminal-emulators/terminator { }; - terminus = callPackage ../applications/misc/terminus { }; + terminus = callPackage ../applications/terminal-emulators/terminus { }; tty-solitaire = callPackage ../applications/misc/tty-solitaire { }; - lxterminal = callPackage ../applications/misc/lxterminal { }; + lxterminal = callPackage ../applications/terminal-emulators/lxterminal { }; - aminal = callPackage ../applications/misc/aminal { + aminal = callPackage ../applications/terminal-emulators/aminal { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel; }; - termite-unwrapped = callPackage ../applications/misc/termite { }; + termite-unwrapped = callPackage ../applications/terminal-emulators/termite { }; - termite = callPackage ../applications/misc/termite/wrapper.nix { termite = termite-unwrapped; }; + termite = callPackage ../applications/terminal-emulators/termite/wrapper.nix { termite = termite-unwrapped; }; termtosvg = callPackage ../tools/misc/termtosvg { }; @@ -23737,7 +23737,7 @@ in tig = gitAndTools.tig; - tilda = callPackage ../applications/misc/tilda { + tilda = callPackage ../applications/terminal-emulators/tilda { gtk = gtk3; }; @@ -24590,16 +24590,16 @@ in xsynth_dssi = callPackage ../applications/audio/xsynth-dssi { }; - xterm = callPackage ../applications/misc/xterm { }; + xterm = callPackage ../applications/terminal-emulators/xterm { }; - mlterm = callPackage ../applications/misc/mlterm { + mlterm = callPackage ../applications/terminal-emulators/mlterm { libssh2 = null; openssl = null; }; - roxterm = callPackage ../applications/misc/roxterm { }; + roxterm = callPackage ../applications/terminal-emulators/roxterm { }; - termonad-with-packages = callPackage ../applications/misc/termonad { + termonad-with-packages = callPackage ../applications/terminal-emulators/termonad { inherit (haskellPackages) ghcWithPackages; }; @@ -28128,7 +28128,7 @@ in imatix_gsl = callPackage ../development/tools/imatix_gsl {}; - iterm2 = callPackage ../applications/misc/iterm2 {}; + iterm2 = callPackage ../applications/terminal-emulators/iterm2 {}; sccache = callPackage ../development/tools/misc/sccache { }; @@ -28193,7 +28193,7 @@ in houdini = callPackage ../applications/misc/houdini {}; - xtermcontrol = callPackage ../applications/misc/xtermcontrol {}; + xtermcontrol = callPackage ../applications/terminal-emulators/xtermcontrol {}; openfst = callPackage ../development/libraries/openfst {};