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:
@@ -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;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -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 ];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user