Merge remote-tracking branch 'upstream/master' into hardened-stdenv

27 files changed, 40 insertions, 9 deletions

diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/tools/text/ansifilter/default.nix
index e47369f47559..cf272f3bc81c 100644
--- a/pkgs/tools/text/ansifilter/default.nix
+++ b/pkgs/tools/text/ansifilter/default.nix
@@ -19,6 +19,7 @@ in stdenv.mkDerivation {
 
     license = stdenv.lib.licenses.gpl1;
     maintainers = [ stdenv.lib.maintainers.Adjective-Object ];
+    platforms = stdenv.lib.platforms.linux;
   };
 
   makeFlags="PREFIX=$(out) conf_dir=$(out)/etc/ansifilter/";
diff --git a/pkgs/tools/text/convertlit/default.nix b/pkgs/tools/text/convertlit/default.nix
index aaa458b05cb1..331fc3fea359 100644
--- a/pkgs/tools/text/convertlit/default.nix
+++ b/pkgs/tools/text/convertlit/default.nix
@@ -29,5 +29,6 @@ stdenv.mkDerivation {
     homepage = http://www.convertlit.com/;
     description = "A tool for converting Microsoft Reader ebooks to more open formats";
     license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/text/dadadodo/default.nix b/pkgs/tools/text/dadadodo/default.nix
index b2ccc090313f..4a146accffc0 100644
--- a/pkgs/tools/text/dadadodo/default.nix
+++ b/pkgs/tools/text/dadadodo/default.nix
@@ -18,5 +18,6 @@ stdenv.mkDerivation rec {
     description = "Markov chain-based text generator";
     homepage = http://www.jwz.org/dadadodo;
     maintainers = with maintainers; [ pSub ];
+    platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/tools/text/diction/default.nix b/pkgs/tools/text/diction/default.nix
index 51366c36bc61..bf27fc3de5d3 100644
--- a/pkgs/tools/text/diction/default.nix
+++ b/pkgs/tools/text/diction/default.nix
@@ -17,5 +17,6 @@ stdenv.mkDerivation rec {
       readability measures.
     '';
     license = stdenv.lib.licenses.gpl3Plus;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix
index 70a3bdeb7984..420e0a37ba7e 100644
--- a/pkgs/tools/text/diffutils/default.nix
+++ b/pkgs/tools/text/diffutils/default.nix
@@ -16,5 +16,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.gnu.org/software/diffutils/diffutils.html;
     description = "Commands for showing the differences between files (diff, cmp, etc.)";
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix
index adab8c9a10df..4112ee891b52 100644
--- a/pkgs/tools/text/discount/default.nix
+++ b/pkgs/tools/text/discount/default.nix
@@ -15,5 +15,6 @@ stdenv.mkDerivation rec {
     homepage = "http://www.pell.portland.or.us/~orc/Code/discount/";
     license = licenses.bsd3;
     maintainers = [ maintainers.shell ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix
index 81995705b523..eb6359ba9782 100644
--- a/pkgs/tools/text/highlight/default.nix
+++ b/pkgs/tools/text/highlight/default.nix
@@ -15,5 +15,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Source code highlighting tool";
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix
index 67d2df103639..6698334791c6 100644
--- a/pkgs/tools/text/mawk/default.nix
+++ b/pkgs/tools/text/mawk/default.nix
@@ -8,10 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "1j49ffl8gpfaq99hkylf3fjiygq74w1kpfp8f52xbpx57vn9587g";
   };
 
-  meta = with stdenv.lib;
-    { description = "Interpreter for the AWK Programming Language";
-      homepage = http://invisible-island.net/mawk/mawk.html;
-      license = licenses.gpl2;
-      maintainers = with maintainers; [ ehmry ];
-    };
-}
\ No newline at end of file
+  meta = with stdenv.lib; {
+    description = "Interpreter for the AWK Programming Language";
+    homepage = http://invisible-island.net/mawk/mawk.html;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ ehmry ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/tools/text/mpage/default.nix b/pkgs/tools/text/mpage/default.nix
index c147b3ea301f..4ebe62ef9a5f 100644
--- a/pkgs/tools/text/mpage/default.nix
+++ b/pkgs/tools/text/mpage/default.nix
@@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
 
     license = "liberal";  # a non-copyleft license, see `Copyright' file
     homepage = http://www.mesa.nl/pub/mpage/;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/text/multitran/data/default.nix b/pkgs/tools/text/multitran/data/default.nix
index 57a375d2a17b..d4b4902303b6 100644
--- a/pkgs/tools/text/multitran/data/default.nix
+++ b/pkgs/tools/text/multitran/data/default.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation {
     homepage = http://multitran.sourceforge.net/;
     description = "Multitran data english-russian";
     license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/text/multitran/libbtree/default.nix b/pkgs/tools/text/multitran/libbtree/default.nix
index 3abe03b2a4ea..ae4ece899a4c 100644
--- a/pkgs/tools/text/multitran/libbtree/default.nix
+++ b/pkgs/tools/text/multitran/libbtree/default.nix
@@ -14,5 +14,6 @@ stdenv.mkDerivation {
     homepage = http://multitran.sourceforge.net/;
     description = "Multitran lib: library for reading Multitran's BTREE database format";
     license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/text/multitran/libfacet/default.nix b/pkgs/tools/text/multitran/libfacet/default.nix
index 0f5032c4a175..4470511f6163 100644
--- a/pkgs/tools/text/multitran/libfacet/default.nix
+++ b/pkgs/tools/text/multitran/libfacet/default.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation {
     homepage = http://multitran.sourceforge.net/;
     description = "Multitran lib: enchanced locale facets";
     license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/text/multitran/libmtquery/default.nix b/pkgs/tools/text/multitran/libmtquery/default.nix
index b3e5f12407d8..153184bf70f3 100644
--- a/pkgs/tools/text/multitran/libmtquery/default.nix
+++ b/pkgs/tools/text/multitran/libmtquery/default.nix
@@ -22,5 +22,6 @@ stdenv.mkDerivation {
     homepage = http://multitran.sourceforge.net/;
     description = "Multitran lib: main engine to query translations";
     license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/text/multitran/libmtsupport/default.nix b/pkgs/tools/text/multitran/libmtsupport/default.nix
index e73ba43791a9..9b214e6b5027 100644
--- a/pkgs/tools/text/multitran/libmtsupport/default.nix
+++ b/pkgs/tools/text/multitran/libmtsupport/default.nix
@@ -14,5 +14,6 @@ stdenv.mkDerivation {
     homepage = http://multitran.sourceforge.net/;
     description = "Multitran lib: basic useful functions";
     license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/tools/text/replace/default.nix
index d6d1090652ad..40728c2c3ec5 100644
--- a/pkgs/tools/text/replace/default.nix
+++ b/pkgs/tools/text/replace/default.nix
@@ -26,5 +26,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://replace.richardlloyd.org.uk/;
     description = "A tool to replace verbatim strings";
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/text/sgml/openjade/default.nix b/pkgs/tools/text/sgml/openjade/default.nix
index 3427f62f15bc..cf3b2bad6c99 100644
--- a/pkgs/tools/text/sgml/openjade/default.nix
+++ b/pkgs/tools/text/sgml/openjade/default.nix
@@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
     description = "An implementation of DSSSL, an ISO standard for formatting SGML (and XML) documents";
     license = stdenv.lib.licenses.mit;
     homepage = http://openjade.sourceforge.net/;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/text/sgml/opensp/compat.nix b/pkgs/tools/text/sgml/opensp/compat.nix
index 164982811811..496d68df5b37 100644
--- a/pkgs/tools/text/sgml/opensp/compat.nix
+++ b/pkgs/tools/text/sgml/opensp/compat.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation {
 
   setupHook = opensp.setupHook;
 
-  meta.description =
-    "Compatibility wrapper for old programs looking for original sp programs";
+  meta = opensp.meta // {
+    description = "Compatibility wrapper for old programs looking for original sp programs";
+    platforms = stdenv.lib.platforms.unix;
+  };
 }
diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix
index 92b506aa2c35..bfd150eefdaf 100644
--- a/pkgs/tools/text/sgml/opensp/default.nix
+++ b/pkgs/tools/text/sgml/opensp/default.nix
@@ -36,5 +36,6 @@ stdenv.mkDerivation {
     description = "A suite of SGML/XML processing tools";
     license = stdenv.lib.licenses.mit;
     homepage = http://openjade.sourceforge.net/;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/text/txt2tags/default.nix b/pkgs/tools/text/txt2tags/default.nix
index 365815142d1d..6aad3c7b23da 100644
--- a/pkgs/tools/text/txt2tags/default.nix
+++ b/pkgs/tools/text/txt2tags/default.nix
@@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
     description = "A KISS markup language";
     license  = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ kovirobi ];
+    platforms = with stdenv.lib.platforms; unix;
   };
 }
diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix
index 944b4221844a..93655df64df2 100644
--- a/pkgs/tools/text/xml/html-xml-utils/default.nix
+++ b/pkgs/tools/text/xml/html-xml-utils/default.nix
@@ -13,5 +13,6 @@ stdenv.mkDerivation rec {
     description = "Utilities for manipulating HTML and XML files";
     homepage = http://www.w3.org/Tools/HTML-XML-utils/;
     license = stdenv.lib.licenses.w3c;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/text/xml/rxp/default.nix b/pkgs/tools/text/xml/rxp/default.nix
index a50e91b78668..fc11e210c3cc 100644
--- a/pkgs/tools/text/xml/rxp/default.nix
+++ b/pkgs/tools/text/xml/rxp/default.nix
@@ -13,5 +13,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus;
     description = "A validating XML parser written in C";
     homepage = http://www.cogsci.ed.ac.uk/~richard/rxp.html;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/text/xml/sablotron/default.nix b/pkgs/tools/text/xml/sablotron/default.nix
index a523ebe954c2..aeb07d451bf2 100644
--- a/pkgs/tools/text/xml/sablotron/default.nix
+++ b/pkgs/tools/text/xml/sablotron/default.nix
@@ -7,4 +7,8 @@ stdenv.mkDerivation {
     md5 = "72654c4b832e7562f8240ea675577f5e";
   };
   buildInputs = [expat];
+
+  meta = {
+    platforms = stdenv.lib.platforms.unix;
+  };
 }
diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix
index b390a9c404a3..24303da40695 100644
--- a/pkgs/tools/text/xml/xmlstarlet/default.nix
+++ b/pkgs/tools/text/xml/xmlstarlet/default.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
     description = "A command line tool for manipulating and querying XML data";
     homepage = http://xmlstar.sourceforge.net/;
     license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/text/xml/xpf/default.nix b/pkgs/tools/text/xml/xpf/default.nix
index e1957333b3fb..7d7cd3c49d9b 100644
--- a/pkgs/tools/text/xml/xpf/default.nix
+++ b/pkgs/tools/text/xml/xpf/default.nix
@@ -15,5 +15,6 @@ stdenv.mkDerivation {
   meta = {
     description = "XML Pipes and Filters - command line tools for manipulating and querying XML data";
     homepage = http://www.cs.uu.nl/wiki/bin/view/Martin/XmlPipesAndFilters;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix
index b9ecc9b1e89b..26d17355951a 100644
--- a/pkgs/tools/text/xurls/default.nix
+++ b/pkgs/tools/text/xurls/default.nix
@@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
     description = "Extract urls from text";
     homepage = https://github.com/mvdan/xurls;
     maintainers = [ maintainers.koral ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/text/zimreader/default.nix b/pkgs/tools/text/zimreader/default.nix
index 488f3d3c5e51..d9dcc3c0fbbb 100644
--- a/pkgs/tools/text/zimreader/default.nix
+++ b/pkgs/tools/text/zimreader/default.nix
@@ -39,5 +39,6 @@ in stdenv.mkDerivation rec {
     description = "A tool to serve ZIM files using HTTP";
     homepage = http://git.wikimedia.org/log/openzim;
     maintainers = with stdenv.lib.maintainers; [ robbinch ];
+    platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/tools/text/zimwriterfs/default.nix b/pkgs/tools/text/zimwriterfs/default.nix
index 10be33f1e242..62f0ff991237 100644
--- a/pkgs/tools/text/zimwriterfs/default.nix
+++ b/pkgs/tools/text/zimwriterfs/default.nix
@@ -18,5 +18,6 @@ stdenv.mkDerivation {
     description = "A console tool to create ZIM files";
     homepage = http://git.wikimedia.org/log/openzim;
     maintainers = with stdenv.lib.maintainers; [ robbinch ];
+    platforms = with stdenv.lib.platforms; linux;
   };
 }