From 3d049938c872eb88c39afd7bdc952abfbb0eb3bd Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 6 Nov 2014 19:40:20 +0000 Subject: Adds some “branch” meta-data MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/ocaml/3.12.1.nix | 1 + pkgs/development/compilers/ocaml/4.00.1.nix | 1 + pkgs/development/compilers/ocaml/4.01.0.nix | 1 + pkgs/development/compilers/ocaml/4.02.0.nix | 1 + pkgs/development/ocaml-modules/camlimages/4.0.nix | 1 + pkgs/development/ocaml-modules/camomile/0.8.2.nix | 3 ++- pkgs/development/ocaml-modules/lablgtk/2.14.0.nix | 1 + pkgs/development/ocaml-modules/sexplib/108.08.00.nix | 1 + pkgs/development/ocaml-modules/typeconv/108.08.00.nix | 3 ++- pkgs/development/tools/ocaml/camlp5/5.15.nix | 3 ++- 10 files changed, 13 insertions(+), 3 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index 16c3cb1d787..6488d94cc08 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; + branch = "3.12"; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; description = "Most popular variant of the Caml language"; diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index 5b1e69b86b0..4e888e14322 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; + branch = "4.00"; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; description = "Most popular variant of the Caml language"; diff --git a/pkgs/development/compilers/ocaml/4.01.0.nix b/pkgs/development/compilers/ocaml/4.01.0.nix index 2876bce9caf..ea3e8d49a4e 100644 --- a/pkgs/development/compilers/ocaml/4.01.0.nix +++ b/pkgs/development/compilers/ocaml/4.01.0.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; + branch = "4.01"; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; description = "Most popular variant of the Caml language"; diff --git a/pkgs/development/compilers/ocaml/4.02.0.nix b/pkgs/development/compilers/ocaml/4.02.0.nix index b6753cc6297..4b5805e2448 100644 --- a/pkgs/development/compilers/ocaml/4.02.0.nix +++ b/pkgs/development/compilers/ocaml/4.02.0.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; + branch = "4.02"; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; description = "Most popular variant of the Caml language"; diff --git a/pkgs/development/ocaml-modules/camlimages/4.0.nix b/pkgs/development/ocaml-modules/camlimages/4.0.nix index e3ab1d37b15..4f47680dcec 100644 --- a/pkgs/development/ocaml-modules/camlimages/4.0.nix +++ b/pkgs/development/ocaml-modules/camlimages/4.0.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { + branch = "4.0"; homepage = https://bitbucket.org/camlspotter/camlimages; description = "OCaml image processing library"; license = licenses.lgpl2; diff --git a/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/pkgs/development/ocaml-modules/camomile/0.8.2.nix index adbdc936d1e..f6d22f62ec0 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.2.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.2.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation { meta = { homepage = http://camomile.sourceforge.net/; description = "A comprehensive Unicode library for OCaml"; - license = "LGPL"; + license = stdenv.lib.licenses.lgpl21; + branch = "0.8.2"; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index 5fb9969e62e..2e50b897f3d 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation (rec { ''; meta = { + branch = "2.14"; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z diff --git a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix index 3dbb0ea8e81..bde9c271371 100644 --- a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix +++ b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = with stdenv.lib; { + branch = "108"; homepage = https://ocaml.janestreet.com/; description = "Library for serializing OCaml values to and from S-expressions"; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/typeconv/108.08.00.nix b/pkgs/development/ocaml-modules/typeconv/108.08.00.nix index 805a8926e18..24daa366b2a 100644 --- a/pkgs/development/ocaml-modules/typeconv/108.08.00.nix +++ b/pkgs/development/ocaml-modules/typeconv/108.08.00.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = https://ocaml.janestreet.com/; description = "Support library for OCaml preprocessor type conversions"; - #license = licenses.apl20; invalid license + license = licenses.asl20; + branch = "108"; platforms = ocaml.meta.platforms; maintainers = with maintainers; [ z77z ]; }; diff --git a/pkgs/development/tools/ocaml/camlp5/5.15.nix b/pkgs/development/tools/ocaml/camlp5/5.15.nix index 97099d1b492..adfdb4bd204 100644 --- a/pkgs/development/tools/ocaml/camlp5/5.15.nix +++ b/pkgs/development/tools/ocaml/camlp5/5.15.nix @@ -37,7 +37,8 @@ stdenv.mkDerivation { It also provides parsing and printing tools. ''; homepage = "${webpage}"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; + branch = "5"; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z -- cgit 1.4.1