diff options
author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-05-27 21:56:04 +0200 |
---|---|---|
committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-05-27 22:00:06 +0200 |
commit | b2d7f4b1ba937951fefdd026314512ab0be91508 (patch) | |
tree | d1f7fc189bac34f376069294d67abfa3c8551693 /pkgs/development/compilers/ocaml | |
parent | 87fd373aac3a1aaa84ddb328d43074aeebc1b133 (diff) |
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.
Diffstat (limited to 'pkgs/development/compilers/ocaml')
-rw-r--r-- | pkgs/development/compilers/ocaml/3.11.2.nix | 9 | ||||
-rw-r--r-- | pkgs/development/compilers/ocaml/3.12.1.nix | 9 | ||||
-rw-r--r-- | pkgs/development/compilers/ocaml/4.00.1.nix | 9 | ||||
-rw-r--r-- | pkgs/development/compilers/ocaml/4.01.0.nix | 9 | ||||
-rw-r--r-- | pkgs/development/compilers/ocaml/4.02.1.nix | 9 | ||||
-rw-r--r-- | pkgs/development/compilers/ocaml/ber-metaocaml-003.nix | 13 |
6 files changed, 40 insertions, 18 deletions
diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix index 195e83e7313b0..ce61e56213905 100644 --- a/pkgs/development/compilers/ocaml/3.11.2.nix +++ b/pkgs/development/compilers/ocaml/3.11.2.nix @@ -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; }; } diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index 6488d94cc08e0..e6ed6f4b73edc 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -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; }; } diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index 4e888e143223c..f8a7ed920a52f 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -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; }; } diff --git a/pkgs/development/compilers/ocaml/4.01.0.nix b/pkgs/development/compilers/ocaml/4.01.0.nix index d178285834ff6..1d323ec0cba68 100644 --- a/pkgs/development/compilers/ocaml/4.01.0.nix +++ b/pkgs/development/compilers/ocaml/4.01.0.nix @@ -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; }; } diff --git a/pkgs/development/compilers/ocaml/4.02.1.nix b/pkgs/development/compilers/ocaml/4.02.1.nix index 18f9d37365067..6f4cce522e46b 100644 --- a/pkgs/development/compilers/ocaml/4.02.1.nix +++ b/pkgs/development/compilers/ocaml/4.02.1.nix @@ -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; }; } diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix index 8b86c805c61f1..882af287c0452 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix @@ -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 + ''; }; } |