ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: xonsh: Update to 0.13.0

Browse source 
* gnu/packages/shells.scm (xonsh): Update to 0.13.0.
[source]: Rewrite snippet as a gexp.
[native-inputs]: Add python-setuptools, python-wheel
[inputs]: Add python-distro, python-pygments, python-pyperclip, python-setproctitle

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
arkhan 2022-07-11 09:54:46 -05:00 committed by Ludovic Courtès
parent 5ecbf5b163
commit dee9a32888
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
gnu/packages/shells.scm
View file

@ -57,6 +57,7 @@ (define-module (gnu packages shells)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages readline) #:use-module (gnu packages readline)
#:use-module (gnu packages rust) #:use-module (gnu packages rust)
@ -64,6 +65,7 @@ (define-module (gnu packages shells)
#:use-module (gnu packages scheme) #:use-module (gnu packages scheme)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (gnu packages texinfo) #:use-module (gnu packages texinfo)
#:use-module (guix build-system cargo) #:use-module (guix build-system cargo)
@ -545,32 +547,29 @@ (define-public zsh
(define-public xonsh (define-public xonsh
(package (package
(name "xonsh") (name "xonsh")
(version "0.12.4") (version "0.13.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "xonsh" version)) (uri (pypi-uri "xonsh" version))
(sha256 (sha256
(base32 "0xlac84nsgs0052n2pw8np1smlgghrbd7p6yrcp7d5qh8zdr9lx3")) (base32 "12ayz1kw2ag3r407j0lng2kfp75im8xqap1nvpmpa0lmsx8wk7ll"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
`(begin #~(begin
;; Delete bundled PLY. (substitute* "setup.py"
(delete-file-recursively "xonsh/ply") (("\"xonsh\\.ply\\.ply\",") ""))
(substitute* "setup.py" ;; Use our properly packaged PLY instead.
(("\"xonsh\\.ply\\.ply\",") "")) (substitute* (list "setup.py"
;; Use our properly packaged PLY instead. "tests/test_lexer.py"
(substitute* (list "setup.py" "xonsh/lexer.py"
"tests/test_lexer.py" "xonsh/parsers/base.py"
"xonsh/__amalgam__.py" "xonsh/parsers/completion_context.py"
"xonsh/lexer.py" "xonsh/xonfig.py")
"xonsh/parsers/base.py" (("from xonsh\\.ply\\.(.*) import" _ module)
"xonsh/parsers/completion_context.py" (format #f "from ~a import" module))
"xonsh/xonfig.py") (("from xonsh\\.ply import") "import"))
(("from xonsh\\.ply\\.(.*) import" _ module) #t))))
(format #f "from ~a import" module))
(("from xonsh\\.ply import") "import"))
#t))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
(list ;; TODO Try running run the test suite. (list ;; TODO Try running run the test suite.
@ -586,8 +585,15 @@ (define-public xonsh
"--invalidation-mode=unchecked-hash" out) "--invalidation-mode=unchecked-hash" out)
(invoke "python" "setup.py" "install" "--root=/" (invoke "python" "setup.py" "install" "--root=/"
(string-append "--prefix=" out)))))))) (string-append "--prefix=" out))))))))
(native-inputs
(list python-setuptools ;needed at build time
python-wheel))
(inputs (inputs
(list python-ply)) (list python-distro
python-ply
python-pygments
python-pyperclip
python-setproctitle))
(home-page "https://xon.sh/") (home-page "https://xon.sh/")
(synopsis "Python-ish shell") (synopsis "Python-ish shell")
(description (description