From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id gLRRC6H9QmN9KAAAbAwnHQ (envelope-from ) for ; Sun, 09 Oct 2022 18:58:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id UOc1C6H9QmMhQQEAauVa8A (envelope-from ) for ; Sun, 09 Oct 2022 18:58:09 +0200 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 E64043646D for ; Sun, 9 Oct 2022 18:58:08 +0200 (CEST) Received: from localhost ([::1]:47486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ohZcu-0007GR-4u for larch@yhetil.org; Sun, 09 Oct 2022 12:58:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ohZco-0007F6-Ru for guix-patches@gnu.org; Sun, 09 Oct 2022 12:58:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45797) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ohZco-0007iQ-CF for guix-patches@gnu.org; Sun, 09 Oct 2022 12:58:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ohZco-00048L-8A for guix-patches@gnu.org; Sun, 09 Oct 2022 12:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58397] [PATCH 1/2] gnu: emacs-password-store: Refer directly to password-store. References: <20221009165608.16412-1-paren@disroot.org> In-Reply-To: <20221009165608.16412-1-paren@disroot.org> Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Oct 2022 16:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58397 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58397@debbugs.gnu.org Cc: "\(" Received: via spool by 58397-submit@debbugs.gnu.org id=B58397.166533467915874 (code B ref 58397); Sun, 09 Oct 2022 16:58:02 +0000 Received: (at 58397) by debbugs.gnu.org; 9 Oct 2022 16:57:59 +0000 Received: from localhost ([127.0.0.1]:44873 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ohZck-00047x-T5 for submit@debbugs.gnu.org; Sun, 09 Oct 2022 12:57:59 -0400 Received: from knopi.disroot.org ([178.21.23.139]:45648) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ohZci-00047i-JH for 58397@debbugs.gnu.org; Sun, 09 Oct 2022 12:57:57 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 09C514C9FD; Sun, 9 Oct 2022 18:57:55 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KcAFw32_yZ4j; Sun, 9 Oct 2022 18:57:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1665334672; bh=B36rHmQO5mZNn9bErohSkifJ54c6SWTGI/vDEOBbNHk=; h=From:To:Cc:Subject:Date; b=HdjbxyVlfwa0vI2OevwzwjjFAVEDtXsC/ny2Ekd0nOzVV3lsexltei6p1tGStERTt iUM+CPNLy/M+mw09I+Fxy3vTkxRsFkIvuXJ4AeEx5uASNi7P0yquzcLJW0Lgq/70Xq QKk4pcii4txR0FjfOBEqrYafYR6R8iEQFi8+KmwS1boWDtldHPG/FxAoFpZLdRvo8J sFK5aNnd/8ZMud3Q4Xn9RRbmDndf0b9zchFuyji066piTb6J7fGP2cRkvL4Tkxhxtn kpzxZZswr+rcVEMQIawSRivkXIdTQWG4IEwmrG2Rk42pi1kpnN5Df5e7HoYeIPtRC8 7ssf3t/ZEI/Eg== Date: Sun, 9 Oct 2022 17:57:48 +0100 Message-Id: <20221009165749.16619-1-paren@disroot.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: "\(" X-ACL-Warn: , "\( via Guix-patches" From: "\( via Guix-patches" via X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1665334688; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=FHTxWORrUPdUuKPT0BB7pMYch5Ik4SSncVD78WJoITU=; b=KHW98nhzuQq+Wzb6qbMUpzGoszJe4+QsP7vdacDCZJLQo/hTj5skPPGPLevOLKjCYnQMdh t0Nmy7AaPer4m0mU4vKGZO6UYFg+9mMIEvX5zOVYEPvdRRcjPVmAuQ9no/gRogCD/lywKs 3UM7v/qOWTOnbXgAFnh1Yk4dv2g4QPXRBvIyB1xmMkX7s/LkVg5YOEAt083+LDfYJ4wa65 eK0ct0h5VBRwQbFXQultrtc6yV9KWAIfBoiaGjSUX+/PUauJTppVJadagzPiKhMdIvl5U1 +8+N6IrLJxFCFfyT2WxcfCx5to7QxuN0HHTLbHphppbZZl9clKKZWLUzjZj5Og== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1665334688; a=rsa-sha256; cv=none; b=GprmJuwlucJMk/K0l+3k5Hgqv+x5gMpECZYjbXmQuui9jYdblr9Am84EAtykVdfuoaAF/r 8QqgBbb3lHJX+6TPWeC/NiwM8Cirs/dpVlluLGTZKZaRz3yNRJLmyWH6HHhBp0M1fasg5Z oUSNaa2PqX2F9MWQcVH4Yu4CTADCz6H0tSDc7rOAuCYW9sW9G4LdsiJNSJPSzAQk7lM5Wy nJKg0/Fdf9ABqanGCzROPXmqjQDZB/BHin1TQefyb8/Y8Od3rhYcvMOJmzepOMslg8X+o8 3aU0jwYwP+7fN3Rtj2da7jy4Z6QSidYD2uA7xB4i4ScX0r8k5y0Oa9kdtZUr9w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=HdjbxyVl; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.88 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=HdjbxyVl; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: E64043646D X-Spam-Score: -0.88 X-Migadu-Scanner: scn1.migadu.com X-TUID: HA5my0yHYXKF * gnu/packages/emacs-xyz.scm (emacs-password-store)[arguments]: Use gexp style. <#:phases>{'extract-el-file}: New phase. [propagated-inputs]: Move it... [inputs]: ...here. --- gnu/packages/emacs-xyz.scm | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8134a19d56..6f415dc7b1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18918,24 +18918,33 @@ (define-public emacs-password-store (uri (git-reference (url "git://git.zx2c4.com/password-store") (commit commit))) + (file-name (git-file-name name version)) (sha256 (base32 - "0ni62f4pq96g0i0q66bch1dl9k4zqwhg7xaf746k3gbbqxcdh3vi")) - (file-name (git-file-name name version)))) + "0ni62f4pq96g0i0q66bch1dl9k4zqwhg7xaf746k3gbbqxcdh3vi")))) (build-system emacs-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'extract-el-file - (lambda _ - (copy-file "contrib/emacs/password-store.el" "password-store.el") - (delete-file-recursively "contrib") - (delete-file-recursively "man") - (delete-file-recursively "src") - (delete-file-recursively "tests")))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'extract-el-file + (lambda _ + (copy-file "contrib/emacs/password-store.el" + "password-store.el") + (delete-file-recursively "contrib") + (delete-file-recursively "man") + (delete-file-recursively "src") + (delete-file-recursively "tests"))) + (add-after 'extract-el-file 'patch-executables + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "password-store.el" + (("\\(executable-find \"pass\"\\)") + (string-append + "\"" + (search-input-file inputs "bin/pass") + "\"")))))))) + (inputs (list password-store)) (propagated-inputs - (list emacs-auth-source-pass emacs-s emacs-with-editor - password-store)) + (list emacs-auth-source-pass emacs-s emacs-with-editor)) (home-page "https://git.zx2c4.com/password-store/tree/contrib/emacs") (synopsis "Password store (pass) support for Emacs") (description -- 2.38.0