From b0a6bb414d9ad7521a0462fb1e48665d14e2decc Mon Sep 17 00:00:00 2001
From: Vincent Bernardoff <vb@luminar.eu.org>
Date: Wed, 23 Apr 2014 17:00:50 +0200
Subject: [PATCH] Updated react to 1.0.1
---
.../ocaml-modules/react/default.nix | 28 ++++++++++---------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix
index a69ef9d446c2..6b0e694d54a0 100644
--- a/pkgs/development/ocaml-modules/react/default.nix
+++ b/pkgs/development/ocaml-modules/react/default.nix
@@ -1,28 +1,30 @@
-{stdenv, fetchurl, ocaml, findlib, ocaml_oasis}:
+{stdenv, fetchurl, ocaml, findlib, opam}:
stdenv.mkDerivation {
- name = "ocaml-react-0.9.4";
+ name = "ocaml-react-1.0.1";
src = fetchurl {
- url = http://github.com/dbuenzli/react/archive/v0.9.4.tar.gz;
- sha256 = "16k0kx93kd45s7pigkzvirfsbr22xhby0y88y86p473qxzc6ngrm";
+ url = "http://erratique.ch/software/react/releases/react-1.0.1.tbz";
+ sha256 = "007c9kzl0i6xvxnqj9jny4hgm28v9a1i079q53vl5hfb5f7h1mda";
};
- buildInputs = [ocaml findlib ocaml_oasis];
+ unpackCmd = "tar xjf $src";
+ buildInputs = [ocaml findlib opam];
createFindlibDestdir = true;
- configurePhase = "oasis setup && ocaml setup.ml -configure --prefix $out";
- buildPhase = "ocaml setup.ml -build";
- installPhase = "ocaml setup.ml -install";
+ configurePhase = "ocaml pkg/git.ml";
+ buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";
+ installPhase = ''
+ opam-installer --script --prefix=$out react.install > install.sh
+ sh install.sh
+ '';
- meta = {
+ meta = with stdenv.lib; {
homepage = http://erratique.ch/software/react;
description = "Applicative events and signals for OCaml";
- license = stdenv.lib.licenses.bsd3;
+ license = licenses.bsd3;
platforms = ocaml.meta.platforms;
- maintainers = [
- stdenv.lib.maintainers.z77z
- ];
+ maintainers = with maintainers; [ z77z vbmithr ];
};
}