Minor modifications of some ocaml packages:

adds myself as a maintainer
adds assertions to have evaluation errors rather than build errors
moves opam out of ocamlPackages, as it does not provide a library
This commit is contained in:
Vincent Laporte 2014-09-21 11:02:55 +01:00
parent d5f938d800
commit 857c13e1af
21 changed files with 87 additions and 43 deletions

View File

@ -4,6 +4,9 @@ let
version = "1.0.9";
webpage = "http://mjambon.com/${pname}.html";
in
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11";
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -23,10 +26,11 @@ stdenv.mkDerivation rec {
mkdir $out/bin
'';
meta = {
meta = with stdenv.lib; {
description = "A binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve";
homepage = "${webpage}";
license = stdenv.lib.licenses.bsd3;
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms;
};
}

View File

@ -5,6 +5,9 @@ let
version = "0.9.5";
ocaml_version = (builtins.parseDrvName ocaml.name).version;
in
assert stdenv.lib.versionAtLeast ocaml_version "3.12";
stdenv.mkDerivation {
name = "ocaml-${pname}-${version}";
@ -31,6 +34,7 @@ stdenv.mkDerivation {
homepage = http://erratique.ch/software/cmdliner;
description = "An OCaml module for the declarative definition of command line interfaces";
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms;
};
}

View File

@ -1,4 +1,7 @@
{stdenv, fetchurl, ocaml, findlib}:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11";
stdenv.mkDerivation {
name = "ocaml-csv-1.3.3";
@ -18,10 +21,11 @@ stdenv.mkDerivation {
installPhase = "ocaml setup.ml -install";
meta = {
meta = with stdenv.lib; {
description = "A pure OCaml library to read and write CSV files";
homepage = "https://forge.ocamlcore.org/projects/csv/";
license = stdenv.lib.licenses.lgpl21;
license = licenses.lgpl21;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms;
};
}

View File

@ -17,11 +17,10 @@ stdenv.mkDerivation rec {
createFindlibDestdir = true;
meta = {
meta = with stdenv.lib; {
description = "A high-level and functional interface to the Format module of the OCaml standard library";
homepage = "${webpage}";
license = "bsd";
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
};
}

View File

@ -1,5 +1,7 @@
{stdenv, fetchurl, ocaml, findlib, minimal ? true}:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11";
stdenv.mkDerivation {
name = "ocaml-extlib-1.6.1";

View File

@ -1,5 +1,7 @@
{stdenv, fetchurl, ocaml, findlib}:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
stdenv.mkDerivation {
name = "ocaml-fix-20130611";
@ -17,7 +19,7 @@ stdenv.mkDerivation {
homepage = http://gallium.inria.fr/~fpottier/fix/;
description = "A simple OCaml module for computing the least solution of a system of monotone equations";
license = licenses.cecill-c;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms;
};
}

View File

@ -1,5 +1,7 @@
{stdenv, fetchurl, ocaml, findlib}:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11";
stdenv.mkDerivation {
name = "ocaml-functory-0.5";
@ -19,8 +21,7 @@ stdenv.mkDerivation {
homepage = https://www.lri.fr/~filliatr/functory/;
description = "A distributed computing library for Objective Caml which facilitates distributed execution of parallelizable computations in a seamless fashion";
license = licenses.lgpl21;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms;
};
}

View File

@ -33,10 +33,11 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ camlzip extlib ];
meta = {
meta = with stdenv.lib; {
description = "A library that parses Java .class files into OCaml data structures";
homepage = "${webpage}";
license = stdenv.lib.licenses.lgpl3;
license = licenses.lgpl3;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms;
};
}

View File

@ -1,5 +1,7 @@
{stdenv, fetchurl, ocaml, findlib}:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
stdenv.mkDerivation {
name = "ocaml-pprint-20140424";
@ -20,8 +22,7 @@ stdenv.mkDerivation {
homepage = http://gallium.inria.fr/~fpottier/pprint/;
description = "An OCaml adaptation of Wadlers and Leijens prettier printer";
license = licenses.cecill-c;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms;
};
}

View File

@ -1,4 +1,7 @@
{stdenv, fetchurl, which, perl, ocaml, findlib, javalib }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
let
pname = "sawja";
version = "1.5";
@ -26,10 +29,11 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ javalib ];
meta = {
meta = with stdenv.lib; {
description = "A library written in OCaml, relying on Javalib to provide a high level representation of Java bytecode programs";
homepage = "${webpage}";
license = stdenv.lib.licenses.gpl3Plus;
license = licenses.gpl3Plus;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms;
};
}

View File

@ -1,5 +1,7 @@
{stdenv, fetchurl, ocaml, findlib, twt, ocaml_sqlite3 }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
stdenv.mkDerivation {
name = "ocaml-sqlite3EZ-0.1.0";
@ -14,10 +16,11 @@ stdenv.mkDerivation {
createFindlibDestdir = true;
meta = {
meta = with stdenv.lib; {
homepage = http://github.com/mlin/ocaml-sqlite3EZ;
description = "A thin wrapper for sqlite3-ocaml with a simplified interface";
license = stdenv.lib.licenses.mit;
license = licenses.mit;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms;
};
}

View File

@ -20,10 +20,11 @@ stdenv.mkDerivation {
installFlags = "PREFIX=$(out)";
meta = {
meta = with stdenv.lib; {
homepage = http://people.csail.mit.edu/mikelin/ocaml+twt/;
description = "The Whitespace Thing for OCaml";
license = stdenv.lib.licenses.mit;
license = licenses.mit;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms;
};
}

View File

@ -30,10 +30,11 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ xmlm ];
meta = {
meta = with stdenv.lib; {
description = "An OCaml module to decode the data of the Unicode character database from its XML representation";
homepage = "${webpage}";
platforms = ocaml.meta.platforms;
license = stdenv.lib.licenses.bsd3;
maintainers = [ maintainers.vbgl ];
license = licenses.bsd3;
};
}

View File

@ -5,6 +5,9 @@ let
webpage = "http://erratique.ch/software/${pname}";
ocaml_version = (builtins.parseDrvName ocaml.name).version;
in
assert stdenv.lib.versionAtLeast ocaml_version "3.12";
stdenv.mkDerivation rec {
name = "ocaml-${pname}-${version}";
@ -28,10 +31,11 @@ stdenv.mkDerivation rec {
ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/
'';
meta = {
meta = with stdenv.lib; {
description = "An OCaml module for normalizing Unicode text";
homepage = "${webpage}";
platforms = ocaml.meta.platforms;
license = stdenv.lib.licenses.bsd3;
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
};
}

View File

@ -5,6 +5,9 @@ let
webpage = "http://erratique.ch/software/${pname}";
ocaml_version = (builtins.parseDrvName ocaml.name).version;
in
assert stdenv.lib.versionAtLeast ocaml_version "3.12";
stdenv.mkDerivation rec {
name = "ocaml-${pname}-${version}";
@ -28,10 +31,11 @@ stdenv.mkDerivation rec {
ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/
'';
meta = {
meta = with stdenv.lib; {
description = "Non-blocking streaming Unicode codec for OCaml";
homepage = "${webpage}";
platforms = ocaml.meta.platforms;
license = stdenv.lib.licenses.bsd3;
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
};
}

View File

@ -5,6 +5,9 @@ let
webpage = "http://erratique.ch/software/${pname}";
ocaml_version = (builtins.parseDrvName ocaml.name).version;
in
assert stdenv.lib.versionAtLeast ocaml_version "3.12";
stdenv.mkDerivation rec {
name = "ocaml-${pname}-${version}";
@ -28,10 +31,11 @@ stdenv.mkDerivation rec {
ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/
'';
meta = {
meta = with stdenv.lib; {
description = "An OCaml streaming codec to decode and encode the XML data format";
homepage = "${webpage}";
platforms = ocaml.meta.platforms;
license = stdenv.lib.licenses.bsd3;
maintainers = [ maintainers.vbgl ];
license = licenses.bsd3;
};
}

View File

@ -25,10 +25,11 @@ stdenv.mkDerivation {
mkdir $out/bin
'';
meta = {
meta = with stdenv.lib; {
description = "An optimized parsing and printing library for the JSON format";
homepage = "${webpage}";
license = stdenv.lib.licenses.bsd3;
license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms;
};
}

View File

@ -4,6 +4,7 @@ let
version = "0.9.4";
webpage = "http://mjambon.com/${pname}.html";
in
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12";
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -23,15 +24,13 @@ stdenv.mkDerivation rec {
mkdir $out/bin
'';
meta = {
meta = with stdenv.lib; {
description = "The C preprocessor for OCaml";
longDescription = ''
Cppo is an equivalent of the C preprocessor targeted at the OCaml language and its variants.
'';
homepage = "${webpage}";
license = "bsd";
maintainers = [ maintainers.vbgl ];
license = licenses.bsd3;
};
}

View File

@ -1,4 +1,7 @@
{stdenv, fetchurl, ocaml, findlib, yojson, menhir}:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
stdenv.mkDerivation {
name = "merlin-1.7.1";
@ -12,10 +15,10 @@ stdenv.mkDerivation {
prefixKey = "--prefix ";
meta = {
meta = with stdenv.lib; {
description = "An editor-independent tool to ease the development of programs in OCaml";
homepage = "http://the-lambda-church.github.io/merlin/";
license = stdenv.lib.licenses.mit;
license = licenses.mit;
maintainers = [ maintainers.vbgl ];
};
}

View File

@ -1,5 +1,7 @@
{ stdenv, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12.1";
let
srcs = {
cudf = fetchurl {

View File

@ -3502,10 +3502,6 @@ let
pycaml = callPackage ../development/ocaml-modules/pycaml { };
opam_1_0_0 = callPackage ../development/tools/ocaml/opam/1.0.0.nix { };
opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { };
opam = opam_1_1;
sqlite3EZ = callPackage ../development/ocaml-modules/sqlite3EZ { };
twt = callPackage ../development/ocaml-modules/twt { };
@ -3543,6 +3539,10 @@ let
opa = let callPackage = newScope pkgs.ocamlPackages_4_00_1; in callPackage ../development/compilers/opa { };
opam_1_0_0 = callPackage ../development/tools/ocaml/opam/1.0.0.nix { };
opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { };
opam = opam_1_1;
ocamlnat = let callPackage = newScope pkgs.ocamlPackages_3_12_1; in callPackage ../development/ocaml-modules/ocamlnat { };
qcmm = callPackage ../development/compilers/qcmm {