mrrl

commit ed9b9dbcb3f227b30f38cfaa40d3d37bcebec09e
parent 6ad40787ff1a34b580f658e3a307a3fa1ad75819
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Tue,  4 Nov 2025 01:42:25 +0000

ocaml packages

Diffstat:
M
templates/pkg/ocaml-findlib
 | 
2
++
M
variants/ccx-x86_64/ocaml-astring
 | 
4
++--
M
variants/ccx-x86_64/ocaml-bos
 | 
8
++++----
M
variants/ccx-x86_64/ocaml-findlib
 | 
2
++
M
variants/ccx-x86_64/ocaml-rresult
 | 
4
++--
M
variants/ccx-x86_64/ocaml-topkg
 | 
2
+-
M
variants/ccx-x86_64/wip.environment
 | 
4
++--
M
variants/root-x86_64/ocaml-astring
 | 
4
++--
M
variants/root-x86_64/ocaml-bos
 | 
8
++++----
M
variants/root-x86_64/ocaml-findlib
 | 
2
++
M
variants/root-x86_64/ocaml-rresult
 | 
4
++--
M
variants/root-x86_64/ocaml-topkg
 | 
2
+-
M
variants/root-x86_64/wip.environment
 | 
4
++--

13 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/templates/pkg/ocaml-findlib b/templates/pkg/ocaml-findlib
@@ -27,6 +27,8 @@ make -j1 all opt
 
 {% endblock build %}
 {% block install -%}
+# workaround `topfind` getting installed to stdlib directory, this is not configurable
+ln -s "$pthbs_package" "$pthbs_destdir{{pkg_install_dir("ocaml")}}"
 make install prefix="$pthbs_destdir"
 
 {% endblock install %}
diff --git a/variants/ccx-x86_64/ocaml-astring b/variants/ccx-x86_64/ocaml-astring
@@ -5,10 +5,10 @@
 #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8
 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f
 #+ocaml.b8790b4e31ab26a55165b60c745d8789addca32a91a851444cbf36abe8c19dc5
-#+ocaml-findlib.5c4dc096bca3b6c0d58218707f3e6e6fd368bf90947850b207a0d904b8ec7636
+#+ocaml-findlib.17e7dd92523f81671779b9a8cd70af19cd52da4c6869a427fed36af4a2e4532a
 #+ocamlbuild.af1e7c1126b473143018d4844d1142ae30a23db6b8c435f28ba21bbe015b03f8
 #+opam.714997e34c97a27678ee9a24f03256bbda3ac9e44597b10f56c795f37a17e989
-#+ocaml-topkg.78e0e6d8b8dc24378f724b748eabc8bb6f3efc1505f1a0eb69002e27d99823ce
+#+ocaml-topkg.980b4538b54e744b4a3e65ba1b1693ea0ca2a8548f2a846428a7214bc5401cad
 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-bos b/variants/ccx-x86_64/ocaml-bos
@@ -5,12 +5,12 @@
 #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8
 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f
 #+ocaml.b8790b4e31ab26a55165b60c745d8789addca32a91a851444cbf36abe8c19dc5
-#+ocaml-findlib.5c4dc096bca3b6c0d58218707f3e6e6fd368bf90947850b207a0d904b8ec7636
+#+ocaml-findlib.17e7dd92523f81671779b9a8cd70af19cd52da4c6869a427fed36af4a2e4532a
 #+ocamlbuild.af1e7c1126b473143018d4844d1142ae30a23db6b8c435f28ba21bbe015b03f8
 #+opam.714997e34c97a27678ee9a24f03256bbda3ac9e44597b10f56c795f37a17e989
-#+ocaml-topkg.78e0e6d8b8dc24378f724b748eabc8bb6f3efc1505f1a0eb69002e27d99823ce
-#+ocaml-astring.3323761d07fa2e26f6eda1a8b752605fc00ae81c05cd5f3331bca4afbcef1086
-#+ocaml-rresult.bde8cfdb1c1b1447d2d5907c88a4caeee271b16602e9bb09591cc6bf9a43a774
+#+ocaml-topkg.980b4538b54e744b4a3e65ba1b1693ea0ca2a8548f2a846428a7214bc5401cad
+#+ocaml-astring.b087c541e4c194bc3110449c663c2b7f27a5203d729b76f2e82929fb14ffcd04
+#+ocaml-rresult.93263b411bb73baed4a8ee58745bae93668b1d78b48352e22e47418c2424f784
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-findlib b/variants/ccx-x86_64/ocaml-findlib
@@ -44,6 +44,8 @@ cd 'findlib-1.9.8'
 
 make -j1 all opt
 
