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

This commit is contained in:
Franz Pletz
2016-05-18 17:10:02 +02:00
1470 changed files with 62103 additions and 28701 deletions
+1 -1
View File
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
'';
hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
maintainers = with stdenv.lib.maintainers; [ simons bjornfor raskin ];
maintainers = with stdenv.lib.maintainers; [ bjornfor raskin ];
inherit version;
branch = "2.32";
};
+1 -1
View File
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
'';
hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
maintainers = with stdenv.lib.maintainers; [ simons bjornfor raskin ];
maintainers = with stdenv.lib.maintainers; [ bjornfor raskin ];
downloadPage = "http://www.graphviz.org/pub/graphviz/ARCHIVE/";
inherit version;
updateWalker = true;