nix: update to 24.11

Reviewed-on: https://codeberg.org/leana8959/.files/pulls/1
Co-authored-by: Léana 江 <leana.jiang+git@icloud.com>
Co-committed-by: Léana 江 <leana.jiang+git@icloud.com>
This commit is contained in:
Primrose 2024-11-30 18:42:54 +00:00 committed by Léana
parent 57ed96f0ea
commit f6a89cba08
60 changed files with 696 additions and 752 deletions

View file

@ -89,6 +89,17 @@
in
why3-pinned.callPackage ./why3.nix { inherit (alt-ergo-pinned) alt-ergo; };
isabelle-2023 =
let
isabelle-pin = import (final.fetchFromGitHub {
owner = "nixos";
repo = "nixpkgs";
rev = "805a384895c696f802a9bf5bf4720f37385df547";
hash = "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=";
}) { inherit (final) system; };
in
isabelle-pin.isabelle;
maeel = final.callPackage ./maeel.nix { };
tokei = final.callPackage ./tokei { }; # alpha tokei with typst, skel, hledger
typst-mutilate = final.callPackage ./typst-mutilate.nix { };
@ -181,7 +192,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"
'';
}