commit c8428921d2e1202d88cde992a6a125a0254599b6
parent 41bca093b249b6c2dceb4d66f3059298ceae388c
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Wed, 22 Oct 2025 09:11:04 +0000
ocaml packages
Diffstat:
12 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/templates/pkg/dune b/templates/pkg/dune
@@ -7,6 +7,7 @@
#@untar:-z:sha256:579c738f8ca191ba0a9b22dbe78f1377542442c9827cf4939f8964f09f9edb28:.
{% endblock %}
{%- block prepare %}
+{{ super() }}
# This allows 'dune --version' to output the correct version instead of "n/a"
sed -i "/^(name dune)/a (version {{pkg_version}})" dune-project
# This enables dune-configurator to use the vendored csexp module
diff --git a/templates/pkg/ocaml-base b/templates/pkg/ocaml-base
@@ -4,6 +4,7 @@
{% block package_deps -%}
#+{{pkg_install_name("busybox-diffutils")}}
#+{{pkg_install_name("gnu-make")}}
+#+{{pkg_install_name("ocaml")}}
#+{{pkg_install_name("dune")}}
#@untar:-z:{{downloads["base-" + assertion(pkg_version) + ".tar.gz"]}}:.
{% endblock %}
diff --git a/templates/pkg/opam b/templates/pkg/opam
@@ -3,6 +3,7 @@
{% block package_deps -%}
#+{{pkg_install_name("busybox-diffutils")}}
#+{{pkg_install_name("gnu-make")}}
+#+{{pkg_install_name("ocaml")}}
#+{{pkg_install_name("dune")}}
#@untar:-z:{{downloads["opam-full-" + assertion(pkg_version) + ".tar.gz"]}}:.
{% endblock %}
diff --git a/templates/pkg/wip.environment b/templates/pkg/wip.environment
@@ -3,4 +3,5 @@
#+{{pkg_install_name("dune")}}
#+{{pkg_install_name("ocamlbuild")}}
#+{{pkg_install_name("ocaml-base")}}
+#+{{pkg_install_name("opam")}}
{#- #+{{pkg_install_name("ocaml-findlib")}} #}
diff --git a/variants/ccx-x86_64/dune b/variants/ccx-x86_64/dune
@@ -10,6 +10,10 @@
# - build script start -
+prefix=/home/ccx/versions/$pthbs_package
+dest=${pthbs_destdir%/}${prefix}
+cd 'dune-3.20.2'
+
# This allows 'dune --version' to output the correct version instead of "n/a"
sed -i "/^(name dune)/a (version 3.20.2)" dune-project
# This enables dune-configurator to use the vendored csexp module
diff --git a/variants/ccx-x86_64/ocaml-base b/variants/ccx-x86_64/ocaml-base
@@ -4,7 +4,8 @@
#+busybox-awk.5c33e58d30be821f0a1fc8ba082d0a34aaecacad2a1c3a8f25b05cd07b2c6dec
#+busybox-diffutils.89043788a08f3d90f6fc1e02d690f6e5eefa88e11c61a1fae5048e457e46eb6f
#+gnu-make.8b0f1b53392f1db9019f1d8e7ac20d3d9a58501db09a7ab0b2f81939fb4a81e3
-#+dune.89c382449ac23b592a6dad5b76c5d9339492743812d4a8d4762535fbdbacffe7
+#+ocaml.5b34db3f087fd067e8cf20c9806c599c52cf1d4564105f3841aa3594496ef578
+#+dune.3fb6520c0d983c32eda72b5313686b7c6790b4e18accfbc671593e6d6b2d5294
#@untar:-z:sha256:9bf9e503e2bd010325c7b0f5ae007ce1e5d3da61f0e06d2fbb64e9d12ccff93c:.
diff --git a/variants/ccx-x86_64/opam b/variants/ccx-x86_64/opam
@@ -4,7 +4,8 @@
#+busybox-awk.5c33e58d30be821f0a1fc8ba082d0a34aaecacad2a1c3a8f25b05cd07b2c6dec
#+busybox-diffutils.89043788a08f3d90f6fc1e02d690f6e5eefa88e11c61a1fae5048e457e46eb6f
#+gnu-make.8b0f1b53392f1db9019f1d8e7ac20d3d9a58501db09a7ab0b2f81939fb4a81e3
-#+dune.89c382449ac23b592a6dad5b76c5d9339492743812d4a8d4762535fbdbacffe7
+#+ocaml.5b34db3f087fd067e8cf20c9806c599c52cf1d4564105f3841aa3594496ef578
+#+dune.3fb6520c0d983c32eda72b5313686b7c6790b4e18accfbc671593e6d6b2d5294
#@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:.
@@ -27,7 +28,7 @@ cd 'opam-2.4.1'
--infodir="$prefix/info" \
--localedir="$prefix/locale" \
--localstatedir='/var/pthbs' \
- --with-dune='/home/ccx/versions/dune.89c382449ac23b592a6dad5b76c5d9339492743812d4a8d4762535fbdbacffe7/command/dune' \
+ --with-dune='/home/ccx/versions/dune.3fb6520c0d983c32eda72b5313686b7c6790b4e18accfbc671593e6d6b2d5294/command/dune' \
--with-mccs \
--with-vendored-deps
diff --git a/variants/ccx-x86_64/wip.environment b/variants/ccx-x86_64/wip.environment
@@ -1,5 +1,6 @@
#!/usr/bin/env pthbs-build
#+ocaml.5b34db3f087fd067e8cf20c9806c599c52cf1d4564105f3841aa3594496ef578
-#+dune.89c382449ac23b592a6dad5b76c5d9339492743812d4a8d4762535fbdbacffe7
+#+dune.3fb6520c0d983c32eda72b5313686b7c6790b4e18accfbc671593e6d6b2d5294
#+ocamlbuild.bc0dcc5465fec021273e3aced8531c2c40c0d06249ce95766c14fdbd1e2b6608
-#+ocaml-base.ebacc5fdaad89d4e0bb39bb76dc5945517531679436afa7f451271cff8fcf2dc-
\ No newline at end of file
+#+ocaml-base.bba7573f2ceefffbc7d2d4aa691db901378e6d978da5ffd84ce64d908cc03d2e
+#+opam.d986ea4a2531676adef59460846593dd963638e81492c7faa595f768f7888ece+
\ No newline at end of file
diff --git a/variants/root-x86_64/dune b/variants/root-x86_64/dune
@@ -10,6 +10,10 @@
# - build script start -
+prefix=/versions/$pthbs_package
+dest=${pthbs_destdir%/}${prefix}
+cd 'dune-3.20.2'
+
# This allows 'dune --version' to output the correct version instead of "n/a"
sed -i "/^(name dune)/a (version 3.20.2)" dune-project
# This enables dune-configurator to use the vendored csexp module
diff --git a/variants/root-x86_64/ocaml-base b/variants/root-x86_64/ocaml-base
@@ -4,7 +4,8 @@
#+busybox-awk.2db96ae9bd5ed9b9476bf92bb3bfae69caca475abd57385640428943edaa5fc5
#+busybox-diffutils.c5eee57596d172f36d2db9220e421b72e49a339032512dcaec3563e463e0786d
#+gnu-make.7c89ba8600db3ad1223a633a8783e077a4273e6371515d54d113a687898684c6
-#+dune.b068a60fd03c7e3430a7806029d31de91e5078867a215dd94af050646989fdcc
+#+ocaml.7dac3082b76965ebaab371cfb7848a931581faf39bda33a9701667cb7503f802
+#+dune.5e63bcbf1f46d89862745271417db6c8725525a27a3ac23a6f2f9e7253d31719
#@untar:-z:sha256:9bf9e503e2bd010325c7b0f5ae007ce1e5d3da61f0e06d2fbb64e9d12ccff93c:.
diff --git a/variants/root-x86_64/opam b/variants/root-x86_64/opam
@@ -4,7 +4,8 @@
#+busybox-awk.2db96ae9bd5ed9b9476bf92bb3bfae69caca475abd57385640428943edaa5fc5
#+busybox-diffutils.c5eee57596d172f36d2db9220e421b72e49a339032512dcaec3563e463e0786d
#+gnu-make.7c89ba8600db3ad1223a633a8783e077a4273e6371515d54d113a687898684c6
-#+dune.b068a60fd03c7e3430a7806029d31de91e5078867a215dd94af050646989fdcc
+#+ocaml.7dac3082b76965ebaab371cfb7848a931581faf39bda33a9701667cb7503f802
+#+dune.5e63bcbf1f46d89862745271417db6c8725525a27a3ac23a6f2f9e7253d31719
#@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:.
@@ -27,7 +28,7 @@ cd 'opam-2.4.1'
--infodir="$prefix/info" \
--localedir="$prefix/locale" \
--localstatedir='/var/pthbs' \
- --with-dune='/versions/dune.b068a60fd03c7e3430a7806029d31de91e5078867a215dd94af050646989fdcc/command/dune' \
+ --with-dune='/versions/dune.5e63bcbf1f46d89862745271417db6c8725525a27a3ac23a6f2f9e7253d31719/command/dune' \
--with-mccs \
--with-vendored-deps
diff --git a/variants/root-x86_64/wip.environment b/variants/root-x86_64/wip.environment
@@ -1,5 +1,6 @@
#!/usr/bin/env pthbs-build
#+ocaml.7dac3082b76965ebaab371cfb7848a931581faf39bda33a9701667cb7503f802
-#+dune.b068a60fd03c7e3430a7806029d31de91e5078867a215dd94af050646989fdcc
+#+dune.5e63bcbf1f46d89862745271417db6c8725525a27a3ac23a6f2f9e7253d31719
#+ocamlbuild.7eaa6dc8723366dd4c460566e807f1740d9b422033342b8edf8a18eca72a2b10
-#+ocaml-base.5bcb5f53c0c99e9d9a898ccd1cfd81231584507490e43e5b3451e53becfca08c-
\ No newline at end of file
+#+ocaml-base.def552fad28fcf2487047a03d1b4799a79d7312d10cc24fee91e2f16dbe1ff14
+#+opam.a03052d94938698270da4bd0ae498021379231678172a76de27b501605568c4d+
\ No newline at end of file
