summary refs log tree commit diff
path: root/pkgs/development/ocaml-modules
diff options
context:
space:
mode:
authorVincent Bernardoff <vb@luminar.eu.org>2014-04-23 17:00:50 +0200
committerVincent Bernardoff <vb@luminar.eu.org>2014-04-23 17:02:46 +0200
commitb0a6bb414d9ad7521a0462fb1e48665d14e2decc (patch)
tree1e168575e2051fadff8c94f4599558fb6b44b536 /pkgs/development/ocaml-modules
parent552d66cd9e94f7e81043aa7becaaaa4b02e7ab6b (diff)
downloadnixlib-b0a6bb414d9ad7521a0462fb1e48665d14e2decc.tar
nixlib-b0a6bb414d9ad7521a0462fb1e48665d14e2decc.tar.gz
nixlib-b0a6bb414d9ad7521a0462fb1e48665d14e2decc.tar.bz2
nixlib-b0a6bb414d9ad7521a0462fb1e48665d14e2decc.tar.lz
nixlib-b0a6bb414d9ad7521a0462fb1e48665d14e2decc.tar.xz
nixlib-b0a6bb414d9ad7521a0462fb1e48665d14e2decc.tar.zst
nixlib-b0a6bb414d9ad7521a0462fb1e48665d14e2decc.zip
Updated react to 1.0.1
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r--pkgs/development/ocaml-modules/react/default.nix28
1 files 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 ];
   };
 }