From 6703f40d915030b4260530319addd22e96f81928 Mon Sep 17 00:00:00 2001 From: Tatu Argillander Date: Tue, 20 May 2025 20:11:18 +0300 Subject: [PATCH 1/3] vtsls: 0.2.8 -> 0.2.9 --- pkgs/by-name/vt/vtsls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vt/vtsls/package.nix b/pkgs/by-name/vt/vtsls/package.nix index a86289d68745..849d11b58a81 100644 --- a/pkgs/by-name/vt/vtsls/package.nix +++ b/pkgs/by-name/vt/vtsls/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vtsls"; - version = "0.2.8"; + version = "0.2.9"; src = fetchFromGitHub { owner = "yioneko"; repo = "vtsls"; rev = "server-v${finalAttrs.version}"; - hash = "sha256-Ng+aOBnxFRbMjoUy6+DvIk2yVpvJT+AMsbvDb+IlYpY="; + hash = "sha256-vlw84nigvQqRB9OQBxOmrR9CClU9M4dNgF/nrvGN+sk="; fetchSubmodules = true; }; @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { src version ; - hash = "sha256-xenPpKsIjEIyVeZDjwjLaBbpWLqWQDBaLLfyzxtrsTI="; + hash = "sha256-SdqeTYRH60CyU522+nBo0uCDnzxDP48eWBAtGTL/pqg="; }; # Patches to get submodule sha from file instead of 'git submodule status' From ef9c68bd22f840fa78a8cd83ff77d83b07882220 Mon Sep 17 00:00:00 2001 From: Tatu Argillander Date: Tue, 20 May 2025 20:51:43 +0300 Subject: [PATCH 2/3] vtsls: use gitSetupHook --- pkgs/by-name/vt/vtsls/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/vt/vtsls/package.nix b/pkgs/by-name/vt/vtsls/package.nix index 849d11b58a81..e9ec5d3cd2bc 100644 --- a/pkgs/by-name/vt/vtsls/package.nix +++ b/pkgs/by-name/vt/vtsls/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, nodejs_22, gitMinimal, + gitSetupHook, pnpm_8, nix-update-script, }: @@ -24,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: { nodejs_22 # patches are applied with git during build gitMinimal + gitSetupHook pnpm_8.configHook ]; @@ -50,10 +52,6 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - # During build vtsls needs a working git installation. - git config --global user.name nixbld - git config --global user.email nixbld@example.com - # during build this sha is used as a marker to skip applying patches and # copying files, which doesn't matter in this case echo "dummysha" > ./packages/service/HEAD From 4d5789974d5e85c01b9c01b8ec27bfdca7091f80 Mon Sep 17 00:00:00 2001 From: Tatu Argillander Date: Tue, 20 May 2025 21:02:28 +0300 Subject: [PATCH 3/3] vtsls: use src.tag --- pkgs/by-name/vt/vtsls/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/vt/vtsls/package.nix b/pkgs/by-name/vt/vtsls/package.nix index e9ec5d3cd2bc..c35f81ce69f1 100644 --- a/pkgs/by-name/vt/vtsls/package.nix +++ b/pkgs/by-name/vt/vtsls/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "yioneko"; repo = "vtsls"; - rev = "server-v${finalAttrs.version}"; + tag = "server-v${finalAttrs.version}"; hash = "sha256-vlw84nigvQqRB9OQBxOmrR9CClU9M4dNgF/nrvGN+sk="; fetchSubmodules = true; };