diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/python-xyz.scm | 59 | ||||
| -rw-r--r-- | gnu/packages/rust-crates.scm | 82 |
2 files changed, 123 insertions, 18 deletions
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4494d53595d..7406a0a9850 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20982,26 +20982,49 @@ doesn't know about.") (define-public python-jellyfish (package (name "python-jellyfish") - (version "0.8.8") - (source (origin - (method url-fetch) - (uri (pypi-uri "jellyfish" version)) - (sha256 - (base32 - "0p2s6b30sfffx8sya2i8kz0i0riw9fq1fi0k89s8kdgrmjf0h1h5")))) - (build-system python-build-system) + (version "1.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jamesturk/jellyfish") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1zsbvyq608yrfv29hlwjkr6ycrghy8s5hpwnj3aa9symihazpb4c")))) + (build-system pyproject-build-system) (arguments - `(#:tests? #f ; XXX: Tests cannot find C coded version. - #:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs outputs tests? #:allow-other-keys) - (when tests? - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "-vv" "jellyfish/test.py"))))))) + (list + #:imported-modules (append %cargo-build-system-modules + %pyproject-build-system-modules) + #:modules '(((guix build cargo-build-system) #:prefix cargo:) + (guix build pyproject-build-system) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'prepare-cargo-build-system + (lambda args + (for-each + (lambda (phase) + (format #t "Running cargo phase: ~a~%" phase) + (apply (assoc-ref cargo:%standard-phases phase) + #:cargo-target #$(cargo-triplet) + args)) + '(unpack-rust-crates + configure + check-for-pregenerated-files + patch-cargo-checksums))))))) + (inputs (cons* maturin (cargo-inputs 'jellyfish))) (native-inputs - (list python-pytest)) - (home-page "https://github.com/jamesturk/jellyfish") + (append + (list python-pytest + python-setuptools + rust + `(,rust "cargo")) + (or (and=> (%current-target-system) + (compose list make-rust-sysroot)) + '()))) + (home-page "https://www.jpt.sh/projects/jellyfish/") (synopsis "Approximate and phonetic matching of strings") (description "Jellyfish uses a variety of string comparison and phonetic encoding algorithms to do fuzzy string matching.") diff --git a/gnu/packages/rust-crates.scm b/gnu/packages/rust-crates.scm index 960d6a1669c..a4f03ccf65a 100644 --- a/gnu/packages/rust-crates.scm +++ b/gnu/packages/rust-crates.scm @@ -2611,6 +2611,10 @@ (crate-source "cc" "1.2.54" "10q5q3kzcqg9s1zrgpk9sn1a98xjnz177ixkkkx9qbfnpwdwhm33")) +(define rust-cc-1.2.50 + (crate-source "cc" "1.2.50" + "0g1q2k30bwnym5hlhk2y3k08hhrklgn68gr61b63f73s49ixal4z")) + (define rust-cedarwood-0.4.6 (crate-source "cedarwood" "0.4.6" "142fw2aj0c34v56bsml95v9cjlq88r3x5gnhccr7691csvnhp4bd")) @@ -9891,6 +9895,10 @@ (crate-source "itoa" "1.0.17" "1lh93xydrdn1g9x547bd05g0d3hra7pd1k4jfd2z1pl1h5hwdv4j")) +(define rust-itoa-1.0.16 + (crate-source "itoa" "1.0.16" + "040hqvfkxl7mpjs54y495ch2qkxx26kbfxyydmi42k7vk8rvbrby")) + (define rust-itoa-1.0.9 (crate-source "itoa" "1.0.9" "0f6cpb4yqzhkrhhg6kqsw3wnmmhdnnffi6r2xzy248gzi2v0l5dg")) @@ -10491,6 +10499,10 @@ (crate-source "libc" "0.2.180" "1z2n7hl10fnk1xnv19ahhqxwnb4qi9aclnl6gigim2aaahw5mhxw")) +(define rust-libc-0.2.178 + (crate-source "libc" "0.2.178" + "1490yks6mria93i3xdva1gm05cjz824g14mbv0ph32lxma6kvj9p")) + (define rust-libc-stdhandle-0.1.0 (crate-source "libc-stdhandle" "0.1.0" "0lbmg42kncl3yjgzx48d2sa3p78w4fmhs9c21dg4r4r8virj9b3d")) @@ -14433,6 +14445,10 @@ (crate-source "portable-atomic" "1.6.0" "1h77x9qx7pns0d66vdrmdbmwpi7586h7ysnkdnhrn5mwi2cyyw3i")) +(define rust-portable-atomic-1.12.0 + (crate-source "portable-atomic" "1.12.0" + "1p9rrnq6fdk8byqf1q7x5jbzqwx9yaj99zg8qabmgrgimv2717pm")) + (define rust-portable-atomic-1.7.0 (crate-source "portable-atomic" "1.7.0" "0rbjqv7lw120k6avb3fbsg58zg69m0wrmjg926lqglph33i4wm6s")) @@ -16997,6 +17013,10 @@ (crate-source "ryu" "1.0.22" "1139acr2kd4n8p36bp1n42xrpaphn6dhwklnazh8hpdnfps4q3x5")) +(define rust-ryu-1.0.21 + (crate-source "ryu" "1.0.21" + "1sja0gi4s0h3yjrx7hky72vivhzx73p5dllsiwg844mzfwl9n132")) + (define rust-safe-arch-0.7.4 (crate-source "safe_arch" "0.7.4" "08sk47n1kcm5w2di6bpgi2hsw8r2caz2230pwqvbdqfv5pl2vc4n")) @@ -19241,6 +19261,10 @@ (crate-source "target-lexicon" "0.13.3" "0355pbycq0cj29h1rp176l57qnfwmygv7hwzchs7iq15gibn4zyz")) +(define rust-target-lexicon-0.13.4 + (crate-source "target-lexicon" "0.13.4" + "1fnh3md1p3bsxviyydvg9qk5q9i9x5a5s5f7ygi6f84ahpmhgpdi")) + (define rust-target-spec-3.4.2 (crate-source "target-spec" "3.4.2" "0lr5sp4hjiawwhdmv3hbg5ip566iqha31shwdpj0ci5svh7lshj9")) @@ -20985,6 +21009,10 @@ (crate-source "unicode-normalization" "0.1.24" "0mnrk809z3ix1wspcqy97ld5wxdb31f3xz6nsvg5qcv289ycjcsh")) +(define rust-unicode-normalization-0.1.25 + (crate-source "unicode-normalization" "0.1.25" + "1s76dcrxw7vs32yhpi0p074apdc3s7lak7809f3qvclwij3zdm2z")) + (define rust-unicode-normalization-alignments-0.1.12 (crate-source "unicode-normalization-alignments" "0.1.12" "1pk2f3arh3qvdsmrsiri0gr5y5vqpk2gv1yjin0njvh4zbj17xj3")) @@ -23843,6 +23871,10 @@ (crate-source "zerocopy" "0.8.33" "1z9d6z8p1ndf0yrvw99jr5zcjnd4270kv4rivqqyi7hbs5l533v6")) +(define rust-zerocopy-0.8.31 + (crate-source "zerocopy" "0.8.31" + "1hwqn8f0zd8h1a7qz2hxym4iaqyzk8kdxgalllydn2i5p6cfqx7x")) + (define rust-zerocopy-derive-0.7.35 (crate-source "zerocopy-derive" "0.7.35" "0gnf2ap2y92nwdalzz3x7142f2b83sni66l39vxp2ijd6j080kzs")) @@ -23867,6 +23899,10 @@ (crate-source "zerocopy-derive" "0.8.33" "1wbh4bil3kqfmiwxlpzhxba6fyh09nsy87k7idk8b1hadfr64y9c")) +(define rust-zerocopy-derive-0.8.31 + (crate-source "zerocopy-derive" "0.8.31" + "0sjw20qqxbax8z8k9ifcmwjjlljjddpm0nmvih9zap7lzl4x5a6q")) + (define rust-zerofrom-0.1.4 (crate-source "zerofrom" "0.1.4" "0mdbjd7vmbix2ynxbrbrrli47a5yrpfx05hi99wf1l4pwwf13v4i")) @@ -35745,6 +35781,52 @@ rust-yansi-1.0.1 rust-zerocopy-0.8.26 rust-zerocopy-derive-0.8.26)) + (jellyfish => + (list rust-ahash-0.8.12 + rust-autocfg-1.5.0 + rust-cc-1.2.50 + rust-cfg-if-1.0.4 + rust-csv-1.4.0 + rust-csv-core-0.1.13 + rust-find-msvc-tools-0.1.5 + rust-getrandom-0.3.4 + rust-heck-0.5.0 + rust-indoc-2.0.7 + rust-itoa-1.0.16 + rust-libc-0.2.178 + rust-memchr-2.7.6 + rust-memoffset-0.9.1 + rust-num-traits-0.2.19 + rust-once-cell-1.21.3 + rust-portable-atomic-1.12.0 + rust-proc-macro2-1.0.103 + rust-pyo3-0.26.0 + rust-pyo3-build-config-0.26.0 + rust-pyo3-ffi-0.26.0 + rust-pyo3-macros-0.26.0 + rust-pyo3-macros-backend-0.26.0 + rust-python3-dll-a-0.2.14 + rust-quote-1.0.42 + rust-r-efi-5.3.0 + rust-rustversion-1.0.22 + rust-ryu-1.0.21 + rust-serde-core-1.0.228 + rust-serde-derive-1.0.228 + rust-shlex-1.3.0 + rust-smallvec-1.15.1 + rust-syn-2.0.111 + rust-target-lexicon-0.13.4 + rust-tinyvec-1.10.0 + rust-tinyvec-macros-0.1.1 + rust-unicode-ident-1.0.22 + rust-unicode-normalization-0.1.25 + rust-unicode-segmentation-1.12.0 + rust-unindent-0.2.4 + rust-version-check-0.9.5 + rust-wasip2-1.0.1+wasi-0.2.4 + rust-wit-bindgen-0.46.0 + rust-zerocopy-0.8.31 + rust-zerocopy-derive-0.8.31)) (jless => (list rust-aho-corasick-1.1.3 rust-anstream-0.6.18 |