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

pkgs/tools/graphics/bins/default.nix

@@ -44,5 +44,6 @@ stdenv.mkDerivation {
     description = "Generates static HTML photo albums";
     homepage = http://bins.sautret.org;
     license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
   };
-}
+}

pkgs/tools/graphics/briss/default.nix

@@ -27,5 +27,6 @@ in stdenv.mkDerivation {
     homepage = http://sourceforge.net/projects/briss/;
     description = "Java application for cropping PDF files";
     license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

pkgs/tools/graphics/cuneiform/default.nix

@@ -15,5 +15,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Multi-language OCR system";
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/tools/graphics/enblend-enfuse/default.nix

@@ -26,5 +26,6 @@ stdenv.mkDerivation rec {
     description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline";
     license = licenses.gpl2;
     maintainers = with maintainers; [ nckx ];
+    platforms = with platforms; linux;
   };
 }

pkgs/tools/graphics/exif/default.nix

@@ -13,5 +13,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://libexif.sourceforge.net/;
     description = "A utility to read and manipulate EXIF data in digital photographs";
+    platforms = stdenv.lib.platforms.unix;
   };
 }

pkgs/tools/graphics/exiftags/default.nix

@@ -21,5 +21,6 @@ stdenv.mkDerivation {
     description = "Displays EXIF data from JPEG files";
     license = stdenv.lib.licenses.free;
     maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; unix;
   };
 }

pkgs/tools/graphics/glxinfo/default.nix

@@ -24,4 +24,8 @@ stdenv.mkDerivation {
     mkdir -p $out/bin
     cp glxinfo glxgears $out/bin/
   ";
+
+  meta = {
+    platforms = stdenv.lib.platforms.linux;
+  };
 }

pkgs/tools/graphics/gmic/default.nix

@@ -36,5 +36,6 @@ stdenv.mkDerivation rec {
     homepage = http://gmic.eu/;
     license = licenses.cecill20;
     maintainers = [ maintainers.rycee ];
+    platforms = platforms.linux;
   };
 }

pkgs/tools/graphics/gnuplot/default.nix

@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = http://www.gnuplot.info/;
     description = "A portable command-line driven graphing utility for many platforms";
-    hydraPlatforms = platforms.linux ++ platforms.darwin;
+    platforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ lovek323 ];
   };
 }

pkgs/tools/graphics/graphviz/2.0.nix

@@ -33,5 +33,6 @@ stdenv.mkDerivation rec {
     description = "A program for visualising graphs";
     homepage = http://www.graphviz.org/;
     branch = "2.0";
+    platforms = stdenv.lib.platforms.unix;
   };
 }

pkgs/tools/graphics/graphviz/2.32.nix

@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
       interfaces for other technical domains.
     '';
 
-    hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
     maintainers = with stdenv.lib.maintainers; [ bjornfor raskin ];
     inherit version;
     branch = "2.32";

pkgs/tools/graphics/graphviz/default.nix

@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
       interfaces for other technical domains.
     '';
 
-    hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
     maintainers = with stdenv.lib.maintainers; [ bjornfor raskin ];
     downloadPage = "http://www.graphviz.org/pub/graphviz/ARCHIVE/";
     inherit version;

pkgs/tools/graphics/leela/default.nix

@@ -19,5 +19,6 @@ stdenv.mkDerivation {
     homepage = https://github.com/TrilbyWhite/Leela;
     license = stdenv.lib.licenses.gpl3;
     maintainers = [ stdenv.lib.maintainers.puffnfresh ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/tools/graphics/lprof/default.nix

@@ -42,5 +42,6 @@ stdenv.mkDerivation {
     description = "Little CMS ICC profile construction set";
     homepage = "http://sourceforge.net/projects/lprof";
     license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/tools/graphics/optipng/default.nix

@@ -34,5 +34,6 @@ stdenv.mkDerivation rec {
     homepage = http://optipng.sourceforge.net/;
     description = "A PNG optimizer";
     license = licenses.zlib;
+    platforms = platforms.unix;
   };
 }

pkgs/tools/graphics/pgf/default.nix

@@ -28,5 +28,6 @@ stdenv.mkDerivation {
     homepage = http://www.libpgf.org/;
     description = "Progressive Graphics Format command line program";
     license = stdenv.lib.licenses.lgpl21Plus;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/tools/graphics/ploticus/default.nix

@@ -24,5 +24,6 @@ stdenv.mkDerivation {
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ pSub ];
     homepage = http://ploticus.sourceforge.net/;
+    platforms = with platforms; linux;
   };
 }

pkgs/tools/graphics/transfig/default.nix

@@ -29,4 +29,8 @@ stdenv.mkDerivation rec {
 
   gensvgPatch =
     ./patch-fig2dev-dev-gensvg.c;
+
+  meta = {
+    platforms = stdenv.lib.platforms.unix;
+  };
 }

pkgs/tools/graphics/welkin/default.nix

@@ -31,5 +31,6 @@ stdenv.mkDerivation rec {
     ];
     hydraPlatforms = [];
     license = stdenv.lib.licenses.free;
+    platforms = with stdenv.lib.platforms; unix;
   };
 }

pkgs/tools/graphics/wkhtmltopdf/default.nix

@@ -128,5 +128,6 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ jb55 ];
+    platforms = with platforms; linux;
   };
 }

pkgs/tools/graphics/xcftools/default.nix

@@ -35,5 +35,6 @@ stdenv.mkDerivation {
       require the Gimp to even be installed.
     '';
     license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
   };
 }