Unverified Commit f0b078ef authored by sterni's avatar sterni Committed by GitHub
Browse files

ocamlPackages.git: 3.3.0 -> 3.3.2; decompress: 1.2.0 -> 1.3.0; duff: 0.3 ->... 

 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
parent 5fa9e280

pkgs/development/ocaml-modules/carton/default.nix

+4 −3
Original line number Diff line number Diff line
@@ -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

pkgs/development/ocaml-modules/decompress/1.2.nix

0 → 100644
+28 −0
Original line number Diff line number Diff line 
{ 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";

  };

}

pkgs/development/ocaml-modules/decompress/default.nix

+6 −5
Original line number Diff line number Diff line 
{ 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 = {

pkgs/development/ocaml-modules/duff/default.nix

+3 −3
Original line number Diff line number Diff line 
{ 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 ];

pkgs/development/ocaml-modules/git/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 = [