From patchwork Mon Jul 11 15:07:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?RWRpc29uIEliw6HDsWV6?= X-Patchwork-Id: 40624 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C2BEE27BBE9; Mon, 11 Jul 2022 16:38:47 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0F62627BBEA for ; Mon, 11 Jul 2022 16:38:47 +0100 (BST) Received: from localhost ([::1]:60462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oAvUk-0005GT-5U for patchwork@mira.cbaines.net; Mon, 11 Jul 2022 11:38:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39570) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oAvUC-0005E9-9I for guix-patches@gnu.org; Mon, 11 Jul 2022 11:38:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46774) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oAvU3-00039Q-G2 for guix-patches@gnu.org; Mon, 11 Jul 2022 11:38:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oAvU3-0001xp-A9 for guix-patches@gnu.org; Mon, 11 Jul 2022 11:38:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56454] [PATCH] gnu: xonsh: Update to 0.13.0 References: <87tu7rvdl0.fsf@riseup.net> In-Reply-To: <87tu7rvdl0.fsf@riseup.net> Resent-From: Edison =?utf-8?b?SWLDocOxZXo=?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 11 Jul 2022 15:38:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56454 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56454@debbugs.gnu.org Received: via spool by 56454-submit@debbugs.gnu.org id=B56454.16575538447427 (code B ref 56454); Mon, 11 Jul 2022 15:38:03 +0000 Received: (at 56454) by debbugs.gnu.org; 11 Jul 2022 15:37:24 +0000 Received: from localhost ([127.0.0.1]:40658 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oAvTN-0001vd-2l for submit@debbugs.gnu.org; Mon, 11 Jul 2022 11:37:24 -0400 Received: from mx1.riseup.net ([198.252.153.129]:53416) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oAv0K-0007Ou-Vc for 56454@debbugs.gnu.org; Mon, 11 Jul 2022 11:07:21 -0400 Received: from fews2.riseup.net (fews2-pn.riseup.net [10.0.1.84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4LhS0g2VMPzDrD6 for <56454@debbugs.gnu.org>; Mon, 11 Jul 2022 15:07:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1657552035; bh=GQBSVZ6kVWD5zpcxLHCO5MXD+VC5ncFFsoMRENmQaR4=; h=Date:From:To:Subject:From; b=gzeI9MSP8JgW5N0qxHJpl5nUKEmeX2vjg5+f70jQIAJHf3YESV0Z6FmWfiuQD4pgv dL74s/2EVCQxxBuPTyPUAk2baq3VOHY28Khm1VCDj66O6kHAeiWfzBAvOc46PfWxLr j9dBF1kSoQuKV8gGtuXCYsIkr8wlf3lokEijcL9Q= X-Riseup-User-ID: 63ED3D97C6B85C349C9AA6BAC0F566C71C51F03619448041DC56B1A1728C35C1 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews2.riseup.net (Postfix) with ESMTPSA id 4LhS0g1dNQz20cc for <56454@debbugs.gnu.org>; Mon, 11 Jul 2022 15:07:15 +0000 (UTC) MIME-Version: 1.0 Date: Mon, 11 Jul 2022 15:07:14 +0000 From: Edison =?utf-8?b?SWLDocOxZXo=?= Message-ID: <9a11ae0a79f20c167abdf7428908beab@riseup.net> X-Mailman-Approved-At: Mon, 11 Jul 2022 11:37:19 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From 57dfcac63ae2b940570065a13d2c075f527d288b Mon Sep 17 00:00:00 2001 From: arkhan Date: Mon, 11 Jul 2022 09:54:46 -0500 Subject: [PATCH] gnu: xonsh: Update to 0.13.0 * 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 --- gnu/packages/shells.scm | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 9fe0ed8e27..0b5ddd7333 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -57,6 +57,7 @@ (define-module (gnu packages shells) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) #:use-module (gnu packages rust) @@ -64,6 +65,7 @@ (define-module (gnu packages shells) #:use-module (gnu packages scheme) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) #:use-module (gnu packages texinfo) #:use-module (guix build-system cargo) @@ -545,24 +547,21 @@ (define-public zsh (define-public xonsh (package (name "xonsh") - (version "0.12.4") + (version "0.13.0") (source (origin (method url-fetch) (uri (pypi-uri "xonsh" version)) (sha256 - (base32 "0xlac84nsgs0052n2pw8np1smlgghrbd7p6yrcp7d5qh8zdr9lx3")) + (base32 "12ayz1kw2ag3r407j0lng2kfp75im8xqap1nvpmpa0lmsx8wk7ll")) (modules '((guix build utils))) (snippet - `(begin - ;; Delete bundled PLY. - (delete-file-recursively "xonsh/ply") + #~(begin (substitute* "setup.py" (("\"xonsh\\.ply\\.ply\",") "")) ;; Use our properly packaged PLY instead. (substitute* (list "setup.py" "tests/test_lexer.py" - "xonsh/__amalgam__.py" "xonsh/lexer.py" "xonsh/parsers/base.py" "xonsh/parsers/completion_context.py" @@ -586,8 +585,15 @@ (define-public xonsh "--invalidation-mode=unchecked-hash" out) (invoke "python" "setup.py" "install" "--root=/" (string-append "--prefix=" out)))))))) + (native-inputs + (list python-setuptools + python-wheel)) (inputs - (list python-ply)) + (list python-distro + python-ply + python-pygments + python-pyperclip + python-setproctitle)) (home-page "https://xon.sh/") (synopsis "Python-ish shell") (description -- 2.36.1