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

2016-08-03 13:34:44 +00:00
parent 3f9e8601f2 d93f917182
commit 1b979d8384
1099 changed files with 2664 additions and 513 deletions
@@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
    homepage = http://www.codenix.com/~tolua/;
    license = licenses.mit;
    maintainers = with maintainers; [ vrthra ];
+    platforms = with platforms; unix;
  };
 }