omake: 0.9.8.5 -> 0.10.1

5 files changed, 19 insertions, 63 deletions

diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix
index 451d025aa3c0..53152898fd6f 100644
--- a/pkgs/development/tools/ocaml/omake/default.nix
+++ b/pkgs/development/tools/ocaml/omake/default.nix
@@ -1,38 +1,24 @@
-{stdenv, fetchurl, makeWrapper, ocaml, ncurses}:
-let
-  pname = "omake";
-  version = "0.9.8.5-3";
-  webpage = "http://omake.metaprl.org";
-in
-stdenv.mkDerivation {
+{ stdenv, fetchurl, ocaml, ncurses }:
 
-  name = "${pname}-${version}";
+stdenv.mkDerivation rec {
+
+  name = "omake-${version}";
+  version = "0.10.1";
 
   src = fetchurl {
-    url = "mirror://debian/pool/main/o/omake/omake_${version}.orig.tar.gz";
-    sha256 = "1bfxbsimfivq0ar2g5fkzvr5ql97n5dg562pfyd29y4zyh4mwrsv";
+    url = "http://download.camlcity.org/download/${name}.tar.gz";
+    sha256 = "093ansbppms90hiqvzar2a46fj8gm9iwnf8gn38s6piyp70lrbsj";
   };
-  patchFlags = "-p0";
-  patches = [ ./omake-build-0.9.8.5.diff ./omake-lm_printf-gcc44.diff ];
-
-  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";
+  buildInputs = [ ocaml ncurses ];
 
   meta = {
     description = "A build system designed for scalability and portability";
-    homepage = "${webpage}";
-    license = "GPL";
-    broken = true;
+    homepage = http://projects.camlcity.org/projects/omake.html;
+    license = with stdenv.lib.licenses; [
+      mit /* scripts */
+      gpl2 /* program */
+    ];
+    inherit (ocaml.meta) platforms;
   };
 }
diff --git a/pkgs/development/tools/ocaml/omake/omake-build-0.9.8.5.diff b/pkgs/development/tools/ocaml/omake/omake-build-0.9.8.5.diff
deleted file mode 100644
index b0a091e341cd..000000000000
--- a/pkgs/development/tools/ocaml/omake/omake-build-0.9.8.5.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/exec/omake_exec.ml	2006-12-08 23:52:01.000000000 +0100
-+++ src/exec/omake_exec.ml	2009-04-15 22:19:07.000000000 +0200
-@@ -46,7 +46,7 @@
- open Omake_options
- open Omake_command_type
-
--external sync : unit -> unit = "caml_sync"
-+(*external sync : unit -> unit = "caml_sync"*)
- 
- module Exec =
- struct
diff --git a/pkgs/development/tools/ocaml/omake/omake-lm_printf-gcc44.diff b/pkgs/development/tools/ocaml/omake/omake-lm_printf-gcc44.diff
deleted file mode 100644
index 03665340f5f9..000000000000
--- a/pkgs/development/tools/ocaml/omake/omake-lm_printf-gcc44.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/libmojave-external/cutil/lm_printf.c.orig	2007-07-15 19:55:23.000000000 +0200
-+++ src/libmojave-external/cutil/lm_printf.c		2009-06-21 19:20:40.000000000 +0200
-@@ -144,3 +144,3 @@
-         if(bufp != buffer)
--            free(buffer);
-+            free(bufp);
-         failwith("ml_print_string");
-@@ -149,3 +149,3 @@
-     if(bufp != buffer)
--        free(buffer);
-+        free(bufp);
-     return v_result;
-@@ -192,3 +192,3 @@
-         if(bufp != buffer)
--            free(buffer);
-+            free(bufp);
-         failwith("ml_print_string");
-@@ -197,3 +197,3 @@
-     if(bufp != buffer)
--        free(buffer);
-+        free(bufp);
-     return v_result;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01d8593a676d..5eb3006d9352 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6337,7 +6337,11 @@ in
   noweb = callPackage ../development/tools/literate-programming/noweb { };
   nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; };
 
-  inherit (ocamlPackages) omake omake_rc1;
+  omake = callPackage ../development/tools/ocaml/omake {
+    inherit (ocamlPackages_4_02) ocaml;
+  };
+
+  inherit (ocamlPackages) omake_rc1;
 
   omniorb = callPackage ../development/tools/omniorb { };
 
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 46f1ce4b023f..6e3f98c7ba2e 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -649,7 +649,6 @@ let
 
     trv = callPackage ../development/tools/misc/trv { };
 
-    omake = callPackage ../development/tools/ocaml/omake { };
     omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { };
 
     verasco = callPackage ../development/tools/analysis/verasco (