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 99% 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 index aebbedacef64..eb520f38bedb 100644 --- a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-vtwheel/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { rev = "36d3e861664aeae36a45f96100f10f8fe2218035"; sha256 = "1h3vrsbli5q9kr84j5ijbivlhpwlh3l8cv233pg362v2zz4ja8i7"; }; - + installPhase = '' sed -i 's|#! perl|#! ${perl}/bin/perl|g' vtwheel mkdir -p $out/lib/urxvt/perl @@ -23,5 +23,5 @@ stdenv.mkDerivation { maintainers = with maintainers; [ danbst ]; platforms = with platforms; unix; }; - + } 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 99% rename from pkgs/applications/misc/rxvt-unicode/wrapper.nix rename to pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix index 38978799b5a8..b03acb99530a 100644 --- a/pkgs/applications/misc/rxvt-unicode/wrapper.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix @@ -29,7 +29,7 @@ let # This provides simple way to customize urxvt using # the `.override` mechanism. wrapper = { configure, ... }: - let + let config = configure { inherit availablePlugins; }; plugins = config.plugins or (builtins.attrValues availablePlugins); extraDeps = config.extraDeps or [ ]; 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 c3fcc723725f..34ca38376572 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -669,11 +669,113 @@ in albert = libsForQt5.callPackage ../applications/misc/albert {}; - alacritty = callPackage ../applications/misc/alacritty { + ### APPLICATIONS/TERMINAL-EMULATORS + + alacritty = callPackage ../applications/terminal-emulators/alacritty { inherit (xorg) libXcursor libXxf86vm libXi; inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices CoreText Foundation OpenGL; }; + aminal = callPackage ../applications/terminal-emulators/aminal { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel; + }; + + cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; + + eterm = callPackage ../applications/terminal-emulators/eterm { }; + + evilvte = callPackage ../applications/terminal-emulators/evilvte (config.evilvte or {}); + + foot = callPackage ../applications/terminal-emulators/foot { }; + + guake = callPackage ../applications/terminal-emulators/guake { }; + + havoc = callPackage ../applications/terminal-emulators/havoc { }; + + hyper = callPackage ../applications/terminal-emulators/hyper { }; + + iterm2 = callPackage ../applications/terminal-emulators/iterm2 {}; + + kitty = callPackage ../applications/terminal-emulators/kitty { + harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; + inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL; + }; + + lilyterm = callPackage ../applications/terminal-emulators/lilyterm { + inherit (gnome2) vte; + gtk = gtk2; + flavour = "stable"; + }; + + lilyterm-git = lilyterm.override { + flavour = "git"; + }; + + lxterminal = callPackage ../applications/terminal-emulators/lxterminal { }; + + microcom = callPackage ../applications/terminal-emulators/microcom { }; + + mlterm = callPackage ../applications/terminal-emulators/mlterm { + libssh2 = null; + openssl = null; + }; + + mrxvt = callPackage ../applications/terminal-emulators/mrxvt { }; + + nimmm = callPackage ../applications/terminal-emulators/nimmm { }; + + roxterm = callPackage ../applications/terminal-emulators/roxterm { }; + + rxvt = callPackage ../applications/terminal-emulators/rxvt { }; + + rxvt-unicode = callPackage ../applications/terminal-emulators/rxvt-unicode/wrapper.nix { }; + + rxvt-unicode-plugins = import ../applications/terminal-emulators/rxvt-unicode-plugins { inherit callPackage; }; + + rxvt-unicode-unwrapped = callPackage ../applications/terminal-emulators/rxvt-unicode { }; + + sakura = callPackage ../applications/terminal-emulators/sakura { }; + + 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/terminal-emulators/st/xst.nix { }; + + stupidterm = callPackage ../applications/terminal-emulators/stupidterm { + gtk = gtk3; + }; + + terminator = callPackage ../applications/terminal-emulators/terminator { }; + + terminus = callPackage ../applications/terminal-emulators/terminus { }; + + termite = callPackage ../applications/terminal-emulators/termite/wrapper.nix { + termite = termite-unwrapped; + }; + termite-unwrapped = callPackage ../applications/terminal-emulators/termite { }; + + termonad-with-packages = callPackage ../applications/terminal-emulators/termonad { + inherit (haskellPackages) ghcWithPackages; + }; + + tilda = callPackage ../applications/terminal-emulators/tilda { + gtk = gtk3; + }; + + tilix = callPackage ../applications/terminal-emulators/tilix { }; + + wayst = callPackage ../applications/terminal-emulators/wayst { }; + + x3270 = callPackage ../applications/terminal-emulators/x3270 { }; + + xterm = callPackage ../applications/terminal-emulators/xterm { }; + + xtermcontrol = callPackage ../applications/terminal-emulators/xtermcontrol {}; + + yaft = callPackage ../applications/terminal-emulators/yaft { }; + aldo = callPackage ../applications/radio/aldo { }; almanah = callPackage ../applications/misc/almanah { }; @@ -2976,8 +3078,6 @@ in cpcfs = callPackage ../tools/filesystems/cpcfs { }; - cool-retro-term = libsForQt5.callPackage ../applications/misc/cool-retro-term { }; - coreutils = callPackage ../tools/misc/coreutils { }; coreutils-full = coreutils.override { minimal = false; }; coreutils-prefixed = coreutils.override { withPrefix = true; singleBinary = false; }; @@ -3431,8 +3531,6 @@ in wayland-utils = callPackage ../tools/wayland/wayland-utils { }; - wayst = callPackage ../applications/misc/wayst { }; - wev = callPackage ../tools/misc/wev { }; wl-clipboard = callPackage ../tools/misc/wl-clipboard { }; @@ -5477,8 +5575,6 @@ in mgba = libsForQt5.callPackage ../misc/emulators/mgba { }; - microcom = callPackage ../applications/misc/microcom { }; - microserver = callPackage ../servers/microserver { }; midisheetmusic = callPackage ../applications/audio/midisheetmusic { }; @@ -5830,8 +5926,6 @@ in nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {}; - nimmm = callPackage ../applications/misc/nimmm { }; - nitrogen = callPackage ../tools/X11/nitrogen {}; nms = callPackage ../tools/misc/nms { }; @@ -7445,8 +7539,6 @@ in tikzit = libsForQt5.callPackage ../tools/typesetting/tikzit { }; - tilix = callPackage ../applications/misc/tilix { }; - tinc_pre = callPackage ../tools/networking/tinc/pre.nix {}; tinycbor = callPackage ../development/libraries/tinycbor { }; @@ -8160,8 +8252,6 @@ in clipnotify = callPackage ../tools/misc/clipnotify { }; - x3270 = callPackage ../applications/misc/x3270 { }; - xclip = callPackage ../tools/misc/xclip { }; xcur2png = callPackage ../tools/graphics/xcur2png { }; @@ -8248,8 +8338,6 @@ in yafaray-core = callPackage ../tools/graphics/yafaray-core { }; - yaft = callPackage ../applications/misc/yaft { }; - yarn = callPackage ../development/tools/yarn { }; yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea/yarn2nix { }; @@ -20520,16 +20608,12 @@ in esniper = callPackage ../applications/networking/esniper { }; - eterm = callPackage ../applications/misc/eterm { }; - eteroj.lv2 = libsForQt5.callPackage ../applications/audio/eteroj.lv2 { }; etesync-dav = callPackage ../applications/misc/etesync-dav {}; etherape = callPackage ../applications/networking/sniffers/etherape { }; - evilvte = callPackage ../applications/misc/evilvte (config.evilvte or {}); - evilpixie = libsForQt514.callPackage ../applications/graphics/evilpixie { }; exercism = callPackage ../applications/misc/exercism { }; @@ -20634,8 +20718,6 @@ in foo-yc20 = callPackage ../applications/audio/foo-yc20 { }; - foot = callPackage ../applications/misc/foot { }; - fossil = callPackage ../applications/version-management/fossil { }; freebayes = callPackage ../applications/science/biology/freebayes { }; @@ -20927,8 +21009,6 @@ in gcalcli = callPackage ../applications/misc/gcalcli { }; - havoc = callPackage ../applications/misc/havoc { }; - vcal = callPackage ../applications/misc/vcal { }; gcolor2 = callPackage ../applications/graphics/gcolor2 { }; @@ -21146,8 +21226,6 @@ in gtk2fontsel = callPackage ../applications/misc/gtk2fontsel { }; - guake = callPackage ../applications/misc/guake { }; - guardian-agent = callPackage ../tools/networking/guardian-agent { }; guitone = callPackage ../applications/version-management/guitone { @@ -21250,8 +21328,6 @@ in hydroxide = callPackage ../applications/networking/hydroxide { }; - hyper = callPackage ../applications/misc/hyper { }; - hyper-haskell-server-with-packages = callPackage ../development/tools/haskell/hyper-haskell/server.nix { inherit (haskellPackages) ghcWithPackages; packages = self: with self; []; @@ -21695,11 +21771,6 @@ in ffmpeg = ffmpeg_2; }; - kitty = callPackage ../applications/misc/kitty { - harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; - inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL; - }; - kiwix = callPackage ../applications/misc/kiwix { }; klayout = libsForQt5.callPackage ../applications/misc/klayout { }; @@ -21929,16 +22000,6 @@ in jftui = callPackage ../applications/video/jftui { }; - lilyterm = callPackage ../applications/misc/lilyterm { - inherit (gnome2) vte; - gtk = gtk2; - flavour = "stable"; - }; - - lilyterm-git = lilyterm.override { - flavour = "git"; - }; - lime = callPackage ../development/libraries/lime { }; luakit = callPackage ../applications/networking/browsers/luakit { @@ -22259,8 +22320,6 @@ in mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { }; - mrxvt = callPackage ../applications/misc/mrxvt { }; - mtpaint = callPackage ../applications/graphics/mtpaint { }; mu-repo = python3Packages.callPackage ../applications/misc/mu-repo { }; @@ -23214,14 +23273,6 @@ in runc = callPackage ../applications/virtualization/runc {}; - rxvt = callPackage ../applications/misc/rxvt { }; - - rxvt-unicode = callPackage ../applications/misc/rxvt-unicode/wrapper.nix { }; - - rxvt-unicode-unwrapped = callPackage ../applications/misc/rxvt-unicode { }; - - rxvt-unicode-plugins = import ../applications/misc/rxvt-unicode-plugins { inherit callPackage; }; - uade123 = callPackage ../applications/audio/uade123 {}; udevil = callPackage ../applications/misc/udevil {}; @@ -23230,8 +23281,6 @@ in sacc = callPackage ../applications/networking/gopher/sacc { }; - sakura = callPackage ../applications/misc/sakura { }; - sameboy = callPackage ../misc/emulators/sameboy { }; sayonara = libsForQt514.callPackage ../applications/audio/sayonara { }; @@ -23328,10 +23377,6 @@ in ncurses = ncurses5; }; - stupidterm = callPackage ../applications/misc/stupidterm { - gtk = gtk3; - }; - styx = callPackage ../applications/misc/styx { }; tecoc = callPackage ../applications/editors/tecoc { }; @@ -23342,14 +23387,6 @@ in sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { }; - st = callPackage ../applications/misc/st { - conf = config.st.conf or null; - patches = config.st.patches or []; - extraLibs = config.st.extraLibs or []; - }; - - xst = callPackage ../applications/misc/st/xst.nix { }; - stag = callPackage ../applications/misc/stag { curses = ncurses; }; @@ -23682,22 +23719,8 @@ in terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; - terminator = callPackage ../applications/misc/terminator { }; - - terminus = callPackage ../applications/misc/terminus { }; - tty-solitaire = callPackage ../applications/misc/tty-solitaire { }; - lxterminal = callPackage ../applications/misc/lxterminal { }; - - aminal = callPackage ../applications/misc/aminal { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel; - }; - - termite-unwrapped = callPackage ../applications/misc/termite { }; - - termite = callPackage ../applications/misc/termite/wrapper.nix { termite = termite-unwrapped; }; - termtosvg = callPackage ../tools/misc/termtosvg { }; inherit (callPackage ../applications/graphics/tesseract {}) @@ -23741,10 +23764,6 @@ in tig = gitAndTools.tig; - tilda = callPackage ../applications/misc/tilda { - gtk = gtk3; - }; - timbreid = callPackage ../applications/audio/pd-plugins/timbreid { fftw = fftwSinglePrec; }; @@ -24594,19 +24613,6 @@ in xsynth_dssi = callPackage ../applications/audio/xsynth-dssi { }; - xterm = callPackage ../applications/misc/xterm { }; - - mlterm = callPackage ../applications/misc/mlterm { - libssh2 = null; - openssl = null; - }; - - roxterm = callPackage ../applications/misc/roxterm { }; - - termonad-with-packages = callPackage ../applications/misc/termonad { - inherit (haskellPackages) ghcWithPackages; - }; - xtrace = callPackage ../tools/X11/xtrace { }; xtruss = callPackage ../tools/X11/xtruss { }; @@ -28132,8 +28138,6 @@ in imatix_gsl = callPackage ../development/tools/imatix_gsl {}; - iterm2 = callPackage ../applications/misc/iterm2 {}; - sccache = callPackage ../development/tools/misc/sccache { }; sequeler = callPackage ../applications/misc/sequeler { }; @@ -28197,8 +28201,6 @@ in houdini = callPackage ../applications/misc/houdini {}; - xtermcontrol = callPackage ../applications/misc/xtermcontrol {}; - openfst = callPackage ../development/libraries/openfst {}; opengrm-ngram = callPackage ../development/libraries/opengrm-ngram {};