aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/language.scm
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2024-09-29 10:55:04 +0300
committerjgart <jgart@dismail.de>2024-10-20 01:12:54 -0500
commit515c1619cf5599ab23a0ecdaac40253bfd5fbd9d (patch)
tree450857816293dcadc6daad8fb1c47601a7c7cf9b /gnu/packages/language.scm
parent8ac0b82e35509aad84e92d6064809ae342d03cc4 (diff)
downloadguix-515c1619cf5599ab23a0ecdaac40253bfd5fbd9d.tar.gz
guix-515c1619cf5599ab23a0ecdaac40253bfd5fbd9d.zip
gnu: libchewing: Update to 0.9.0.
* gnu/packages/language.scm (libchewing): Update to 0.9.0. [build-system]: Switch to cargo-build-system. [arguments]: Adjust for switch to cargo-build-system. Enable parallel-tests. Add a phase to allow older versions of rust-clap-mangen. Add the cmake version of 'configure after 'configure. Use the cmake versions of 'build, 'check and 'install. [native-inputs]: Add corrosion, cmake-minimal. Remove autoconf, automake, libtool, perl, pkg-config, python-wrapper, texinfo. Co-authored-by: Charles <charles@charje.net> Change-Id: Ic11e38646fc47cfc2c575320f43b9355a1c83b39 Signed-off-by: jgart <jgart@dismail.de>
Diffstat (limited to 'gnu/packages/language.scm')
class='del'>- (git-reference
- (url "https://github.com/chewing/libchewing.git")
- (commit
- (string-append "v" version))))
- (file-name
- (git-file-name name version))
+ (uri (git-reference
+ (url "https://github.com/chewing/libchewing")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
- (base32 "04d09w6xdd08v6laj9y4qmqsijw5i2jvshcilhh4vg6cfnfgl2my"))))
- (build-system gnu-build-system)
+ (base32 "1n0w9niff46w7vncs699gj4y2xghn1sbl0f4mg5x33dcapqd14sg"))))
+ (build-system cargo-build-system)
(arguments
- `(;; test-easy-symbol and test-fullshape fail with multiple cores.
- #:parallel-tests? #f
+ `(#:modules ((guix build cargo-build-system)
+ (guix build utils)
+ ((guix build cmake-build-system) #:prefix cmake:))
+ #: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))
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'disable-failing-tests
+ (add-after 'unpack 'allow-older-version-of-clap-mangen
+ (lambda _
+ (substitute* "tools/Cargo.toml"
+ (("0.2.12") "0.2.11"))))
+ (add-after 'configure 'cmake-configure
+ (lambda args
+ (apply (assoc-ref cmake:%standard-phases 'configure)
+ ;; For the tests.
+ (append args (list #:out-of-source? #f)))))
+ (add-after 'unpack 'work-around-genkeystroke
(lambda _
- (substitute* "test/Makefile.am"
- ((" test-bopomofo ")
- "")
- ((" test-config ")
- "")
- ((" test-reset ")
- "")
- ((" test-symbol ")
- "")
- ((" test-keyboardless ")
- "")
- ((" test-special-symbol ")
- "")
- ((" test-keyboard ")
- "")
- ((" test-regression ")
- "")
- ((" test-userphrase ")
- ""))
- #t)))))
+ ;; 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)))))
(native-inputs
- `(("autoconf" ,autoconf)
- ("automake" ,automake)
- ("libtool" ,libtool)
- ("perl" ,perl)
- ("pkg-config" ,pkg-config)
- ("python" ,python-wrapper)
- ("texinfo" ,texinfo)))
+ (list corrosion cmake-minimal))
(inputs
(list ncurses sqlite))
(synopsis "Chinese phonetic input method")
-rw-r--r--2017-11-28build: Explicitly flush the "LOAD" and "GUILEC" lines....* build-aux/compile-all.scm <top level>: Add calls to 'force-output' in the #:report-load and #:report-compilation procedures. Fixes a regression introduced in 2890ad332fcdfd4bc92b127d783975437c8b718b whereby compilation output would be buffered, leading to a weird visual effect. Ludovic Courtès
2017-11-21Revert "Add (guix self) and use it when pulling."...This reverts commit 5f93d97005897c2d859f0be1bdff34c88467ec61. 'guix pull' would fail because (guix self) needs 'scheme-files' from (guix discovery), which was not exported until now. Ludovic Courtès
2017-11-21hydra: Add jobs for the modular Guix....* build-aux/hydra/guix-modular.scm: New file. * Makefile.am (EXTRA_DIST): Add it. Ludovic Courtès
2017-11-21hydra: 'evaluate' passes an alist to the entry point....* build-aux/hydra/evaluate.scm (%top-srcdir): New variable. <top level>: Pass it to 'hydra-jobs'. Ludovic Courtès
2017-11-21Add (guix self) and use it when pulling....This mitigates <https://bugs.gnu.org/27284>. * guix/self.scm: New file. * Makefile.am (MODULES): Add it. * build-aux/build-self.scm (libgcrypt, zlib, gzip, bzip2, xz) (false-if-wrong-guile, package-for-current-guile, guile-json) (guile-ssh, guile-git, guile-bytestructures): Remove. (build): Rewrite to simply delegate to 'compiled-guix'. * gnu/packages.scm (%distro-root-directory): Rewrite to try different directories. * guix/discovery.scm (guix): Export 'scheme-files'. * guix/scripts/pull.scm (build-and-install): Split into... (install-latest): ... this. New procedure. And... (build-and-install): ... this, which now takes a monadic value argument. (indirect-root-added): Remove. (guix-pull): Call 'add-indirect-root'. Call 'build-from-source' and pass the result to 'build-and-install'. Ludovic Courtès
generated by cgit