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

16 files changed, 30 insertions, 7 deletions

diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix
index e623f67e64bc..d9d69a4a4c01 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/pkgs/tools/typesetting/asciidoc/default.nix
@@ -271,7 +271,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://www.methods.co.nz/asciidoc/";
     license = licenses.gpl2Plus;
-    hydraPlatforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ maintainers.bjornfor ];
   };
 }
diff --git a/pkgs/tools/typesetting/git-latexdiff/default.nix b/pkgs/tools/typesetting/git-latexdiff/default.nix
index 76536190f345..9dc73886b5ac 100644
--- a/pkgs/tools/typesetting/git-latexdiff/default.nix
+++ b/pkgs/tools/typesetting/git-latexdiff/default.nix
@@ -32,5 +32,6 @@ stdenv.mkDerivation rec {
     description = "View diff on LaTeX source files on the generated PDF files";
     maintainers = [ maintainers.DamienCassou ];
     license = licenses.free; # https://gitlab.com/git-latexdiff/git-latexdiff/issues/9
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/typesetting/halibut/default.nix b/pkgs/tools/typesetting/halibut/default.nix
index 28325825ca2c..487af940077c 100644
--- a/pkgs/tools/typesetting/halibut/default.nix
+++ b/pkgs/tools/typesetting/halibut/default.nix
@@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.chiark.greenend.org.uk/~sgtatham/halibut/;
     license = licenses.mit;
     maintainers = with maintainers; [ pSub ];
+    platforms = with platforms; unix;
   };
 }
diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix
index 600522d45a26..f3ef746fedfc 100644
--- a/pkgs/tools/typesetting/hevea/default.nix
+++ b/pkgs/tools/typesetting/hevea/default.nix
@@ -17,5 +17,6 @@ stdenv.mkDerivation rec {
     homepage = http://pauillac.inria.fr/~maranget/hevea/;
     license = licenses.qpl;
     maintainers = with maintainers; [ pSub ];
+    platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/tools/typesetting/multimarkdown/default.nix b/pkgs/tools/typesetting/multimarkdown/default.nix
index d628d84ee9e2..53e75ebd5ec5 100644
--- a/pkgs/tools/typesetting/multimarkdown/default.nix
+++ b/pkgs/tools/typesetting/multimarkdown/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     # licensed under GPLv2+ or MIT:
     # https://raw.githubusercontent.com/fletcher/MultiMarkdown-4/master/LICENSE
     license = with stdenv.lib.licenses; [ gpl2Plus ];
-    hydraPlatforms = platforms.all;
+    platforms = platforms.all;
     maintainers = with stdenv.lib.maintainers; [ lowfatcomputing ];
   };
 }
diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/tools/typesetting/rubber/default.nix
index 96e1f532bffd..2b8505ac5df0 100644
--- a/pkgs/tools/typesetting/rubber/default.nix
+++ b/pkgs/tools/typesetting/rubber/default.nix
@@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus;
     homepage = http://www.pps.jussieu.fr/~beffara/soft/rubber/;
     maintainers = [ stdenv.lib.maintainers.ttuegel ];
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix
index 0d2282a4fd8f..b910be76b851 100644
--- a/pkgs/tools/typesetting/tex/auctex/default.nix
+++ b/pkgs/tools/typesetting/tex/auctex/default.nix
@@ -12,11 +12,6 @@ let auctex = stdenv.mkDerivation ( rec {
 
   outputs = [ "out" "tex" ];
 
-  meta = {
-    description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs";
-    homepage = http://www.gnu.org/software/auctex;
-  };
-
   src = fetchurl {
     url = "mirror://gnu/${pname}/${name}.tar.gz";
     sha256 = "1cf9fkkmzjxa4jvk6c01zgxdikr4zzb5pcx8i4r0hwdk0xljkbwq";
@@ -32,6 +27,12 @@ let auctex = stdenv.mkDerivation ( rec {
     "--with-lispdir=\${out}/share/emacs/site-lisp"
     "--with-texmf-dir=\${tex}"
   ];
+
+  meta = {
+    description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs";
+    homepage = http://www.gnu.org/software/auctex;
+    platforms = stdenv.lib.platforms.unix;
+  };
 });
 
 in auctex // { pkgs = [ auctex.tex ]; }
diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix
index a7bc527042e4..3c243f9c2c52 100644
--- a/pkgs/tools/typesetting/tex/dblatex/default.nix
+++ b/pkgs/tools/typesetting/tex/dblatex/default.nix
@@ -67,5 +67,6 @@ stdenv.mkDerivation rec {
     description = "A program to convert DocBook to DVI, PostScript or PDF via LaTeX or ConTeXt";
     homepage = http://dblatex.sourceforge.net/;
     license = stdenv.lib.licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/typesetting/tex/lkproof/default.nix b/pkgs/tools/typesetting/tex/lkproof/default.nix
index 936e4a31af12..844eadc4440d 100644
--- a/pkgs/tools/typesetting/tex/lkproof/default.nix
+++ b/pkgs/tools/typesetting/tex/lkproof/default.nix
@@ -14,4 +14,8 @@ stdenv.mkDerivation {
     mkdir -p $out/share/texmf-nix/tex/generic/lkproof
     cp -prd *.sty $out/share/texmf-nix/tex/generic/lkproof
   ";
+
+  meta = {
+    platforms = stdenv.lib.platforms.unix;
+  };
 }
diff --git a/pkgs/tools/typesetting/tex/pgf/1.x.nix b/pkgs/tools/typesetting/tex/pgf/1.x.nix
index 5e84a92caddb..de5ef2abccfb 100644
--- a/pkgs/tools/typesetting/tex/pgf/1.x.nix
+++ b/pkgs/tools/typesetting/tex/pgf/1.x.nix
@@ -17,5 +17,6 @@ stdenv.mkDerivation {
 
   meta = {
     branch = "1";
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/typesetting/tex/pgf/2.x.nix b/pkgs/tools/typesetting/tex/pgf/2.x.nix
index 05e28454be1f..cb8d2dbdf484 100644
--- a/pkgs/tools/typesetting/tex/pgf/2.x.nix
+++ b/pkgs/tools/typesetting/tex/pgf/2.x.nix
@@ -17,5 +17,6 @@ stdenv.mkDerivation {
 
   meta = {
     branch = "2";
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/typesetting/tex/pgf/3.x.nix b/pkgs/tools/typesetting/tex/pgf/3.x.nix
index b8df977cfb01..28225ebf28a6 100644
--- a/pkgs/tools/typesetting/tex/pgf/3.x.nix
+++ b/pkgs/tools/typesetting/tex/pgf/3.x.nix
@@ -26,5 +26,6 @@ stdenv.mkDerivation {
 
   meta = {
     branch = "3";
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/typesetting/tex/pgfplots/default.nix b/pkgs/tools/typesetting/tex/pgfplots/default.nix
index d7c03967b0b4..2fe3daee6991 100644
--- a/pkgs/tools/typesetting/tex/pgfplots/default.nix
+++ b/pkgs/tools/typesetting/tex/pgfplots/default.nix
@@ -18,4 +18,8 @@ stdenv.mkDerivation {
     mkdir -p $out/share/texmf-nix
     cp -prd * $out/share/texmf-nix
   ";
+
+  meta = {
+    platforms = stdenv.lib.platforms.unix;
+  };
 }
diff --git a/pkgs/tools/typesetting/tex/tex4ht/default.nix b/pkgs/tools/typesetting/tex/tex4ht/default.nix
index 61936e766c5e..8380abf2e948 100644
--- a/pkgs/tools/typesetting/tex/tex4ht/default.nix
+++ b/pkgs/tools/typesetting/tex/tex4ht/default.nix
@@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
     homepage = "http://tug.org/tex4ht/";
     description = "A system to convert (La)TeX documents to HTML and various other formats";
     license = stdenv.lib.licenses.lppl12;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix
index 5f118e636b8b..7bd34f402504 100644
--- a/pkgs/tools/typesetting/xmlroff/default.nix
+++ b/pkgs/tools/typesetting/xmlroff/default.nix
@@ -36,4 +36,8 @@ stdenv.mkDerivation rec {
   sourceRoot = "${name}/xmlroff/";
 
   patches = [./xmlroff.patch];
+
+  meta = {
+    platforms = stdenv.lib.platforms.unix;
+  };
 }
diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix
index 37bc1831d5b1..2ed846cb0703 100644
--- a/pkgs/tools/typesetting/xmlto/default.nix
+++ b/pkgs/tools/typesetting/xmlto/default.nix
@@ -44,5 +44,6 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl2Plus;
     homepage = https://fedorahosted.org/xmlto/;
+    platforms = stdenv.lib.platforms.unix;
   };
 }