diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix index 718d14a52851..7232795a8148 100644 --- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix +++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + nix-update-script, ocamlPackages, }: @@ -13,8 +14,8 @@ ocamlPackages.buildDunePackage rec { src = fetchFromGitHub { owner = "rescript-lang"; repo = "rescript-vscode"; - rev = version; - hash = "sha256-v+qCVge57wvA97mtzbxAX9Fvi7ruo6ZyIC14O8uWl9Y="; + tag = version; + hash = "sha256-Tox5Qq0Kpqikac90sQww2cGr9RHlXnVy7GMnRA18CoA="; }; strictDeps = true; @@ -22,12 +23,21 @@ ocamlPackages.buildDunePackage rec { ocamlPackages.cppo ]; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "([0-9]+\.[0-9]+\.[0-9]+)" + ]; + }; + meta = { description = "Analysis binary for the ReScript VSCode plugin"; homepage = "https://github.com/rescript-lang/rescript-vscode"; - maintainers = [ - lib.maintainers.dlip - lib.maintainers.jayesh-bhoot + changelog = "https://github.com/rescript-lang/rescript-vscode/releases/tag/${version}"; + maintainers = with lib.maintainers; [ + dlip + jayesh-bhoot + RossSmyth ]; license = lib.licenses.mit; mainProgram = "rescript-editor-analysis"; diff --git a/pkgs/by-name/re/rescript-language-server/package.nix b/pkgs/by-name/re/rescript-language-server/package.nix index b2042cfdbb08..ea7a87e5f530 100644 --- a/pkgs/by-name/re/rescript-language-server/package.nix +++ b/pkgs/by-name/re/rescript-language-server/package.nix @@ -20,18 +20,13 @@ let throw "Unsupported system: ${stdenv.system}"; in buildNpmPackage rec { + # These have the same source, and must be the same version. + inherit (rescript-editor-analysis) src; pname = "rescript-language-server"; inherit version; - src = fetchFromGitHub { - owner = "rescript-lang"; - repo = "rescript-vscode"; - tag = version; - hash = "sha256-Tox5Qq0Kpqikac90sQww2cGr9RHlXnVy7GMnRA18CoA="; - }; - sourceRoot = "${src.name}/server"; - npmDepsHash = "sha256-Qi41qDJ0WR0QWw7guhuz1imT51SqI7mORGjNbmZWnio="; + npmDepsHash = "sha256-Qi41qDJ0WR0QWw7guhuz1imT51SqI7mORGjNbmZWnio"; strictDeps = true; nativeBuildInputs = [ esbuild ]; @@ -57,7 +52,7 @@ buildNpmPackage rec { versionCheckProgramArg = "--version"; doInstallCheck = true; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex" "([0-9]\.[0-9][0-9]\.[0-9])"]; }; meta = { description = "ReScript Language Server";