Merge pull request #601 from craff/ocaml/upgrade_and_new

Ocaml/upgrade and new
This commit is contained in:
Michael Raskin
2013-06-13 05:41:59 -07:00
16 changed files with 525 additions and 23 deletions

View File

@@ -0,0 +1,37 @@
{stdenv, fetchurl, makeWrapper, ocaml, ncurses}:
let
pname = "omake";
version = "0.9.8.6-0.rc1";
webpage = "http://omake.metaprl.org";
in
stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
url = "${webpage}/downloads/${pname}-${version}.tar.gz";
sha256 = "1sas02pbj56m7wi5vf3vqrrpr4ynxymw2a8ybvfj2dkjf7q9ii13";
};
patchFlags = "-p0";
patches = [ ./warn.patch ];
buildInputs = [ ocaml makeWrapper ncurses ];
phases = "unpackPhase patchPhase buildPhase";
buildPhase = ''
make bootstrap
make PREFIX=$out all
make PREFIX=$out install
'';
# prefixKey = "-prefix ";
#
# configureFlags = if transitional then "--transitional" else "--strict";
#
# buildFlags = "world.opt";
meta = {
description = "Omake build system";
homepage = "${webpage}";
license = "GPL";
};
}

View File

@@ -0,0 +1,10 @@
diff -p1 -aur ../omake-0.9.8.6.ori/lib/build/OCaml.om ./lib/build/OCaml.om
--- ../omake-0.9.8.6.ori/lib/build/OCaml.om 2008-03-05 01:07:25.000000000 +0000
+++ ./lib/build/OCaml.om 2013-06-01 15:52:37.000000000 +0000
@@ -178,3 +178,3 @@ declare OCAMLDEPFLAGS
public.OCAMLPPFLAGS =
-public.OCAMLFLAGS = -warn-error A
+public.OCAMLFLAGS =
public.OCAMLCFLAGS = -g
Seulement dans ./lib/build: OCaml.om~
Seulement dans .: warn.patch