diff --git a/Makefile b/Makefile index 8ea63c0f895..ebcb528204a 100644 --- a/Makefile +++ b/Makefile @@ -74,9 +74,10 @@ install-ocamlformat: dev-depext: opam depext -y $(TEST_DEPS) +# v4-414-dev .PHONY: melange melange: - opam pin add -n melange.dev https://github.com/melange-re/melange.git#v4-414-dev + opam pin add -n melange.dev https://github.com/melange-re/melange.git#24e21cc42 .PHONY: dev-deps dev-deps: melange diff --git a/flake.lock b/flake.lock index 6e7b356c3ba..3dc295fee17 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -39,8 +39,8 @@ }, "original": { "owner": "melange-re", - "ref": "v4-414-dev", "repo": "melange", + "rev": "24e21cc4284ffb18b3a856c1d730f06f34d32737", "type": "github" } }, @@ -87,11 +87,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708532945, - "narHash": "sha256-0KucnySzsz5Zgonjjm8cQMql+HGHa/OhB0fnKmGeD+0=", + "lastModified": 1715037484, + "narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ac4c5a60bebfb783f1106d126b9f39cc8e809e0e", + "rev": "ad7efee13e0d216bf29992311536fce1d3eefbef", "type": "github" }, "original": { @@ -111,11 +111,11 @@ ] }, "locked": { - "lastModified": 1708563706, - "narHash": "sha256-9Mt5hD3W0hDyIcPos9anTFRW7RHjEg3+2inj6jOY2S4=", + "lastModified": 1713734511, + "narHash": "sha256-WytVDQJz0i3arHUDVSj+b/9/IQq/z9wBrkSeQDIZAgU=", "ref": "refs/heads/master", - "rev": "922a726d2dcd816263c34df7d8d0f44fd4700be2", - "revCount": 2062, + "rev": "e485128b11892dc1e6a17f28b687368f2ac0db32", + "revCount": 2067, "submodules": true, "type": "git", "url": "https://github.com/ocaml/ocaml-lsp" diff --git a/flake.nix b/flake.nix index 95b2fe58f18..28959f38dd9 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ }; melange = { # When moving the compiler tests to OCaml 5.1, change to v4-51-dev - url = "github:melange-re/melange/v4-414-dev"; + url = "github:melange-re/melange?rev=24e21cc4284ffb18b3a856c1d730f06f34d32737"; inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; };