public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor modifications of some ocaml packages:

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ocaml-modules/biniou/default.nix
+6 -2
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;
};
}
pkgs/development/ocaml-modules/cmdliner/default.nix
+4
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;
};
}
pkgs/development/ocaml-modules/csv/default.nix
+6 -2
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;
};
}
pkgs/development/ocaml-modules/easy-format/default.nix
+3 -4
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 ];
};
}
pkgs/development/ocaml-modules/extlib/default.nix
+2
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";
pkgs/development/ocaml-modules/fix/default.nix
+3 -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;
};
}
pkgs/development/ocaml-modules/functory/default.nix
+3 -2
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;
};
}
pkgs/development/ocaml-modules/javalib/default.nix
+3 -2
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;
};
}
pkgs/development/ocaml-modules/pprint/default.nix
+3 -2
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 Wadler’s and Leijen’s prettier printer";
license = licenses.cecill-c;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms;
};
}
pkgs/development/ocaml-modules/sawja/default.nix
+6 -2
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;
};
}
pkgs/development/ocaml-modules/sqlite3EZ/default.nix
+5 -2
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;
};
}
pkgs/development/ocaml-modules/twt/default.nix
+3 -2
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;
};
}
pkgs/development/ocaml-modules/uucd/default.nix
+3 -2
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;
};
}
pkgs/development/ocaml-modules/uunf/default.nix
+6 -2
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 ];
};
}
pkgs/development/ocaml-modules/uutf/default.nix
+6 -2
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 ];
};
}
pkgs/development/ocaml-modules/xmlm/default.nix
+6 -2
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;
};
}
pkgs/development/ocaml-modules/yojson/default.nix
+3 -2
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;
};
}