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

This commit is contained in:
Rickard Nilsson
2013-01-20 16:53:21 +01:00
41 changed files with 537 additions and 127 deletions

View File

@@ -38,8 +38,8 @@ rec {
name = "lazarus-${version}";
meta = {
description = "Lazarus graphical IDE for FreePascal language";
homepage = http://www.lazarus.freepascal.org ;
homepage = http://www.lazarus.freepascal.org;
maintainers = [args.lib.maintainers.raskin];
platforms = args.lib.platforms.linux;
#platforms = args.lib.platforms.linux;
};
}

View File

@@ -48,13 +48,12 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "Opa is a concise and elegant language for writing distributed web applications. Both client and server sides.";
description = "A concise and elegant language for writing distributed web applications";
longDescription = ''
Opa is a new generation of web development platform that lets you write distributed
web applications using a single technology. Among the the many features of Opa are these:
Opa is concise, simple, concurrent, dynamically distributed, and secure.
Opa is a new generation of web development platform that lets you write distributed
web applications using a single technology. Among the the many features of Opa are these:
Opa is concise, simple, concurrent, dynamically distributed, and secure.
'';
homepage = http://opalang.org/;
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.kkallio ];