@@ -4,38 +4,11 @@ Date: Sat, 30 Mar 2024 22:44:15 -0400
44Subject: [PATCH] applied caqti+archive
55
66
7- diff --git a/flake.lock b/flake.lock
8- index c1271a6825..dff4183b0e 100644
9- --- a/flake.lock
10- +++ b/flake.lock
11- @@ -324,11 +324,11 @@
12- "opam-repository": {
13- "flake": false,
14- "locked": {
15- - "lastModified": 1708601497,
16- - "narHash": "sha256-mDYINTjOiYLN4wT5fGlWTvHFQdWkzY46XUuZWKgmJxY=",
17- + "lastModified": 1706815373,
18- + "narHash": "sha256-CiwJOt27w7ecb27gMddbVO1ATwWz+KB9upiGZ3TRHqU=",
19- "owner": "ocaml",
20- "repo": "opam-repository",
21- - "rev": "90d8c520a4f0b035ac51e267a8b33739c5a78b5a",
22- + "rev": "c2acc9437350903c72eab1fabf1e1b6f74134667",
23- "type": "github"
24- },
25- "original": {
267diff --git a/opam.export b/opam.export
27- index 655b623d35..d5a81b5465 100644
8+ index 655b623d35..130eb77140 100644
289--- a/opam.export
2910+++ b/opam.export
30- @@ -8,7 +8,6 @@ roots: [
31- "bitstring.4.1.0"
32- "camlp4.4.14+1"
33- "capnp.3.4.0"
34- - "check_opam_switch.~dev"
35- "cohttp-async.5.0.0"
36- "core_extended.v0.14.0"
37- "extlib.1.7.8"
38- @@ -69,11 +68,10 @@ installed: [
11+ @@ -69,9 +69,9 @@ installed: [
3912 "camlp4.4.14+1"
4013 "camomile.1.0.2"
4114 "capnp.3.4.0"
@@ -46,80 +19,24 @@ index 655b623d35..d5a81b5465 100644
4619+ "caqti-async.2.0.1"
4720+ "caqti-driver-postgresql.2.0.1"
4821 "charInfo_width.1.1.0"
49- - "check_opam_switch.~dev"
22+ "check_opam_switch.~dev"
5023 "cmdliner.1.0.3"
51- "cohttp.5.0.0"
52- "cohttp-async.5.0.0"
53- @@ -138,6 +136,7 @@ installed: [
24+ @@ -138,6 +138,7 @@ installed: [
5425 "lmdb.1.0"
5526 "logs.0.7.0"
5627 "lwt.5.4.0"
5728+ "lwt-dllist.1.0.1"
5829 "lwt_log.1.1.1"
5930 "lwt_react.1.1.2"
6031 "macaddr.5.0.1"
61- @@ -266,7 +265,6 @@ installed: [
62- pinned: [
63- "async_kernel.v0.14.0"
64- "capnp.3.4.0"
65- - "check_opam_switch.~dev"
66- "graphql_ppx.1.2.2"
67- "rpc_parallel.v0.14.0"
68- ]
69- @@ -350,42 +348,6 @@ Cap'n Proto is a multi-language code generation framework designed for
70- "sha256=03aac06742f3d4ec8a189f0db65d46393b7497e8637ece15c39ff4ec01117b8b"
71- }
72- }
73- - package "check_opam_switch" {
74- - opam-version: "2.0"
75- - version: "~dev"
76- - synopsis:
77- - "A tool to check that the current opam environment is up to date with an opam.export file"
78- - description:
79- - "A tool to check that the current opam environment is up to date with an opam.export file"
80- 81- - depends: [
82- - "dune" {>= "3.3"}
83- - "opam-core" {>= "2.0.0"}
84- - "opam-format" {>= "2.0.0"}
85- - "minicli" {>= "5.0.0"}
86- - "odoc" {with-doc}
87- - ]
88- - build: [
89- - ["dune" "subst"] {dev}
90- - [
91- - "dune"
92- - "build"
93- - "-p"
94- - name
95- - "-j"
96- - jobs
97- - "@install"
98- - "@runtest" {with-test}
99- - "@doc" {with-doc}
100- - ]
101- - ]
102- - url {
103- - src:
104- - "https://github.com/tweag/check_opam_switch/archive/d0aa49884e0f9fd4bbb2cd1a32b798a12f84b603.tar.gz"
105- - checksum:
106- - "sha256=24ab29ea4aff9da9d649f0b577c5d4e27ce2bef51058e139965cc9be25494a46"
107- - }
108- - }
109- package "graphql_ppx" {
110- opam-version: "2.0"
111- version: "1.2.2"
112- diff --git a/scripts/pin-external-packages.sh b/scripts/pin-external-packages.sh
113- index 84e615b527..f531d8e43d 100755
114- --- a/scripts/pin-external-packages.sh
115- +++ b/scripts/pin-external-packages.sh
116- @@ -10,3 +10,5 @@ for pkg in $PACKAGES; do
117- echo "Pinning package" $pkg
118- opam pin -y add src/external/$pkg
119- done
120- +
121- + opam pin add -y https://github.com/tweag/check_opam_switch.git#d0aa49884e0f9fd4bbb2cd1a32b798a12
122- \ No newline at end of file
32+ @@ -155,6 +156,7 @@ installed: [
33+ "mirage-crypto-rng.0.11.0"
34+ "mirage-crypto-rng-async.0.11.0"
35+ "mmap.1.1.0"
36+ + "mtime.2.0.0"
37+ "num.1.1"
38+ "ocaml.4.14.0"
39+ "ocaml-base-compiler.4.14.0"
12340diff --git a/src/app/archive/cli/archive_cli.ml b/src/app/archive/cli/archive_cli.ml
12441index 0868f63e37..e4cf825b0e 100644
12542--- a/src/app/archive/cli/archive_cli.ml
0 commit comments