unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / code / Atom feed
From: arkhan--- via Bug reports for GNU Guix <bug-guix@gnu.org>
To: 55004@debbugs.gnu.org, guix-patches@gnu.org
Subject: bug#55004: [PATCH] gnu: xonsh: Update to 0.12.4
Date: Wed, 11 May 2022 21:35:25 +0000	[thread overview]
Message-ID: <4d8833515001b3fa0c68da7605fb4e5e12dce088@disroot.org> (raw)
In-Reply-To: <3d1ae99772de7961d405da05e5968540@disroot.org>

[-- Attachment #1: Type: text/plain, Size: 2290 bytes --]

Attach patch file

11 de mayo de 2022, 16:14, "arkhan--- via Bug reports for GNU Guix" <bug-guix@gnu.org mailto:bug-guix@gnu.org?to=%22arkhan---%20via%20Bug%20reports%20for%20GNU%20Guix%22%20%3Cbug-guix%40gnu.org%3E > escribió:

> 
> From 70d42eba0c1f764956ad319853a5a1da7eb3da2a Mon Sep 17 00:00:00 2001
> From: arkhan <arkhan@riseup.net>
> Date: Wed, 11 May 2022 16:04:40 -0500
> Subject: [PATCH] Update xonsh 0.12.4
> 
> ---
> gnu/packages/shells.scm | 21 +++++++++++++++------
> 1 file changed, 15 insertions(+), 6 deletions(-)
> 
> diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
> index 00a0ef363d..ce4cdc765d 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,18 @@ (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/")
> -- 
> 2.36.0
>

[-- Attachment #2: 0001-Update-xonsh-0.12.4.patch --]
[-- Type: application/octet-stream, Size: 2388 bytes --]

From 70d42eba0c1f764956ad319853a5a1da7eb3da2a Mon Sep 17 00:00:00 2001
From: arkhan <arkhan@riseup.net>
Date: Wed, 11 May 2022 16:04:40 -0500
Subject: [PATCH] Update xonsh 0.12.4

---
 gnu/packages/shells.scm | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 00a0ef363d..ce4cdc765d 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,18 @@ (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/")
-- 
2.36.0


      parent reply	other threads:[~2022-05-11 21:36 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-18 16:43 bug#55004: Cant build xonsh 0.12.1 arkhan--- via Bug reports for GNU Guix
2022-04-18 18:03 ` arkhan--- via Bug reports for GNU Guix
2022-05-11 21:12 ` bug#55004: [PATCH] gnu: xonsh: Update to 0.12.4 arkhan--- via Bug reports for GNU Guix
2022-06-08 20:35   ` bug#55004: Cant build xonsh 0.12.1 Maxim Cournoyer
2022-05-11 21:35 ` arkhan--- via Bug reports for GNU Guix [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4d8833515001b3fa0c68da7605fb4e5e12dce088@disroot.org \
    --to=bug-guix@gnu.org \
    --cc=55004@debbugs.gnu.org \
    --cc=arkhan@disroot.org \
    --cc=guix-patches@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).