Merge remote-tracking branch 'upstream/master' into staging

2016-08-29 00:24:47 +00:00
parent 2958ec7d6f c004c6e14d
commit e17bc25943
22 changed files with 204 additions and 662 deletions
@@ -181,6 +181,6 @@ stdenv.mkDerivation ({
    license = lib.licenses.lgpl2Plus;

    maintainers = [ lib.maintainers.eelco ];
-    #platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux;
  } // meta;
 })