From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id UKluH6R2hWAyogAAgWs5BA (envelope-from ) for ; Sun, 25 Apr 2021 16:03:16 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id WPUKG6R2hWBeTAAAB5/wlQ (envelope-from ) for ; Sun, 25 Apr 2021 14:03:16 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id CA9D215329 for ; Sun, 25 Apr 2021 16:03:15 +0200 (CEST) Received: from localhost ([::1]:46454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lafLu-0002Ne-Ts for larch@yhetil.org; Sun, 25 Apr 2021 10:03:14 -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-Type: multipart/mixed; boundary="u6ZHylTiD1GscW4c" Content-Disposition: inline Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1619359396; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=f4tKwsYcjHg0uf4E+M2YSzyN4obp0Hog4ADIiDhYVVk=; b=eoQXDRmUV5SL0NbK8ohOWezVZH5aWEzrdwN/sK8TOx0QJVaiTVC57PdHsw9zocZP+Fyucx rWZNA5iNeezABo481wvpqvbIN2k4uavF1pMARyPwaczgiujuglMGP/AqQuuuQ9bxxC5FOq qx4SeW7d7WfYaxTjQEzQKjjIkbrAkOm13iqOyFHVsqN6MZxn7GKMFDU+W4GhvIWVNZM4RH /OhMt16VmWe2ypZkU7b2s4XcXwPyKyjHcaFsOkHm82naJVfkrSeypRa4y56jtb+UKHU37h DwxL6gV5/x/vxE9o8SOIgkwtFEqGWKrAbVO+4fTQdIkWN6Lye636Hw93sr4BUg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1619359396; a=rsa-sha256; cv=none; b=PL8KI60ZSVbpqNTd4ymAhqhelcbIPAjDDwiZvOZggfQwvD9HtUDB5qIQY4uPxncllLbcpS bUJ/EFmTzK1Htn0fq1L0l/KrWzXwuAm/qBhBHNjDNm+GpjqR2t8zwCdd2fc3oBuSQin+iZ RT8KONcxIu8DTNlvLdSg4Gnu0zOTpjxXbUdwzO+y/hN1avrS0VA0JCD6fkj/MjnShHKVBV hBbdqu9iWvp9DMIsst35EDTTShgPKyQkDarx/VK9l7eOnYYqHwtmr541F0M09PI5lbtY7e O9qk9TCmX1UdNwomX9SusbTVYEB35V33igPx0wWI0qBlDgJoO0JPc3KcUjDokg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=BaRPCzbF; dmarc=fail reason="SPF not aligned (relaxed)" header.from=163.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 0.16 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=BaRPCzbF; dmarc=fail reason="SPF not aligned (relaxed)" header.from=163.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: CA9D215329 X-Spam-Score: 0.16 X-Migadu-Scanner: scn0.migadu.com X-TUID: Noxx8g5f0hSA --u6ZHylTiD1GscW4c Content-Type: text/plain; charset=us-ascii Content-Disposition: inline --u6ZHylTiD1GscW4c Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: attachment; filename="0001-gnu-global-fix-globash.patch" Content-Transfer-Encoding: 8bit >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. -- 2.31.1 --u6ZHylTiD1GscW4c--