nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-21 19:44:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

vscode-extensions.chenglou92.rescript-vscode: 1.3.0 -> 1.6.0

Browse Source 
This upgrade also brings the version of the subpackage
rescript-editor-analysis on par with rescript-vscode.
This commit is contained in:
Jayesh Bhoot 2022-07-18 23:23:02 +05:30
parent b3f5f7edd8
commit cc5159e589
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/editors/vscode/extensions/rescript/default.nix
View File

@ -1,6 +1,7 @@
{ lib, stdenv, vscode-utils, callPackage }: { lib, stdenv, vscode-utils, callPackage }:
let let
rescript-editor-analysis = (callPackage ./rescript-editor-analysis.nix { }); version = "1.6.0";
rescript-editor-analysis = callPackage ./rescript-editor-analysis.nix { inherit version; };
arch = arch =
if stdenv.isLinux then "linux" if stdenv.isLinux then "linux"
else if stdenv.isDarwin then "darwin" else if stdenv.isDarwin then "darwin"
@ -11,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
mktplcRef = { mktplcRef = {
name = "rescript-vscode"; name = "rescript-vscode";
publisher = "chenglou92"; publisher = "chenglou92";
version = "1.3.0"; inherit version;
sha256 = "sha256-Sgi7FFOpI/XOeyPOrDhwZdZ+43ilUz7oQ49yB7tiMXk="; sha256 = "sha256-/Nv+uyTkJQVaPKIDRr1P/Z5vsituXpP48/sDn3FUEeA=";
}; };
postPatch = '' postPatch = ''
rm -r ${analysisDir} rm -r ${analysisDir}
@ -22,7 +23,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
meta = with lib; { meta = with lib; {
description = "The official VSCode plugin for ReScript"; description = "The official VSCode plugin for ReScript";
homepage = "https://github.com/rescript-lang/rescript-vscode"; homepage = "https://github.com/rescript-lang/rescript-vscode";
maintainers = with maintainers; [ dlip ]; maintainers = with maintainers; [ dlip jayesh-bhoot ];
license = licenses.mit; license = licenses.mit;
}; };
} }

17
pkgs/applications/editors/vscode/extensions/rescript/rescript-editor-analysis.nix
View File

@ -1,21 +1,24 @@
{ lib, stdenv, fetchFromGitHub, bash, ocaml }: { lib, stdenv, fetchFromGitHub, bash, ocaml, dune_3, version }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "rescript-editor-analysis"; pname = "rescript-editor-analysis";
version = "1.1.3"; inherit version;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rescript-lang"; owner = "rescript-lang";
repo = "rescript-vscode"; repo = "rescript-vscode";
rev = "8d0412a72307b220b7f5774e2612760a2d429059"; rev = version;
sha256 = "rHQtfuIiEWlSPuZvNpEafsvlXCj2Uv1YRR1IfvKfC2s="; sha256 = "sha256-O5kZCnhtMcevPTs5UxhIXx124WQf1VvF2WMVHjMEQZc=";
}; };
nativeBuildInputs = [ ocaml ]; nativeBuildInputs = [ ocaml dune_3 ];
# Skip testing phases because they need to download and install node modules
postPatch = '' postPatch = ''
cd analysis cd analysis
substituteInPlace Makefile --replace "/bin/bash" "${bash}/bin/bash" substituteInPlace Makefile \
--replace "build: build-analysis-binary build-reanalyze build-tests" "build: build-analysis-binary" \
--replace "test: test-analysis-binary test-reanalyze" "test: test-analysis-binary"
''; '';
installPhase = '' installPhase = ''
@ -25,7 +28,7 @@ stdenv.mkDerivation {
meta = with lib; { meta = with lib; {
description = "Analysis binary for the ReScript VSCode plugin"; description = "Analysis binary for the ReScript VSCode plugin";
homepage = "https://github.com/rescript-lang/rescript-vscode"; homepage = "https://github.com/rescript-lang/rescript-vscode";
maintainers = with maintainers; [ dlip ]; maintainers = with maintainers; [ dlip jayesh-bhoot ];
license = licenses.mit; license = licenses.mit;
}; };
} }