diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2022-07-05 15:35:34 +0200 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2022-07-06 21:00:03 +0200 |
| commit | ff494fa028e7e982bb17d50f8abae34a51284bcb (patch) | |
| tree | 6fd93d06350e399f37639f6b0774badb22de0b2a | |
| parent | 78d0a0688cfe05d820f197bc50d95dce8ea25519 (diff) | |
| download | nixpkgs-ff494fa028e7e982bb17d50f8abae34a51284bcb.tar nixpkgs-ff494fa028e7e982bb17d50f8abae34a51284bcb.tar.gz nixpkgs-ff494fa028e7e982bb17d50f8abae34a51284bcb.tar.bz2 nixpkgs-ff494fa028e7e982bb17d50f8abae34a51284bcb.tar.lz nixpkgs-ff494fa028e7e982bb17d50f8abae34a51284bcb.tar.xz nixpkgs-ff494fa028e7e982bb17d50f8abae34a51284bcb.tar.zst nixpkgs-ff494fa028e7e982bb17d50f8abae34a51284bcb.zip | |
ocamlPackages.hxd: 0.3.1 -> 0.3.2
https://github.com/dinosaure/hxd/releases/tag/v0.3.2
| -rw-r--r-- | pkgs/development/ocaml-modules/hxd/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 4 |
2 files changed, 9 insertions, 14 deletions
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 { }; |