git.iko.soy/typeable/nixpkgs
on master help sign in
ocamlPackages.git: 3.3.0 -> 3.3.2; decompress: 1.2.0 -> 1.3.0; duff: 0.3 -> 0.4; and related updates (#116486)

* ocamlPackages.hxd: 0.2.0 -> 0.3.1 ocamlPackages.hxd: disable lwt by default on OCaml 4.06 (syntax error) * ocamlPackages.duff: 0.3 -> 0.4 * ocamlPackages.decompress: 1.2.0 -> 1.3.0 Keep decompress 1.2.0 around as decompress-1-2 until imagelib supports decompress 1.3.0: https://github.com/rlepigre/ocaml-imagelib/issues/49 * ocamlPackages.carton*: 0.2.0 -> 0.4.0 * ocamlPackages.git: 3.3.0 -> 3.3.2

commitf0b078ef9ddd1bcb960c0e2131fcfa4a3e78f549 authorsterni <0rpkxez4ksa01gb3typccl0i@systemli.org> dateTue 16 Mar 2021, 13:07 (6 years ago) parent5fa9e28
8 files changed+61−34
pkgs/development/ocaml-modules/carton/default.nix+4−3 pkgs/development/ocaml-modules/decompress/1.2.nix+28 pkgs/development/ocaml-modules/decompress/default.nix+6−5 pkgs/development/ocaml-modules/duff/default.nix+3−3 pkgs/development/ocaml-modules/git/default.nix+2−2 pkgs/development/ocaml-modules/git/unix.nix+1−9 pkgs/development/ocaml-modules/hxd/default.nix+12−11 pkgs/top-level/ocaml-packages.nix+5−1
pkgs/development/ocaml-modules/carton/default.nix+4−3
@@ -2,19 +2,19 @@
22, ke, duff, decompress, cstruct, optint, bigstringaf, stdlib-shims
33, bigarray-compat, checkseum, logs, psq, fmt
44, result, rresult, fpath, base64, bos, digestif, mmap, alcotest
5−, crowbar, alcotest-lwt, lwt, findlib, mirage-flow, cmdliner
5+, crowbar, alcotest-lwt, lwt, findlib, mirage-flow, cmdliner, hxd
66}:
77
88buildDunePackage rec {
99 pname = "carton";
10− version = "0.2.0";
10+ version = "0.4.0";
1111
1212 useDune2 = true;
1313 minimumOCamlVersion = "4.08";
1414
1515 src = fetchurl {
1616 url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/${pname}-${pname}-v${version}.tbz";
17− sha256 = "0gfns4a9p9540kijccsg52yzyn3jfvi737mb0g71yazyc89dqwhn";
17+ sha256 = "777f9692b83cd63570c17527a32c5045818ab9242d923cbbde72fc23d0da0140";
1818 };
1919
2020 # remove changelogs for mimic and the git* packages
@@ -30,6 +30,7 @@ buildDunePackage rec {
3030 rresult
3131 fpath
3232 bos
33+ hxd
3334 ];
3435 propagatedBuildInputs = [
3536 ke
pkgs/development/ocaml-modules/decompress/1.2.nixnew file+28
@@ -0,0 +1,28 @@
1+{ lib, fetchurl, buildDunePackage
2+, checkseum, bigarray-compat, optint
3+}:
4+
5+buildDunePackage rec {
6+ version = "1.2.0";
7+ pname = "decompress";
8+
9+ minimumOCamlVersion = "4.07";
10+
11+ useDune2 = true;
12+
13+ src = fetchurl {
14+ url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz";
15+ sha256 = "1c3sq9a6kpzl0pj3gmg7w18ssjjl70yv0r3l7qjprcncjx23v62i";
16+ };
17+
18+ propagatedBuildInputs = [ optint bigarray-compat checkseum ];
19+ # required hxd version is not available in nixpkgs
20+ doCheck = false;
21+
22+ meta = {
23+ description = "Pure OCaml implementation of Zlib";
24+ license = lib.licenses.mit;
25+ maintainers = [ lib.maintainers.vbgl ];
26+ homepage = "https://github.com/mirage/decompress";
27+ };
28+}
pkgs/development/ocaml-modules/decompress/default.nix+6−5
@@ -1,10 +1,10 @@
11{ lib, fetchurl, buildDunePackage
2−, checkseum, bigarray-compat, optint
3−, bigstringaf, alcotest, hxd, camlzip, base64
2+, checkseum, bigarray-compat, optint, cmdliner
3+, bigstringaf, alcotest, camlzip, base64, ctypes, fmt
44}:
55
66buildDunePackage rec {
7− version = "1.2.0";
7+ version = "1.3.0";
88 pname = "decompress";
99
1010 minimumOCamlVersion = "4.07";
@@ -13,11 +13,12 @@ buildDunePackage rec {
1313
1414 src = fetchurl {
1515 url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz";
16− sha256 = "1c3sq9a6kpzl0pj3gmg7w18ssjjl70yv0r3l7qjprcncjx23v62i";
16+ sha256 = "de149896939be13fedec46a4581121d5ab74850a2241d08e6aa8ae4bb18c52c4";
1717 };
1818
19+ buildInputs = [ cmdliner ];
1920 propagatedBuildInputs = [ optint bigarray-compat checkseum ];
20− checkInputs = [ alcotest bigstringaf hxd camlzip base64 ];
21+ checkInputs = [ alcotest bigstringaf ctypes fmt camlzip base64 ];
2122 doCheck = true;
2223
2324 meta = {
pkgs/development/ocaml-modules/duff/default.nix+3−3
@@ -1,17 +1,17 @@
1−{ lib, fetchurl, buildDunePackage
1+{ lib, fetchurl, buildDunePackage, fetchpatch
22, stdlib-shims, bigarray-compat, fmt
33, alcotest, hxd, crowbar, bigstringaf
44}:
55
66buildDunePackage rec {
77 pname = "duff";
8− version = "0.3";
8+ version = "0.4";
99
1010 useDune2 = true;
1111
1212 src = fetchurl {
1313 url = "https://github.com/mirage/duff/releases/download/v${version}/duff-v${version}.tbz";
14− sha256 = "1lb67yxk93ifj94p1i3swjbnj5xy8j6xzs72bwvq6cffx5xykznm";
14+ sha256 = "4795e8344a2c2562e0ef6c44ab742334b5cd807637354715889741b20a461da4";
1515 };
1616
1717 propagatedBuildInputs = [ stdlib-shims bigarray-compat fmt ];
pkgs/development/ocaml-modules/git/default.nix+2−2
@@ -8,14 +8,14 @@
88
99buildDunePackage rec {
1010 pname = "git";
11− version = "3.3.0";
11+ version = "3.3.2";
1212
1313 minimumOCamlVersion = "4.08";
1414 useDune2 = true;
1515
1616 src = fetchurl {
1717 url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
18− sha256 = "090b67e8f8a02fb52b4d0c7aa445b5ff7353fdb2da00fb37b908f089c6776cd0";
18+ sha256 = "01xcjggsb13n6018lp6ic0f6pglfl39qcg126h1k3da19hvpzhrv";
1919 };
2020
2121 buildInputs = [
pkgs/development/ocaml-modules/git/unix.nix+1−9
@@ -1,4 +1,4 @@
1−{ buildDunePackage, fetchpatch, git
1+{ buildDunePackage, git
22, mmap, rresult, result, bigstringaf
33, fmt, bos, fpath, uri, digestif, logs, lwt, git-cohttp-unix
44, mirage-clock, mirage-clock-unix, astring, awa, cmdliner
@@ -15,14 +15,6 @@ buildDunePackage {
1515
1616 useDune2 = true;
1717
18− patches = [
19− # https://github.com/mirage/ocaml-git/pull/472
20− (fetchpatch {
21− url = "https://github.com/sternenseemann/ocaml-git/commit/54998331eb9d5c61afe8901fabe0c74c2877f096.patch";
22− sha256 = "12kd45mlfaj4hxh33k9920a22mq1q2sdrin2j41w1angvg00d3my";
23− })
24− ];
25−
2618 buildInputs = [
2719 awa awa-mirage cmdliner git-cohttp-unix
2820 mirage-clock mirage-clock-unix tcpip
pkgs/development/ocaml-modules/hxd/default.nix+12−11
@@ -1,11 +1,11 @@
11{ lib, buildDunePackage, fetchurl
2−, dune-configurator, cmdliner, angstrom
3−, rresult, stdlib-shims, fmt, fpath
2+, ocaml, dune-configurator, cmdliner
3+, lwt, withLwt ? lib.versionAtLeast ocaml.version "4.07"
44}:
55
66buildDunePackage rec {
77 pname = "hxd";
8− version = "0.2.0";
8+ version = "0.3.1";
99
1010 useDune2 = true;
1111
@@ -13,24 +13,25 @@ buildDunePackage rec {
1313
1414 src = fetchurl {
1515 url = "https://github.com/dinosaure/hxd/releases/download/v${version}/hxd-v${version}.tbz";
16− sha256 = "1lyfrq058cc9x0c0hzsf3hv3ys0h8mxkwin9lldidlnj10izqf1l";
16+ sha256 = "1c226c91e17cd329dec0c287bfd20f36302aa533069ff9c6ced32721f96b29bc";
1717 };
1818
19+ # ignore yes stderr output due to trapped SIGPIPE
20+ postPatch = ''
21+ sed -i 's|yes ".\+"|& 2> /dev/null|' test/*.t
22+ '';
23+
1924 nativeBuildInputs = [
2025 dune-configurator
2126 ];
2227
28+ propagatedBuildInputs = lib.optional withLwt lwt;
29+
2330 buildInputs = [
2431 cmdliner
25− angstrom
26− rresult
27− fmt
28− fpath
2932 ];
3033
31− propagatedBuildInputs = [
32− stdlib-shims
33− ];
34+ doCheck = true;
3435
3536 meta = with lib; {
3637 description = "Hexdump in OCaml";
pkgs/top-level/ocaml-packages.nix+5−1
@@ -238,6 +238,8 @@ let
238238
239239 decompress = callPackage ../development/ocaml-modules/decompress { };
240240
241+ decompress-1-2 = callPackage ../development/ocaml-modules/decompress/1.2.nix { };
242+
241243 diet = callPackage ../development/ocaml-modules/diet { };
242244
243245 digestif = callPackage ../development/ocaml-modules/digestif { };
@@ -399,7 +401,9 @@ let
399401
400402 hxd = callPackage ../development/ocaml-modules/hxd { };
401403
402− imagelib = callPackage ../development/ocaml-modules/imagelib { };
404+ imagelib = callPackage ../development/ocaml-modules/imagelib {
405+ decompress = decompress-1-2;
406+ };
403407
404408 inotify = callPackage ../development/ocaml-modules/inotify { };
405409