From dcffd285273718d3a35ed43e3a51e2a96fad7f72 Mon Sep 17 00:00:00 2001 From: Eric Merritt Date: Sun, 14 Jun 2015 13:22:46 -0700 Subject: [PATCH] ocp-build: upgrade to 1.99.9-beta This also allows ocp-build to build for ocaml 4.02 and greater --- pkgs/development/tools/ocaml/ocp-build/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index fe174febc9e3..31b99ada2a38 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -1,17 +1,16 @@ -{ stdenv, fetchurl, ocaml, findlib, ncurses }: +{ stdenv, fetchurl, ocaml, findlib, ncurses, camlp4 }: stdenv.mkDerivation { - name = "ocp-build-1.99.8-beta"; + name = "ocp-build-1.99.9-beta"; src = fetchurl { - url = http://www.typerex.org/pub/ocp-build/ocp-build.1.99.8-beta.tar.gz; - sha256 = "03zqpl73ah0fji5baxmk8w0h7waamlnhhysi128yap4abzsh5w87"; + url = http://www.typerex.org/pub/ocp-build/ocp-build.1.99.9-beta.tar.gz; + sha256 = "0wcb49bp239ns9mz55ky0kfjcz80cp97k0j0rwaw4h5sp3phn4l0"; }; - buildInputs = [ ocaml findlib ncurses ]; - - patches = [ ./fix-for-no-term.patch ]; + buildInputs = [ ocaml findlib ncurses camlp4 ]; + 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