From c5a2c52121e591e4435bbfe0a04f0a257a1f0df7 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Sun, 9 Feb 2025 17:32:07 -0800 Subject: [PATCH] v5-51 --- Changes.md | 2 +- dune-project | 2 +- flake.lock | 7 ++++--- flake.nix | 4 ++-- melange.opam | 2 +- vendor/melange-compiler-libs | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Changes.md b/Changes.md index 401b859b4e..d0e4ad1890 100644 --- a/Changes.md +++ b/Changes.md @@ -1,4 +1,4 @@ -5.0.0-53 +5.0.0-51 --------------- - Make the `unprocessed` alert fatal by default diff --git a/dune-project b/dune-project index 2885c8dd34..3972f81381 100644 --- a/dune-project +++ b/dune-project @@ -34,7 +34,7 @@ (synopsis "Toolchain to produce JS from Reason/OCaml") (depends (ocaml - (>= "5.3")) + (and (>= "5.1") (< "5.2"))) (cmdliner (>= "1.1.0")) dune-build-info diff --git a/flake.lock b/flake.lock index d2bac5dd62..0da1700e0d 100644 --- a/flake.lock +++ b/flake.lock @@ -7,15 +7,16 @@ ] }, "locked": { - "lastModified": 1736571386, - "narHash": "sha256-KW5Ojkxj0hmFwx2xqrNjMzDpyK3UHkUzpgq2/k04ynM=", + "lastModified": 1737850214, + "narHash": "sha256-QT1TKwopliHFVtOx6OsZfMxUJTbzztwdYfqRBBXis2A=", "owner": "melange-re", "repo": "melange-compiler-libs", - "rev": "8455eecb7dfc24f25db46e55b86803ecb6bd674f", + "rev": "e0ff4aba4ff1f5ccf86e973678b8e0d11c79146a", "type": "github" }, "original": { "owner": "melange-re", + "ref": "5.1", "repo": "melange-compiler-libs", "type": "github" } diff --git a/flake.nix b/flake.nix index e19de32cab..a863696c58 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ melange-compiler-libs = { # this changes rarely, and it's better than having to rely on nix's poor # support for submodules - url = "github:melange-re/melange-compiler-libs"; + url = "github:melange-re/melange-compiler-libs/5.1"; inputs.nixpkgs.follows = "nixpkgs"; }; }; @@ -16,7 +16,7 @@ forAllSystems = f: nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (system: let pkgs = nixpkgs.legacyPackages.${system}.extend (self: super: { - ocamlPackages = super.ocaml-ng.ocamlPackages_5_3; + ocamlPackages = super.ocaml-ng.ocamlPackages_5_1; }); in f pkgs); diff --git a/melange.opam b/melange.opam index 65b5e3b6b1..45373762f5 100644 --- a/melange.opam +++ b/melange.opam @@ -8,7 +8,7 @@ homepage: "https://github.com/melange-re/melange" bug-reports: "https://github.com/melange-re/melange/issues" depends: [ "dune" {>= "3.13"} - "ocaml" {>= "5.3"} + "ocaml" {>= "5.1" & < "5.2"} "cmdliner" {>= "1.1.0"} "dune-build-info" "cppo" {build} diff --git a/vendor/melange-compiler-libs b/vendor/melange-compiler-libs index 8455eecb7d..e0ff4aba4f 160000 --- a/vendor/melange-compiler-libs +++ b/vendor/melange-compiler-libs @@ -1 +1 @@ -Subproject commit 8455eecb7dfc24f25db46e55b86803ecb6bd674f +Subproject commit e0ff4aba4ff1f5ccf86e973678b8e0d11c79146a