update merlin, utop (#1790)

nix-ocaml · Nov 26, 2024 · 6a59b6d · 6a59b6d
1 parent 9421b52
commit 6a59b6d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/ocaml/default.nix b/ocaml/default.nix
@@ -2098,8 +2098,8 @@ with oself;
 
   postgresql = (osuper.postgresql.override { postgresql = libpq; }).overrideAttrs (o: {
     src = builtins.fetchurl {
-      url = "https://github.com/mmottl/postgresql-ocaml/releases/download/5.1.0/postgresql-5.1.0.tbz";
-      sha256 = "12qnn61mgvlsibm5yinrxks5fah1ngmj1hd611hz2a9mhclbg2kz";
+      url = "https://github.com/mmottl/postgresql-ocaml/releases/download/5.1.1/postgresql-5.1.1.tbz";
+      sha256 = "1pbk0crah7xm9h32179mia7xxbhkz50pvqh3w2lgzgjyqv6vyszd";
     };
     nativeBuildInputs = o.nativeBuildInputs ++ [ pkg-config ];
 
@@ -2678,8 +2678,8 @@ with oself;
     src = fetchFromGitHub {
       owner = "ocaml-community";
       repo = "utop";
-      rev = "b490baca2192312acc3c3bfe4902a43c115f93a6";
-      hash = "sha256-i8W4tnI8WMwDpWL37mjqqBd3FYr1C39AfzqvsHCxg9c=";
+      rev = "2.15.0";
+      hash = "sha256-wfsMBx+2XPkgl+V2NCXBZ4X3wZa75bX7QnXsMrqysTw=";
     };
   });
 

diff --git a/ocaml/merlin/lib.nix b/ocaml/merlin/lib.nix
@@ -43,8 +43,8 @@ buildDunePackage {
     then
       builtins.fetchurl
         {
-          url = "https://github.com/ocaml/merlin/releases/download/v5.2.1-502/merlin-5.2.1-502.tbz";
-          sha256 = "0k2qip2y0qgf9q05dgs9rpds8l66j5drcjn1a6c626ykn9qxq0jw";
+          url = "https://github.com/ocaml/merlin/releases/download/v5.3-502/merlin-5.3-502.tbz";
+          sha256 = "1g14maryp5aw02a0chj9xqbdkky125g4y38cxwqnxylp4gqldsic";
         }
     else if lib.versionOlder "5.1" ocaml.version
     then
@@ -62,8 +62,8 @@ buildDunePackage {
         }
     else
       builtins.fetchurl {
-        url = "https://github.com/ocaml/merlin/releases/download/v4.17.1-414/merlin-4.17.1-414.tbz";
-        sha256 = "1ijzcizf7n6a1a5is0mg311blfcmxyyp6jymc4w0acl6yip80gxz";
+        url = "https://github.com/ocaml/merlin/releases/download/v4.18-414/merlin-4.18-414.tbz";
+        sha256 = "1h8cwdzvcyxdr6jkpsj7sn2r31aw2g4155l63a63a7hlcsiggmpn";
       };
 
   postPatch =