public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
sterni 2021-03-16 13:07:17 +01:00 committed by GitHub
parent 5fa9e2808f
commit f0b078ef9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 61 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/ocaml-modules/carton/default.nix
View File

@ -2,19 +2,19 @@
, ke, duff, decompress, cstruct, optint, bigstringaf, stdlib-shims , ke, duff, decompress, cstruct, optint, bigstringaf, stdlib-shims
, bigarray-compat, checkseum, logs, psq, fmt , bigarray-compat, checkseum, logs, psq, fmt
, result, rresult, fpath, base64, bos, digestif, mmap, alcotest , 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 { buildDunePackage rec {
pname = "carton"; pname = "carton";
version = "0.2.0"; version = "0.4.0";
useDune2 = true; useDune2 = true;
minimumOCamlVersion = "4.08"; minimumOCamlVersion = "4.08";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/${pname}-${pname}-v${version}.tbz"; 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 # remove changelogs for mimic and the git* packages
@ -30,6 +30,7 @@ buildDunePackage rec {
rresult rresult
fpath fpath
bos bos
hxd
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
ke ke

28
pkgs/development/ocaml-modules/decompress/1.2.nix Normal file
View File

@ -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";
};
}

11
pkgs/development/ocaml-modules/decompress/default.nix
View File

@ -1,10 +1,10 @@
{ lib, fetchurl, buildDunePackage { lib, fetchurl, buildDunePackage
, checkseum, bigarray-compat, optint , checkseum, bigarray-compat, optint, cmdliner
, bigstringaf, alcotest, hxd, camlzip, base64 , bigstringaf, alcotest, camlzip, base64, ctypes, fmt
}: }:
buildDunePackage rec { buildDunePackage rec {
version = "1.2.0"; version = "1.3.0";
pname = "decompress"; pname = "decompress";
minimumOCamlVersion = "4.07"; minimumOCamlVersion = "4.07";
@ -13,11 +13,12 @@ buildDunePackage rec {
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz"; 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 ]; propagatedBuildInputs = [ optint bigarray-compat checkseum ];
checkInputs = [ alcotest bigstringaf hxd camlzip base64 ]; checkInputs = [ alcotest bigstringaf ctypes fmt camlzip base64 ];
doCheck = true; doCheck = true;
meta = { meta = {

6
pkgs/development/ocaml-modules/duff/default.nix
View File

@ -1,17 +1,17 @@
{ lib, fetchurl, buildDunePackage { lib, fetchurl, buildDunePackage, fetchpatch
, stdlib-shims, bigarray-compat, fmt , stdlib-shims, bigarray-compat, fmt
, alcotest, hxd, crowbar, bigstringaf , alcotest, hxd, crowbar, bigstringaf
}: }:
buildDunePackage rec { buildDunePackage rec {
pname = "duff"; pname = "duff";
version = "0.3"; version = "0.4";
useDune2 = true; useDune2 = true;
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/duff/releases/download/v${version}/duff-v${version}.tbz"; url = "https://github.com/mirage/duff/releases/download/v${version}/duff-v${version}.tbz";
sha256 = "1lb67yxk93ifj94p1i3swjbnj5xy8j6xzs72bwvq6cffx5xykznm"; sha256 = "4795e8344a2c2562e0ef6c44ab742334b5cd807637354715889741b20a461da4";
}; };
propagatedBuildInputs = [ stdlib-shims bigarray-compat fmt ]; propagatedBuildInputs = [ stdlib-shims bigarray-compat fmt ];

4
pkgs/development/ocaml-modules/git/default.nix
View File

@ -8,14 +8,14 @@
buildDunePackage rec { buildDunePackage rec {
pname = "git"; pname = "git";
version = "3.3.0"; version = "3.3.2";
minimumOCamlVersion = "4.08"; minimumOCamlVersion = "4.08";
useDune2 = true; useDune2 = true;
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz"; url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
sha256 = "090b67e8f8a02fb52b4d0c7aa445b5ff7353fdb2da00fb37b908f089c6776cd0"; sha256 = "01xcjggsb13n6018lp6ic0f6pglfl39qcg126h1k3da19hvpzhrv";
}; };
buildInputs = [ buildInputs = [

10
pkgs/development/ocaml-modules/git/unix.nix
View File

@ -1,4 +1,4 @@
{ buildDunePackage, fetchpatch, git { buildDunePackage, git
, mmap, rresult, result, bigstringaf , mmap, rresult, result, bigstringaf
, fmt, bos, fpath, uri, digestif, logs, lwt, git-cohttp-unix , fmt, bos, fpath, uri, digestif, logs, lwt, git-cohttp-unix
, mirage-clock, mirage-clock-unix, astring, awa, cmdliner , mirage-clock, mirage-clock-unix, astring, awa, cmdliner
@ -15,14 +15,6 @@ buildDunePackage {
useDune2 = true; 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 = [ buildInputs = [
awa awa-mirage cmdliner git-cohttp-unix awa awa-mirage cmdliner git-cohttp-unix
mirage-clock mirage-clock-unix tcpip mirage-clock mirage-clock-unix tcpip

23
pkgs/development/ocaml-modules/hxd/default.nix
View File

@ -1,11 +1,11 @@
{ lib, buildDunePackage, fetchurl { lib, buildDunePackage, fetchurl
, dune-configurator, cmdliner, angstrom , ocaml, dune-configurator, cmdliner
, rresult, stdlib-shims, fmt, fpath , lwt, withLwt ? lib.versionAtLeast ocaml.version "4.07"
}: }:
buildDunePackage rec { buildDunePackage rec {
pname = "hxd"; pname = "hxd";
version = "0.2.0"; version = "0.3.1";
useDune2 = true; useDune2 = true;
@ -13,24 +13,25 @@ buildDunePackage rec {
src = fetchurl { src = fetchurl {
url = "https://github.com/dinosaure/hxd/releases/download/v${version}/hxd-v${version}.tbz"; 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 = [ nativeBuildInputs = [
dune-configurator dune-configurator
]; ];
propagatedBuildInputs = lib.optional withLwt lwt;
buildInputs = [ buildInputs = [
cmdliner cmdliner
angstrom
rresult
fmt
fpath
]; ];
propagatedBuildInputs = [ doCheck = true;
stdlib-shims
];
meta = with lib; { meta = with lib; {
description = "Hexdump in OCaml"; description = "Hexdump in OCaml";

6
pkgs/top-level/ocaml-packages.nix
View File

@ -238,6 +238,8 @@ let
decompress = callPackage ../development/ocaml-modules/decompress { }; decompress = callPackage ../development/ocaml-modules/decompress { };
decompress-1-2 = callPackage ../development/ocaml-modules/decompress/1.2.nix { };
diet = callPackage ../development/ocaml-modules/diet { }; diet = callPackage ../development/ocaml-modules/diet { };
digestif = callPackage ../development/ocaml-modules/digestif { }; digestif = callPackage ../development/ocaml-modules/digestif { };
@ -399,7 +401,9 @@ let
hxd = callPackage ../development/ocaml-modules/hxd { }; 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 { }; inotify = callPackage ../development/ocaml-modules/inotify { };