Merge branch 'main' into gnls

Author: thomasjm

modules/kernels/go/language-server-gopls/go-parser.nix

@@ -11,7 +11,11 @@ buildGoModule rec {
     owner = "codedownio";
     repo = "go-notebook-language-server";
     rev = "v${version}";
+<<<<<<< gnls
     hash = "sha256-bOh7LbPxs+olEGKrNnnoq6xMhoRRSeZCV6GgJ7CUPyk=";
+=======
+    hash = "sha256-SdN/v4psQRQ8O+3BosYgcZzBZSxNytVmw1A/lM2fQ/4=";
+>>>>>>> main
   };
 
   sourceRoot = "${src.name}/go-parser";