unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#55378] [PATCH] gnu: xonsh: Update to 0.12.4
@ 2022-05-11 23:55 arkhan--- via Guix-patches via
  2022-05-13 15:50 ` bug#55378: " Ludovic Courtès
  0 siblings, 1 reply; 2+ messages in thread
From: arkhan--- via Guix-patches via @ 2022-05-11 23:55 UTC (permalink / raw)
  To: 55378

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

From 70d42eba0c1f764956ad319853a5a1da7eb3da2a Mon Sep 17 00:00:00 2001
From: arkhan <arkhan@riseup.net mailto: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


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#55378: [PATCH] gnu: xonsh: Update to 0.12.4
  2022-05-11 23:55 [bug#55378] [PATCH] gnu: xonsh: Update to 0.12.4 arkhan--- via Guix-patches via
@ 2022-05-13 15:50 ` Ludovic Courtès
  0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2022-05-13 15:50 UTC (permalink / raw)
  To: arkhan; +Cc: 55378-done

Hi,

arkhan@disroot.org skribis:

>>From 70d42eba0c1f764956ad319853a5a1da7eb3da2a Mon Sep 17 00:00:00 2001
> From: arkhan <arkhan@riseup.net mailto: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(-)

I applied and tweaked the commit log.  Thanks!

Ludo’.




^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-05-13 15:58 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-11 23:55 [bug#55378] [PATCH] gnu: xonsh: Update to 0.12.4 arkhan--- via Guix-patches via
2022-05-13 15:50 ` bug#55378: " Ludovic Courtès

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).