From patchwork Sun Apr 25 10:08:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: luhui X-Patchwork-Id: 28873 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 9E06E27BC7D; Sun, 25 Apr 2021 15:03:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2D30427BC7C for ; Sun, 25 Apr 2021 15:03:12 +0100 (BST) Received: from localhost ([::1]:46454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lafLr-0002Ne-CW for patchwork@mira.cbaines.net; Sun, 25 Apr 2021 10:03:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50318) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1labiE-0003NJ-QR for guix-patches@gnu.org; Sun, 25 Apr 2021 06:10:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58728) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1labiE-0002xE-IE for guix-patches@gnu.org; Sun, 25 Apr 2021 06:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1labiE-0003gb-CH for guix-patches@gnu.org; Sun, 25 Apr 2021 06:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48014] [PATCH] gnu: global: fix globash Resent-From: luhui Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 25 Apr 2021 10:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48014 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48014@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161934534714082 (code B ref -1); Sun, 25 Apr 2021 10:10:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 Apr 2021 10:09:07 +0000 Received: from localhost ([127.0.0.1]:42038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1labhK-0003f4-Q0 for submit@debbugs.gnu.org; Sun, 25 Apr 2021 06:09:07 -0400 Received: from lists.gnu.org ([209.51.188.17]:47860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1labhI-0003ew-ED for submit@debbugs.gnu.org; Sun, 25 Apr 2021 06:09:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50210) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1labhI-0003LB-9g for guix-patches@gnu.org; Sun, 25 Apr 2021 06:09:04 -0400 Received: from m12-15.163.com ([220.181.12.15]:44898) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1labhC-0002Eo-KB for guix-patches@gnu.org; Sun, 25 Apr 2021 06:09:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=Date:From:Subject:Message-ID:MIME-Version; bh=f4tKw sYcjHg0uf4E+M2YSzyN4obp0Hog4ADIiDhYVVk=; b=BaRPCzbFoo5d4PZyXZcdk rtFxTDS6MT779cxJvbm62JrMGi3d9bKDblt2kNTMDu/ACzjBy9+ZzOZ5KNf5tBLb iwOwyaoCmAcEALIFM/M/YOflPLzAWLKl6aP0vtkYqwd6YdPzo0q6IdjFsJ6lzKLB ph4iE3qNZAzmRAu7ZlkpsY= Received: from localhost (unknown [110.178.47.120]) by smtp11 (Coremail) with SMTP id D8CowABnuzupP4VguBzsAg--.20297S3; Sun, 25 Apr 2021 18:08:48 +0800 (CST) Date: Sun, 25 Apr 2021 18:08:41 +0800 From: luhui Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-CM-TRANSID: D8CowABnuzupP4VguBzsAg--.20297S3 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUTa9-UUUUU X-Originating-IP: [110.178.47.120] X-CM-SenderInfo: 5oxk3xlqv6il2tof0z/1tbiQwZ-DFc7Ts4I1QABsG Received-SPF: pass client-ip=220.181.12.15; envelope-from=luhuins@163.com; helo=m12-15.163.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sun, 25 Apr 2021 10:03:03 -0400 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 2ec3b22edadb1db21a006d39f9998fd552d9110d Mon Sep 17 00:00:00 2001 From: luhui Date: Sun, 25 Apr 2021 16:49:05 +0800 Subject: [PATCH] gnu: global: fix globash * gnu/packages/code.scm (global)[#phases]: Add 'fix-globash'. --- gnu/packages/code.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index a79d8b4a2b..342ded76ff 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Julien Lepiller +;;; Copyright © 2021 lu hui ;;; ;;; This file is part of GNU Guix. ;;; @@ -135,7 +136,8 @@ highlighting your own code that seemed comprehensible when you wrote it.") (base32 "10vvsgx8v54whb4j9mk5qqyb5h3rdd9da0il3wir8pcpksyk0dww")))) (build-system gnu-build-system) - (inputs `(("ncurses" ,ncurses) + (inputs `(("coreutils" ,coreutils) + ("ncurses" ,ncurses) ("libltdl" ,libltdl) ("sqlite" ,sqlite) ("python-wrapper" ,python-wrapper))) @@ -149,6 +151,13 @@ highlighting your own code that seemed comprehensible when you wrote it.") #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-globash + (lambda* (#:key inputs #:allow-other-keys) + (let* ((echo (string-append + (assoc-ref inputs "coreutils") "/bin/echo"))) + (substitute* "globash/globash.in" + (("/bin/echo") + echo))))) (add-after 'install 'post-install (lambda* (#:key outputs #:allow-other-keys) ;; Install the plugin files in the right place.