From patchwork Thu Jun 11 14:44:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Katherine Cox-Buday X-Patchwork-Id: 22644 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 1240F27BBE3; Thu, 11 Jun 2020 15:45:13 +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_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,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 ESMTP id 98C4927BBE1 for ; Thu, 11 Jun 2020 15:45:12 +0100 (BST) Received: from localhost ([::1]:51578 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjOS8-0001C9-0X for patchwork@mira.cbaines.net; Thu, 11 Jun 2020 10:45:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjORy-0001C0-AO for guix-patches@gnu.org; Thu, 11 Jun 2020 10:45:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54334) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jjORx-0003iP-Ts for guix-patches@gnu.org; Thu, 11 Jun 2020 10:45:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jjORx-0004PK-JG for guix-patches@gnu.org; Thu, 11 Jun 2020 10:45:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41790] [PATCH] Update emacs-direnv Resent-From: Katherine Cox-Buday Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jun 2020 14:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Oleg Pykhalov Cc: 41790@debbugs.gnu.org, Nicolas Goaziou Received: via spool by 41790-submit@debbugs.gnu.org id=B41790.159188668616885 (code B ref 41790); Thu, 11 Jun 2020 14:45:01 +0000 Received: (at 41790) by debbugs.gnu.org; 11 Jun 2020 14:44:46 +0000 Received: from localhost ([127.0.0.1]:37637 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jjORh-0004OH-L8 for submit@debbugs.gnu.org; Thu, 11 Jun 2020 10:44:45 -0400 Received: from mail-io1-f68.google.com ([209.85.166.68]:45436) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jjORg-0004O3-HL for 41790@debbugs.gnu.org; Thu, 11 Jun 2020 10:44:44 -0400 Received: by mail-io1-f68.google.com with SMTP id y5so6522819iob.12 for <41790@debbugs.gnu.org>; Thu, 11 Jun 2020 07:44:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=9J1Ro+q/AB0heaDGwa8f9LbX6NCpr3gRK6XfQIyiS9U=; b=IIRm0E1w8YSIFv6wNSUp4r60mGL/8LpSGep13wMQ85FXWXUgp3rBs4xUhhgrIlhpp4 D669WfLVnV2+fT3TlPzdeoWhlieHgqvo7mgFglIAlf7r0J6IE0b8j0sMLDm30sQEvzVy 5yIteEdl61UKcFQ3TR5wVXgUZsOIRpbfEqSWvfBLWvXjDbEFNvBbnNHrn5rcnuTakegM /SALkHtax5sZishXpe5erooFZy/jsZwX6v0676n65FFdrD5nEE0X2C+7EBlDQ0litQAp hgYZBRGFMx6ZRyhKFmpd2C93OCb6kCK5ww7EBEJDUs9q37JEGghlAgg1gc0iBRCsZqzo SAsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=9J1Ro+q/AB0heaDGwa8f9LbX6NCpr3gRK6XfQIyiS9U=; b=T9iYfDh3l+KJtr2Qp7HusMawuC02R+1UNvihRyQJ1ixCtzvfMxnH7V/fQiJqCebaSS cFUZKslD4o4Mh8iqEeQ8oT1y+9tpQlXD0SX60zlHuPO2hNRBChLvCwNujEXzIl5OkCle BrotKVq38W7kW8wY5BJT8dgJF0p6V3ytsZgv701lF0tII8blVDftUNqqq0j6/S3mKAY5 hya8Qjr95F7DR/3tex2G6sMywQNBc43eulWxXPzLcUvgEM6I1RAgEZQO4usQ5IWIgAdo y6x7unC8HYf153IJKVlR1l+kEfOtZoG8GPjceGnXSfNWnNX5fdDMeij+e2/sJetY8oY8 EJig== X-Gm-Message-State: AOAM5315mvExLqK1ooIGiCN/OS083XZlNuShBx2I8hbHuDAVyMP/jkc3 KpogjrYNS54uxtD0KnwA7FBq0rdC X-Google-Smtp-Source: ABdhPJz+qooeOsIy9gLH+dMdwjt+Z0yNZ/1TrQ+7CTVJKulKJnkZ02MaSXG4+A4GmVEe+DpU2rqwRw== X-Received: by 2002:a5d:860a:: with SMTP id f10mr8841851iol.11.1591886678438; Thu, 11 Jun 2020 07:44:38 -0700 (PDT) Received: from gazelle-pro (172-221-246-205.res.spectrum.com. [172.221.246.205]) by smtp.gmail.com with ESMTPSA id g15sm1594544ilq.39.2020.06.11.07.44.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2020 07:44:36 -0700 (PDT) From: Katherine Cox-Buday References: <871rmmoq7u.fsf@nicolasgoaziou.fr> <87pna6zy3l.fsf@gmail.com> <87k10e92tg.fsf@gmail.com> Date: Thu, 11 Jun 2020 09:44:35 -0500 In-Reply-To: <87k10e92tg.fsf@gmail.com> (Oleg Pykhalov's message of "Wed, 10 Jun 2020 21:46:19 +0300") Message-ID: <87eeql8xws.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 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 Oleg Pykhalov writes: Heya Oleg, thanks for chiming in. > Propagated inputs could lead to conflicts in a Guix profile. The > simplest example I could remember is - you want upgrade package ‘A’ > which propagates ‘direnv’, but you cannot because package ‘B’ propagates > it too. In this case you need to upgrade both ‘A’ and ‘B’ or delete ‘A’ > (or ‘B’). Would there be a conflict if they both propagated the same input (in this case the direnv binary)? > Instead we could make the package functional by substituting in > /gnu/store/…-emacs-direnv-…-checkout/direnv.el file ‘direnv--detect’ > ("Detect the direnv executable.") procedure which could return a path to > ‘direnv’ binary as a string directly without calling ‘executable-find’. > WDYT? In general, I like to keep packages as close to their source as possible, but I'm slowly learning that this is not often the case when packaging things (which is a shame and a risk in my opinion). But all things considered, I think this is probably the right approach here given the feedback I'm getting. Here's a patch which should supersede the previous patch: Thank you both for your thoughtful reviews! From 52a5541b8a44c6629f6e2a6d3d47184f2ed5169b Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Wed, 10 Jun 2020 10:09:48 -0500 Subject: [PATCH] gnu: emacs-direnv: Update to 2.1.0. * gnu/packages/emacs-xyz.scm (emacs-direnv): Update to 2.1.0 and make direnv a propagated-input. --- gnu/packages/emacs-xyz.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 946d01cba5..6eb5bc9d39 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -166,6 +166,7 @@ #:use-module (gnu packages sphinx) #:use-module (gnu packages xdisorg) #:use-module (gnu packages shells) + #:use-module (gnu packages shellutils) #:use-module (gnu packages sqlite) #:use-module (gnu packages gnupg) #:use-module (gnu packages video) @@ -2020,7 +2021,7 @@ Its features are: (define-public emacs-direnv (package (name "emacs-direnv") - (version "2.0.0") + (version "2.1.0") (source (origin (method git-fetch) @@ -2030,8 +2031,20 @@ Its features are: (file-name (git-file-name name version)) (sha256 (base32 - "005ibyzsx1fdyrl5iyhqpb1bg83mphzahq7zvw58x00syyqi2z49")))) + "0xkqn4604k2imas6azy1www56br8ls4iv9a44pxcd8h94j1fp44d")))) (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-in-direnv + (lambda* (#:key inputs #:allow-other-keys) + (let* ((direnv-path (assoc-ref inputs "direnv")) + (direnv-bin (string-append + "\"" direnv-path "/bin/direnv\""))) + (substitute* "direnv.el" + (("\"direnv\"") direnv-bin)))))))) + (inputs + `(("direnv" ,direnv))) (propagated-inputs `(("dash" ,emacs-dash) ("with-editor" ,emacs-with-editor))) -- 2.26.2