diff options
Diffstat (limited to 'gnu/packages/shells.scm')
| -rw-r--r-- | gnu/packages/shells.scm | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 2a1fbe0a6c..0759a56385 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -143,8 +143,12 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).") (list doxygen groff ; for 'fish --help' procps)) ; for the test suite (arguments - '(#:phases - (modify-phases %standard-phases + (list + #:modules '((guix build cmake-build-system) + ((guix build gnu-build-system) #:prefix gnu:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases (add-after 'unpack 'set-env (lambda _ ;; some tests write to $HOME @@ -244,6 +248,10 @@ direct descendant of NetBSD's Almquist Shell (@command{ash}).") port) (close-port port)) #t)) + (replace 'check + (lambda* (#:rest args) + (apply (assoc-ref gnu:%standard-phases 'check) + #:test-target "test" args))) ;; Use fish-foreign-env to source /etc/profile. (add-before 'install 'source-etc-profile (lambda* (#:key inputs #:allow-other-keys) @@ -553,14 +561,14 @@ ksh, and tcsh.") (define-public xonsh (package (name "xonsh") - (version "0.19.2") + (version "0.19.9") (source (origin (method url-fetch) (uri (pypi-uri "xonsh" version)) (sha256 (base32 - "1c30p5qvn6c2l1jq7lby86m0cg9s2k3xrbbcznpc78jlv600dpfg")) + "0zf3fjjq0p9pngq48s8c14ywzv4b02y14vr9g93vgalqg96lrasc")) (modules '((guix build utils))) (snippet #~(begin @@ -608,6 +616,7 @@ ksh, and tcsh.") "test_sourcefile" "test_spec_decorator_alias_output_format" "test_spec_modifier_alias_output_format" + "test_trace_in_script" "test_vc_get_branch" "test_xonsh_activator" "test_xonsh_lexer") @@ -683,7 +692,16 @@ use of experts and novices alike.") #$(package-version scheme48) "/rx"))) (delete-file-recursively "rx") - (symlink rxpath "rx"))))))) + (symlink rxpath "rx")))) + (add-after 'replace-rx 'fix-includes + (lambda _ + (with-directory-excursion "c" + (substitute* "syscalls.c" + (("#include <stdlib.h>" all) + (string-append all "\n#include <time.h>"))) + (substitute* "tty.c" + (("#include <termios.h>" all) + (string-append all "\n#include <pty.h>"))))))))) (inputs (list scheme48 scheme48-rx)) (native-inputs |