From patchwork Fri Jan 4 22:46:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gesthuizen X-Patchwork-Id: 662 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 802DC16A1F; Fri, 4 Jan 2019 22:52:37 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from listsout.gnu.org (listsout.gnu.org [208.118.235.17]) by mira.cbaines.net (Postfix) with ESMTP id 0E23A16A1C for ; Fri, 4 Jan 2019 22:52:37 +0000 (GMT) Received: from localhost ([127.0.0.1]:32868 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gfYKS-00037Q-9y for patchwork@mira.cbaines.net; Fri, 04 Jan 2019 17:52:36 -0500 Received: from eggsout.gnu.org ([209.51.188.92]:59185 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gfYF7-0005Xv-Pr for guix-patches@gnu.org; Fri, 04 Jan 2019 17:47:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gfYF4-0000gn-Jb for guix-patches@gnu.org; Fri, 04 Jan 2019 17:47:05 -0500 Received: from debbugsout.gnu.org ([209.51.188.43]:42312) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gfYF4-0000fj-FP for guix-patches@gnu.org; Fri, 04 Jan 2019 17:47:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gfYF4-0005Lh-3u for guix-patches@gnu.org; Fri, 04 Jan 2019 17:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33982] emacs-irony-mode: Don't require propagated inputs Resent-From: Tim Gesthuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 04 Jan 2019 22:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33982 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 33982@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154664197820502 (code B ref -1); Fri, 04 Jan 2019 22:47:01 +0000 Received: (at submit) by debbugs.gnu.org; 4 Jan 2019 22:46:18 +0000 Received: from localhost ([127.0.0.1]:47108 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gfYEL-0005Ka-RH for submit@debbugs.gnu.org; Fri, 04 Jan 2019 17:46:18 -0500 Received: from eggsout.gnu.org ([209.51.188.92]:35601) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gfYEK-0005KT-7s for submit@debbugs.gnu.org; Fri, 04 Jan 2019 17:46:16 -0500 Received: from listsout.gnu.org ([208.118.235.17]:57488) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gfYEJ-0000LL-8r for submit@debbugs.gnu.org; Fri, 04 Jan 2019 17:46:15 -0500 Received: from eggsout.gnu.org ([209.51.188.92]:58745 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gfYEI-0004dB-78 for guix-patches@gnu.org; Fri, 04 Jan 2019 17:46:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gfYEE-0000J3-7S for guix-patches@gnu.org; Fri, 04 Jan 2019 17:46:14 -0500 Received: from sonic305-21.consmr.mail.ir2.yahoo.com ([77.238.177.83]:45503) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gfYEC-0000IK-LW for guix-patches@gnu.org; Fri, 04 Jan 2019 17:46:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s2048; t=1546641965; bh=jD/PXpGOSs38Fyyz//vk5uTtJPnvOrVHgb+XBYKCSQA=; h=To:From:Subject:Date:From:Subject; b=Wd2LVwzMua4Hf0YNHf5iSHXai+SfyupmH+CnpElOyOxz9pWJMxaMbgr7dHFmQjr2N/iS5VuK4m3JHnCJjMWRebZMBNR1xpjLnFslT61PlOepd0TPqi1MxYHRgAJf1OViaK2LHb4IDG7p64JFZyFyMvKz6qVhhPtuWQu9G2qwX7T5loI9grGk1ZyI0iIAgpVMZICRPVqGwtsx3XIgZ0xgEQvvyrwP146uLltzxk0YC5+0NO7k+97mQXWV+iP4X2kLb9FSj1MjF57Ikk2FuSUB1T0doHDYViDLJv+hqVeIrd8a8AYQxmoznCYvpTaB7RwnMTjH7kB82Xb1AenxbRaBYw== X-YMail-OSG: lf3pxksVM1kLekjfQv2EvB0JN6Sq2iWJPKryn.QtlgBNoH.VJhmFP5ZnZ94xAGW Yxo_Od0CU..B3yq9v2IkSZQIMDk4lQrbwEm_O4qf2nUY6kBclWyfb4DxoIVyuDgPj9yWOLVULeIg zmJrWYKXDZLXrgzboNjWwMJwZQSfy5Hv6e7TpywNHu7k8VG08_zawYxcS.4uIEIxEC1g6550ENnI QadAnCBL5lGrZ7.CCXDS3Erxvj9gdGDx2TSJjTXG3CkukLm8m5i0vNNgfQGJdwJsHRDyfT1QidW. vT8MU.2v9uojmUlE_FO6gTzEC.MMTtTQvjJGrYBQS.34D9jIKOnU7npP8BQWA8rRqSGqs2JfoKBP co0JhRxx3k7l6A_7ud5JhZKqBPGcIcn0UBagdXEI.ejgZDH6VJf3guXcbPs1C1M1QvH8gnhA2_yB 6SjOXd07Drw73TAmnsPtJoHQiwIgb4cr1ueghyeUVbD0FBbu4VJX31bEDRTdvf5ccvTqf9P5izR8 A094BX6JOh7Po0MBNGikxr44rG8b_WZ2bHW_.qTzIqzvvZ6bbUtvMwgRvBLqd9D2LKE0tGYNElyt fYbl9CnJo9Lp4RBFbJO4a24GqJ_EdlpYWDu1JfMiN2RlCFihz5Hnux0Pl18eJmqorkKUxB5zTNIK 5dGoKaCY5SaxGbz_bkpJYylsLU9MYqlp0gKrjU7jJzz_LuGHbOYFBZDYEBSbpgkS0mes76nNb8wO HI31kIcEGTVBaEGvJuHbsCnhPevqH6EztrPjYRPAeHRgw6kAf.AhdQyKrfqyhweC8Dq26lsbqwAM qu4_2QSZqYp6Vme9Mpk4ONfuLxsccQfNxv_2ILwKcfM2kz.VUYGvCqQFPmEH8ssjA2HyNxLTSqND lygibhjbKgLpTv1s4NxxQF1jzshbKkdLlRm0N5R82YF0BJrwbv_R809cfpM3YN0YfXqR0_iGXZFH KrRUSj9s_vQWP4KVJQW34tOyx4n924luhAiLX71uEwIatPzmduftAu.Fg3oVooO9j3gKY6k3cXWT qLExy888Aho3tye6Oj95QlMn_.eCinG46Q2A1BI0p4M_iKZqfwLBjawgVVsMFFqstkL_22jsE Received: from sonic.gate.mail.ne1.yahoo.com by sonic305.consmr.mail.ir2.yahoo.com with HTTP; Fri, 4 Jan 2019 22:46:05 +0000 Received: from p5B221793.dip0.t-ipconnect.de (EHLO [192.168.178.27]) ([91.34.23.147]) by smtp431.mail.ir2.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID ffe8e42ab5604d9d2dd93949cb872c45 for ; Fri, 04 Jan 2019 22:46:04 +0000 (UTC) From: Tim Gesthuizen Message-ID: <53ff84d5-070a-f0d6-dc2b-26f9443159e3@yahoo.de> Date: Fri, 4 Jan 2019 23:46:03 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 Content-Language: en-US X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.51.188.43 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 Hi, emacs-irony-mode needs emacs-irony-mode-server as a propagated input at the moment. This can be avoided with the attached patch. Tim. From 528e0ebf36c07960776e8070584dce09088328d7 Mon Sep 17 00:00:00 2001 From: Tim Gesthuizen Date: Mon, 24 Dec 2018 14:46:27 +0100 Subject: [PATCH] gnu: emacs-irony-mode: Remove propagated input emacs-irony-mode finds its server binary because its a propagated input and is in the path. We can substitute the variable `irony-server-install-prefix` to not propagate the input and keep the binary isolated from the user. * gnu/packages/emacs.scm (emacs-irony-mode): [propagated-inputs] Remove propagated inputs [inputs] Add emacs-irony-mode-server [arguments] Add phase substituting the variable of the server path --- gnu/packages/emacs.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 7fdcfb1a3..df4e676c0 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -2831,9 +2831,16 @@ These are distributed in separate files and can be used individually.") "0nhjrnlmss535jbshjjd30vydbr8py21vkx4p294w6d8vg2rssf8")) (file-name (string-append name "-" version ".tar.gz")))) (build-system emacs-build-system) - (arguments '()) - (propagated-inputs - `(("emacs-irony-mode-server" ,emacs-irony-mode-server))) + (inputs `(("server" ,emacs-irony-mode-server))) + (arguments `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda* (#:key inputs #:allow-other-keys) + (chmod "irony.el" #o644) + (emacs-substitute-variables "irony.el" + ("irony-server-install-prefix" + (assoc-ref inputs "server"))) + #t))))) (synopsis "C/C++/ObjC Code completion and syntax checks for Emacs") (description "Irony-mode provides Clang-assisted syntax checking and completion for C, C++, and ObjC in GNU Emacs. Using @code{libclang} it can @@ -2848,7 +2855,6 @@ described on the homepage.") (name "emacs-irony-mode-server") (inputs `(("clang" ,clang))) - (propagated-inputs '()) (arguments `(#:phases (modify-phases %standard-phases -- 2.20.1