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