ocp-build: 1.99.9-beta -> 1.99.16-beta (#15553)

2 files changed, 10 insertions, 27 deletions

diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix
index 48657a8e19d..5ae27b476b4 100644
--- a/pkgs/development/tools/ocaml/ocp-build/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-build/default.nix
@@ -1,27 +1,21 @@
-{ stdenv, fetchurl, ocaml, findlib, ncurses, camlp4 }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, ncurses }:
+
+let version = "1.99.16-beta"; in
 
 stdenv.mkDerivation {
 
-  name = "ocp-build-1.99.9-beta";
+  name = "ocp-build-${version}";
 
-  src = fetchurl {
-    url = http://www.typerex.org/pub/ocp-build/ocp-build.1.99.9-beta.tar.gz;
-    sha256 = "0wcb49bp239ns9mz55ky0kfjcz80cp97k0j0rwaw4h5sp3phn4l0";
+  src = fetchFromGitHub {
+    owner = "OCamlPro";
+    repo = "ocp-build";
+    rev = version;
+    sha256 = "1nkd7wlf1vrc4p20bs94vbkd970q2ag23csh9a897ka65rk08gvw";
   };
 
-  buildInputs = [ ocaml findlib ncurses camlp4 ];
+  buildInputs = [ ocaml findlib ncurses ];
   preInstall = "mkdir -p $out/bin";
 
-  # In the Nix sandbox, the TERM variable is unset and stty does not
-  # work. In such a case, ocp-build crashes due to a bug. The
-  # ./fix-for-no-term.patch fixes this bug in the source code and hence
-  # also in the final installed version of ocp-build. However, it does not
-  # fix the bug in the precompiled bootstrap version of ocp-build that is
-  # used during the compilation process. In order to bypass the bug until
-  # it's also fixed upstream, we simply set TERM to some valid entry in the
-  # terminfo database during the bootstrap.
-  TERM = "xterm";
-
   meta = with stdenv.lib; {
     homepage = http://www.typerex.org/ocp-build.html;
     description = "A build tool for OCaml";
diff --git a/pkgs/development/tools/ocaml/ocp-build/fix-for-no-term.patch b/pkgs/development/tools/ocaml/ocp-build/fix-for-no-term.patch
deleted file mode 100644
index 8ce83d095fb..00000000000
--- a/pkgs/development/tools/ocaml/ocp-build/fix-for-no-term.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ocp-build-ocp-build.1.99.8-beta/src/ocp-build/buildTerm.ml	2014-10-27 13:54:37.532023502 +0100
-+++ ocp-build-ocp-build.1.99.8-beta/src/ocp-build/buildTerm.ml.new	2014-10-27 13:54:43.397099033 +0100
-@@ -49,7 +49,7 @@
-           | _ -> failwith "stty"
-         end
-       | _ -> raise Not_found
--    with Unix.Unix_error _ | End_of_file | Failure _ ->
-+    with Unix.Unix_error _ | End_of_file | Failure _ | Not_found ->
-       try
-         (* shell envvar *)
-         int_of_string (Sys.getenv "COLUMNS")