aboutsummaryrefslogtreecommitdiff
path: root/pkgs/development/ocaml-modules/reactivedata
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2016-12-10 09:58:33 +0000
committerVincent Laporte <Vincent.Laporte@gmail.com>2017-01-13 06:38:11 +0000
commit6b546f254340f16dae30bfc00e3b6ca2373e96d1 (patch)
treec27edff8e774619c1aa328a9947117a6f8c59b4d /pkgs/development/ocaml-modules/reactivedata
parent5d309cc8345b1346ea67be2805b751b107f6617f (diff)
ocamlPackages.reactivedata: 0.2 -> 0.2.1
Diffstat (limited to 'pkgs/development/ocaml-modules/reactivedata')
-rw-r--r--pkgs/development/ocaml-modules/reactivedata/default.nix22
1 files changed, 7 insertions, 15 deletions
diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix
index cd64e6578c16..828a3fb60683 100644
--- a/pkgs/development/ocaml-modules/reactivedata/default.nix
+++ b/pkgs/development/ocaml-modules/reactivedata/default.nix
@@ -1,28 +1,20 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocaml_react, camlp4, opam }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocaml_react, opam }:
-let
- ocamlVersion = stdenv.lib.getVersion ocaml;
-in
-
-assert stdenv.lib.versionAtLeast ocamlVersion "3.11";
+assert stdenv.lib.versionAtLeast ocaml.version "3.11";
stdenv.mkDerivation {
- name = "ocaml-reactiveData-0.2";
+ name = "ocaml${ocaml.version}-reactiveData-0.2.1";
src = fetchurl {
- url = https://github.com/ocsigen/reactiveData/archive/0.2.tar.gz;
- sha256 = "0rskcxnyjn8sxqnncdm6rh9wm99nha5m5sc83fywgzs64xfl43fq";
+ url = https://github.com/ocsigen/reactiveData/archive/0.2.1.tar.gz;
+ sha256 = "0wcs0z50nia1cpk8mh6i5qbc6sff9cc8x7s7q1q89d7m73bnv4vf";
};
- buildInputs = [ ocaml findlib ocamlbuild opam camlp4 ];
+ buildInputs = [ ocaml findlib ocamlbuild opam ];
propagatedBuildInputs = [ocaml_react];
buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";
- installPhase = ''
- opam-installer --script --prefix=$out reactiveData.install > install.sh
- sed -i s!lib/reactiveData!lib/ocaml/${ocamlVersion}/site-lib/reactiveData! install.sh
- sh install.sh
- '';
+ installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
meta = with stdenv.lib; {
description = "An OCaml module for functional reactive programming (FRP) based on React";