Use OCaml 4.14.2 for the dev environment

OCamlPro · Aug 7, 2024 · d20bcaf · d20bcaf
1 parent f3df455
commit d20bcaf
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ on:
 permissions: {}
 
 env:
-  OCAML_DEFAULT_VERSION: 4.14.1
+  OCAML_DEFAULT_VERSION: 4.14.2
   # Add OPAMYES=true to the environment, this is usefill to replace `-y` option
   # in any opam call
   OPAMYES: true
@@ -27,7 +27,7 @@ jobs:
           - ubuntu-latest
         ocaml-compiler:
           - 4.08.1
-          - 4.14.1
+          - 4.14.2
           - 5.0.0
         exclude:
           # No longer seems to be available

diff --git a/.github/workflows/build_js.yml b/.github/workflows/build_js.yml
@@ -5,7 +5,7 @@ name: Build Javascript
 on: [push,pull_request]
 
 env:
-  OCAML_DEFAULT_VERSION: 4.14.1
+  OCAML_DEFAULT_VERSION: 4.14.2
   # Add OPAMYES=true to the environment, this is usefull to replace `-y` option
   # in any opam call
   OPAMYES: true

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -18,7 +18,7 @@ on:
   pull_request:
 
 env:
-  OCAML_DEFAULT_VERSION: 4.14.1
+  OCAML_DEFAULT_VERSION: 4.14.2
   # Add OPAMYES=true to the environment, this is usefill to replace `-y` option
   # in any opam call
   OPAMYES: true

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -3,7 +3,7 @@ name: Linter
 on: [push,pull_request]
 
 env:
-  OCAML_DEFAULT_VERSION: 4.14.1
+  OCAML_DEFAULT_VERSION: 4.14.2
   # Add OPAMYES=true to the environment, this is usefill to replace `-y` option
   # in any opam call
   OPAMYES: true

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch
 
 env:
-  OCAML_DEFAULT_VERSION: 4.14.1
+  OCAML_DEFAULT_VERSION: 4.14.2
   OPAMYES: true
   OPAMLOCKED: locked
 

diff --git a/Makefile b/Makefile
@@ -239,6 +239,7 @@ archi: $(EXTRA_DIR)/ocamldot/ocamldot
 lock:
 	dune build ./alt-ergo-lib.opam
 	opam lock ./alt-ergo-lib.opam -w
+	# Remove OCaml compiler constraints
 	sed -i \
 		'/"ocaml"\|"ocaml-base-compiler"\|"ocaml-system"\|"ocaml-config"\|"base-domains"\|"base-nnp"/d' \
 		./alt-ergo-lib.opam.locked

diff --git a/nix/default.nix b/nix/default.nix
@@ -4,7 +4,7 @@ import sources.nixpkgs {
   overlays = [
     (_: pkgs: { inherit sources; })
     (_: pkgs: {
-      ocamlPackages = pkgs.ocamlPackages.overrideScope' (self: super: {
+      ocamlPackages = pkgs.ocaml-ng.ocamlPackages_4_14.overrideScope' (self: super: {
         pp_loc = pkgs.callPackage ./pp_loc.nix { };
         ocplib-simplex = pkgs.callPackage ./ocplib-simplex.nix { };
         dolmen = pkgs.callPackage ./dolmen.nix { };

diff --git a/nix/sources.json b/nix/sources.json
@@ -31,10 +31,10 @@
         "homepage": null,
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "544b36d1b4815fd5f187ed00ff7a59fd0323317c",
-        "sha256": "0jh67yjfkv9sj4xldlv9p6whljg0rh96hy7x082061ghsb3kg6q4",
+        "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5",
+        "sha256": "1f5d2g1p6nfwycpmrnnmc2xmcszp804adp16knjvdkj8nz36y1fg",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/544b36d1b4815fd5f187ed00ff7a59fd0323317c.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/205fd4226592cc83fd4c0885a3e4c9c400efabb5.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "ocplib-simplex": {