mrrl

commit 2bb8dd553b1d9de92af9bc50c75dc2d32825f02b
parent c8428921d2e1202d88cde992a6a125a0254599b6
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Wed, 22 Oct 2025 09:13:30 +0000

dune

Diffstat:
M
templates/pkg/dune
 | 
6
+-----
M
variants/ccx-x86_64/dune
 | 
6
+-----
M
variants/ccx-x86_64/ocaml-base
 | 
2
+-
M
variants/ccx-x86_64/opam
 | 
4
++--
M
variants/ccx-x86_64/wip.environment
 | 
8
++++----
M
variants/root-x86_64/dune
 | 
6
+-----
M
variants/root-x86_64/ocaml-base
 | 
2
+-
M
variants/root-x86_64/opam
 | 
4
++--
M
variants/root-x86_64/wip.environment
 | 
8
++++----

9 files changed, 17 insertions(+), 29 deletions(-)
diff --git a/templates/pkg/dune b/templates/pkg/dune
@@ -23,11 +23,7 @@ sed -i 's/stdune.csexp/dune-configurator.csexp/' vendor/csexp/src/dune
 		--etcdir="$prefix/config/etc" \
 		--mandir="$prefix/man" \
 		--docdir="$prefix/doc/{{shortname}}" \
-		--datadir="$prefix/data" \
-		--datarootdir="$prefix/data" \
-		--infodir="$prefix/info" \
-		--localedir="$prefix/locale" \
-		--localstatedir='{{var_dir}}'
+		--datadir="$prefix/data"
 
 {% endblock %}
 {%- block build %}
diff --git a/variants/ccx-x86_64/dune b/variants/ccx-x86_64/dune
@@ -29,11 +29,7 @@ sed -i 's/stdune.csexp/dune-configurator.csexp/' vendor/csexp/src/dune
 		--etcdir="$prefix/config/etc" \
 		--mandir="$prefix/man" \
 		--docdir="$prefix/doc/dune" \
-		--datadir="$prefix/data" \
-		--datarootdir="$prefix/data" \
-		--infodir="$prefix/info" \
-		--localedir="$prefix/locale" \
-		--localstatedir='/var/pthbs'
+		--datadir="$prefix/data"
 
 
 
diff --git a/variants/ccx-x86_64/ocaml-base b/variants/ccx-x86_64/ocaml-base
@@ -5,7 +5,7 @@
 #+busybox-diffutils.89043788a08f3d90f6fc1e02d690f6e5eefa88e11c61a1fae5048e457e46eb6f
 #+gnu-make.8b0f1b53392f1db9019f1d8e7ac20d3d9a58501db09a7ab0b2f81939fb4a81e3
 #+ocaml.5b34db3f087fd067e8cf20c9806c599c52cf1d4564105f3841aa3594496ef578
-#+dune.3fb6520c0d983c32eda72b5313686b7c6790b4e18accfbc671593e6d6b2d5294
+#+dune.32276362e2911131d99ab31240dd8b501ba72e915d8fc732e4ae1ddba3330b61
 #@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.3fb6520c0d983c32eda72b5313686b7c6790b4e18accfbc671593e6d6b2d5294
+#+dune.32276362e2911131d99ab31240dd8b501ba72e915d8fc732e4ae1ddba3330b61
 #@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.3fb6520c0d983c32eda72b5313686b7c6790b4e18accfbc671593e6d6b2d5294/command/dune' \
+	--with-dune='/home/ccx/versions/dune.32276362e2911131d99ab31240dd8b501ba72e915d8fc732e4ae1ddba3330b61/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.3fb6520c0d983c32eda72b5313686b7c6790b4e18accfbc671593e6d6b2d5294
+#+dune.32276362e2911131d99ab31240dd8b501ba72e915d8fc732e4ae1ddba3330b61
 #+ocamlbuild.bc0dcc5465fec021273e3aced8531c2c40c0d06249ce95766c14fdbd1e2b6608
-#+ocaml-base.bba7573f2ceefffbc7d2d4aa691db901378e6d978da5ffd84ce64d908cc03d2e
-#+opam.d986ea4a2531676adef59460846593dd963638e81492c7faa595f768f7888ece-
\ No newline at end of file
+#+ocaml-base.cc7bafe8ce813ad4fe425e514e1e6fa06114b713c167523d61eecf3d5fed0067
+#+opam.c8965200f30456904658d753dd2c54de9d006a2083050aa4f27b8ecefa2b526c+
\ No newline at end of file
diff --git a/variants/root-x86_64/dune b/variants/root-x86_64/dune
@@ -29,11 +29,7 @@ sed -i 's/stdune.csexp/dune-configurator.csexp/' vendor/csexp/src/dune
 		--etcdir="$prefix/config/etc" \
 		--mandir="$prefix/man" \
 		--docdir="$prefix/doc/dune" \
-		--datadir="$prefix/data" \
-		--datarootdir="$prefix/data" \
-		--infodir="$prefix/info" \
-		--localedir="$prefix/locale" \
-		--localstatedir='/var/pthbs'
+		--datadir="$prefix/data"
 
 
 
diff --git a/variants/root-x86_64/ocaml-base b/variants/root-x86_64/ocaml-base
@@ -5,7 +5,7 @@
 #+busybox-diffutils.c5eee57596d172f36d2db9220e421b72e49a339032512dcaec3563e463e0786d
 #+gnu-make.7c89ba8600db3ad1223a633a8783e077a4273e6371515d54d113a687898684c6
 #+ocaml.7dac3082b76965ebaab371cfb7848a931581faf39bda33a9701667cb7503f802
-#+dune.5e63bcbf1f46d89862745271417db6c8725525a27a3ac23a6f2f9e7253d31719
+#+dune.979f332520ac60bf29bf3e25950d2503bc4d33241dbcefaf723e2a09c90fcd3c
 #@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.5e63bcbf1f46d89862745271417db6c8725525a27a3ac23a6f2f9e7253d31719
+#+dune.979f332520ac60bf29bf3e25950d2503bc4d33241dbcefaf723e2a09c90fcd3c
 #@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.5e63bcbf1f46d89862745271417db6c8725525a27a3ac23a6f2f9e7253d31719/command/dune' \
+	--with-dune='/versions/dune.979f332520ac60bf29bf3e25950d2503bc4d33241dbcefaf723e2a09c90fcd3c/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.5e63bcbf1f46d89862745271417db6c8725525a27a3ac23a6f2f9e7253d31719
+#+dune.979f332520ac60bf29bf3e25950d2503bc4d33241dbcefaf723e2a09c90fcd3c
 #+ocamlbuild.7eaa6dc8723366dd4c460566e807f1740d9b422033342b8edf8a18eca72a2b10
-#+ocaml-base.def552fad28fcf2487047a03d1b4799a79d7312d10cc24fee91e2f16dbe1ff14
-#+opam.a03052d94938698270da4bd0ae498021379231678172a76de27b501605568c4d-
\ No newline at end of file
+#+ocaml-base.7f76b58548263e4ac4d9e37e872210733301657436c45d922943dcd9700adb5a
+#+opam.6f30ba3e70219451af59c0da4fbbaa1e068b8cddd94afffad04be5c19158e351+
\ No newline at end of file