cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #258590 from figsoda/topiary

Browse source 
topiary: 0.2.3 -> 0.3.0
This commit is contained in:
Nick Cao 2023-10-02 15:42:01 -04:00 committed by GitHub
commit 6ed4db35b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 365 additions and 433 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

775
pkgs/development/tools/misc/topiary/Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

23
pkgs/development/tools/misc/topiary/default.nix
View file

@ -6,23 +6,27 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "topiary"; pname = "topiary";
version = "0.2.3"; version = "0.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tweag"; owner = "tweag";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-RYJaZGJijaS4a9gJmEvi4jVDN0sglUJHuy04pGdv5YE="; hash = "sha256-zt4uXkO6Y0Yc1Wt8l5O79oKbgNLrgip40ftD7UfUPwo=";
}; };
cargoLock = { cargoLock = {
lockFile = ./Cargo.lock; lockFile = ./Cargo.lock;
outputHashes = { outputHashes = {
"tree-sitter-bash-0.19.0" = "sha256-Po2r+wUWJwC+ODk/xotYI7PsmjC3TFSu1dU0FrrnAXQ="; "tree-sitter-bash-0.19.0" = "sha256-a0/KyHV2jUpytsZSHI7tVw8GfYnuqVjfs5KScLZkB0I=";
"tree-sitter-facade-0.9.3" = "sha256-M/npshnHJkU70pP3I4WMXp3onlCSWM5mMIqXP45zcUs="; "tree-sitter-facade-0.9.3" = "sha256-M/npshnHJkU70pP3I4WMXp3onlCSWM5mMIqXP45zcUs=";
"tree-sitter-json-0.20.0" = "sha256-cyrea0Y13OVGkXbYE0Cwc7nUsDGEZyoQmPAS9wVuHw0=";
"tree-sitter-nickel-0.0.1" = "sha256-aYsEx1Y5oDEqSPCUbf1G3J5Y45ULT9OkD+fn6stzrOU="; "tree-sitter-nickel-0.0.1" = "sha256-aYsEx1Y5oDEqSPCUbf1G3J5Y45ULT9OkD+fn6stzrOU=";
"tree-sitter-ocaml-0.20.1" = "sha256-5X2c2Deb8xNlp0LPQKFWIT3jwxKuuKdFlp9b3iA818Y="; "tree-sitter-ocaml-0.20.4" = "sha256-j3Hv2qOMxeBNOW+WIgIYzG3zMIFWPQpoHe94b2rT+A8=";
"tree-sitter-query-0.1.0" = "sha256-Gv882sbL2fmR++h4/I7dFCp+g6pddRCaLyX7+loEoHU="; "tree-sitter-ocamllex-0.20.2" = "sha256-YhmEE7I7UF83qMuldHqc/fD/no/7YuZd6CaAIaZ1now=";
"tree-sitter-query-0.1.0" = "sha256-5N7FT0HTK3xzzhAlk3wBOB9xlEpKSNIfakgFnsxEi18=";
"tree-sitter-rust-0.20.4" = "sha256-seWoMuA87ZWCq3mUXopVeDCcTxX/Bh+B4PFLVa0CBQA=";
"tree-sitter-toml-0.5.1" = "sha256-5nLNBxFeOGE+gzbwpcrTVnuL1jLUA0ZLBVw2QrOLsDQ=";
"web-tree-sitter-sys-1.3.0" = "sha256-9rKB0rt0y9TD/HLRoB9LjEP9nO4kSWR9ylbbOXo2+2M="; "web-tree-sitter-sys-1.3.0" = "sha256-9rKB0rt0y9TD/HLRoB9LjEP9nO4kSWR9ylbbOXo2+2M=";
}; };
}; };
@ -31,16 +35,11 @@ rustPlatform.buildRustPackage rec {
cargoTestFlags = cargoBuildFlags; cargoTestFlags = cargoBuildFlags;
env = { env = {
TOPIARY_LANGUAGE_DIR = "${placeholder "out"}/share/languages"; TOPIARY_LANGUAGE_DIR = "${placeholder "out"}/share/queries";
}; };
# Cargo.lock is outdated
postPatch = ''
ln -sf ${./Cargo.lock} Cargo.lock
'';
postInstall = '' postInstall = ''
install -Dm444 languages/* -t $out/share/languages install -Dm444 queries/* -t $out/share/queries
''; '';
passthru.updateScript = nix-update-script { }; passthru.updateScript = nix-update-script { };