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

This commit is contained in:
William A. Kennington III
2015-05-01 15:57:09 -07:00
122 changed files with 2018 additions and 323 deletions
+1 -1
View File
@@ -34,7 +34,7 @@ composableDerivation.composableDerivation {} {
'';
meta = {
description = "MonetDB is a open-source database system for high-performance applications in data mining, OLAP, GIS, XML Query, text and multimedia retrieval";
description = "A open-source database system for high-performance applications in data mining, OLAP, GIS, XML Query, text and multimedia retrieval";
homepage = http://monetdb.cwi.nl/;
license = "MonetDB Public License"; # very similar to Mozilla public license (MPL) Version see 1.1 http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
};