mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-23 05:37:27 +03:00
Merge pull request #283178 from natsukium/sudachi-rs/update
sudachi-rs: 0.6.7 -> 0.6.8; add updateScript
This commit is contained in:
commit
a89664f224
@ -4,17 +4,18 @@
|
||||
, sudachidict
|
||||
, runCommand
|
||||
, sudachi-rs
|
||||
, writeScript
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sudachi-rs";
|
||||
version = "0.6.7";
|
||||
version = "0.6.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "WorksApplications";
|
||||
repo = "sudachi.rs";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-VzNOI6PP9sKBsNfB5yIxAI8jI8TEdM4tD49Jl/2tkSE=";
|
||||
hash = "sha256-9GXU+YDPuQ+roqQfUE5q17Hl6AopsvGhRPjZ+Ui+n24=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -22,7 +23,7 @@ rustPlatform.buildRustPackage rec {
|
||||
--replace '"resources"' '"${placeholder "out"}/share/resources"'
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-b2NtgHcMkimzFFuqohAo9KdSaIq6oi3qo/k8/VugyFs=";
|
||||
cargoHash = "sha256-Ufo3dB2KGDDNiebp7hLhQrUMLsefO8wRpJQDz57Yb8Y=";
|
||||
|
||||
# prepare the resources before the build so that the binary can find sudachidict
|
||||
preBuild = ''
|
||||
@ -30,12 +31,22 @@ rustPlatform.buildRustPackage rec {
|
||||
install -Dm644 resources/* -t $out/share/resources
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
# detects an error that sudachidict is not found
|
||||
cli = runCommand "${pname}-cli-test" { } ''
|
||||
mkdir $out
|
||||
echo "高輪ゲートウェイ駅" | ${lib.getExe sudachi-rs} > $out/result
|
||||
passthru = {
|
||||
updateScript = writeScript "update.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nix-update
|
||||
|
||||
set -eu -o pipefail
|
||||
nix-update sudachi-rs
|
||||
nix-update --version=skip python3Packages.sudachipy
|
||||
'';
|
||||
tests = {
|
||||
# detects an error that sudachidict is not found
|
||||
cli = runCommand "${pname}-cli-test" { } ''
|
||||
mkdir $out
|
||||
echo "高輪ゲートウェイ駅" | ${lib.getExe sudachi-rs} > $out/result
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -2,6 +2,7 @@
|
||||
, fetchFromGitHub
|
||||
, sudachidict
|
||||
, setuptools
|
||||
, sudachipy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -33,6 +34,10 @@ buildPythonPackage rec {
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
sudachipy
|
||||
];
|
||||
|
||||
# we need to prepare some files before the build
|
||||
# https://github.com/WorksApplications/SudachiDict/blob/develop/package_python.sh
|
||||
preBuild = ''
|
||||
|
@ -10,6 +10,7 @@
|
||||
, pytestCheckHook
|
||||
, sudachidict-core
|
||||
, tokenizers
|
||||
, sudachipy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -19,7 +20,7 @@ buildPythonPackage rec {
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-Am+ae2lgnndSDzf0GF8R1i6OPLdIlm2dLThqYqXbscA=";
|
||||
hash = "sha256-ARwvThfATDdzBTjPFr9yjbE/0eYvp/TCZOEGbUupJmU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -37,6 +38,9 @@ buildPythonPackage rec {
|
||||
cd python
|
||||
'';
|
||||
|
||||
# avoid infinite recursion due to sudachidict
|
||||
doCheck = false;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
sudachidict-core
|
||||
@ -47,6 +51,20 @@ buildPythonPackage rec {
|
||||
"sudachipy"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
inherit (sudachi-rs) updateScript;
|
||||
tests = {
|
||||
pytest = sudachipy.overridePythonAttrs (
|
||||
_: {
|
||||
doCheck = true;
|
||||
# avoid catchConflicts of sudachipy
|
||||
# we don't need to install this package since it is just a test
|
||||
dontInstall = true;
|
||||
}
|
||||
);
|
||||
};
|
||||
};
|
||||
|
||||
meta = sudachi-rs.meta // {
|
||||
homepage = "https://github.com/WorksApplications/sudachi.rs/tree/develop/python";
|
||||
mainProgram = "sudachipy";
|
||||
|
Loading…
Reference in New Issue
Block a user