From a37a8a23bdcc20e5da2460faa2f3f47865c34784 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Fri, 1 Apr 2022 15:16:07 +0000 Subject: gnu: oil: Update to 0.9.9. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/shells.scm (oil): Update to 0.9.9. [source]: Add comment on embedded CPython like Ludo’ proposed in https://issues.guix.gnu.org/53642#3. Signed-off-by: Ludovic Courtès --- gnu/packages/shells.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu/packages/shells.scm') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index dda670d237..3a48bc7dbf 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2020, 2022 Marius Bakke ;;; Copyright © 2021, 2022 Nicolas Goaziou -;;; Copyright © 2021 Felix Gruber +;;; Copyright © 2021, 2022 Felix Gruber ;;; ;;; This file is part of GNU Guix. ;;; @@ -834,14 +834,20 @@ (define-public mksh (define-public oil (package (name "oil") - (version "0.9.7") + (version "0.9.9") (source + ;; oil's sources contain a modified version of CPython 2.7.13. + ;; According to https://www.oilshell.org/blog/2017/05/05.html + ;; this bundles version of CPython had certain unused parts removed + ;; and its build system has been replaced by a custom one. + ;; This would probably make it quite complicated to replace the + ;; bundled CPython with the one from the python2 package. (origin (method url-fetch) (uri (string-append "https://www.oilshell.org/download/oil-" version ".tar.gz")) (sha256 - (base32 "09ill1wks8gmixfc648wx25wx0wzlgkjj34bbpglx496i6yp81aw")))) + (base32 "1ymszq0wy7sy709yqx8dpmv7b37fkc57bdg02ah2gnjbvbk6s2z1")))) (build-system gnu-build-system) (arguments (list #:strip-binaries? #f ; strip breaks the binary -- cgit v1.2.3 From 606ba144803df497bc71444408feb990001314f6 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Mon, 25 Apr 2022 09:40:02 +0300 Subject: gnu: zsh: Build and install info pages. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/shells.scm (zsh)[arguments]: Add 'make-info' and 'install-info' phases. [native-inputs]: Add TEXINFO. Co-authored-by: Ludovic Courtès --- gnu/packages/shells.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gnu/packages/shells.scm') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 3a48bc7dbf..00a0ef363d 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2020, 2022 Marius Bakke ;;; Copyright © 2021, 2022 Nicolas Goaziou ;;; Copyright © 2021, 2022 Felix Gruber +;;; Copyright © 2022 Andrew Tropin ;;; ;;; This file is part of GNU Guix. ;;; @@ -64,6 +65,7 @@ (define-module (gnu packages shells) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (gnu packages xorg) + #:use-module (gnu packages texinfo) #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) @@ -521,9 +523,12 @@ (define-public zsh (substitute* "Test/A01grammar.ztst" (("command -pv") "command -v") (("command -p") "command ") - (("'command' -p") "'command' ")) - #t))))) - (native-inputs (list autoconf)) + (("'command' -p") "'command' ")))) + (add-after 'build 'make-info + (lambda _ (invoke "make" "info"))) + (add-after 'build 'install-info + (lambda _ (invoke "make" "install.info")))))) + (native-inputs (list autoconf texinfo)) (inputs (list ncurses pcre perl)) (synopsis "Powerful shell for interactive use and scripting") (description "The Z shell (zsh) is a Unix shell that can be used -- cgit v1.2.3 From 2e6f4220cffc72f55f5390a57499e95fc9a03796 Mon Sep 17 00:00:00 2001 From: arkhan Date: Wed, 11 May 2022 16:04:40 -0500 Subject: gnu: xonsh: Update to 0.12.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/shells.scm (xonsh): Update to 0.12.4. [source](snippet): Substitute "xonsh/parsers/completion_context.py". [arguments]: Rewrite #:phases as a gexp. Signed-off-by: Ludovic Courtès --- gnu/packages/shells.scm | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'gnu/packages/shells.scm') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 00a0ef363d..9fe0ed8e27 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -545,13 +545,13 @@ (define-public zsh (define-public xonsh (package (name "xonsh") - (version "0.9.27") + (version "0.12.4") (source (origin (method url-fetch) (uri (pypi-uri "xonsh" version)) (sha256 - (base32 "1maz7yvb5py91n699yqsna81x2i25mvrqkrcn7h7870nxd87ral2")) + (base32 "0xlac84nsgs0052n2pw8np1smlgghrbd7p6yrcp7d5qh8zdr9lx3")) (modules '((guix build utils))) (snippet `(begin @@ -565,6 +565,7 @@ (define-public xonsh "xonsh/__amalgam__.py" "xonsh/lexer.py" "xonsh/parsers/base.py" + "xonsh/parsers/completion_context.py" "xonsh/xonfig.py") (("from xonsh\\.ply\\.(.*) import" _ module) (format #f "from ~a import" module)) @@ -572,10 +573,19 @@ (define-public xonsh #t)))) (build-system python-build-system) (arguments - '(;; TODO Try running run the test suite. - ;; See 'requirements-tests.txt' in the source distribution for more - ;; information. - #:tests? #f)) + (list ;; TODO Try running run the test suite. + ;; See 'requirements-tests.txt' in the source distribution for more + ;; information. + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (invoke "python" "-m" "compileall" + "--invalidation-mode=unchecked-hash" out) + (invoke "python" "setup.py" "install" "--root=/" + (string-append "--prefix=" out)))))))) (inputs (list python-ply)) (home-page "https://xon.sh/") -- cgit v1.2.3