Skip to content

Commit 2c62a1c

Browse files
authored
nix: updates (#1550)
* remove 5.1 stuff * update merlin version on 5.3 * update flakes * update ocamlformat Signed-off-by: Rudi Grinberg <[email protected]>
1 parent 61f03a5 commit 2c62a1c

File tree

2 files changed

+15
-34
lines changed

2 files changed

+15
-34
lines changed

flake.lock

Lines changed: 12 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
flake-utils.url = "github:numtide/flake-utils";
44
nixpkgs.url = "github:nix-ocaml/nix-overlays";
55
merlin5_3 = {
6-
url = "github:liam923/merlin/rename-holes";
6+
url = "github:ocaml/merlin";
77
flake = false;
88
};
99
merlin5_2 = {
@@ -15,7 +15,7 @@
1515
outputs = { self, flake-utils, nixpkgs, ... }@inputs:
1616
let
1717
package = "ocaml-lsp-server";
18-
ocamlformat = pkgs: pkgs.ocamlformat_0_26_2;
18+
ocamlformat = pkgs: pkgs.ocamlformat_0_27_0;
1919
basePackage = {
2020
duneVersion = "3";
2121
version = "n/a";
@@ -59,7 +59,7 @@
5959
jsonrpc = buildDunePackage (basePackage // {
6060
pname = "jsonrpc";
6161
doCheck = false;
62-
propagatedBuildInputs = with pkgs.ocamlPackages; [ ];
62+
propagatedBuildInputs = with pkgs.ocamlPackages; [ yojson ];
6363
});
6464

6565
lsp = buildDunePackage (basePackage // {

0 commit comments

Comments
 (0)