Merge pull request #178673 from AndersonTorres/MISC

dterm: move to applications/terminal-emulators

2 files changed, 19 insertions, 4 deletions

diff --git a/pkgs/tools/misc/dterm/default.nix b/pkgs/applications/terminal-emulators/dterm/default.nix
index 48665751aeb..69b1f67d629 100644
--- a/pkgs/tools/misc/dterm/default.nix
+++ b/pkgs/applications/terminal-emulators/dterm/default.nix
@@ -1,4 +1,8 @@
-{ lib, stdenv, fetchurl, readline }:
+{ lib
+, stdenv
+, fetchurl
+, readline
+}:
 
 stdenv.mkDerivation rec {
   pname = "dterm";
@@ -6,20 +10,31 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://www.knossos.net.nz/downloads/dterm-${version}.tgz";
-    sha256 = "94533be79f1eec965e59886d5f00a35cb675c5db1d89419f253bb72f140abddb";
+    hash = "sha256-lFM7558e7JZeWYhtXwCjXLZ1xdsdiUGfJTu3LxQKvds=";
   };
 
   buildInputs = [ readline ];
+
   postPatch = ''
     substituteInPlace Makefile \
       --replace 'gcc' '${stdenv.cc.targetPrefix}cc'
   '';
+
   preInstall = "mkdir -p $out/bin";
+
   installFlags = [ "BIN=$(out)/bin/" ];
 
   meta = with lib; {
     homepage = "http://www.knossos.net.nz/resources/free-software/dterm/";
     description = "A simple terminal program";
+    longDescription = ''
+      dterm is a simple terminal emulator, which doesn’t actually emulate any
+      particular terminal. Mainly, it is designed for use with xterm and
+      friends, which already do a perfectly good emulation, and therefore don’t
+      need any special help; dterm simply provides a means by which keystrokes
+      are forwarded to the serial line, and data forwarded from the serial line
+      appears on the terminal.
+    '';
     license = licenses.gpl2Only;
     maintainers = with maintainers; [ auchter ];
     platforms = platforms.unix;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9050a4cb7c0..6200c3513b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1147,8 +1147,6 @@ with pkgs;
 
   cope = callPackage ../tools/misc/cope { };
 
-  dterm = callPackage ../tools/misc/dterm { };
-
   ejson2env = callPackage ../tools/admin/ejson2env { };
 
   davinci-resolve = callPackage ../applications/video/davinci-resolve { };
@@ -1583,6 +1581,8 @@ with pkgs;
 
   darktile = callPackage ../applications/terminal-emulators/darktile { };
 
+  dterm = callPackage ../applications/terminal-emulators/dterm { };
+
   eterm = callPackage ../applications/terminal-emulators/eterm { };
 
   foot = callPackage ../applications/terminal-emulators/foot { };