diff --git a/pkgs/development/ocaml-modules/carton/default.nix b/pkgs/development/ocaml-modules/carton/default.nix index 5bf7be4e779..31b864e29d3 100644 --- a/pkgs/development/ocaml-modules/carton/default.nix +++ b/pkgs/development/ocaml-modules/carton/default.nix @@ -2,19 +2,19 @@ , ke, duff, decompress, cstruct, optint, bigstringaf, stdlib-shims , bigarray-compat, checkseum, logs, psq, fmt , result, rresult, fpath, base64, bos, digestif, mmap, alcotest -, crowbar, alcotest-lwt, lwt, findlib, mirage-flow, cmdliner +, crowbar, alcotest-lwt, lwt, findlib, mirage-flow, cmdliner, hxd }: buildDunePackage rec { pname = "carton"; - version = "0.2.0"; + version = "0.4.0"; useDune2 = true; minimumOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/${pname}-${pname}-v${version}.tbz"; - sha256 = "0gfns4a9p9540kijccsg52yzyn3jfvi737mb0g71yazyc89dqwhn"; + sha256 = "777f9692b83cd63570c17527a32c5045818ab9242d923cbbde72fc23d0da0140"; }; # remove changelogs for mimic and the git* packages @@ -30,6 +30,7 @@ buildDunePackage rec { rresult fpath bos + hxd ]; propagatedBuildInputs = [ ke diff --git a/pkgs/development/ocaml-modules/decompress/1.2.nix b/pkgs/development/ocaml-modules/decompress/1.2.nix new file mode 100644 index 00000000000..e81202ea58f --- /dev/null +++ b/pkgs/development/ocaml-modules/decompress/1.2.nix @@ -0,0 +1,28 @@ +{ lib, fetchurl, buildDunePackage +, checkseum, bigarray-compat, optint +}: + +buildDunePackage rec { + version = "1.2.0"; + pname = "decompress"; + + minimumOCamlVersion = "4.07"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz"; + sha256 = "1c3sq9a6kpzl0pj3gmg7w18ssjjl70yv0r3l7qjprcncjx23v62i"; + }; + + propagatedBuildInputs = [ optint bigarray-compat checkseum ]; + # required hxd version is not available in nixpkgs + doCheck = false; + + meta = { + description = "Pure OCaml implementation of Zlib"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + homepage = "https://github.com/mirage/decompress"; + }; +} diff --git a/pkgs/development/ocaml-modules/decompress/default.nix b/pkgs/development/ocaml-modules/decompress/default.nix index f53e166c662..d2cba68d732 100644 --- a/pkgs/development/ocaml-modules/decompress/default.nix +++ b/pkgs/development/ocaml-modules/decompress/default.nix @@ -1,10 +1,10 @@ { lib, fetchurl, buildDunePackage -, checkseum, bigarray-compat, optint -, bigstringaf, alcotest, hxd, camlzip, base64 +, checkseum, bigarray-compat, optint, cmdliner +, bigstringaf, alcotest, camlzip, base64, ctypes, fmt }: buildDunePackage rec { - version = "1.2.0"; + version = "1.3.0"; pname = "decompress"; minimumOCamlVersion = "4.07"; @@ -13,11 +13,12 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz"; - sha256 = "1c3sq9a6kpzl0pj3gmg7w18ssjjl70yv0r3l7qjprcncjx23v62i"; + sha256 = "de149896939be13fedec46a4581121d5ab74850a2241d08e6aa8ae4bb18c52c4"; }; + buildInputs = [ cmdliner ]; propagatedBuildInputs = [ optint bigarray-compat checkseum ]; - checkInputs = [ alcotest bigstringaf hxd camlzip base64 ]; + checkInputs = [ alcotest bigstringaf ctypes fmt camlzip base64 ]; doCheck = true; meta = { diff --git a/pkgs/development/ocaml-modules/duff/default.nix b/pkgs/development/ocaml-modules/duff/default.nix index 64a32d179d5..a57f8564d9e 100644 --- a/pkgs/development/ocaml-modules/duff/default.nix +++ b/pkgs/development/ocaml-modules/duff/default.nix @@ -1,17 +1,17 @@ -{ lib, fetchurl, buildDunePackage +{ lib, fetchurl, buildDunePackage, fetchpatch , stdlib-shims, bigarray-compat, fmt , alcotest, hxd, crowbar, bigstringaf }: buildDunePackage rec { pname = "duff"; - version = "0.3"; + version = "0.4"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/duff/releases/download/v${version}/duff-v${version}.tbz"; - sha256 = "1lb67yxk93ifj94p1i3swjbnj5xy8j6xzs72bwvq6cffx5xykznm"; + sha256 = "4795e8344a2c2562e0ef6c44ab742334b5cd807637354715889741b20a461da4"; }; propagatedBuildInputs = [ stdlib-shims bigarray-compat fmt ]; diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index 8ef1c3627f0..0fd66226e36 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -8,14 +8,14 @@ buildDunePackage rec { pname = "git"; - version = "3.3.0"; + version = "3.3.2"; minimumOCamlVersion = "4.08"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz"; - sha256 = "090b67e8f8a02fb52b4d0c7aa445b5ff7353fdb2da00fb37b908f089c6776cd0"; + sha256 = "01xcjggsb13n6018lp6ic0f6pglfl39qcg126h1k3da19hvpzhrv"; }; buildInputs = [ diff --git a/pkgs/development/ocaml-modules/git/unix.nix b/pkgs/development/ocaml-modules/git/unix.nix index 58ac0204b4b..f4cea472886 100644 --- a/pkgs/development/ocaml-modules/git/unix.nix +++ b/pkgs/development/ocaml-modules/git/unix.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, fetchpatch, git +{ buildDunePackage, git , mmap, rresult, result, bigstringaf , fmt, bos, fpath, uri, digestif, logs, lwt, git-cohttp-unix , mirage-clock, mirage-clock-unix, astring, awa, cmdliner @@ -15,14 +15,6 @@ buildDunePackage { useDune2 = true; - patches = [ - # https://github.com/mirage/ocaml-git/pull/472 - (fetchpatch { - url = "https://github.com/sternenseemann/ocaml-git/commit/54998331eb9d5c61afe8901fabe0c74c2877f096.patch"; - sha256 = "12kd45mlfaj4hxh33k9920a22mq1q2sdrin2j41w1angvg00d3my"; - }) - ]; - buildInputs = [ awa awa-mirage cmdliner git-cohttp-unix mirage-clock mirage-clock-unix tcpip diff --git a/pkgs/development/ocaml-modules/hxd/default.nix b/pkgs/development/ocaml-modules/hxd/default.nix index 1d677ac1a2e..0775e21b1f8 100644 --- a/pkgs/development/ocaml-modules/hxd/default.nix +++ b/pkgs/development/ocaml-modules/hxd/default.nix @@ -1,11 +1,11 @@ { lib, buildDunePackage, fetchurl -, dune-configurator, cmdliner, angstrom -, rresult, stdlib-shims, fmt, fpath +, ocaml, dune-configurator, cmdliner +, lwt, withLwt ? lib.versionAtLeast ocaml.version "4.07" }: buildDunePackage rec { pname = "hxd"; - version = "0.2.0"; + version = "0.3.1"; useDune2 = true; @@ -13,24 +13,25 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/dinosaure/hxd/releases/download/v${version}/hxd-v${version}.tbz"; - sha256 = "1lyfrq058cc9x0c0hzsf3hv3ys0h8mxkwin9lldidlnj10izqf1l"; + sha256 = "1c226c91e17cd329dec0c287bfd20f36302aa533069ff9c6ced32721f96b29bc"; }; + # ignore yes stderr output due to trapped SIGPIPE + postPatch = '' + sed -i 's|yes ".\+"|& 2> /dev/null|' test/*.t + ''; + nativeBuildInputs = [ dune-configurator ]; + propagatedBuildInputs = lib.optional withLwt lwt; + buildInputs = [ cmdliner - angstrom - rresult - fmt - fpath ]; - propagatedBuildInputs = [ - stdlib-shims - ]; + doCheck = true; meta = with lib; { description = "Hexdump in OCaml"; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 3c8c500d8b5..a0556ccecb1 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -238,6 +238,8 @@ let decompress = callPackage ../development/ocaml-modules/decompress { }; + decompress-1-2 = callPackage ../development/ocaml-modules/decompress/1.2.nix { }; + diet = callPackage ../development/ocaml-modules/diet { }; digestif = callPackage ../development/ocaml-modules/digestif { }; @@ -399,7 +401,9 @@ let hxd = callPackage ../development/ocaml-modules/hxd { }; - imagelib = callPackage ../development/ocaml-modules/imagelib { }; + imagelib = callPackage ../development/ocaml-modules/imagelib { + decompress = decompress-1-2; + }; inotify = callPackage ../development/ocaml-modules/inotify { };