diff --git a/pkgs/development/ocaml-modules/hxd/default.nix b/pkgs/development/ocaml-modules/hxd/default.nix index 7840bb4ff19..54ce87de99e 100644 --- a/pkgs/development/ocaml-modules/hxd/default.nix +++ b/pkgs/development/ocaml-modules/hxd/default.nix @@ -1,26 +1,19 @@ { lib, buildDunePackage, fetchurl -, ocaml, dune-configurator, cmdliner -, lwt, withLwt ? lib.versionAtLeast ocaml.version "4.07" +, dune-configurator, cmdliner +, lwt, withLwt ? true }: buildDunePackage rec { pname = "hxd"; - version = "0.3.1"; + version = "0.3.2"; - useDune2 = true; - - minimumOCamlVersion = "4.06"; + minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/dinosaure/hxd/releases/download/v${version}/hxd-v${version}.tbz"; - sha256 = "1c226c91e17cd329dec0c287bfd20f36302aa533069ff9c6ced32721f96b29bc"; + url = "https://github.com/dinosaure/hxd/releases/download/v${version}/hxd-${version}.tbz"; + sha256 = "a00290abb8538e79b32ddc22ed9b301b9806bc4c03eb1e5105b14af47dabec9f"; }; - # ignore yes stderr output due to trapped SIGPIPE - postPatch = '' - sed -i 's|yes ".\+"|& 2> /dev/null|' test/*.t - ''; - propagatedBuildInputs = lib.optional withLwt lwt; buildInputs = [ diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 10723fbc7a6..fa2b83b0a47 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -519,7 +519,9 @@ let hpack = callPackage ../development/ocaml-modules/hpack { }; - hxd = callPackage ../development/ocaml-modules/hxd { }; + hxd = callPackage ../development/ocaml-modules/hxd { + cmdliner = cmdliner_1_1; + }; imagelib = callPackage ../development/ocaml-modules/imagelib { };