Merge branch 'master' into staging

Hydra nixpkgs: ?compare=1286624
2016-08-07 11:35:28 +02:00
parent 3659e44f98 f7f8de64f4
commit 03e32315a5
1229 changed files with 6400 additions and 2848 deletions
@@ -54,5 +54,6 @@ stdenv.mkDerivation rec {
    license = stdenv.lib.licenses.lgpl2Plus;

    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.unix;
  };
 }