diff options
Diffstat (limited to 'gnu/packages/language.scm')
| -rw-r--r-- | gnu/packages/language.scm | 78 |
1 files changed, 34 insertions, 44 deletions
diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index dc10309668..7627acd168 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -37,9 +37,6 @@ #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages cmake) - #:use-module (gnu packages crates-io) - #:use-module (gnu packages crates-database) - #:use-module (gnu packages crates-tls) #:use-module (gnu packages dbm) #:use-module (gnu packages dictionaries) #:use-module (gnu packages docbook) @@ -63,6 +60,7 @@ #:use-module (gnu packages perl-check) #:use-module (gnu packages qt) #:use-module (gnu packages ruby) + #:use-module (gnu packages rust) #:use-module (gnu packages scheme) #:use-module (gnu packages sqlite) #:use-module (gnu packages serialization) @@ -289,51 +287,43 @@ Random Cage Fighting Birds, Cool Music etc.") (file-name (git-file-name name version)) (sha256 (base32 "0gh64wvrk5pn0fhmpvj1j99d5g7f7697rk96zbkc8l72yjr819z5")))) - (build-system cargo-build-system) + (build-system cmake-build-system) (arguments - `(#:modules ((guix build cargo-build-system) + `(#:modules (((guix build cargo-build-system) #:prefix cargo:) (guix build utils) - ((guix build cmake-build-system) #:prefix cmake:)) + (guix build cmake-build-system)) #:imported-modules ((guix build cmake-build-system) ,@%cargo-build-system-modules) - #:install-source? #f - ;; Keep the vendor-dir outside of cmake's directories. - #:vendor-dir "../guix-vendor" - #:cargo-inputs - (("rust-anyhow" ,rust-anyhow-1) - ("rust-clap" ,rust-clap-4) - ("rust-clap-mangen" ,rust-clap-mangen-0.2) - ("rust-der" ,rust-der-0.7) - ("rust-directories" ,rust-directories-5) - ("rust-env-logger" ,rust-env-logger-0.10) - ("rust-log" ,rust-log-0.4) - ("rust-rusqlite" ,rust-rusqlite-0.29)) - #:cargo-development-inputs - (("rust-tempfile" ,rust-tempfile-3)) + #:out-of-source? #f ;For the tests. #:phases (modify-phases %standard-phases - (add-after 'configure 'cmake-configure + (add-after 'unpack 'prepare-cargo-build-system (lambda args - (apply (assoc-ref cmake:%standard-phases 'configure) - ;; For the tests. - (append args (list #:out-of-source? #f))))) + (for-each + (lambda (phase) + (format #t "Running cargo phase: ~a~%" phase) + (apply (assoc-ref cargo:%standard-phases phase) + ;; Keep the vendor-dir outside of cmake's directories. + #:vendor-dir "../guix-vendor" + #:cargo-target ,(cargo-triplet) + args)) + '(unpack-rust-crates + configure + check-for-pregenerated-files + patch-cargo-checksums)))) (add-after 'unpack 'work-around-genkeystroke (lambda _ ;; Remove this phase when we can find ncurses with cmake. (substitute* "tests/CMakeLists.txt" - (("CURSES_FOUND") "FALSE")))) - (replace 'build - (assoc-ref cmake:%standard-phases 'build)) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys #:rest args) - (when tests? - ((assoc-ref cmake:%standard-phases 'check))))) - (replace 'install - (assoc-ref cmake:%standard-phases 'install))))) + (("CURSES_FOUND") "FALSE"))))))) (native-inputs - (list corrosion cmake-minimal)) + (append + (list rust `(,rust "cargo") ) + (or (and=> (%current-target-system) + (compose list make-rust-sysroot)) + '()))) (inputs - (list ncurses sqlite)) + (cons* corrosion ncurses sqlite (cargo-inputs 'libchewing))) (synopsis "Chinese phonetic input method") (description "Chewing is an intelligent phonetic (Zhuyin/Bopomofo) input method, one of the most popular choices for Traditional Chinese users.") @@ -343,7 +333,7 @@ method, one of the most popular choices for Traditional Chinese users.") (define-public liblouis (package (name "liblouis") - (version "3.31.0") + (version "3.34.0") (source (origin (method git-fetch) @@ -353,7 +343,7 @@ method, one of the most popular choices for Traditional Chinese users.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "02bga2l4jiyrgfqdl27wszz5yd6h80n2dmq3p6nb2br83jywisfh")))) + (base32 "1p6ihaxnbwqi8vk471h7v71lkrknk6ahxggm3p7v7l6hal7n6smq")))) (build-system gnu-build-system) (outputs '("out" "bin" "doc" "python")) (arguments @@ -391,14 +381,13 @@ support for hyphenation. New languages can easily be added through tables that support a rule- or dictionary based approach. Tools for testing and debugging tables are also included. Liblouis also supports math braille, Nemeth and Marburg.") - (home-page "http://liblouis.org/") + (home-page "https://liblouis.io/") (license (list license:lgpl2.1+ ; library license:gpl3+)))) ; tools (define-public liblouisutdml - ;; Use the latest commit, which includes test suite fixes not yet released. - (let ((commit "00ca7838e30ebd5ed6f635236aa235e2c8f089c1") - (revision "0")) + (let ((commit "68f702d43cda279f960d8ffa2415ac639d301295") + (revision "1")) (package (name "liblouisutdml") (version (git-version "2.12.0" revision commit)) @@ -411,12 +400,13 @@ Marburg.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1pr3wys48bzblr6kav24gr8slsp409f81iqxw19922k24y5y31l7")))) + (base32 "0r0k91fcsp4kwlgrmb497r2dh0c3yz45wbd1ds1kh0m28v78q5i3")))) (build-system gnu-build-system) (outputs '("out" "bin" "doc")) (arguments (list #:configure-flags - #~(list "--disable-static"))) + #~(list "--disable-static" + "CFLAGS=-Wno-error=incompatible-pointer-types"))) (native-inputs (list autoconf automake @@ -435,7 +425,7 @@ Marburg.") transcription services for xml, html and text documents. It translates into appropriate braille codes and formats according to its style sheet and the specifications in the document.") - (home-page "http://liblouis.org/") + (home-page "https://liblouis.io/") (license (list license:lgpl3+ ; library license:gpl3+))))) ; tools |