From 607650adacff4ff618e4f25dd3f3bd6324b54a03 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 28 Jun 2017 17:39:15 +0000 Subject: [PATCH] ocamlPackages.ptime: 0.8.2 -> 0.8.3 --- pkgs/development/ocaml-modules/ptime/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix index b8017134e526..bb4bbef516c8 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;