bump version

nohzafk · Jul 13, 2024 · eb578de · eb578de
1 parent cd32ca2
commit eb578de
Show file tree

Hide file tree

Showing 52 changed files with 1,731 additions and 988 deletions.
diff --git a/_generator/langserver.json b/_generator/langserver.json
@@ -1,4 +1,9 @@
 [
+    {
+        "langserver": "ada-language-server",
+        "packages": "",
+        "langserver_binary": "ada_language_server"
+    },
     {
         "langserver": "ansible-language-server",
         "packages": "",
@@ -9,6 +14,11 @@
         "packages": "",
         "langserver_binary": "astro-ls"
     },
+    {
+        "langserver": "basedpyright",
+        "packages": "",
+        "langserver_binary": "basedpyright-langserver"
+    },
     {
         "langserver": "bash-language-server",
         "packages": "",
@@ -104,6 +114,16 @@
         "packages": "",
         "langserver_binary": "fsautocomplete"
     },
+    {
+        "langserver": "futhark-lsp",
+        "packages": "",
+        "langserver_binary": "futhark"
+    },
+    {
+        "langserver": "gleam",
+        "packages": "",
+        "langserver_binary": "gleam"
+    },
     {
         "langserver": "gopls",
         "packages": "",
@@ -169,11 +189,26 @@
         "packages": "",
         "langserver_binary": "start_lexical.sh"
     },
+    {
+        "langserver": "lua-lsp",
+        "packages": "",
+        "langserver_binary": "lua-lsp"
+    },
+    {
+        "langserver": "marksman",
+        "packages": "",
+        "langserver_binary": "marksman"
+    },
     {
         "langserver": "metals",
         "packages": "",
         "langserver_binary": "metals"
     },
+    {
+        "langserver": "mint-ls",
+        "packages": "",
+        "langserver_binary": "mint"
+    },
     {
         "langserver": "mojo-lsp-server",
         "packages": "",
@@ -219,11 +254,21 @@
         "packages": "",
         "langserver_binary": "mono"
     },
+    {
+        "langserver": "perl-language-server",
+        "packages": "",
+        "langserver_binary": "perl"
+    },
     {
         "langserver": "phpactor",
         "packages": "",
         "langserver_binary": "phpactor"
     },
+    {
+        "langserver": "purescript-language-server",
+        "packages": "",
+        "langserver_binary": "purescript-language-server"
+    },
     {
         "langserver": "pylsp",
         "packages": "",
@@ -339,6 +384,11 @@
         "packages": "nodePackages.typescript-language-server",
         "langserver_binary": "typescript-language-server"
     },
+    {
+        "langserver": "typescriptreact_eslint",
+        "packages": "nodePackages.typescript-language-server,vscode-langservers-extracted",
+        "langserver_binary": "typescript-language-server,vscode-eslint-language-server"
+    },
     {
         "langserver": "typst-lsp",
         "packages": "typst-lsp",

diff --git a/_generator/src_template/{{cookiecutter.langserver}}/devcontainer-feature.json b/_generator/src_template/{{cookiecutter.langserver}}/devcontainer-feature.json
@@ -1,51 +1,48 @@
 {
-    "id": "{{cookiecutter.langserver}}",
-    "version": "0.4.2",
-    "name": "emacs lsp-bridge {{cookiecutter.langserver}} language server",
-    "description": "emacs lsp-bridge {{cookiecutter.langserver}} language server environment installed by Nix Pacakge Manager",
-    "options": {
-        "version": {
-            "type": "string",
-            "proposals": [
-                "latest",
-                "2.11"
-            ],
-            "default": "latest",
-            "description": "Version of Nix to install."
-        },
-        "multiUser": {
-            "type": "boolean",
-            "default": true,
-            "description": "Perform a multi-user install (instead of single user)"
-        },
-        "packages": {
-            "type": "string",
-            "default": "",
-            "description": "Optinal additional comma separated list of Nix packages to install in profile besides default language server pacakge."
-        },
-        "useAttrPath": {
-            "type": "boolean",
-            "default": true,
-            "description": "Enable this option to use exact attribute path of the package in the Nixpkgs repository, aligning with the nix-env -iA command."
-        },
-        "flakeUri": {
-            "type": "string",
-            "default": "",
-            "description": "Optional URI to a Nix Flake to install in profile."
-        },
-        "extraNixConfig": {
-            "type": "string",
-            "default": "",
-            "description": "Optional comma separated list of extra lines to add to /etc/nix/nix.conf."
-        }
+  "id": "{{cookiecutter.langserver}}",
+  "version": "0.4.3",
+  "name": "emacs lsp-bridge {{cookiecutter.langserver}} language server",
+  "description": "emacs lsp-bridge {{cookiecutter.langserver}} language server environment installed by Nix Pacakge Manager",
+  "options": {
+    "version": {
+      "type": "string",
+      "proposals": ["latest", "2.11"],
+      "default": "latest",
+      "description": "Version of Nix to install."
     },
-    "installsAfter": [
-        "ghcr.io/devcontainers/features/common-utils",
-        "ghcr.io/devcontainers/features/sshd"
-    ],
-    "containerEnv": {
-        "PATH": "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:${PATH}"
+    "multiUser": {
+      "type": "boolean",
+      "default": true,
+      "description": "Perform a multi-user install (instead of single user)"
     },
-    "entrypoint": "/usr/local/share/nix-entrypoint.sh",
-    "postStartCommand": "nohup bash /tmp/lsp-bridge-start.sh"
-}
+    "packages": {
+      "type": "string",
+      "default": "",
+      "description": "Optinal additional comma separated list of Nix packages to install in profile besides default language server pacakge."
+    },
+    "useAttrPath": {
+      "type": "boolean",
+      "default": true,
+      "description": "Enable this option to use exact attribute path of the package in the Nixpkgs repository, aligning with the nix-env -iA command."
+    },
+    "flakeUri": {
+      "type": "string",
+      "default": "",
+      "description": "Optional URI to a Nix Flake to install in profile."
+    },
+    "extraNixConfig": {
+      "type": "string",
+      "default": "",
+      "description": "Optional comma separated list of extra lines to add to /etc/nix/nix.conf."
+    }
+  },
+  "installsAfter": [
+    "ghcr.io/devcontainers/features/common-utils",
+    "ghcr.io/devcontainers/features/sshd"
+  ],
+  "containerEnv": {
+    "PATH": "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:${PATH}"
+  },
+  "entrypoint": "/usr/local/share/nix-entrypoint.sh",
+  "postStartCommand": "nohup bash /tmp/lsp-bridge-start.sh"
+}
diff --git a/_generator/src_template/{{cookiecutter.langserver}}/lsp-bridge.nix b/_generator/src_template/{{cookiecutter.langserver}}/lsp-bridge.nix
@@ -2,12 +2,12 @@
 
 pkgs.stdenv.mkDerivation {
   pname = "lsp-bridge-src";
-  version = "20240609-master";
+  version = "20240717-master";
   src = pkgs.fetchFromGitHub {
-    owner = "nohzafk";
+    owner = "manateelazycat";
     repo = "lsp-bridge";
-    rev = "feature/run-in-container";
-    sha256 = "sha256-Y1gc2aPDTTPLPjPpyCfvA7jaeww/v6dgZGscAKjW3qw=";
+    rev = "f47cf14";
+    sha256 = "sha256-Rg3oA+wYdhsT2q4QQ/0aCGdluoaZ9ZY9JAeXRV2M34s=";
   };
   buildInputs = [ pkgs.python311Packages.python ];
   dontConfigure = true;

diff --git a/src/docker-langserver/devcontainer-feature.json b/src/docker-langserver/devcontainer-feature.json
@@ -1,51 +1,48 @@
 {
-    "id": "docker-langserver",
-    "version": "0.4.2",
-    "name": "emacs lsp-bridge docker-langserver language server",
-    "description": "emacs lsp-bridge docker-langserver language server environment installed by Nix Pacakge Manager",
-    "options": {
-        "version": {
-            "type": "string",
-            "proposals": [
-                "latest",
-                "2.11"
-            ],
-            "default": "latest",
-            "description": "Version of Nix to install."
-        },
-        "multiUser": {
-            "type": "boolean",
-            "default": true,
-            "description": "Perform a multi-user install (instead of single user)"
-        },
-        "packages": {
-            "type": "string",
-            "default": "",
-            "description": "Optinal additional comma separated list of Nix packages to install in profile besides default language server pacakge."
-        },
-        "useAttrPath": {
-            "type": "boolean",
-            "default": true,
-            "description": "Enable this option to use exact attribute path of the package in the Nixpkgs repository, aligning with the nix-env -iA command."
-        },
-        "flakeUri": {
-            "type": "string",
-            "default": "",
-            "description": "Optional URI to a Nix Flake to install in profile."
-        },
-        "extraNixConfig": {
-            "type": "string",
-            "default": "",
-            "description": "Optional comma separated list of extra lines to add to /etc/nix/nix.conf."
-        }
+  "id": "docker-langserver",
+  "version": "0.4.3",
+  "name": "emacs lsp-bridge docker-langserver language server",
+  "description": "emacs lsp-bridge docker-langserver language server environment installed by Nix Pacakge Manager",
+  "options": {
+    "version": {
+      "type": "string",
+      "proposals": ["latest", "2.11"],
+      "default": "latest",
+      "description": "Version of Nix to install."
     },
-    "installsAfter": [
-        "ghcr.io/devcontainers/features/common-utils",
-        "ghcr.io/devcontainers/features/sshd"
-    ],
-    "containerEnv": {
-        "PATH": "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:${PATH}"
+    "multiUser": {
+      "type": "boolean",
+      "default": true,
+      "description": "Perform a multi-user install (instead of single user)"
     },
-    "entrypoint": "/usr/local/share/nix-entrypoint.sh",
-    "postStartCommand": "nohup bash /tmp/lsp-bridge-start.sh"
-}
+    "packages": {
+      "type": "string",
+      "default": "",
+      "description": "Optinal additional comma separated list of Nix packages to install in profile besides default language server pacakge."
+    },
+    "useAttrPath": {
+      "type": "boolean",
+      "default": true,
+      "description": "Enable this option to use exact attribute path of the package in the Nixpkgs repository, aligning with the nix-env -iA command."
+    },
+    "flakeUri": {
+      "type": "string",
+      "default": "",
+      "description": "Optional URI to a Nix Flake to install in profile."
+    },
+    "extraNixConfig": {
+      "type": "string",
+      "default": "",
+      "description": "Optional comma separated list of extra lines to add to /etc/nix/nix.conf."
+    }
+  },
+  "installsAfter": [
+    "ghcr.io/devcontainers/features/common-utils",
+    "ghcr.io/devcontainers/features/sshd"
+  ],
+  "containerEnv": {
+    "PATH": "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:${PATH}"
+  },
+  "entrypoint": "/usr/local/share/nix-entrypoint.sh",
+  "postStartCommand": "nohup bash /tmp/lsp-bridge-start.sh"
+}
diff --git a/src/docker-langserver/lsp-bridge.nix b/src/docker-langserver/lsp-bridge.nix
@@ -2,12 +2,12 @@
 
 pkgs.stdenv.mkDerivation {
   pname = "lsp-bridge-src";
-  version = "20240609-master";
+  version = "20240717-master";
   src = pkgs.fetchFromGitHub {
-    owner = "nohzafk";
+    owner = "manateelazycat";
     repo = "lsp-bridge";
-    rev = "feature/run-in-container";
-    sha256 = "sha256-Y1gc2aPDTTPLPjPpyCfvA7jaeww/v6dgZGscAKjW3qw=";
+    rev = "f47cf14";
+    sha256 = "sha256-Rg3oA+wYdhsT2q4QQ/0aCGdluoaZ9ZY9JAeXRV2M34s=";
   };
   buildInputs = [ pkgs.python311Packages.python ];
   dontConfigure = true;