about summary refs log tree commit diff
path: root/pkgs/development/ocaml-modules/ptime
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2017-06-28 17:39:15 +0000
committerVincent Laporte <Vincent.Laporte@gmail.com>2017-06-28 17:39:15 +0000
commit607650adacff4ff618e4f25dd3f3bd6324b54a03 (patch)
treec36c9dfaf5ab5e7eb6a02c73bee554f19829abf3 /pkgs/development/ocaml-modules/ptime
parent64ff2e271268d3bad6b8a64704d36b1ffb62c1e5 (diff)
ocamlPackages.ptime: 0.8.2 -> 0.8.3
Diffstat (limited to 'pkgs/development/ocaml-modules/ptime')
-rw-r--r--pkgs/development/ocaml-modules/ptime/default.nix15
1 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix
index b8017134e5269..bb4bbef516c85 100644
--- a/pkgs/development/ocaml-modules/ptime/default.nix
+++ b/pkgs/development/ocaml-modules/ptime/default.nix
@@ -1,28 +1,25 @@
-{stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg, result, opam}:
+{ stdenv, fetchurl, buildOcaml, ocaml, findlib, ocamlbuild, topkg, result, opam, js_of_ocaml }:
 
 buildOcaml rec {
-  version = "0.8.2";
+  version = "0.8.3";
   name = "ptime";
 
   src = fetchurl {
     url = "http://erratique.ch/software/ptime/releases/ptime-${version}.tbz";
-    sha256 = "1lihkhzskzwxskiarh4mvf7gbz5nfv25vmazbfz81m344i32a5pj";
+    sha256 = "18jimskgnd9izg7kn6zk6sk35adgjm605dkv13plwslbb90kqr44";
   };
 
   unpackCmd = "tar -xf $curSrc";
 
-  buildInputs = [ ocaml findlib ocamlbuild topkg opam ];
+  buildInputs = [ ocaml findlib ocamlbuild topkg opam js_of_ocaml ];
 
   propagatedBuildInputs = [ result ];
 
   buildPhase = ''
-    ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml build --with-js_of_ocaml false
+    ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml build --with-js_of_ocaml true
   '';
 
-  installPhase = ''
-    opam-installer --script --prefix=$out ptime.install | sh
-    ln -s $out/lib/ptime $out/lib/ocaml/${ocaml.version}/site-lib
-  '';
+  inherit (topkg) installPhase;
 
   meta = {
     homepage = http://erratique.ch/software/ptime;