+# workaround `topfind` getting installed to stdlib directory, this is not configurable
+ln -s "$pthbs_package" "$pthbs_destdir/home/ccx/versions/ocaml.b8790b4e31ab26a55165b60c745d8789addca32a91a851444cbf36abe8c19dc5"
 make install prefix="$pthbs_destdir"
 
 
diff --git a/variants/ccx-x86_64/ocaml-rresult b/variants/ccx-x86_64/ocaml-rresult
@@ -5,10 +5,10 @@
 #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8
 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f
 #+ocaml.b8790b4e31ab26a55165b60c745d8789addca32a91a851444cbf36abe8c19dc5
-#+ocaml-findlib.5c4dc096bca3b6c0d58218707f3e6e6fd368bf90947850b207a0d904b8ec7636
+#+ocaml-findlib.17e7dd92523f81671779b9a8cd70af19cd52da4c6869a427fed36af4a2e4532a
 #+ocamlbuild.af1e7c1126b473143018d4844d1142ae30a23db6b8c435f28ba21bbe015b03f8
 #+opam.714997e34c97a27678ee9a24f03256bbda3ac9e44597b10f56c795f37a17e989
-#+ocaml-topkg.78e0e6d8b8dc24378f724b748eabc8bb6f3efc1505f1a0eb69002e27d99823ce
+#+ocaml-topkg.980b4538b54e744b4a3e65ba1b1693ea0ca2a8548f2a846428a7214bc5401cad
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-topkg b/variants/ccx-x86_64/ocaml-topkg
@@ -5,7 +5,7 @@
 #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8
 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f
 #+ocaml.b8790b4e31ab26a55165b60c745d8789addca32a91a851444cbf36abe8c19dc5
-#+ocaml-findlib.5c4dc096bca3b6c0d58218707f3e6e6fd368bf90947850b207a0d904b8ec7636
+#+ocaml-findlib.17e7dd92523f81671779b9a8cd70af19cd52da4c6869a427fed36af4a2e4532a
 #+ocamlbuild.af1e7c1126b473143018d4844d1142ae30a23db6b8c435f28ba21bbe015b03f8
 #+opam.714997e34c97a27678ee9a24f03256bbda3ac9e44597b10f56c795f37a17e989
 #@untar:-j:sha256:452082626e651ac4b1633c2b4ae4cad7abeb1fb6a13046e699f95eec58b5d1c7:.
diff --git a/variants/ccx-x86_64/wip.environment b/variants/ccx-x86_64/wip.environment
@@ -4,4 +4,4 @@
 #+ocamlbuild.af1e7c1126b473143018d4844d1142ae30a23db6b8c435f28ba21bbe015b03f8
 #+ocaml-base.6f21ed59c1615888f40f14b4362c60d1043053ba17c1be3fe604d54b69b82081
 #+opam.714997e34c97a27678ee9a24f03256bbda3ac9e44597b10f56c795f37a17e989
-#+ocaml-bos.0cbb5a97c8f83e78eb2aa5cdbba77b3c25e93bdaafc5e6c00e9693de8d08fa3e-
\ No newline at end of file
+#+ocaml-bos.8b0a8baba8f6f0197683a7fdf4c3932e426032b1bc600844ce3a154788ffb6a7+
\ No newline at end of file
diff --git a/variants/root-x86_64/ocaml-astring b/variants/root-x86_64/ocaml-astring
@@ -5,10 +5,10 @@
 #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc
 #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676
 #+ocaml.4b14d5c50c08207a0442af369f9995a12f6a15db8d8b0fd5247a982789fc3090
-#+ocaml-findlib.04309c5e083b0e20cc932f4fdb501691a4c46ad02cbb030dafe1b83671f59dda
+#+ocaml-findlib.da3c6e8cdab92fdea8305b1438434afbb9e70579f26ed2a3e81059c03a6ce386
 #+ocamlbuild.7dbc10e2fcb4197fa855b0d7ac0932a3c7920e53535a080407d725092501ef20
 #+opam.41ab4229b7606047164bfc9b9077da4555831edd67cf82d236ba1c6059bb9b96
-#+ocaml-topkg.50b1453dbd60817cc29c84861c9d0a87b4dfc12444118685f4b849f1e49d593b
+#+ocaml-topkg.0987876080339238102240cf92a7fc12eea584ad95e3e64d2c0e233714e81fa0
 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:.
 
 
diff --git a/variants/root-x86_64/ocaml-bos b/variants/root-x86_64/ocaml-bos
@@ -5,12 +5,12 @@
 #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc
 #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676
 #+ocaml.4b14d5c50c08207a0442af369f9995a12f6a15db8d8b0fd5247a982789fc3090
