chore(merlin): subrepo to submodule (#914)

ps-id: f11de926-0782-4971-8664-80b2e7215684

Author: rgrinberg

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "ocaml-lsp-server/vendor/merlin"]
+	path = ocaml-lsp-server/vendor/merlin
+	url = https://github.com/rgrinberg/merlin

CHANGES.md

@@ -12,6 +12,8 @@
 - Do not attach extra data to diagnostics unless the client supports this
   (#910)
 
+- Use /bin/sh instead of /bin/bash. This fixes ocamllsp on NixOS
+
 # 1.14.1
 
 ## Fixes

flake.lock

@@ -10,11 +10,6 @@
       url = "github:ocaml/opam-repository";
       flake = false;
     };
-    git-subrepo-src = {
-      url =
-        "github:rgrinberg/git-subrepo?rev=8fb6be3fb1500ab845081fc26ecdb950e9c0438c";
-      flake = false;
-    };
   };
 
   outputs = { self, flake-utils, opam-nix, opam-repository, nixpkgs, ... }@inputs:
@@ -58,8 +53,6 @@
                   # the scope don't leak into dependent derivations
                   doNixSupport = false;
                 });
-                git-subrepo = prev.git-subrepo.overrideAttr
-                  (old: { src = inputs.git-subrepo-src; });
               };
             in
             scope.overrideScope' overlay
@@ -75,7 +68,6 @@
             buildInputs = (with pkgs;
               [
                 # dev tools
-                git-subrepo
                 ocamlformat_0_21_0
                 yarn
                 dune-release