chore: advance opam pin to use newer dependencies (#3131)

Author: sabine

.devcontainer/Dockerfile

@@ -1,7 +1,7 @@
 FROM ocaml/opam:debian-ocaml-5.2
 
 # Branch freeze was opam-repo HEAD at the time of commit
-RUN cd ~/opam-repository && git checkout -b freeze c45f5bab71d3589f41f9603daca5acad14df0ab0 && opam update
+RUN cd ~/opam-repository && git checkout -b freeze 584630e7a7e27e3cf56158696a3fe94623a0cf4f && opam update
 
 # Dev tools
 RUN opam install -y dune-release merlin ocamlformat=0.26.2 utop ocaml-lsp-server

.github/workflows/ci.yml

@@ -35,7 +35,7 @@ jobs:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
           dune-cache: ${{ matrix.os != 'macos-latest' }}
           opam-repositories: |
-            pin: git+https://github.com/ocaml/opam-repository#c45f5bab71d3589f41f9603daca5acad14df0ab0
+            pin: git+https://github.com/ocaml/opam-repository#584630e7a7e27e3cf56158696a3fe94623a0cf4f
           opam-disable-sandboxing: true
 
       - name: Install system dependencies (Linux)

.github/workflows/debug-ci.yml

@@ -28,7 +28,7 @@ jobs:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
           dune-cache: ${{ matrix.os != 'macos-latest' }}
           opam-repositories: |
-            pin: git+https://github.com/ocaml/opam-repository#c45f5bab71d3589f41f9603daca5acad14df0ab0
+            pin: git+https://github.com/ocaml/opam-repository#584630e7a7e27e3cf56158696a3fe94623a0cf4f
           opam-disable-sandboxing: true
 
       - name: Install system dependencies (Linux)

.github/workflows/linkcheck.yml

@@ -33,7 +33,7 @@ jobs:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
           dune-cache: ${{ matrix.os != 'macos-latest' }}
           opam-repositories: |
-            pin: git+https://github.com/ocaml/opam-repository#c45f5bab71d3589f41f9603daca5acad14df0ab0
+            pin: git+https://github.com/ocaml/opam-repository#584630e7a7e27e3cf56158696a3fe94623a0cf4f
           opam-disable-sandboxing: true
 
       - name: Install olinkcheck

.github/workflows/scrape.yml

@@ -30,7 +30,7 @@ jobs:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
           dune-cache: ${{ matrix.os != 'macos-latest' }}
           opam-repositories: |
-            pin: git+https://github.com/ocaml/opam-repository#c45f5bab71d3589f41f9603daca5acad14df0ab0
+            pin: git+https://github.com/ocaml/opam-repository#584630e7a7e27e3cf56158696a3fe94623a0cf4f
           opam-disable-sandboxing: true
 
       - name: Install system dependencies

Dockerfile

@@ -11,7 +11,7 @@ RUN sudo apk -U upgrade --no-cache && sudo apk add --no-cache \
     openssl-dev
 
 # Branch freeze was opam-repo HEAD at the time of commit
-RUN cd ~/opam-repository && git reset --hard c45f5bab71d3589f41f9603daca5acad14df0ab0 && opam update
+RUN cd ~/opam-repository && git reset --hard 584630e7a7e27e3cf56158696a3fe94623a0cf4f && opam update
 
 WORKDIR /home/opam
 

Makefile

@@ -11,7 +11,7 @@ deps: create_switch ## Install development dependencies
 
 .PHONY: create_switch
 create_switch: ## Create switch and pinned opam repo
-	opam switch create . 5.2.0 --no-install --repos pin=git+https://github.com/ocaml/opam-repository#c45f5bab71d3589f41f9603daca5acad14df0ab0
+	opam switch create . 5.2.0 --no-install --repos pin=git+https://github.com/ocaml/opam-repository#584630e7a7e27e3cf56158696a3fe94623a0cf4f
 
 .PHONY: switch
 switch: deps ## Create an opam switch and install development dependencies

dune-project

@@ -34,8 +34,7 @@
   "This repository contains the server that serves the official OCaml website at https://ocaml.org.")
  (depends
   (ocaml
-   (>= 4.14.0))
-  dune
+   (>= 5.2.0))
   ppx_deriving
   cohttp
   cohttp-lwt-unix

dune-workspace

@@ -0,0 +1,6 @@
+(lang dune 3.19)
+
+(repository (name pinned_opam_repository) (url git+https://github.com/ocaml/opam-repository#584630e7a7e27e3cf56158696a3fe94623a0cf4f))
+
+(lock_dir
+  (repositories pinned_opam_repository))

ocamlorg.opam

@@ -18,8 +18,8 @@ homepage: "https://github.com/ocaml/ocaml.org"
 doc: "https://ocaml.github.io/ocaml.org/"
 bug-reports: "https://github.com/ocaml/ocaml.org/issues"
 depends: [
-  "ocaml" {>= "4.14.0"}
   "dune" {>= "3.15"}
+  "ocaml" {>= "5.2.0"}
   "ppx_deriving"
   "cohttp"
   "cohttp-lwt-unix"