Merge remote-tracking branch 'upstream/master' into staging

3 files changed, 32 insertions, 2 deletions

diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix
new file mode 100644
index 000000000000..a0be19607ea5
--- /dev/null
+++ b/pkgs/tools/text/aha/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub }:
+
+let version = "0.4.8"; in
+stdenv.mkDerivation rec {
+  name = "aha-${version}";
+
+  src = fetchFromGitHub {
+    sha256 = "1209rda6kc9x88b47y1035zs9lxk0x3qzsb87f8m5b55fdkgxqlj";
+    rev = version;
+    repo = "aha";
+    owner = "theZiz";
+  };
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "ANSI HTML Adapter";
+    longDescription = ''
+      aha takes ANSI SGR-coloured input and produces W3C-conformant HTML code.
+    '';
+    homepage = https://github.com/theZiz/aha;
+    downloadPage = https://github.com/theZiz/aha/releases;
+    license = with licenses; [ lgpl2Plus mpl11 ];
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  makeFlags = "PREFIX=$(out)";
+
+  enableParallelBuilding = true;
+}
diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix
index da7799900a35..2ea4a9501452 100644
--- a/pkgs/tools/text/grin/default.nix
+++ b/pkgs/tools/text/grin/default.nix
@@ -14,7 +14,7 @@ pythonPackages.buildPythonPackage rec {
 
   meta = {
     homepage = https://pypi.python.org/pypi/grin;
-    description = "A grep program configured the way I like it.";
+    description = "A grep program configured the way I like it";
     platform = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.sjagoe ];
   };
diff --git a/pkgs/tools/text/html2text/default.nix b/pkgs/tools/text/html2text/default.nix
index 27de591d8896..8fd0bea2254c 100644
--- a/pkgs/tools/text/html2text/default.nix
+++ b/pkgs/tools/text/html2text/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "html2text is a command line utility, written in C++, that converts HTML documents into plain text.";
+    description = "A command line utility, written in C++, that converts HTML documents into plain text";
     homepage = http://www.mbayer.de/html2text/;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;