Merge master into staging

2015-12-23 18:57:35 +01:00
parent a6b34b3bfd cbada77b0b
commit 11c702c582
396 changed files with 88910 additions and 5635 deletions
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
  doCheck = interactive # simplify bootstrapping
    && !stdenv.isDarwin && !stdenv.isSunOS/*flaky*/;

-  meta = {
+  meta = with stdenv.lib; {
    homepage = "http://www.gnu.org/software/texinfo/";
    description = "The GNU documentation system";
    license = licenses.gpl3Plus;