From patchwork Sun Oct 9 16:57:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\\(" X-Patchwork-Id: 43253 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 BD4EF27BBEA; Sun, 9 Oct 2022 17:58:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 78D3427BBE9 for ; Sun, 9 Oct 2022 17:58:11 +0100 (BST) Received: from localhost ([::1]:47486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ohZcw-0007GR-LX for patchwork@mira.cbaines.net; Sun, 09 Oct 2022 12:58:10 -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 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" Reply-to: "\(" X-ACL-Warn: , "\( via Guix-patches" X-Patchwork-Original-From: "\( via Guix-patches" via From: "\\(" X-getmail-retrieved-from-mailbox: Patches * 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 From patchwork Sun Oct 9 16:57:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\\(" X-Patchwork-Id: 43252 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 3E48F27BBEA; Sun, 9 Oct 2022 17:58:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DDD2427BBE9 for ; Sun, 9 Oct 2022 17:58:10 +0100 (BST) Received: from localhost ([::1]:47484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ohZcv-0007Fn-Pz for patchwork@mira.cbaines.net; Sun, 09 Oct 2022 12:58:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ohZcp-0007FI-18 for guix-patches@gnu.org; Sun, 09 Oct 2022 12:58:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45798) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ohZco-0007iY-PZ 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-00048S-Ky for guix-patches@gnu.org; Sun, 09 Oct 2022 12:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58397] [PATCH 2/2] gnu: emacs-ivy-pass: Don't propagate password-store. 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.166533467915880 (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]:44875 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ohZcl-00047z-7g for submit@debbugs.gnu.org; Sun, 09 Oct 2022 12:57:59 -0400 Received: from knopi.disroot.org ([178.21.23.139]:45752) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ohZci-00047j-JJ 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 A97FF4C8D7; 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 2zx1xNekVMzj; Sun, 9 Oct 2022 18:57:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1665334673; bh=77a7TKUofAtJ/sUPThU12mI19RNznlYaFxV2ZOSUyfw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dfiH+wcCH0aZWhhbNsb/8kyGj/ZMxZV/yJ+EpA+WfH1CK+KOzBafAeOWvy2nGDZIG Oo8LCp5uSzpQs7Wu99LFTa2CDQxkbViL86WB6q9wEzWUpzUHI8yHIoJlTdwxtOXb2N R6wlzpLqsOv1qleb7yY2aOggUOQzQptPf2YRHyb6zSIH/G8aJ2lwVgAealPESL9X7X Mi/bfF1IE4JOFuRglNzNQIRgxI4cTJY4/jhLHqgM9GSLWlkrQE8N4KIaFLcJsZsYiK JQLy6RrK9+/U46ickbIoTPUfeLM0wKS08GvaoTvUas8KjiRCGCsnnzQOgAsQuoVXpy 5Hk1aBSRMKJdA== Date: Sun, 9 Oct 2022 17:57:49 +0100 Message-Id: <20221009165749.16619-2-paren@disroot.org> In-Reply-To: <20221009165749.16619-1-paren@disroot.org> References: <20221009165749.16619-1-paren@disroot.org> 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" Reply-to: "\(" X-ACL-Warn: , "\( via Guix-patches" X-Patchwork-Original-From: "\( via Guix-patches" via From: "\\(" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-ivy-pass)[propagated-inputs] : Delete it. [synopsis, description]: Use @command when referring to pass. --- gnu/packages/emacs-xyz.scm | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6f415dc7b1..27494f2a37 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10535,23 +10535,22 @@ (define-public emacs-ivy-pass (package (name "emacs-ivy-pass") (version (git-version "0.1" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ecraven/ivy-pass") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "18crb4zh2pjf0cmv3b913m9vfng27girjwfqc3mk7vqd1r5a49yk")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ecraven/ivy-pass") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "18crb4zh2pjf0cmv3b913m9vfng27girjwfqc3mk7vqd1r5a49yk")))) (build-system emacs-build-system) - (propagated-inputs - (list emacs-ivy emacs-password-store password-store)) + (propagated-inputs (list emacs-ivy emacs-password-store)) (home-page "https://github.com/ecraven/ivy-pass") - (synopsis "Ivy interface for password store (pass)") - (description "This package provides an Ivy interface for working with -the password store @code{pass}.") + (synopsis "Ivy interface to @code{pass}") + (description + "This package provides an Ivy interface for working with the +password store (@command{pass}) in Emacs.") (license license:gpl3)))) (define-public emacs-ivy-yasnippet