diff options
author | sterni <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-03-16 13:07:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-16 13:07:17 +0100 |
commit | f0b078ef9ddd1bcb960c0e2131fcfa4a3e78f549 (patch) | |
tree | 36765bf55b0d24d11f8818ff857f96be1257b092 /pkgs/development/ocaml-modules/decompress | |
parent | 5fa9e2808fd5556ec36918a260bf27296c9a2fd6 (diff) |
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
Diffstat (limited to 'pkgs/development/ocaml-modules/decompress')
-rw-r--r-- | pkgs/development/ocaml-modules/decompress/1.2.nix | 28 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/decompress/default.nix | 11 |
2 files changed, 34 insertions, 5 deletions
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 0000000000000..e81202ea58fdf --- /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 f53e166c66289..d2cba68d732ec 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 = { |