diff --git a/flake.lock b/flake.lock index 00b118912a5..b1cc0973ea2 100644 --- a/flake.lock +++ b/flake.lock @@ -70,40 +70,6 @@ "type": "github" } }, - "merlin4_14": { - "flake": false, - "locked": { - "lastModified": 1708603952, - "narHash": "sha256-UV/0OLSKJnUixytdn2yxsUvnAy6Q+1UnTRKBWKg3OLU=", - "owner": "ocaml", - "repo": "merlin", - "rev": "7017cc271403487756e412349f3718a8ba2e6a36", - "type": "github" - }, - "original": { - "owner": "ocaml", - "ref": "v4.14-414", - "repo": "merlin", - "type": "github" - } - }, - "merlin5_1": { - "flake": false, - "locked": { - "lastModified": 1708603966, - "narHash": "sha256-rXN+r5xDlF9uty0YPZO0pNy2E3T1yPCM2h82xZFGylw=", - "owner": "ocaml", - "repo": "merlin", - "rev": "7d7f525180f5979516e10c05d0cd49823edb5ef1", - "type": "github" - }, - "original": { - "owner": "ocaml", - "ref": "v4.14-501", - "repo": "merlin", - "type": "github" - } - }, "nix-filter": { "locked": { "lastModified": 1710156097, @@ -158,40 +124,12 @@ "type": "github" } }, - "ocamllsp": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "merlin4_14": "merlin4_14", - "merlin5_1": "merlin5_1", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1715989198, - "narHash": "sha256-QGBm2M3X/AdRWNOXxUaEE7DnsgfNJKwdlxvp2Xgsx6k=", - "ref": "refs/heads/master", - "rev": "70574f6c302000e15756c8e2fb8f9fc9e1e6696b", - "revCount": 2101, - "submodules": true, - "type": "git", - "url": "https://github.com/ocaml/ocaml-lsp" - }, - "original": { - "submodules": true, - "type": "git", - "url": "https://github.com/ocaml/ocaml-lsp" - } - }, "root": { "inputs": { "flake-utils": "flake-utils", "melange": "melange", "nixpkgs": "nixpkgs", - "ocaml-overlays": "ocaml-overlays", - "ocamllsp": "ocamllsp" + "ocaml-overlays": "ocaml-overlays" } }, "systems": { diff --git a/flake.nix b/flake.nix index c8931d85b42..7574514c3f8 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,6 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; flake-utils.url = "github:numtide/flake-utils"; - ocamllsp = { - url = "git+https://github.com/ocaml/ocaml-lsp?submodules=1"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - }; melange = { url = "github:melange-re/melange/refs/tags/4.0.0-51"; inputs.nixpkgs.follows = "nixpkgs"; @@ -22,7 +17,6 @@ { self , flake-utils , nixpkgs - , ocamllsp , melange , ocaml-overlays }: @@ -40,7 +34,6 @@ }); }) melange.overlays.default - ocamllsp.overlays.default (self: super: { coq_8_16_native = super.coq_8_16.overrideAttrs (a: { configureFlags = [ "-native-compiler" "yes" ];