Use common licence attributes from lib/licenses.nix

Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
This commit is contained in:
Tobias Geerinckx-Rice
2015-05-27 22:00:06 +02:00
parent 87fd373aac
commit b2d7f4b1ba
73 changed files with 269 additions and 234 deletions
+6 -3
View File
@@ -41,9 +41,12 @@ stdenv.mkDerivation rec {
ln -sv $out/lib/ocaml/caml $out/include/caml
'';
meta = {
meta = with stdenv.lib; {
homepage = http://caml.inria.fr/ocaml;
license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
license = with licenses; [
qpl /* compiler */
lgpl2 /* library */
];
description = "Most popular variant of the Caml language";
longDescription =
@@ -65,7 +68,7 @@ stdenv.mkDerivation rec {
documentation generator (ocamldoc).
'';
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
platforms = with platforms; linux ++ darwin;
};
}
+6 -3
View File
@@ -34,10 +34,13 @@ stdenv.mkDerivation rec {
nativeCompilers = useNativeCompilers;
};
meta = {
meta = with stdenv.lib; {
homepage = http://caml.inria.fr/ocaml;
branch = "3.12";
license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
license = with licenses; [
qpl /* compiler */
lgpl2 /* library */
];
description = "Most popular variant of the Caml language";
longDescription =
@@ -59,7 +62,7 @@ stdenv.mkDerivation rec {
and a documentation generator (ocamldoc).
'';
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
platforms = with platforms; linux ++ darwin;
};
}
+6 -3
View File
@@ -33,10 +33,13 @@ stdenv.mkDerivation rec {
nativeCompilers = useNativeCompilers;
};
meta = {
meta = with stdenv.lib; {
homepage = http://caml.inria.fr/ocaml;
branch = "4.00";
license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
license = with licenses; [
qpl /* compiler */
lgpl2 /* library */
];
description = "Most popular variant of the Caml language";
longDescription =
@@ -58,7 +61,7 @@ stdenv.mkDerivation rec {
and a documentation generator (ocamldoc).
'';
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
platforms = with platforms; linux ++ darwin;
};
}
+6 -3
View File
@@ -48,10 +48,13 @@ stdenv.mkDerivation rec {
nativeCompilers = useNativeCompilers;
};
meta = {
meta = with stdenv.lib; {
homepage = http://caml.inria.fr/ocaml;
branch = "4.01";
license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
license = with licenses; [
qpl /* compiler */
lgpl2 /* library */
];
description = "Most popular variant of the Caml language";
longDescription =
@@ -73,7 +76,7 @@ stdenv.mkDerivation rec {
and a documentation generator (ocamldoc).
'';
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
platforms = with platforms; linux ++ darwin;
};
}
+6 -3
View File
@@ -44,10 +44,13 @@ stdenv.mkDerivation rec {
nativeCompilers = useNativeCompilers;
};
meta = {
meta = with stdenv.lib; {
homepage = http://caml.inria.fr/ocaml;
branch = "4.02";
license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
license = with licenses; [
qpl /* compiler */
lgpl2 /* library */
];
description = "Most popular variant of the Caml language";
longDescription =
@@ -69,7 +72,7 @@ stdenv.mkDerivation rec {
and a documentation generator (ocamldoc).
'';
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
platforms = with platforms; linux ++ darwin;
};
}
@@ -55,9 +55,16 @@ stdenv.mkDerivation rec {
cd ..
'';
meta = {
meta = with stdenv.lib; {
homepage = "http://okmij.org/ftp/ML/index.html#ber-metaocaml";
license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
description = "A conservative extension of OCaml with the primitive type of code values, and three basic multi-stage expression forms: Brackets, Escape, and Run";
license = with licenses; [
qpl /* compiler */
lgpl2 /* library */
];
description = "Conservative extension of OCaml";
longDescription = ''
A conservative extension of OCaml with the primitive type of code values,
and three basic multi-stage expression forms: Brackets, Escape, and Run
'';
};
}