!update to 24.11 (beta)

This commit is contained in:
Primrose 2024-11-18 20:47:30 +01:00
parent 57ed96f0ea
commit 188f78e47f
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
14 changed files with 50 additions and 94 deletions

View file

@ -181,7 +181,6 @@
# Unmerged packages from nixfinal
# TODO: use upstream when merged
dl-librescore = final.callPackage ./dl-librescore.nix { };
fish-lsp = final.callPackage ./fish-lsp { };
});
perSystem =

View file

@ -1,51 +0,0 @@
{
mkYarnPackage,
fetchFromGitHub,
fetchYarnDeps,
fish,
fixup-yarn-lock,
nodejs,
yarn,
makeWrapper,
}:
mkYarnPackage rec {
pname = "fish-lsp";
version = "1.0.7";
src = fetchFromGitHub {
owner = "ndonfris";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Np7ELQxHqSnkzVkASYSyO9cTiO1yrakDuK88kkACNAI=";
};
offlineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock";
hash = "sha256-hmaLWO1Sj+2VujrGD2A+COfVE2D+tCnxyojjq1512K4=";
};
nativeBuildInputs = [
fish
fixup-yarn-lock
nodejs
yarn
makeWrapper
];
buildPhase = ''
runHook preBuild
wasm_file=$(find node_modules -type f -a -name tree-sitter-fish.wasm)
cp -f $wasm_file ./deps/fish-lsp
yarn run sh:build-time
yarn --offline compile
yarn run sh:relink
# yarn run sh:build-completions
runHook postBuild
'';
postInstall = ''
wrapProgram "$out/bin/fish-lsp" \
--set-default fish_lsp_logfile "/tmp/fish_lsp_logs.txt"
'';
}