From e4168845c752fdea46baf96e9c6f35fd590019f5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 19 Nov 2022 07:21:55 +0100 Subject: [PATCH] =?UTF-8?q?ocamlPackages.ptime:=200.8.6=20=E2=86=92=201.0.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/ptime/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix index 169cf4ce16f..ee12abd3e3b 100644 --- a/pkgs/development/ocaml-modules/ptime/default.nix +++ b/pkgs/development/ocaml-modules/ptime/default.nix @@ -1,26 +1,24 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, js_of_ocaml -, jsooSupport ? true +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg }: -stdenv.mkDerivation rec { - version = "0.8.6"; - pname = "ocaml${ocaml.version}-ptime"; +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") + "ptime is not available for OCaml ${ocaml.version}" - minimalOCamlVersion = "4.03"; +stdenv.mkDerivation rec { + version = "1.0.0"; + pname = "ocaml${ocaml.version}-ptime"; src = fetchurl { url = "https://erratique.ch/software/ptime/releases/ptime-${version}.tbz"; - sha256 = "sha256-gy/fUsfUHUZx1A/2sQMQIFMHl1V+QO3zHAsEnZT/lkI="; + sha256 = "sha256-RByDjAFiyDdR8G663/MxabuSHTTuwVn7urtw7Z3iEQs="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; - buildInputs = [ topkg ] ++ lib.optional jsooSupport js_of_ocaml; + buildInputs = [ topkg ]; strictDeps = true; - buildPhase = "${topkg.run} build --with-js_of_ocaml ${lib.boolToString jsooSupport}"; - - inherit (topkg) installPhase; + inherit (topkg) buildPhase installPhase; meta = { homepage = "https://erratique.ch/software/ptime";