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

2014-09-18 22:28:35 +02:00
parent f32e964cc4 aa67e95bb5
commit 91ec6e0d90
340 changed files with 5242 additions and 1514 deletions
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
    longDescription =''
      A full featured Web server. It implements most features of the HTTP protocol, and has a very powerful extension mechanism that make very easy to plug your own OCaml modules for generating pages.
      '';
-    license = "LGPL"; # <- todo: check
+    license = stdenv.lib.licenses.lgpl21;
    platforms = ocaml.meta.platforms;
    maintainers = [ stdenv.lib.maintainers.gal_bolle ];
  };