git.iko.soy/typeable/nixpkgs
on master help sign in
ocamlPackages: cohttp: 2.5.0 -> 4.0.0; conduit: 2.2.2 -> 4.0.0 (#118144)

* ocamlPackages.x509: 0.12.0 -> 0.13.0 https://github.com/mirleft/ocaml-x509/releases/tag/v0.13.0 * ocamlPackages.tls{,-mirage}: 0.12.8 -> 0.13.1 https://github.com/mirleft/ocaml-tls/releases/tag/v0.13.0 https://github.com/mirleft/ocaml-tls/releases/tag/v0.13.1 * ocamlPackages.ca-certs: 0.2.0 -> 0.2.1 Adds support for NIX_SSL_CERT_FILE, so we can finally run its test suite! https://github.com/mirage/ca-certs/releases/tag/v0.2.1 * ocamlPackages.dns*: 4.6.3 -> 5.0.0 * jackline: unstable-2020-09-03 -> unstable-2021-04-23 Compatibility with tls >= 0.13.0 * ocamlPackages.ca-certs-nss: init at 3.64.0.1 * ocamlPackages.conduit: 2.2.2 -> 2.3.0 https://github.com/mirage/ocaml-conduit/releases/tag/v2.3.0 * ocamlPackages.curly: fix tests with new ca-certs behavior * ocamlPackages.cohttp: 2.5.0 -> 4.0.0 ocamlPackages.cohttp-lwt-unix: add description https://github.com/mirage/ocaml-cohttp/releases/tag/v4.0.0 * ocamlPackages.mirage{,-runtime,-types*}: 3.10.1 -> 3.10.3 Adjust to a few changed dependencies: https://github.com/mirage/mirage/releases/tag/v3.10.2 https://github.com/mirage/mirage/releases/tag/v3.10.3 * ocamlPackages.conduit*: 2.3.0 -> 4.0.0 https://github.com/mirage/ocaml-conduit/releases/tag/v4.0.0 * ocamlPackages.cohttp-lwt-unix: disable tests * ocamlPackages.dns*: 5.0.0 -> 5.0.1 https://github.com/mirage/ocaml-dns/releases/tag/v5.0.1 * ocamlPackages.awa*: 0.0.1 -> 0.0.3 https://github.com/mirage/awa-ssh/releases/tag/v0.0.2 https://github.com/mirage/awa-ssh/releases/tag/v0.0.3 * ocamlPackages.optint: 0.0.4 -> 0.1.0 https://github.com/mirage/optint/releases/tag/v0.0.5 https://github.com/mirage/optint/releases/tag/v0.1.0 * ocamlPackages.decompress: 1.3.0 -> 1.4.0 https://github.com/mirage/decompress/releases/tag/v1.4.0 * ocamlPackages.checkseum: 0.2.1 -> 0.3.1 https://github.com/mirage/checkseum/releases/tag/v0.3.0 https://github.com/mirage/checkseum/releases/tag/v0.3.1 * ocamlPackages.checkseum: allow compilation with ocaml-freestanding * ocamlPackages.carton: 0.4.0 -> 0.4.1 https://github.com/mirage/ocaml-git/releases/tag/carton-v0.4.1 * ocamlPackages.mimic: 0.0.2 -> 0.0.3 * Upstream changed. * https://github.com/dinosaure/mimic/releases/tag/0.0.3 * ocamlPackages.letsencrypt: 0.2.4 -> 0.2.5 * ocamlPackages.paf: 0.0.1 -> 0.0.3 * ocamlPackages.git-cohttp-mirage: remove at 3.3.3 Will be replaced by git-paf 3.4.0. * ocamlPackages.git*: 3.3.3 -> 3.4.0 ocamlPackages.git-paf: init at 3.4.0 https://github.com/mirage/ocaml-git/releases/tag/3.4.0 * ocamlPackages.irmin*: 2.5.3 -> 2.6.0 https://github.com/mirage/irmin/releases/tag/2.6.0

commitf93d83d21b6a2d485006c4832f4850545ab7824e authorsterni <0rpkxez4ksa01gb3typccl0i@systemli.org> dateTue 11 May 2021, 06:54 (6 years ago) parent966aa89
40 files changed+371−161
compare with master
unifiedsplit
pkgs/applications/networking/instant-messengers/jackline/default.nix+3−3 pkgs/development/ocaml-modules/awa/default.nix+2−2 pkgs/development/ocaml-modules/ca-certs-nss/default.nix+55 pkgs/development/ocaml-modules/ca-certs/default.nix+8−4 pkgs/development/ocaml-modules/carton/default.nix+3−3 pkgs/development/ocaml-modules/checkseum/default.nix+31−8 pkgs/development/ocaml-modules/checkseum/makefile-no-opam.patch+12 pkgs/development/ocaml-modules/cohttp/async.nix+55−17 pkgs/development/ocaml-modules/cohttp/default.nix+6−7 pkgs/development/ocaml-modules/cohttp/lwt-unix.nix+17−8 pkgs/development/ocaml-modules/cohttp/lwt.nix+15−10 pkgs/development/ocaml-modules/cohttp/mirage.nix+3 pkgs/development/ocaml-modules/conduit/async.nix+9−9 pkgs/development/ocaml-modules/conduit/default.nix+5−5 pkgs/development/ocaml-modules/conduit/lwt-unix.nix+20−7 pkgs/development/ocaml-modules/conduit/mirage.nix+4−3 pkgs/development/ocaml-modules/curly/default.nix+4−2 pkgs/development/ocaml-modules/decompress/default.nix+2−2 pkgs/development/ocaml-modules/dns/certify.nix+2−2 pkgs/development/ocaml-modules/dns/default.nix+2−2 pkgs/development/ocaml-modules/git/cohttp-mirage.nix−18 pkgs/development/ocaml-modules/git/default.nix+9−4 pkgs/development/ocaml-modules/git/paf.nix+49 pkgs/development/ocaml-modules/git/unix.nix+8−3 pkgs/development/ocaml-modules/irmin/containers.nix+2−2 pkgs/development/ocaml-modules/irmin/git.nix+2−2 pkgs/development/ocaml-modules/irmin/graphql.nix+2−1 pkgs/development/ocaml-modules/irmin/http.nix+4−1 pkgs/development/ocaml-modules/irmin/mirage-git.nix+2−2 pkgs/development/ocaml-modules/irmin/ppx.nix+2−2 pkgs/development/ocaml-modules/irmin/unix.nix+4−2 pkgs/development/ocaml-modules/letsencrypt/default.nix+2−2 pkgs/development/ocaml-modules/mimic/default.nix+5−9 pkgs/development/ocaml-modules/mirage/runtime.nix+2−2 pkgs/development/ocaml-modules/optint/default.nix+3−3 pkgs/development/ocaml-modules/paf/default.nix+4−2 pkgs/development/ocaml-modules/tls/default.nix+6−6 pkgs/development/ocaml-modules/tls/mirage.nix+2−3 pkgs/development/ocaml-modules/x509/default.nix+2−2 pkgs/top-level/ocaml-packages.nix+3−1
pkgs/applications/networking/instant-messengers/jackline/default.nix+3−3
@@ -4,7 +4,7 @@ with ocamlPackages;
44
55buildDunePackage rec {
66 pname = "jackline";
7− version = "unstable-2020-09-03";
7+ version = "unstable-2021-04-23";
88
99 minimumOCamlVersion = "4.08";
1010
@@ -13,8 +13,8 @@ buildDunePackage rec {
1313 src = fetchFromGitHub {
1414 owner = "hannesm";
1515 repo = "jackline";
16− rev = "dd5f19636c9b99b72c348f0f639452d87b7c017c";
17− sha256 = "076smdgig4nwvqsqxa6gsl0c3daq5agwgzp4n2y8xxm3qiq91y89";
16+ rev = "861c59bb7cd27ad5c7558ff94cb0d0e8dca249e5";
17+ sha256 = "00waw5qr0n70i9l9b25r9ryfi836x4qrj046bb4k9qa4d0p8q1sa";
1818 };
1919
2020 nativeBuildInpts = [
pkgs/development/ocaml-modules/awa/default.nix+2−2
@@ -8,14 +8,14 @@
88
99buildDunePackage rec {
1010 pname = "awa";
11− version = "0.0.1";
11+ version = "0.0.3";
1212
1313 minimumOCamlVersion = "4.07";
1414 useDune2 = true;
1515
1616 src = fetchurl {
1717 url = "https://github.com/mirage/awa-ssh/releases/download/v${version}/awa-v${version}.tbz";
18− sha256 = "c1d604645517b191184a5800f5c48a6a9a3e5a2fce4a0e2ecfeee74586301400";
18+ sha256 = "5a7927363ffe672cccf12d5425386e84f6f553a17ffec2b01ae5dc28180c831a";
1919 };
2020
2121 nativeBuildInputs = [ ppx_sexp_conv ppx_cstruct ];
pkgs/development/ocaml-modules/ca-certs-nss/default.nixnew file+55
@@ -0,0 +1,55 @@
1+{ lib
2+, buildDunePackage
3+, fetchurl
4+, rresult
5+, mirage-crypto
6+, mirage-clock
7+, x509
8+, logs
9+, fmt
10+, hex
11+, bos
12+, astring
13+, cmdliner
14+, alcotest
15+}:
16+
17+buildDunePackage rec {
18+ pname = "ca-certs-nss";
19+ version = "3.64.0.1";
20+
21+ minimumOCamlVersion = "4.07";
22+
23+ src = fetchurl {
24+ url = "https://github.com/mirage/ca-certs-nss/releases/download/v${version}/ca-certs-nss-v${version}.tbz";
25+ sha256 = "909c64076491647471f785527bfdd9a886a34504edabf88542b43f27b86067f9";
26+ };
27+
28+ useDune2 = true;
29+
30+ propagatedBuildInputs = [
31+ rresult
32+ mirage-crypto
33+ mirage-clock
34+ x509
35+ ];
36+
37+ buildInputs = [
38+ logs
39+ fmt
40+ hex
41+ bos
42+ astring
43+ cmdliner
44+ ];
45+
46+ doCheck = true;
47+ checkInputs = [ alcotest ];
48+
49+ meta = with lib; {
50+ license = licenses.isc;
51+ description = "X.509 trust anchors extracted from Mozilla's NSS";
52+ maintainers = [ maintainers.sternenseemann ];
53+ homepage = "https://github.com/mirage/ca-certs-nss";
54+ };
55+}
pkgs/development/ocaml-modules/ca-certs/default.nix+8−4
@@ -1,24 +1,28 @@
11{ lib, buildDunePackage, fetchurl
22, bos, fpath, rresult, ptime, mirage-crypto, x509, astring, logs
3+, cacert, alcotest
34}:
45
56buildDunePackage rec {
67 pname = "ca-certs";
7− version = "0.2.0";
8+ version = "0.2.1";
89
910 minimumOCamlVersion = "4.07";
1011
1112 src = fetchurl {
1213 url = "https://github.com/mirage/ca-certs/releases/download/v${version}/ca-certs-v${version}.tbz";
13− sha256 = "15jfb5zvahs90jsfs7ridqihlka5198z2xrvplj8ddchxfmpx868";
14+ sha256 = "d43109496a5129feff967d557c556af96f8b10456896a405c43b7cf0c35d0af3";
1415 };
1516
1617 useDune2 = true;
1718
1819 propagatedBuildInputs = [ bos fpath rresult ptime mirage-crypto x509 astring logs ];
1920
20− # tests need access to network and systemwide ca cert chain
21− doCheck = false;
21+ doCheck = true;
22+ checkInputs = [
23+ cacert # for /etc/ssl/certs/ca-bundle.crt
24+ alcotest
25+ ];
2226
2327 meta = with lib; {
2428 description = "Detect root CA certificates from the operating system";
pkgs/development/ocaml-modules/carton/default.nix+3−3
@@ -7,19 +7,19 @@
77
88buildDunePackage rec {
99 pname = "carton";
10− version = "0.4.0";
10+ version = "0.4.1";
1111
1212 useDune2 = true;
1313 minimumOCamlVersion = "4.08";
1414
1515 src = fetchurl {
1616 url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/${pname}-${pname}-v${version}.tbz";
17− sha256 = "777f9692b83cd63570c17527a32c5045818ab9242d923cbbde72fc23d0da0140";
17+ sha256 = "d16aad5560d9ab1e3b4d93d2e8fdea638c216ff47338fb630a8aefd22b452665";
1818 };
1919
2020 # remove changelogs for mimic and the git* packages
2121 postPatch = ''
22− rm CHANGES.md CHANGES.mimic.md
22+ rm CHANGES.md
2323 '';
2424
2525 buildInputs = [
pkgs/development/ocaml-modules/checkseum/default.nix+31−8
@@ -1,23 +1,46 @@
1−{ lib, fetchurl, buildDunePackage, dune-configurator
1+{ lib, fetchurl, buildDunePackage, dune-configurator, pkg-config
22, bigarray-compat, optint
3−, fmt, rresult
4−, alcotest
3+, fmt, rresult, bos, fpath, astring, alcotest
4+, withFreestanding ? false
5+, ocaml-freestanding
56}:
67
78buildDunePackage rec {
8− version = "0.2.1";
9+ version = "0.3.1";
910 pname = "checkseum";
1011
1112 useDune2 = true;
1213
14+ minimumOCamlVersion = "4.07";
15+
1316 src = fetchurl {
1417 url = "https://github.com/mirage/checkseum/releases/download/v${version}/checkseum-v${version}.tbz";
15− sha256 = "1swb44c64pcs4dh9ka9lig6d398qwwkd3kkiajicww6qk7jbh3n5";
18+ sha256 = "b9e4d054e17618b1faed8c0eb15afe0614b2f093e58b59a180bda4500a5d2da1";
1619 };
1720
18− buildInputs = [ dune-configurator fmt rresult ];
19− propagatedBuildInputs = [ bigarray-compat optint ];
20− checkInputs = lib.optionals doCheck [ alcotest ];
21+ patches = [
22+ ./makefile-no-opam.patch
23+ ];
24+
25+ nativeBuildInputs = [
26+ dune-configurator
27+ pkg-config
28+ ];
29+ propagatedBuildInputs = [
30+ bigarray-compat
31+ optint
32+ ] ++ lib.optionals withFreestanding [
33+ ocaml-freestanding
34+ ];
35+
36+ checkInputs = [
37+ alcotest
38+ bos
39+ astring
40+ fmt
41+ fpath
42+ rresult
43+ ];
2144
2245 doCheck = true;
2346
pkgs/development/ocaml-modules/checkseum/makefile-no-opam.patchnew file+12
@@ -0,0 +1,12 @@
1+diff --git a/freestanding/Makefile b/freestanding/Makefile
2+index d535050..bb286bd 100644
3+--- a/freestanding/Makefile
4++++ b/freestanding/Makefile
5+@@ -1,4 +1,6 @@
6+-PKG_CONFIG_PATH := $(shell opam config var prefix)/lib/pkgconfig
7++ifneq (, $(shell command -v opam))
8++PKG_CONFIG_PATH ?= $(shell opam var prefix)/lib/pkgconfig
9++endif
10+
11+ EXISTS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --exists ocaml-freestanding; echo $$?)
12+
pkgs/development/ocaml-modules/cohttp/async.nix+55−17
@@ -1,22 +1,60 @@
1−{ lib, buildDunePackage, async, cohttp, conduit-async, uri, ppx_sexp_conv
2−, logs, magic-mime }:
1+{ lib
2+, buildDunePackage
3+, ppx_sexp_conv
4+, base
5+, async
6+, async_kernel
7+, async_unix
8+, cohttp
9+, conduit-async
10+, uri
11+, uri-sexp
12+, logs
13+, fmt
14+, sexplib0
15+, ipaddr
16+, magic-mime
17+, ounit
18+, mirage-crypto
19+, core
20+}:
321
4−if !lib.versionAtLeast cohttp.version "0.99" then
5− cohttp
6−else if !lib.versionAtLeast async.version "0.13" then
7− throw "cohttp-async needs async-0.13 (hence OCaml >= 4.08)"
8−else
22+buildDunePackage {
23+ pname = "cohttp-async";
924
10− buildDunePackage {
11− pname = "cohttp-async";
12− useDune2 = true;
13− inherit (cohttp) version src;
25+ inherit (cohttp)
26+ version
27+ src
28+ minimumOCamlVersion
29+ useDune2
30+ ;
1431
15− buildInputs = [ ppx_sexp_conv ];
32+ buildInputs = [ ppx_sexp_conv ];
1633
17− propagatedBuildInputs = [ async cohttp conduit-async logs magic-mime uri ];
34+ propagatedBuildInputs = [
35+ cohttp
36+ conduit-async
37+ async_kernel
38+ async_unix
39+ async
40+ base
41+ magic-mime
42+ logs
43+ fmt
44+ sexplib0
45+ uri
46+ uri-sexp
47+ ipaddr
48+ ];
1849
19− meta = cohttp.meta // {
20− description = "CoHTTP implementation for the Async concurrency library";
21− };
22− }
50+ doCheck = true;
51+ checkInputs = [
52+ ounit
53+ mirage-crypto
54+ core
55+ ];
56+
57+ meta = cohttp.meta // {
58+ description = "CoHTTP implementation for the Async concurrency library";
59+ };
60+}
pkgs/development/ocaml-modules/cohttp/default.nix+6−7
@@ -1,25 +1,24 @@
11{ lib, fetchurl, buildDunePackage
2−, ppx_fields_conv, ppx_sexp_conv, stdlib-shims
3−, base64, fieldslib, jsonm, re, stringext, uri-sexp
2+, ppx_sexp_conv, base64, jsonm, re, stringext, uri-sexp
43, ocaml, fmt, alcotest
54}:
65
76buildDunePackage rec {
87 pname = "cohttp";
9− version = "2.5.5";
8+ version = "4.0.0";
109
1110 useDune2 = true;
1211
13− minimumOCamlVersion = "4.04.1";
12+ minimumOCamlVersion = "4.08";
1413
1514 src = fetchurl {
1615 url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-v${version}.tbz";
17− sha256 = "0ywmql4lp6ps2gd064ixbjzsdnnn5vk3pipm005sswl553qqwaim";
16+ sha256 = "bd7aa4cd2c82744990ed7c49e3ee7a40324c64cb3d8509804809155e2bacd1d2";
1817 };
1918
20− buildInputs = [ jsonm ppx_fields_conv ppx_sexp_conv ];
19+ buildInputs = [ jsonm ppx_sexp_conv ];
2120
22− propagatedBuildInputs = [ base64 fieldslib re stringext uri-sexp stdlib-shims ];
21+ propagatedBuildInputs = [ base64 re stringext uri-sexp ];
2322
2423 doCheck = lib.versionAtLeast ocaml.version "4.05";
2524 checkInputs = [ fmt alcotest ];
pkgs/development/ocaml-modules/cohttp/lwt-unix.nix+17−8
@@ -1,19 +1,28 @@
11{ lib, buildDunePackage, cohttp-lwt
2−, conduit-lwt-unix, ppx_sexp_conv
3−, cmdliner, fmt, magic-mime
2+, conduit-lwt-unix, conduit-lwt, ppx_sexp_conv
3+, cmdliner, fmt, logs, magic-mime
4+, ounit
5+, cacert
46}:
57
6−if !lib.versionAtLeast cohttp-lwt.version "0.99"
7−then cohttp-lwt
8−else
9−
108buildDunePackage {
119 pname = "cohttp-lwt-unix";
12− inherit (cohttp-lwt) version src meta;
10+ inherit (cohttp-lwt) version src;
1311
1412 useDune2 = true;
1513
1614 buildInputs = [ cmdliner ppx_sexp_conv ];
1715
18− propagatedBuildInputs = [ cohttp-lwt conduit-lwt-unix fmt magic-mime ];
16+ propagatedBuildInputs = [
17+ cohttp-lwt conduit-lwt conduit-lwt-unix fmt logs magic-mime
18+ ];
19+
20+ # TODO(@sternenseemann): fail for unknown reason
21+ # https://github.com/mirage/ocaml-cohttp/issues/675#issuecomment-830692742
22+ doCheck = false;
23+ checkInputs = [ ounit cacert ];
24+
25+ meta = cohttp-lwt.meta // {
26+ description = "CoHTTP implementation for Unix and Windows using Lwt";
27+ };
1928}
pkgs/development/ocaml-modules/cohttp/lwt.nix+15−10
@@ -1,16 +1,21 @@
1−{ lib, buildDunePackage, cohttp, ocaml_lwt, uri, ppx_sexp_conv, logs }:
2−
3−if !lib.versionAtLeast cohttp.version "0.99"
4−then cohttp
5−else if !lib.versionAtLeast ppx_sexp_conv.version "0.13"
6−then throw "cohttp-lwt is not available for ppx_sexp_conv version ${ppx_sexp_conv.version}"
7−else
1+{ lib, buildDunePackage, cohttp, ocaml_lwt, uri, ppx_sexp_conv, logs, sexplib0 }:
82
93buildDunePackage {
104 pname = "cohttp-lwt";
11− inherit (cohttp) version src useDune2 meta;
5+ inherit (cohttp)
6+ version
7+ src
8+ useDune2
9+ minimumOCamlVersion
10+ ;
11+
12+ buildInputs = [ ppx_sexp_conv ];
1213
13− buildInputs = [ uri ppx_sexp_conv ];
14+ propagatedBuildInputs = [
15+ cohttp ocaml_lwt logs sexplib0 uri
16+ ];
1417
15− propagatedBuildInputs = [ cohttp ocaml_lwt logs ];
18+ meta = cohttp.meta // {
19+ description = "CoHTTP implementation using the Lwt concurrency library";
20+ };
1621}
pkgs/development/ocaml-modules/cohttp/mirage.nix+3
@@ -2,6 +2,7 @@
22, mirage-flow, mirage-channel, mirage-kv
33, conduit, conduit-mirage, lwt
44, astring, magic-mime
5+, ppx_sexp_conv
56}:
67
78buildDunePackage {
@@ -9,6 +10,8 @@ buildDunePackage {
910
1011 inherit (cohttp) version src minimumOCamlVersion useDune2;
1112
13+ nativeBuildInputs = [ ppx_sexp_conv ];
14+
1215 propagatedBuildInputs = [
1316 mirage-flow mirage-channel conduit conduit-mirage mirage-kv
1417 lwt cohttp cohttp-lwt astring magic-mime
pkgs/development/ocaml-modules/conduit/async.nix+9−9
@@ -1,17 +1,17 @@
1−{ lib, buildDunePackage, async, async_ssl, ppx_sexp_conv, conduit }:
2−
3−if !lib.versionAtLeast conduit.version "1.0"
4−then conduit
5−else
1+{ lib, buildDunePackage, async, async_ssl, ppx_sexp_conv, ppx_here, uri, conduit }:
62
73buildDunePackage {
84 pname = "conduit-async";
9− useDune2 = true;
10− inherit (conduit) version src;
5+ inherit (conduit)
6+ version
7+ src
8+ minimumOCamlVersion
9+ useDune2
10+ ;
1111
12− buildInputs = [ ppx_sexp_conv ];
12+ buildInputs = [ ppx_sexp_conv ppx_here ];
1313
14− propagatedBuildInputs = [ async async_ssl conduit ];
14+ propagatedBuildInputs = [ async async_ssl conduit uri ];
1515
1616 meta = conduit.meta // {
1717 description = "A network connection establishment library for Async";
pkgs/development/ocaml-modules/conduit/default.nix+5−5
@@ -5,18 +5,18 @@
55
66buildDunePackage rec {
77 pname = "conduit";
8− version = "2.2.2";
8+ version = "4.0.0";
99 useDune2 = true;
1010
11− minimumOCamlVersion = "4.07";
11+ minimumOCamlVersion = "4.03";
1212
1313 src = fetchurl {
14− url = "https://github.com/mirage/ocaml-conduit/releases/download/v2.2.2/conduit-v2.2.2.tbz";
15− sha256 = "1zb83w2pq9c8xrappfxa6y5q93772f5dj22x78camsm77a2c2z55";
14+ url = "https://github.com/mirage/ocaml-conduit/releases/download/v${version}/conduit-v${version}.tbz";
15+ sha256 = "74b29d72bf47adc5d5c4cae6130ad5a2a4923118b9c571331bd1cb3c56decd2a";
1616 };
1717
1818 buildInputs = [ ppx_sexp_conv ];
19− propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ];
19+ propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri logs ];
2020
2121 meta = {
2222 description = "A network connection establishment library";
pkgs/development/ocaml-modules/conduit/lwt-unix.nix+20−7
@@ -1,18 +1,31 @@
11{ buildDunePackage
2−, conduit-lwt, ppx_sexp_conv, ocaml_lwt, uri, ipaddr, ipaddr-sexp
3−, lwt_ssl, tls
2+, conduit-lwt, ppx_sexp_conv, ocaml_lwt, uri, ipaddr, ipaddr-sexp, ca-certs, logs
3+, lwt_ssl, tls, lwt_log, ssl
44}:
55
66buildDunePackage {
77 pname = "conduit-lwt-unix";
8− inherit (conduit-lwt) version src minimumOCamlVersion;
9−
10− useDune2 = true;
8+ inherit (conduit-lwt) version src minimumOCamlVersion useDune2;
119
1210 buildInputs = [ ppx_sexp_conv ];
1311
14− propagatedBuildInputs =
15− [ conduit-lwt ocaml_lwt uri ipaddr ipaddr-sexp tls lwt_ssl ];
12+ propagatedBuildInputs = [
13+ conduit-lwt
14+ ocaml_lwt
15+ uri
16+ ipaddr
17+ ipaddr-sexp
18+ tls
19+ ca-certs
20+ logs
21+ lwt_ssl
22+ ];
23+
24+ doCheck = true;
25+ checkInputs = [
26+ lwt_log
27+ ssl
28+ ];
1629
1730 meta = conduit-lwt.meta // {
1831 description = "A network connection establishment library for Lwt_unix";
pkgs/development/ocaml-modules/conduit/mirage.nix+4−3
@@ -1,7 +1,8 @@
11{ buildDunePackage, conduit-lwt
2−, ppx_sexp_conv, sexplib, cstruct, mirage-stack, mirage-flow
2+, ppx_sexp_conv, sexplib, uri, cstruct, mirage-stack, mirage-flow
33, mirage-flow-combinators, mirage-random, mirage-time, mirage-clock
44, dns-client, vchan, xenstore, tls, tls-mirage, ipaddr, ipaddr-sexp
5+, tcpip, ca-certs-nss
56}:
67
78buildDunePackage {
@@ -12,10 +13,10 @@ buildDunePackage {
1213 nativeBuildInputs = [ ppx_sexp_conv ];
1314
1415 propagatedBuildInputs = [
15− sexplib cstruct mirage-stack mirage-clock mirage-flow
16+ sexplib uri cstruct mirage-stack mirage-clock mirage-flow
1617 mirage-flow-combinators mirage-random mirage-time
1718 dns-client conduit-lwt vchan xenstore tls tls-mirage
18− ipaddr ipaddr-sexp
19+ ipaddr ipaddr-sexp tcpip ca-certs-nss
1920 ];
2021
2122 meta = conduit-lwt.meta // {
pkgs/development/ocaml-modules/curly/default.nix+4−2
@@ -1,5 +1,6 @@
11{ stdenv, lib, buildDunePackage, fetchurl, ocaml
2−, result, alcotest, cohttp-lwt-unix, odoc, curl }:
2+, result, alcotest, cohttp-lwt-unix, odoc, curl, cacert
3+}:
34
45buildDunePackage rec {
56 pname = "curly";
@@ -15,8 +16,9 @@ buildDunePackage rec {
1516 };
1617
1718 propagatedBuildInputs = [ result ];
18− checkInputs = [ alcotest cohttp-lwt-unix ];
19+ checkInputs = [ alcotest cohttp-lwt-unix cacert ];
1920 # test dependencies are only available for >= 4.08
21+ # https://github.com/mirage/ca-certs/issues/16
2022 doCheck = lib.versionAtLeast ocaml.version "4.08"
2123 # Some test fails in macOS sandbox
2224 # > Fatal error: exception Unix.Unix_error(Unix.EPERM, "bind", "")
pkgs/development/ocaml-modules/decompress/default.nix+2−2
@@ -4,7 +4,7 @@
44}:
55
66buildDunePackage rec {
7− version = "1.3.0";
7+ version = "1.4.0";
88 pname = "decompress";
99
1010 minimumOCamlVersion = "4.07";
@@ -13,7 +13,7 @@ buildDunePackage rec {
1313
1414 src = fetchurl {
1515 url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz";
16− sha256 = "de149896939be13fedec46a4581121d5ab74850a2241d08e6aa8ae4bb18c52c4";
16+ sha256 = "d1669e07446d73dd5e16f020d4a1682abcbb1b7a1e3bf19b805429636c26a19b";
1717 };
1818
1919 buildInputs = [ cmdliner ];
pkgs/development/ocaml-modules/dns/certify.nix+2−2
@@ -1,6 +1,6 @@
11{ buildDunePackage, dns, dns-tsig, dns-mirage, randomconv, x509
22, mirage-random, mirage-time, mirage-clock, mirage-stack
3−, logs, mirage-crypto-pk, mirage-crypto-rng, tls, lwt
3+, logs, mirage-crypto-pk, mirage-crypto-rng, mirage-crypto-ec, lwt
44}:
55
66buildDunePackage {
@@ -21,7 +21,7 @@ buildDunePackage {
2121 logs
2222 mirage-crypto-pk
2323 mirage-crypto-rng
24− tls
24+ mirage-crypto-ec
2525 lwt
2626 ];
2727
pkgs/development/ocaml-modules/dns/default.nix+2−2
@@ -4,14 +4,14 @@
44
55buildDunePackage rec {
66 pname = "dns";
7− version = "4.6.3";
7+ version = "5.0.1";
88
99 useDune2 = true;
1010 minimumOCamlVersion = "4.07";
1111
1212 src = fetchurl {
1313 url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-v${version}.tbz";
14− sha256 = "0g7xw43jm5hv0w9lsnhhi0w3243mxl615cdsvz29yh39fcqvqsdy";
14+ sha256 = "72c0a1a91c8e409bd448c8e0ea28d16d13177c326aea403ee1c30ddcb5969adc";
1515 };
1616
1717 propagatedBuildInputs = [ rresult astring fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics ];
pkgs/development/ocaml-modules/git/cohttp-mirage.nixdeleted−18
@@ -1,18 +0,0 @@
1−{ lib, buildDunePackage
2−, git, mimic, cohttp-mirage, cohttp, cohttp-lwt
3−, fmt, lwt, result, rresult, uri
4−}:
5−
6−buildDunePackage {
7− pname = "git-cohttp-mirage";
8−
9− inherit (git) version src minimumOCamlVersion useDune2;
10−
11− propagatedBuildInputs = [
12− git mimic cohttp-mirage cohttp cohttp-lwt fmt lwt result rresult uri
13− ];
14−
15− meta = git.meta // {
16− description = "A package to use HTTP-based ocaml-git with MirageOS backend";
17− };
18−}
pkgs/development/ocaml-modules/git/default.nix+9−4
@@ -1,30 +1,35 @@
11{ stdenv, lib, fetchurl, buildDunePackage
22, alcotest, mtime, mirage-crypto-rng, tls, git-binary
33, angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt, checkseum
4−, fpath, ke, logs, lwt, ocamlgraph, uri, rresult, base64
4+, fpath, ke, logs, lwt, ocamlgraph, uri, rresult, base64, hxd
55, result, bigstringaf, optint, mirage-flow, domain-name, emile
66, mimic, carton, carton-lwt, carton-git, ipaddr, psq, crowbar, alcotest-lwt
77}:
88
99buildDunePackage rec {
1010 pname = "git";
11− version = "3.3.3";
11+ version = "3.4.0";
1212
1313 minimumOCamlVersion = "4.08";
1414 useDune2 = true;
1515
1616 src = fetchurl {
1717 url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
18− sha256 = "0j8pw9w74bfhrjsqr8zm8g7h1az94z9vg7qgc6z6649zm9yjiax3";
18+ sha256 = "6eef1240c7c85a8e495b82ef863c509ad41d75e0c45cf73c34ed1bdafd03413f";
1919 };
2020
21+ # remove changelog for the carton package
22+ postPatch = ''
23+ rm CHANGES.carton.md
24+ '';
25+
2126 buildInputs = [
2227 base64
2328 ];
2429 propagatedBuildInputs = [
2530 angstrom astring checkseum cstruct decompress digestif encore duff fmt fpath
2631 ke logs lwt ocamlgraph uri rresult result bigstringaf optint mirage-flow
27− domain-name emile mimic carton carton-lwt carton-git ipaddr psq
32+ domain-name emile mimic carton carton-lwt carton-git ipaddr psq hxd
2833 ];
2934 checkInputs = [
3035 alcotest alcotest-lwt mtime mirage-crypto-rng tls git-binary crowbar
pkgs/development/ocaml-modules/git/paf.nixnew file+49
@@ -0,0 +1,49 @@
1+{ lib, buildDunePackage
2+, git
3+, mimic
4+, paf
5+, ca-certs-nss
6+, cohttp
7+, cohttp-lwt
8+, fmt
9+, ipaddr
10+, logs
11+, lwt
12+, mirage-clock
13+, mirage-stack
14+, mirage-time
15+, result
16+, rresult
17+, tls
18+, uri
19+}:
20+
21+buildDunePackage {
22+ pname = "git-paf";
23+
24+ inherit (git) version src minimumOCamlVersion useDune2;
25+
26+ propagatedBuildInputs = [
27+ git
28+ mimic
29+ paf
30+ ca-certs-nss
31+ cohttp
32+ cohttp-lwt
33+ fmt
34+ lwt
35+ result
36+ rresult
37+ ipaddr
38+ logs
39+ mirage-clock
40+ mirage-stack
41+ mirage-time
42+ tls
43+ uri
44+ ];
45+
46+ meta = git.meta // {
47+ description = "A package to use HTTP-based ocaml-git with MirageOS backend";
48+ };
49+}
pkgs/development/ocaml-modules/git/unix.nix+8−3
@@ -6,7 +6,8 @@
66, tcpip, awa-mirage, mirage-flow
77, alcotest, alcotest-lwt, base64, cstruct
88, ke, mirage-crypto-rng, ocurl, git-binary
9−, ptime
9+, ptime, mimic, ca-certs-nss, tls, tls-mirage
10+, cacert
1011}:
1112
1213buildDunePackage {
@@ -24,10 +25,14 @@ buildDunePackage {
2425 fmt bos fpath uri digestif logs lwt
2526 astring cohttp-lwt-unix decompress
2627 domain-name ipaddr mtime mirage-flow
28+ cstruct ptime mimic ca-certs-nss
29+ tls tls-mirage
2730 ];
2831 checkInputs = [
29− alcotest alcotest-lwt base64 cstruct ke
30− mirage-crypto-rng ocurl git-binary ptime
32+ alcotest alcotest-lwt base64 ke
33+ mirage-crypto-rng git-binary
34+ cohttp-lwt-unix
35+ cacert # sets up NIX_SSL_CERT_FILE
3136 ];
3237 doCheck = true;
3338
pkgs/development/ocaml-modules/irmin/containers.nix+2−2
@@ -1,6 +1,6 @@
11{ buildDunePackage
22, irmin, irmin-unix, irmin-git, ppx_irmin, lwt, mtime
3−, alcotest, alcotest-lwt
3+, alcotest, alcotest-lwt, cacert
44}:
55
66buildDunePackage {
@@ -18,7 +18,7 @@ buildDunePackage {
1818
1919 doCheck = true;
2020 checkInputs = [
21− alcotest alcotest-lwt
21+ alcotest alcotest-lwt cacert
2222 ];
2323
2424 meta = ppx_irmin.meta // {
pkgs/development/ocaml-modules/irmin/git.nix+2−2
@@ -1,7 +1,7 @@
11{ lib, buildDunePackage
22, git, irmin, irmin-test, ppx_irmin, git-cohttp-unix, git-unix
33, digestif, cstruct, fmt, astring, fpath, logs, lwt, uri
4−, mtime, alcotest
4+, mtime, alcotest, cacert
55}:
66
77buildDunePackage {
@@ -26,7 +26,7 @@ buildDunePackage {
2626 uri
2727 ];
2828
29− checkInputs = [ mtime alcotest git-cohttp-unix git-unix irmin-test ];
29+ checkInputs = [ mtime alcotest git-cohttp-unix git-unix irmin-test cacert ];
3030
3131 doCheck = true;
3232
pkgs/development/ocaml-modules/irmin/graphql.nix+2−1
@@ -1,5 +1,5 @@
11{ lib, buildDunePackage, cohttp-lwt, graphql-cohttp, graphql-lwt, irmin
2−, alcotest, alcotest-lwt, logs, yojson, cohttp-lwt-unix
2+, alcotest, alcotest-lwt, logs, yojson, cohttp-lwt-unix, cacert
33}:
44
55buildDunePackage rec {
@@ -19,6 +19,7 @@ buildDunePackage rec {
1919 logs
2020 cohttp-lwt-unix
2121 yojson
22+ cacert
2223 ];
2324
2425 meta = irmin.meta // {
pkgs/development/ocaml-modules/irmin/http.nix+4−1
@@ -1,5 +1,6 @@
11{ lib, buildDunePackage, cohttp-lwt, irmin, webmachine
22, checkseum, git-unix, irmin-git, irmin-test, digestif, git-cohttp-unix
3+, cacert
34}:
45
56buildDunePackage rec {
@@ -12,7 +13,9 @@ buildDunePackage rec {
1213
1314 propagatedBuildInputs = [ cohttp-lwt irmin webmachine ];
1415
15− checkInputs = [ digestif checkseum git-cohttp-unix git-unix irmin-git irmin-test ];
16+ checkInputs = [
17+ digestif checkseum git-cohttp-unix git-unix irmin-git irmin-test cacert
18+ ];
1619
1720 doCheck = true;
1821
pkgs/development/ocaml-modules/irmin/mirage-git.nix+2−2
@@ -1,6 +1,6 @@
11{ buildDunePackage, irmin-mirage, irmin-git
22, mirage-kv, cohttp, conduit-lwt, conduit-mirage
3−, git-cohttp-mirage, fmt, git, lwt, mirage-clock, uri
3+, git-paf, fmt, git, lwt, mirage-clock, uri
44}:
55
66buildDunePackage {
@@ -15,7 +15,7 @@ buildDunePackage {
1515 cohttp
1616 conduit-lwt
1717 conduit-mirage
18− git-cohttp-mirage
18+ git-paf
1919 fmt
2020 git
2121 lwt
pkgs/development/ocaml-modules/irmin/ppx.nix+2−2
@@ -2,11 +2,11 @@
22
33buildDunePackage rec {
44 pname = "ppx_irmin";
5− version = "2.5.3";
5+ version = "2.6.0";
66
77 src = fetchurl {
88 url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz";
9− sha256 = "2c8ef24cc57379c3a138f121fea350ee7b6077abc22a4fdc6a47d0c81585f3f6";
9+ sha256 = "1db134221e82c424260a0e206b640fcb82902be35eea4137af2bcd9c98d3ac0f";
1010 };
1111
1212 minimumOCamlVersion = "4.08";
pkgs/development/ocaml-modules/irmin/unix.nix+4−2
@@ -1,7 +1,7 @@
11{ lib, buildDunePackage
22, checkseum, cmdliner, git-unix, git-cohttp-unix, yaml, fpath
33, irmin, irmin-fs, irmin-git, irmin-graphql, irmin-http
4−, irmin-pack, irmin-watcher, irmin-test
4+, irmin-pack, irmin-watcher, irmin-test, cacert
55}:
66
77buildDunePackage rec {
@@ -18,7 +18,9 @@ buildDunePackage rec {
1818 irmin-pack irmin-watcher git-cohttp-unix
1919 ];
2020
21− checkInputs = lib.optional doCheck irmin-test;
21+ checkInputs = [
22+ irmin-test cacert
23+ ];
2224
2325 doCheck = true;
2426
pkgs/development/ocaml-modules/letsencrypt/default.nix+2−2
@@ -31,11 +31,11 @@
3131
3232buildDunePackage rec {
3333 pname = "letsencrypt";
34− version = "0.2.4";
34+ version = "0.2.5";
3535
3636 src = fetchurl {
3737 url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-v${version}.tbz";
38− sha256 = "91c79828a50243804da29c17563c54d2d528a79207e5b874dce6a3e7fedf7567";
38+ sha256 = "6e3bbb5f593823d49e83e698c06cf9ed48818695ec8318507b311ae74731e607";
3939 };
4040
4141 minimumOCamlVersion = "4.08";
pkgs/development/ocaml-modules/mimic/default.nix+5−9
@@ -1,27 +1,23 @@
11{ lib, buildDunePackage, fetchurl
2−, fmt, mirage-flow, result, rresult, cstruct, logs, ke
2+, fmt, mirage-flow, result, rresult, cstruct, logs, ke, lwt
33, alcotest, alcotest-lwt, bigstringaf, bigarray-compat
44}:
55
66buildDunePackage rec {
77 pname = "mimic";
8− version = "0.0.2";
8+ version = "0.0.3";
99
1010 minimumOCamlVersion = "4.08";
1111 useDune2 = true;
1212
1313 src = fetchurl {
14− url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/${pname}-${pname}-v${version}.tbz";
15− sha256 = "3ad5af3caa1120ecfdf022de41ba5be8edfbf50270fc99238b82d3d2d6e7c317";
14+ url = "https://github.com/dinosaure/mimic/releases/download/${version}/mimic-${version}.tbz";
15+ sha256 = "e4743cd2e4f8242eb1ce9d8086fd2affba0eb6a62131309ffa279108bd3dbbcb";
1616 };
1717
18− # don't install changelogs for other packages
19− postPatch = ''
20− rm -f CHANGES.md CHANGES.carton.md
21− '';
22−
2318 propagatedBuildInputs = [
2419 fmt
20+ lwt
2521 mirage-flow
2622 result
2723 rresult
pkgs/development/ocaml-modules/mirage/runtime.nix+2−2
@@ -3,7 +3,7 @@
33
44buildDunePackage rec {
55 pname = "mirage-runtime";
6− version = "3.10.1";
6+ version = "3.10.3";
77
88 useDune2 = true;
99
@@ -11,7 +11,7 @@ buildDunePackage rec {
1111
1212 src = fetchurl {
1313 url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-v${version}.tbz";
14− sha256 = "1glmsz2znhfkk4w6d6nsr7q5jqvivhmi8zwagzw2d8pah0c8bhm4";
14+ sha256 = "7c8059ef9e330eaef1ed51c0d89afe17900310f8083a426cd8099602222c2281";
1515 };
1616
1717 propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs ocaml_lwt ];
pkgs/development/ocaml-modules/optint/default.nix+3−3
@@ -1,12 +1,12 @@
11{ lib, buildDunePackage, fetchurl }:
22
33buildDunePackage rec {
4− minimumOCamlVersion = "4.03";
5− version = "0.0.4";
4+ minimumOCamlVersion = "4.07";
5+ version = "0.1.0";
66 pname = "optint";
77 src = fetchurl {
88 url = "https://github.com/mirage/optint/releases/download/v${version}/optint-v${version}.tbz";
9− sha256 = "1a7gabxqmfvii8qnxq1clx43md2h9glskxhac8y8r0rhzblx3s1a";
9+ sha256 = "27847660223c16cc7eaf8fcd9d5589a0b802114330a2529578f8007d3b01185d";
1010 };
1111
1212 useDune2 = true;
pkgs/development/ocaml-modules/paf/default.nix+4−2
@@ -5,6 +5,7 @@
55, mirage-stack
66, mirage-time
77, httpaf
8+, h2
89, tls-mirage
910, mimic
1011, cohttp-lwt
@@ -31,11 +32,11 @@
3132
3233buildDunePackage rec {
3334 pname = "paf";
34− version = "0.0.1";
35+ version = "0.0.3";
3536
3637 src = fetchurl {
3738 url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz";
38− sha256 = "7a794c21ce458bda302553b0f5ac128c067579fbb3b7b8fba9b410446c43e790";
39+ sha256 = "a0bbb84b19e1f0255337fc4d7017f3ea3611b241746e391b11c1d8b1f5f30a2b";
3940 };
4041
4142 useDune2 = true;
@@ -45,6 +46,7 @@ buildDunePackage rec {
4546 mirage-stack
4647 mirage-time
4748 httpaf
49+ h2
4850 tls-mirage
4951 mimic
5052 cohttp-lwt
pkgs/development/ocaml-modules/tls/default.nix+6−6
@@ -1,17 +1,17 @@
11{ lib, fetchurl, buildDunePackage, ppx_sexp_conv, ppx_cstruct, cstruct
22, cstruct-sexp, sexplib, mirage-crypto, mirage-crypto-pk, mirage-crypto-rng
3−, x509, domain-name, fmt, cstruct-unix, ounit2, ocaml_lwt, ptime
4−, hacl_x25519, fiat-p256, hkdf, logs, alcotest }:
3+, x509, domain-name, fmt, cstruct-unix, ounit2, ocaml_lwt, ptime, rresult
4+, mirage-crypto-ec, hkdf, logs, alcotest }:
55
66buildDunePackage rec {
77 minimumOCamlVersion = "4.08";
88
9− version = "0.12.8";
9+ version = "0.13.1";
1010 pname = "tls";
1111
1212 src = fetchurl {
1313 url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz";
14− sha256 = "0sgppvfnamfnsglw1cl801i1xqkxbs33g40kwmmqj2vqjcarm26a";
14+ sha256 = "ca95fa59a82f7d38b0b495fc0cd1ff54e7728492a292895d0067c1ba9de81b7b";
1515 };
1616
1717 useDune2 = true;
@@ -21,8 +21,8 @@ buildDunePackage rec {
2121
2222 propagatedBuildInputs = [ ppx_sexp_conv ppx_cstruct cstruct cstruct-sexp
2323 sexplib mirage-crypto mirage-crypto-pk mirage-crypto-rng
24− x509 domain-name fmt ocaml_lwt ptime hacl_x25519 fiat-p256
25− hkdf logs ];
24+ x509 domain-name fmt ocaml_lwt ptime mirage-crypto-ec
25+ hkdf logs rresult ];
2626
2727 meta = with lib; {
2828 homepage = "https://github.com/mirleft/ocaml-tls";
pkgs/development/ocaml-modules/tls/mirage.nix+2−3
@@ -1,6 +1,6 @@
11{ buildDunePackage, tls
22, x509, lwt, fmt, mirage-flow, mirage-kv, mirage-clock, ptime
3−, mirage-crypto, mirage-crypto-pk, hacl_x25519, fiat-p256
3+, mirage-crypto, mirage-crypto-pk, mirage-crypto-ec
44}:
55
66buildDunePackage {
@@ -19,8 +19,7 @@ buildDunePackage {
1919 ptime
2020 mirage-crypto
2121 mirage-crypto-pk
22− hacl_x25519
23− fiat-p256
22+ mirage-crypto-ec
2423 ];
2524
2625 meta = tls.meta // {
pkgs/development/ocaml-modules/x509/default.nix+2−2
@@ -8,11 +8,11 @@ buildDunePackage rec {
88 minimumOCamlVersion = "4.07";
99
1010 pname = "x509";
11− version = "0.12.0";
11+ version = "0.13.0";
1212
1313 src = fetchurl {
1414 url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-v${version}.tbz";
15− sha256 = "04g59j8sn8am0z0a94h8cyvr6cqzd5gkn2lj6g51nb5dkwajj19h";
15+ sha256 = "4577c2a616bda45cc777869fc44e272397d63a029135a993df8937bcfd6f6c49";
1616 };
1717
1818 useDune2 = true;
pkgs/top-level/ocaml-packages.nix+3−1
@@ -82,6 +82,8 @@ let
8282
8383 ca-certs = callPackage ../development/ocaml-modules/ca-certs { };
8484
85+ ca-certs-nss = callPackage ../development/ocaml-modules/ca-certs-nss { };
86+
8587 carton = callPackage ../development/ocaml-modules/carton { };
8688
8789 carton-git = callPackage ../development/ocaml-modules/carton/git.nix { };
@@ -457,7 +459,7 @@ let
457459
458460 git-cohttp-unix = callPackage ../development/ocaml-modules/git/cohttp-unix.nix { };
459461
460− git-cohttp-mirage = callPackage ../development/ocaml-modules/git/cohttp-mirage.nix { };
462+ git-paf = callPackage ../development/ocaml-modules/git/paf.nix { };
461463
462464 git-unix = callPackage ../development/ocaml-modules/git/unix.nix {
463465 git-binary = pkgs.git;