From df70ab86b3371fb55250f65eb10b8de3c55d6376 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 13 Dec 2023 06:48:10 +0100 Subject: [PATCH] =?UTF-8?q?ocaml-ng.ocamlPackages=5F5=5F1.ocaml:=205.1.0?= =?UTF-8?q?=20=E2=86=92=205.1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/ocaml/5.1.nix | 4 ++-- pkgs/development/tools/ocaml/merlin/4.x.nix | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ocaml/5.1.nix b/pkgs/development/compilers/ocaml/5.1.nix index 9947eadb4963..90efd1050206 100644 --- a/pkgs/development/compilers/ocaml/5.1.nix +++ b/pkgs/development/compilers/ocaml/5.1.nix @@ -1,6 +1,6 @@ import ./generic.nix { major_version = "5"; minor_version = "1"; - patch_version = "0"; - sha256 = "sha256-bOjbOTqvwmTlr3McaPvrIJIKtq6E1b+TURllt0IzUas="; + patch_version = "1"; + sha256 = "sha256-jX6Yv9o76UBgK3o53PkSotL96reR7UDmKgmkzWfd7vE="; } diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index 56871eab1cc1..3bccf4162be6 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -25,7 +25,7 @@ let "4.14.1" = "4.13-414"; "5.0.0" = "4.12-500"; "5.1.0" = "4.13-501"; - # "5.1.1" = "4.13.1-501"; + "5.1.1" = "4.13.1-501"; }; hashes = { @@ -34,6 +34,7 @@ let "4.12-500" = "sha256-j49R7KVzNKlXDL7WibTHxPG4VSOVv0uaz5/yMZZjkH8="; "4.13-414" = "sha256-AlzxqTuh5AkW9dnPIv51abv7r0A/VOS3JOT5IHix2wM="; "4.13-501" = "sha256-G/VrI+qBVj2wxuB2qE9P1M73IvDmqmTrBFAA6mp+NRE="; + "4.13.1-501" = "sha256-NVfgX3DFsQghApEgWilCgr5O2WSkwKtenZZFSJ1wwa0="; }; version = lib.getAttr ocaml.version merlinVersions;