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 brokenwip/yesman
parent
8572994486
commit
c59b8ce9c3
@ -0,0 +1,66 @@ |
||||
{ lib, buildDunePackage, fetchurl |
||||
, 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 |
||||
}: |
||||
|
||||
buildDunePackage rec { |
||||
pname = "carton"; |
||||
version = "0.2.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"; |
||||
}; |
||||
|
||||
# remove changelogs for mimic and the git* packages |
||||
postPatch = '' |
||||
rm CHANGES.md CHANGES.mimic.md |
||||
''; |
||||
|
||||
buildInputs = [ |
||||
cmdliner |
||||
digestif |
||||
mmap |
||||
result |
||||
rresult |
||||
fpath |
||||
bos |
||||
]; |
||||
propagatedBuildInputs = [ |
||||
ke |
||||
duff |
||||
decompress |
||||
cstruct |
||||
optint |
||||
bigstringaf |
||||
stdlib-shims |
||||
bigarray-compat |
||||
checkseum |
||||
logs |
||||
psq |
||||
fmt |
||||
]; |
||||
|
||||
doCheck = true; |
||||
checkInputs = [ |
||||
base64 |
||||
alcotest |
||||
alcotest-lwt |
||||
crowbar |
||||
lwt |
||||
findlib |
||||
mirage-flow |
||||
]; |
||||
|
||||
meta = with lib; { |
||||
description = "Implementation of PACKv2 file in OCaml"; |
||||
license = licenses.mit; |
||||
homepage = "https://github.com/mirage/ocaml-git"; |
||||
maintainers = [ maintainers.sternenseemann ]; |
||||
}; |
||||
} |
@ -0,0 +1,28 @@ |
||||
{ buildDunePackage, carton, carton-lwt |
||||
, bigarray-compat, bigstringaf, lwt, fpath, result |
||||
, mmap, fmt, decompress, astring |
||||
, alcotest, alcotest-lwt, cstruct, logs |
||||
, mirage-flow, rresult, ke |
||||
}: |
||||
|
||||
buildDunePackage { |
||||
pname = "carton-git"; |
||||
|
||||
inherit (carton) version src useDune2 minimumOCamlVersion postPatch; |
||||
|
||||
propagatedBuildInputs = [ |
||||
carton |
||||
carton-lwt |
||||
bigarray-compat |
||||
bigstringaf |
||||
lwt |
||||
fpath |
||||
result |
||||
mmap |
||||
fmt |
||||
decompress |
||||
astring |
||||
]; |
||||
|
||||
inherit (carton) meta; |
||||
} |
@ -0,0 +1,46 @@ |
||||
{ buildDunePackage, carton |
||||
, lwt, decompress, optint, bigstringaf |
||||
, alcotest, alcotest-lwt, cstruct, fmt, logs |
||||
, mirage-flow, result, rresult, bigarray-compat |
||||
, ke, base64, bos, checkseum, digestif, fpath, mmap |
||||
, stdlib-shims |
||||
, git-binary # pkgs.git |
||||
}: |
||||
|
||||
buildDunePackage { |
||||
pname = "carton-lwt"; |
||||
|
||||
inherit (carton) version src useDune2 minimumOCamlVersion postPatch; |
||||
|
||||
propagatedBuildInputs = [ |
||||
carton |
||||
lwt |
||||
decompress |
||||
optint |
||||
bigstringaf |
||||
]; |
||||
|
||||
doCheck = true; |
||||
checkInputs = [ |
||||
git-binary |
||||
alcotest |
||||
alcotest-lwt |
||||
cstruct |
||||
fmt |
||||
logs |
||||
mirage-flow |
||||
result |
||||
rresult |
||||
bigarray-compat |
||||
ke |
||||
base64 |
||||
bos |
||||
checkseum |
||||
digestif |
||||
fpath |
||||
mmap |
||||
stdlib-shims |
||||
]; |
||||
|
||||
inherit (carton) meta; |
||||
} |
@ -1,15 +0,0 @@ |
||||
{ buildDunePackage, git, cohttp, cohttp-lwt }: |
||||
|
||||
buildDunePackage { |
||||
pname = "git-http"; |
||||
inherit (git) version src minimumOCamlVersion; |
||||
|
||||
useDune2 = true; |
||||
|
||||
propagatedBuildInputs = [ git cohttp cohttp-lwt ]; |
||||
|
||||
meta = { |
||||
description = "Client implementation of the “Smart” HTTP Git protocol in pure OCaml"; |
||||
inherit (git.meta) homepage license maintainers; |
||||
}; |
||||
} |
@ -1,20 +0,0 @@ |
||||
{ stdenv, buildDunePackage, git-http, cohttp, cohttp-lwt-unix |
||||
, mmap, cmdliner, mtime, alcotest, mirage-crypto-rng, tls |
||||
, io-page, git-binary |
||||
}: |
||||
|
||||
buildDunePackage { |
||||
pname = "git-unix"; |
||||
inherit (git-http) version src minimumOCamlVersion; |
||||
|
||||
useDune2 = true; |
||||
|
||||
propagatedBuildInputs = [ mmap cmdliner git-http cohttp cohttp-lwt-unix mtime ]; |
||||
checkInputs = [ alcotest mirage-crypto-rng tls io-page git-binary ]; |
||||
doCheck = !stdenv.isAarch64; |
||||
|
||||
meta = { |
||||
description = "Unix backend for the Git protocol(s)"; |
||||
inherit (git-http.meta) homepage license maintainers; |
||||
}; |
||||
} |
@ -0,0 +1,18 @@ |
||||
{ lib, buildDunePackage |
||||
, git, mimic, cohttp-mirage, cohttp, cohttp-lwt |
||||
, fmt, lwt, result, rresult, uri |
||||
}: |
||||
|
||||
buildDunePackage { |
||||
pname = "git-cohttp-mirage"; |
||||
|
||||
inherit (git) version src minimumOCamlVersion useDune2; |
||||
|
||||
propagatedBuildInputs = [ |
||||
git mimic cohttp-mirage cohttp cohttp-lwt fmt lwt result rresult uri |
||||
]; |
||||
|
||||
meta = git.meta // { |
||||
description = "A package to use HTTP-based ocaml-git with MirageOS backend"; |
||||
}; |
||||
} |
@ -0,0 +1,17 @@ |
||||
{ buildDunePackage, git, git-cohttp |
||||
, cohttp-lwt-unix, cohttp-lwt, fmt, lwt, result, rresult, uri |
||||
}: |
||||
|
||||
buildDunePackage { |
||||
pname = "git-cohttp-unix"; |
||||
|
||||
inherit (git) version src minimumOCamlVersion useDune2; |
||||
|
||||
propagatedBuildInputs = [ |
||||
git git-cohttp cohttp-lwt-unix cohttp-lwt fmt lwt result rresult uri |
||||
]; |
||||
|
||||
meta = git.meta // { |
||||
description = "A package to use HTTP-based ocaml-git with Unix backend"; |
||||
}; |
||||
} |
@ -0,0 +1,19 @@ |
||||
{ buildDunePackage, git |
||||
, cohttp, cohttp-lwt, fmt, lwt, result, rresult, uri |
||||
, alcotest, alcotest-lwt, bigstringaf, cstruct, logs |
||||
, mirage-flow, ke |
||||
}: |
||||
|
||||
buildDunePackage rec { |
||||
pname = "git-cohttp"; |
||||
|
||||
inherit (git) version minimumOCamlVersion src useDune2; |
||||
|
||||
propagatedBuildInputs = [ |
||||
git cohttp cohttp-lwt fmt lwt result rresult uri |
||||
]; |
||||
|
||||
meta = git.meta // { |
||||
description = "A package to use HTTP-based ocaml-git with Unix backend"; |
||||
}; |
||||
} |
@ -0,0 +1,44 @@ |
||||
{ buildDunePackage, fetchpatch, git |
||||
, mmap, rresult, result, bigstringaf |
||||
, fmt, bos, fpath, uri, digestif, logs, lwt, git-cohttp-unix |
||||
, mirage-clock, mirage-clock-unix, astring, awa, cmdliner |
||||
, cohttp-lwt-unix, decompress, domain-name, ipaddr, mtime |
||||
, tcpip, awa-mirage, mirage-flow |
||||
, alcotest, alcotest-lwt, base64, cstruct |
||||
, ke, mirage-crypto-rng, ocurl, git-binary |
||||
}: |
||||
|
||||
buildDunePackage { |
||||
pname = "git-unix"; |
||||
inherit (git) version src minimumOCamlVersion; |
||||
|
||||
useDune2 = true; |
||||
|
||||
buildInputs = [ |
||||
awa awa-mirage cmdliner git-cohttp-unix |
||||
mirage-clock mirage-clock-unix tcpip |
||||
]; |
||||
propagatedBuildInputs = [ |
||||
mmap rresult result bigstringaf |
||||
fmt bos fpath uri digestif logs lwt |
||||
astring cohttp-lwt-unix decompress |
||||
domain-name ipaddr mtime mirage-flow |
||||
]; |
||||
checkInputs = [ |
||||
alcotest alcotest-lwt base64 cstruct ke |
||||
mirage-crypto-rng ocurl git-binary |
||||
]; |
||||
doCheck = true; |
||||
|
||||
patches = [ |
||||
(fetchpatch { |
||||
url = "https://github.com/mirage/ocaml-git/commit/09b41073fa869c0a595e1d8ed7224d539682af1c.patch"; |
||||
sha256 = "1avbxv60gbrll9gny1pl6jwbx5b8282h3frhzy2ghb0fx1pggp6w"; |
||||
}) |
||||
]; |
||||
|
||||
meta = { |
||||
description = "Unix backend for the Git protocol(s)"; |
||||
inherit (git.meta) homepage license maintainers; |
||||
}; |
||||
} |
@ -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 ]; |
||||
} |
@ -0,0 +1,27 @@ |
||||
{ buildDunePackage |
||||
, irmin, irmin-unix, irmin-git, ppx_irmin, lwt, mtime |
||||
, alcotest, alcotest-lwt |
||||
}: |
||||
|
||||
buildDunePackage { |
||||
pname = "irmin-containers"; |
||||
|
||||
inherit (ppx_irmin) src version useDune2; |
||||
|
||||
nativeBuildInputs = [ |
||||
ppx_irmin |
||||
]; |
||||
|
||||
propagatedBuildInputs = [ |
||||
irmin irmin-unix irmin-git ppx_irmin lwt mtime |
||||
]; |
||||
|
||||
doCheck = true; |
||||
checkInputs = [ |
||||
alcotest alcotest-lwt |
||||
]; |
||||
|
||||
meta = ppx_irmin.meta // { |
||||
description = "Mergeable Irmin data structures"; |
||||
}; |
||||
} |
@ -0,0 +1,21 @@ |
||||
{ buildDunePackage, irmin, mtime, logs, lwt }: |
||||
|
||||
buildDunePackage { |
||||
pname = "irmin-layers"; |
||||
|
||||
inherit (irmin) version src useDune2; |
||||
|
||||
propagatedBuildInputs = [ |
||||
irmin |
||||
mtime |
||||
logs |
||||
lwt |
||||
]; |
||||
|
||||
# mutual dependency on irmin-test |
||||
doCheck = false; |
||||
|
||||
meta = irmin.meta // { |
||||
description = "Combine different Irmin stores into a single, layered store"; |
||||
}; |
||||
} |
@ -1,21 +0,0 @@ |
||||
{ lib, buildDunePackage, irmin, irmin-test }: |
||||
|
||||
buildDunePackage rec { |
||||
|
||||
pname = "irmin-mem"; |
||||
|
||||
inherit (irmin) version src; |
||||
|
||||
useDune2 = true; |
||||
|
||||
propagatedBuildInputs = [ irmin ]; |
||||
|
||||
checkInputs = lib.optional doCheck irmin-test; |
||||
|
||||
doCheck = true; |
||||
|
||||
meta = irmin.meta // { |
||||
description = "Generic in-memory Irmin stores"; |
||||
}; |
||||
|
||||
} |
@ -0,0 +1,27 @@ |
||||
{ buildDunePackage, irmin-mirage, irmin-git |
||||
, mirage-kv, cohttp, conduit-lwt, conduit-mirage |
||||
, git-cohttp-mirage, fmt, git, lwt, mirage-clock, uri |
||||
}: |
||||
|
||||
buildDunePackage { |
||||
pname = "irmin-mirage-git"; |
||||
|
||||
inherit (irmin-mirage) version src useDune2; |
||||
|
||||
propagatedBuildInputs = [ |
||||
irmin-mirage |
||||
irmin-git |
||||
mirage-kv |
||||
cohttp |
||||
conduit-lwt |
||||
conduit-mirage |
||||
git-cohttp-mirage |
||||
fmt |
||||
git |
||||
lwt |
||||
mirage-clock |
||||
uri |
||||
]; |
||||
|
||||
inherit (irmin-mirage) meta; |
||||
} |
@ -0,0 +1,21 @@ |
||||
{ buildDunePackage, irmin-mirage, irmin-graphql |
||||
, mirage-clock, cohttp-lwt, lwt, uri, git |
||||
}: |
||||
|
||||
buildDunePackage { |
||||
pname = "irmin-mirage-graphql"; |
||||
|
||||
inherit (irmin-mirage) version src useDune2; |
||||
|
||||
propagatedBuildInputs = [ |
||||
irmin-mirage |
||||
irmin-graphql |
||||
mirage-clock |
||||
cohttp-lwt |
||||
lwt |
||||
uri |
||||
git |
||||
]; |
||||
|
||||
inherit (irmin-mirage) meta; |
||||
} |
@ -0,0 +1,15 @@ |
||||
{ buildDunePackage, irmin, fmt, ptime, mirage-clock }: |
||||
|
||||
buildDunePackage { |
||||
pname = "irmin-mirage"; |
||||
|
||||
inherit (irmin) version src useDune2; |
||||
|
||||
propagatedBuildInputs = [ |
||||
irmin fmt ptime mirage-clock |
||||
]; |
||||
|
||||
meta = irmin.meta // { |
||||
description = "MirageOS-compatible Irmin stores"; |
||||
}; |
||||
} |
Loading…
Reference in new issue