Revert "omake: remove 0.9.8.6-rc1"

This reverts commit e672fbc6f0.
This commit is contained in:
Vincent Laporte 2016-12-18 09:25:03 +00:00
parent 508d9499b1
commit e76a1f0e7e
4 changed files with 52 additions and 0 deletions

View file

@ -0,0 +1,38 @@
{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 = "http://pkgs.fedoraproject.org/repo/pkgs/ocaml-omake/${pname}-${version}.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/${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";
platforms = ocaml.meta.platforms or [];
};
}

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

View file

@ -6376,6 +6376,8 @@ in
inherit (ocamlPackages_4_02) ocaml;
};
inherit (ocamlPackages) omake_rc1;
omniorb = callPackage ../development/tools/omniorb { };
opengrok = callPackage ../development/tools/misc/opengrok { };

View file

@ -649,6 +649,8 @@ let
trv = callPackage ../development/tools/misc/trv { };
omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { };
verasco = callPackage ../development/tools/analysis/verasco (
if system == "x86_64-linux"
then { tools = pkgs.pkgsi686Linux.stdenv.cc; }