Fix the ocaml/opam-repository version

diskuv · Apr 14, 2024 · 1028f54 · 1028f54
1 parent d61c08a
commit 1028f54
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,10 @@
 # Changes
 
+## 2.1.1
+
+- `src/runtimelib/ocaml_opam_repository_gitref.txt` is used to fix the version
+  of the ocaml/opam-repository used during a `dkml init`.
+
 ## 2.0.0
 
 - Remove `duniverse/` and opam monorepo Makefile targets since dune+shim

diff --git a/src/runtimelib/dune b/src/runtimelib/dune
@@ -5,6 +5,7 @@
    %{target}
    (progn
     (echo "let version = String.trim {|%{read:version.txt}|}\n")
+    (echo "let ocaml_opam_repository_gitref = String.trim {|%{read:ocaml_opam_repository_gitref.txt}|}\n")
     (echo "let ocaml_system = String.trim {|%{system}|}\n")))))
 
 (library

diff --git a/src/runtimelib/init_system.ml b/src/runtimelib/init_system.ml
@@ -76,6 +76,8 @@ let create_opam_root ?disable_sandboxing ?reinit ~opamroot_dir_fp ~ocaml_home_fp
           Fpath.to_string opamroot_dir_fp;
           "-v";
           Fpath.to_string ocaml_home_fp;
+          "-c";
+          "git+https://github.com/ocaml/opam-repository.git#" ^ Dkml_config.ocaml_opam_repository_gitref;
         ]
       @ disable_sandboxing_args @ reinit_args)
   in

diff --git a/src/runtimelib/ocaml_opam_repository_gitref.txt b/src/runtimelib/ocaml_opam_repository_gitref.txt
@@ -0,0 +1 @@
+6c3f73f42890cc19f81eb1dec8023c2cd7b8b5cd