-#+ocaml-findlib.04309c5e083b0e20cc932f4fdb501691a4c46ad02cbb030dafe1b83671f59dda
+#+ocaml-findlib.da3c6e8cdab92fdea8305b1438434afbb9e70579f26ed2a3e81059c03a6ce386
 #+ocamlbuild.7dbc10e2fcb4197fa855b0d7ac0932a3c7920e53535a080407d725092501ef20
 #+opam.41ab4229b7606047164bfc9b9077da4555831edd67cf82d236ba1c6059bb9b96
-#+ocaml-topkg.50b1453dbd60817cc29c84861c9d0a87b4dfc12444118685f4b849f1e49d593b
-#+ocaml-astring.28c0ba20029acc773f5aaf802b9c2d4bc3ec6815f78534ca0065c283580ea241
-#+ocaml-rresult.7d124dc2e9a1e5cf7e6bb12a7ed1f839333959851fd704d889c154c8e9d6ed48
+#+ocaml-topkg.0987876080339238102240cf92a7fc12eea584ad95e3e64d2c0e233714e81fa0
+#+ocaml-astring.2069c9bf6d4b7481a21bc32e8cc76d2b8968c2a798abbe87127dcc39a50dc1ff
+#+ocaml-rresult.eb945811faf9d90aac83d1a9bd7aaf66be9852cea70a4ae249933f85b9e53af0
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
diff --git a/variants/root-x86_64/ocaml-findlib b/variants/root-x86_64/ocaml-findlib
@@ -44,6 +44,8 @@ cd 'findlib-1.9.8'
 
 make -j1 all opt
 
+# workaround `topfind` getting installed to stdlib directory, this is not configurable
+ln -s "$pthbs_package" "$pthbs_destdir/versions/ocaml.4b14d5c50c08207a0442af369f9995a12f6a15db8d8b0fd5247a982789fc3090"
 make install prefix="$pthbs_destdir"
 
 
diff --git a/variants/root-x86_64/ocaml-rresult b/variants/root-x86_64/ocaml-rresult
@@ -5,10 +5,10 @@
 #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc
 #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676
 #+ocaml.4b14d5c50c08207a0442af369f9995a12f6a15db8d8b0fd5247a982789fc3090
-#+ocaml-findlib.04309c5e083b0e20cc932f4fdb501691a4c46ad02cbb030dafe1b83671f59dda
+#+ocaml-findlib.da3c6e8cdab92fdea8305b1438434afbb9e70579f26ed2a3e81059c03a6ce386
 #+ocamlbuild.7dbc10e2fcb4197fa855b0d7ac0932a3c7920e53535a080407d725092501ef20
 #+opam.41ab4229b7606047164bfc9b9077da4555831edd67cf82d236ba1c6059bb9b96
-#+ocaml-topkg.50b1453dbd60817cc29c84861c9d0a87b4dfc12444118685f4b849f1e49d593b
+#+ocaml-topkg.0987876080339238102240cf92a7fc12eea584ad95e3e64d2c0e233714e81fa0
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
diff --git a/variants/root-x86_64/ocaml-topkg b/variants/root-x86_64/ocaml-topkg
@@ -5,7 +5,7 @@
 #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc
 #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676
 #+ocaml.4b14d5c50c08207a0442af369f9995a12f6a15db8d8b0fd5247a982789fc3090
-#+ocaml-findlib.04309c5e083b0e20cc932f4fdb501691a4c46ad02cbb030dafe1b83671f59dda
+#+ocaml-findlib.da3c6e8cdab92fdea8305b1438434afbb9e70579f26ed2a3e81059c03a6ce386
 #+ocamlbuild.7dbc10e2fcb4197fa855b0d7ac0932a3c7920e53535a080407d725092501ef20
 #+opam.41ab4229b7606047164bfc9b9077da4555831edd67cf82d236ba1c6059bb9b96
 #@untar:-j:sha256:452082626e651ac4b1633c2b4ae4cad7abeb1fb6a13046e699f95eec58b5d1c7:.
diff --git a/variants/root-x86_64/wip.environment b/variants/root-x86_64/wip.environment
@@ -4,4 +4,4 @@
 #+ocamlbuild.7dbc10e2fcb4197fa855b0d7ac0932a3c7920e53535a080407d725092501ef20
 #+ocaml-base.e5ace8983e084348e90d518c91ff918d0270001074c8c4890d93d7d0cc971120
 #+opam.41ab4229b7606047164bfc9b9077da4555831edd67cf82d236ba1c6059bb9b96
-#+ocaml-bos.055f07d5e230af7994a561f2ce257bec96c03956cb90548d886f7c77fc9d18cc-
\ No newline at end of file
+#+ocaml-bos.ce9abc118ea6ac71e465a3c198dbd0540c732c3df87cfa1e21fa646c0d986b70+
\ No newline at end of file