Merge branch master into staging

2015-04-06 18:58:08 -07:00
parent 04e39bdb5c 812d8f9fa6
commit 6ec373d776
430 changed files with 8926 additions and 4887 deletions
@@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
    license = stdenv.lib.licenses.gpl2Plus;
    maintainers = with stdenv.lib.maintainers; [viric shlevy];
    platforms = with stdenv.lib.platforms; linux;
+    broken = true;
  };
 }