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

This commit is contained in:
Robin Gloster
2016-08-03 13:34:44 +00:00
1099 changed files with 2664 additions and 513 deletions
+1
View File
@@ -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;
};
}
+1 -1
View File
@@ -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";
+1 -1
View File
@@ -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;