ocamlPackages: irmin 2.2.0 → 2.4.0; git: 2.13 → 3.2.0; and related changes (#110184)
* ocamlPackages.index: 1.2.1 -> 1.3.0
* ocamlPackages.decompress: 0.9.0 -> 1.2.0
* ocamlPackages.imagelib-unix: remove at 20191011
* ocamlPackages.imagelib: 20191011 -> 20200929
* ocamlPackages.duff: 0.2 -> 0.3
* ocamlPackages.carton{,-git,-lwt}: init at 0.2.0
* ocamlPackages.encore: 0.5 → 0.7
* ocamlPackages.git-http: remove at 2.1.3
* ocamlPackages.git-unix: move into git directory
* ocamlPackages.irmin-mem: remove at 2.2.0
Replaced by irmin.mem contained in ocamlPackages.irmin >= 2.4.0
* ocamlPackages.git*: 2.1.3 -> 3.2.0
ocamlPackages.git-unix: 2.1.3 -> 3.2.0
ocamlPackages.git-cohttp{,-unix,-mirage}: init at 3.2.0
* ocamlPackages.irmin*: 2.2.0 -> 2.4.0
ocamlPackages.irmin-containers: init at 2.4.0
ocamlPackages.irmin-layers: init at 2.4.0
ocamlPackages.irmin-mirage: init at 2.4.0
ocamlPackages.irmin-mirage-git: init at 2.4.0
ocamlPackages.irmin-mirage-graphql: init at 2.4.0
* ocamlPackages.wodan-irmin: mark as broken
This commit is contained in:
@@ -1,30 +1,28 @@
|
||||
{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, decompress }:
|
||||
{ lib, fetchurl, buildDunePackage
|
||||
, decompress, stdlib-shims, alcotest
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
minimumOCamlVersion = "4.07";
|
||||
version = "20191011";
|
||||
version = "20200929";
|
||||
pname = "imagelib";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rlepigre";
|
||||
repo = "ocaml-imagelib";
|
||||
rev = "03fed7733825cef7e0465163f398f6af810e2e75";
|
||||
sha256 = "0h7vgyss42nhlfqpbdnb54nxq86rskqi2ilx8b87r0hi19hqx463";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rlepigre/ocaml-imagelib/releases/download/ocaml-imagelib_${version}/imagelib-ocaml-imagelib_${version}.tbz";
|
||||
sha256 = "1wyq4xxj0dxwafbcmd7jylsd8w1gbyl7j4ak6jbq1n0ardwmpwca";
|
||||
};
|
||||
|
||||
patches = [ (fetchpatch {
|
||||
url = "https://github.com/rlepigre/ocaml-imagelib/pull/24/commits/4704fd44adcda62e0d96ea5b1927071326aa6111.patch";
|
||||
sha256 = "0ipjab1hfa2v2pnd8g1k3q2ia0plgiw7crm3fa4w2aqpzdyabkb9";
|
||||
}) ];
|
||||
propagatedBuildInputs = [ decompress stdlib-shims ];
|
||||
|
||||
propagatedBuildInputs = [ decompress ];
|
||||
doCheck = true;
|
||||
checkInputs = [ alcotest ];
|
||||
|
||||
meta = {
|
||||
description = "Image formats such as PNG and PPM in OCaml";
|
||||
license = lib.licenses.lgpl3;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
inherit (src.meta) homepage;
|
||||
homepage = "https://github.com/rlepigre/ocaml-imagelib";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
{ buildDunePackage, imagelib }:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "imagelib-unix";
|
||||
inherit (imagelib) version src useDune2 meta;
|
||||
|
||||
propagatedBuildInputs = [ imagelib ];
|
||||
}
|
||||
Reference in New Issue
Block a user