Merge master into x-updates

2013-12-21 10:20:55 +01:00
parent f6b3e2ca54 d6a95753d5
commit 2b24f1349a
79 changed files with 538 additions and 263 deletions
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
  meta = with stdenv.lib; {
    homepage    = http://www.gnuplot.info;
    description = "A portable command-line driven graphing utility for many platforms";
-    platforms   = platforms.all;
+    hydraPlatforms = platforms.linux ++ platforms.darwin;
    maintainers = with maintainers; [ lovek323 ];
  };
 }