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

This commit is contained in:
Robin Gloster
2016-08-03 13:34:44 +00:00
1099 changed files with 2664 additions and 513 deletions
@@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
meta = {
description = "Interactive geometry program";
platforms = stdenv.lib.platforms.linux;
};
}
@@ -17,5 +17,6 @@ stdenv.mkDerivation rec {
description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator";
homepage = "http://tetgen.org/";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.linux;
};
}
@@ -19,5 +19,6 @@ stdenv.mkDerivation {
description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator";
homepage = "http://tetgen.org/";
license = stdenv.lib.licenses.agpl3Plus;
platforms = stdenv.lib.platforms.linux;
};
}