commit 813a3464e9fdf2755164e36c488a95a89305c647
parent 2bb8dd553b1d9de92af9bc50c75dc2d32825f02b
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Wed, 22 Oct 2025 09:19:37 +0000
ocaml packagest
Diffstat:
10 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/templates/pkg/dune b/templates/pkg/dune
@@ -2,7 +2,7 @@
{% extends "genlinks" %}
{% block package_deps -%}
#+{{pkg_install_name("busybox-diffutils")}}
-#+{{pkg_install_name("gnu-make")}}
+#+{{pkg_install_name("musl-cross-make")}}
#+{{pkg_install_name("ocaml")}}
#@untar:-z:sha256:579c738f8ca191ba0a9b22dbe78f1377542442c9827cf4939f8964f09f9edb28:.
{% endblock %}
diff --git a/templates/pkg/ocaml-base b/templates/pkg/ocaml-base
@@ -3,7 +3,6 @@
{% extends "genlinks" %}
{% 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"]}}:.
diff --git a/variants/ccx-x86_64/dune b/variants/ccx-x86_64/dune
@@ -3,7 +3,7 @@
#+busybox-findutils.804ee3af0afdd7b1aa159f81593b490bacd3a0b622a7c1566ce82196ae88f771
#+busybox-awk.5c33e58d30be821f0a1fc8ba082d0a34aaecacad2a1c3a8f25b05cd07b2c6dec
#+busybox-diffutils.89043788a08f3d90f6fc1e02d690f6e5eefa88e11c61a1fae5048e457e46eb6f
-#+gnu-make.8b0f1b53392f1db9019f1d8e7ac20d3d9a58501db09a7ab0b2f81939fb4a81e3
+#+musl-cross-make.c8a0fd5e5e3f323f7c1c660f3fd06f389185bea4c3b65613a1cdb47b7e1c9738
#+ocaml.5b34db3f087fd067e8cf20c9806c599c52cf1d4564105f3841aa3594496ef578
#@untar:-z:sha256:579c738f8ca191ba0a9b22dbe78f1377542442c9827cf4939f8964f09f9edb28:.
diff --git a/variants/ccx-x86_64/ocaml-base b/variants/ccx-x86_64/ocaml-base
@@ -3,9 +3,8 @@
#+busybox-findutils.804ee3af0afdd7b1aa159f81593b490bacd3a0b622a7c1566ce82196ae88f771
#+busybox-awk.5c33e58d30be821f0a1fc8ba082d0a34aaecacad2a1c3a8f25b05cd07b2c6dec
#+busybox-diffutils.89043788a08f3d90f6fc1e02d690f6e5eefa88e11c61a1fae5048e457e46eb6f
-#+gnu-make.8b0f1b53392f1db9019f1d8e7ac20d3d9a58501db09a7ab0b2f81939fb4a81e3
#+ocaml.5b34db3f087fd067e8cf20c9806c599c52cf1d4564105f3841aa3594496ef578
-#+dune.32276362e2911131d99ab31240dd8b501ba72e915d8fc732e4ae1ddba3330b61
+#+dune.c0d5e2229436852a26671b9709a235c91a10168d20a58ca7473773dd9ed09f03
#@untar:-z:sha256:9bf9e503e2bd010325c7b0f5ae007ce1e5d3da61f0e06d2fbb64e9d12ccff93c:.
diff --git a/variants/ccx-x86_64/opam b/variants/ccx-x86_64/opam
@@ -5,7 +5,7 @@
#+busybox-diffutils.89043788a08f3d90f6fc1e02d690f6e5eefa88e11c61a1fae5048e457e46eb6f
#+gnu-make.8b0f1b53392f1db9019f1d8e7ac20d3d9a58501db09a7ab0b2f81939fb4a81e3
#+ocaml.5b34db3f087fd067e8cf20c9806c599c52cf1d4564105f3841aa3594496ef578
-#+dune.32276362e2911131d99ab31240dd8b501ba72e915d8fc732e4ae1ddba3330b61
+#+dune.c0d5e2229436852a26671b9709a235c91a10168d20a58ca7473773dd9ed09f03
#@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:.
@@ -28,7 +28,7 @@ cd 'opam-2.4.1'
--infodir="$prefix/info" \
--localedir="$prefix/locale" \
--localstatedir='/var/pthbs' \
- --with-dune='/home/ccx/versions/dune.32276362e2911131d99ab31240dd8b501ba72e915d8fc732e4ae1ddba3330b61/command/dune' \
+ --with-dune='/home/ccx/versions/dune.c0d5e2229436852a26671b9709a235c91a10168d20a58ca7473773dd9ed09f03/command/dune' \
--with-mccs \
--with-vendored-deps
diff --git a/variants/ccx-x86_64/wip.environment b/variants/ccx-x86_64/wip.environment
@@ -1,6 +1,6 @@
#!/usr/bin/env pthbs-build
#+ocaml.5b34db3f087fd067e8cf20c9806c599c52cf1d4564105f3841aa3594496ef578
-#+dune.32276362e2911131d99ab31240dd8b501ba72e915d8fc732e4ae1ddba3330b61
+#+dune.c0d5e2229436852a26671b9709a235c91a10168d20a58ca7473773dd9ed09f03
#+ocamlbuild.bc0dcc5465fec021273e3aced8531c2c40c0d06249ce95766c14fdbd1e2b6608
-#+ocaml-base.cc7bafe8ce813ad4fe425e514e1e6fa06114b713c167523d61eecf3d5fed0067
-#+opam.c8965200f30456904658d753dd2c54de9d006a2083050aa4f27b8ecefa2b526c-
\ No newline at end of file
+#+ocaml-base.8629ed0a5c239733da45a8c626e763a8e56606c9d59f5ed9f4850c585f08388f
+#+opam.aabf00157cdd4b7809039af17e5666b949feb61bf953098bac8babdd477ae12e+
\ No newline at end of file
diff --git a/variants/root-x86_64/dune b/variants/root-x86_64/dune
@@ -3,7 +3,7 @@
#+busybox-findutils.77e02cf8e8c855b16cb60636507ca0c104c8b812535721b3ddd00deb85fab783
#+busybox-awk.2db96ae9bd5ed9b9476bf92bb3bfae69caca475abd57385640428943edaa5fc5
#+busybox-diffutils.c5eee57596d172f36d2db9220e421b72e49a339032512dcaec3563e463e0786d
-#+gnu-make.7c89ba8600db3ad1223a633a8783e077a4273e6371515d54d113a687898684c6
+#+musl-cross-make.f87ce5b6081b67490d8993a640c0abb7213f4c5f3fc2d9e1736ba20b727ae9cd
#+ocaml.7dac3082b76965ebaab371cfb7848a931581faf39bda33a9701667cb7503f802
#@untar:-z:sha256:579c738f8ca191ba0a9b22dbe78f1377542442c9827cf4939f8964f09f9edb28:.
diff --git a/variants/root-x86_64/ocaml-base b/variants/root-x86_64/ocaml-base
@@ -3,9 +3,8 @@
#+busybox-findutils.77e02cf8e8c855b16cb60636507ca0c104c8b812535721b3ddd00deb85fab783
#+busybox-awk.2db96ae9bd5ed9b9476bf92bb3bfae69caca475abd57385640428943edaa5fc5
#+busybox-diffutils.c5eee57596d172f36d2db9220e421b72e49a339032512dcaec3563e463e0786d
-#+gnu-make.7c89ba8600db3ad1223a633a8783e077a4273e6371515d54d113a687898684c6
#+ocaml.7dac3082b76965ebaab371cfb7848a931581faf39bda33a9701667cb7503f802
-#+dune.979f332520ac60bf29bf3e25950d2503bc4d33241dbcefaf723e2a09c90fcd3c
+#+dune.25861cde2fd1eaee734c20c4dff15aa2f459e9e79690f3dff5edec27ba56687f
#@untar:-z:sha256:9bf9e503e2bd010325c7b0f5ae007ce1e5d3da61f0e06d2fbb64e9d12ccff93c:.
diff --git a/variants/root-x86_64/opam b/variants/root-x86_64/opam
@@ -5,7 +5,7 @@
#+busybox-diffutils.c5eee57596d172f36d2db9220e421b72e49a339032512dcaec3563e463e0786d
#+gnu-make.7c89ba8600db3ad1223a633a8783e077a4273e6371515d54d113a687898684c6
#+ocaml.7dac3082b76965ebaab371cfb7848a931581faf39bda33a9701667cb7503f802
-#+dune.979f332520ac60bf29bf3e25950d2503bc4d33241dbcefaf723e2a09c90fcd3c
+#+dune.25861cde2fd1eaee734c20c4dff15aa2f459e9e79690f3dff5edec27ba56687f
#@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:.
@@ -28,7 +28,7 @@ cd 'opam-2.4.1'
--infodir="$prefix/info" \
--localedir="$prefix/locale" \
--localstatedir='/var/pthbs' \
- --with-dune='/versions/dune.979f332520ac60bf29bf3e25950d2503bc4d33241dbcefaf723e2a09c90fcd3c/command/dune' \
+ --with-dune='/versions/dune.25861cde2fd1eaee734c20c4dff15aa2f459e9e79690f3dff5edec27ba56687f/command/dune' \
--with-mccs \
--with-vendored-deps
diff --git a/variants/root-x86_64/wip.environment b/variants/root-x86_64/wip.environment
@@ -1,6 +1,6 @@
#!/usr/bin/env pthbs-build
#+ocaml.7dac3082b76965ebaab371cfb7848a931581faf39bda33a9701667cb7503f802
-#+dune.979f332520ac60bf29bf3e25950d2503bc4d33241dbcefaf723e2a09c90fcd3c
+#+dune.25861cde2fd1eaee734c20c4dff15aa2f459e9e79690f3dff5edec27ba56687f
#+ocamlbuild.7eaa6dc8723366dd4c460566e807f1740d9b422033342b8edf8a18eca72a2b10
-#+ocaml-base.7f76b58548263e4ac4d9e37e872210733301657436c45d922943dcd9700adb5a
-#+opam.6f30ba3e70219451af59c0da4fbbaa1e068b8cddd94afffad04be5c19158e351-
\ No newline at end of file
+#+ocaml-base.8bc0113590bbf21d7d5256cd9242f5c4cb2380b23374adc6d538441626a3a685
+#+opam.d429c3369d801addfb0843a2b76f58573e77091c0a75f6abcd8fbeddda451cf8+
\ No newline at end of file
