diff --git a/pkgs/by-name/su/sudachi-rs/package.nix b/pkgs/by-name/su/sudachi-rs/package.nix index cfa5adff59b4..9bb716adda66 100644 --- a/pkgs/by-name/su/sudachi-rs/package.nix +++ b/pkgs/by-name/su/sudachi-rs/package.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sudachi-rs"; - version = "0.6.10"; + version = "0.6.11"; src = fetchFromGitHub { owner = "WorksApplications"; repo = "sudachi.rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-2sJ9diE/EjrQmFcCc4VluE4Gu4RebTYitd7zzfgj3g4="; + hash = "sha256-UHJSojDJ5EpoXvXj3qIs2s9Kzg7JrPQhi7o6WWF4Y5o="; }; postPatch = '' @@ -24,12 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace '"resources"' '"${placeholder "out"}/share/resources"' ''; - cargoPatches = [ - # https://github.com/WorksApplications/sudachi.rs/issues/299 - ./update-outdated-lockfile.patch - ]; - - cargoHash = "sha256-lUP/9s4W0JehxeCjMmq6G22KMGdDNnq1YlobeLQn2AE="; + cargoHash = "sha256-qWuFY97qPoKVxWp29ywaMEr2fTc0Y4wDR9LK+40r6QI="; # prepare the resources before the build so that the binary can find sudachidict preBuild = '' diff --git a/pkgs/by-name/su/sudachi-rs/update-outdated-lockfile.patch b/pkgs/by-name/su/sudachi-rs/update-outdated-lockfile.patch deleted file mode 100644 index 08905baf9385..000000000000 --- a/pkgs/by-name/su/sudachi-rs/update-outdated-lockfile.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 31a5ee3..d72e154 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -289,7 +289,7 @@ dependencies = [ - - [[package]] - name = "default_input_text" --version = "0.6.9" -+version = "0.6.11-a1" - dependencies = [ - "sudachi", - ] -@@ -432,14 +432,14 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - - [[package]] - name = "join_katakana_oov" --version = "0.6.9" -+version = "0.6.11-a1" - dependencies = [ - "sudachi", - ] - - [[package]] - name = "join_numeric" --version = "0.6.9" -+version = "0.6.11-a1" - dependencies = [ - "sudachi", - ] -@@ -593,9 +593,9 @@ dependencies = [ - - [[package]] - name = "pyo3" --version = "0.22.6" -+version = "0.23.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f402062616ab18202ae8319da13fa4279883a2b8a9d9f83f20dbade813ce1884" -+checksum = "57fe09249128b3173d092de9523eaa75136bf7ba85e0d69eca241c7939c933cc" - dependencies = [ - "cfg-if", - "indoc", -@@ -611,9 +611,9 @@ dependencies = [ - - [[package]] - name = "pyo3-build-config" --version = "0.22.6" -+version = "0.23.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b14b5775b5ff446dd1056212d778012cbe8a0fbffd368029fd9e25b514479c38" -+checksum = "1cd3927b5a78757a0d71aa9dff669f903b1eb64b54142a9bd9f757f8fde65fd7" - dependencies = [ - "once_cell", - "target-lexicon", -@@ -621,9 +621,9 @@ dependencies = [ - - [[package]] - name = "pyo3-ffi" --version = "0.22.6" -+version = "0.23.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9ab5bcf04a2cdcbb50c7d6105de943f543f9ed92af55818fd17b660390fc8636" -+checksum = "dab6bb2102bd8f991e7749f130a70d05dd557613e39ed2deeee8e9ca0c4d548d" - dependencies = [ - "libc", - "pyo3-build-config", -@@ -631,9 +631,9 @@ dependencies = [ - - [[package]] - name = "pyo3-macros" --version = "0.22.6" -+version = "0.23.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0fd24d897903a9e6d80b968368a34e1525aeb719d568dba8b3d4bfa5dc67d453" -+checksum = "91871864b353fd5ffcb3f91f2f703a22a9797c91b9ab497b1acac7b07ae509c7" - dependencies = [ - "proc-macro2", - "pyo3-macros-backend", -@@ -643,9 +643,9 @@ dependencies = [ - - [[package]] - name = "pyo3-macros-backend" --version = "0.22.6" -+version = "0.23.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "36c011a03ba1e50152b4b394b479826cad97e7a21eb52df179cd91ac411cbfbe" -+checksum = "43abc3b80bc20f3facd86cd3c60beed58c3e2aa26213f3cda368de39c60a27e4" - dependencies = [ - "heck", - "proc-macro2", -@@ -794,7 +794,7 @@ dependencies = [ - - [[package]] - name = "simple_oov" --version = "0.6.9" -+version = "0.6.11-a1" - dependencies = [ - "sudachi", - ] -@@ -807,7 +807,7 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - - [[package]] - name = "sudachi" --version = "0.6.9" -+version = "0.6.11-a1" - dependencies = [ - "aho-corasick", - "bitflags", -@@ -835,7 +835,7 @@ dependencies = [ - - [[package]] - name = "sudachi-cli" --version = "0.6.9" -+version = "0.6.11-a1" - dependencies = [ - "cfg-if", - "clap", -@@ -855,7 +855,7 @@ dependencies = [ - - [[package]] - name = "sudachipy" --version = "0.6.9" -+version = "0.6.11-a1" - dependencies = [ - "pyo3", - "scopeguard", diff --git a/pkgs/development/python-modules/sudachipy/default.nix b/pkgs/development/python-modules/sudachipy/default.nix index e517bc836a67..e7a14128397e 100644 --- a/pkgs/development/python-modules/sudachipy/default.nix +++ b/pkgs/development/python-modules/sudachipy/default.nix @@ -22,12 +22,9 @@ buildPythonPackage rec { disabled = pythonAtLeast "3.14"; # The pyo3 version used does not support 3.14+ - patches = sudachi-rs.cargoPatches; - cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - patches = sudachi-rs.cargoPatches; - hash = "sha256-lUP/9s4W0JehxeCjMmq6G22KMGdDNnq1YlobeLQn2AE="; + hash = "sha256-qWuFY97qPoKVxWp29ywaMEr2fTc0Y4wDR9LK+40r6QI"; }; nativeBuildInputs = [