From patchwork Mon Apr 24 10:12:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mekeor Melire X-Patchwork-Id: 49464 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 E8AB127BBEA; Mon, 24 Apr 2023 11:17:22 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham 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 CBB5D27BBE2 for ; Mon, 24 Apr 2023 11:17:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pqtFo-00027U-L7; Mon, 24 Apr 2023 06:17:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pqtFm-00026x-Lm for guix-patches@gnu.org; Mon, 24 Apr 2023 06:17:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pqtFm-000874-Cl for guix-patches@gnu.org; Mon, 24 Apr 2023 06:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pqtFm-0001WQ-29 for guix-patches@gnu.org; Mon, 24 Apr 2023 06:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63041] [PATCH v2] gnu: emacs-password-store: Update to 2.3.0. References: In-Reply-To: Resent-From: Mekeor Melire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Apr 2023 10:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63041 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63041@debbugs.gnu.org Cc: Mekeor Melire Received: via spool by 63041-submit@debbugs.gnu.org id=B63041.16823313935809 (code B ref 63041); Mon, 24 Apr 2023 10:17:02 +0000 Received: (at 63041) by debbugs.gnu.org; 24 Apr 2023 10:16:33 +0000 Received: from localhost ([127.0.0.1]:47611 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqtFI-0001Vd-Qh for submit@debbugs.gnu.org; Mon, 24 Apr 2023 06:16:33 -0400 Received: from mout02.posteo.de ([185.67.36.66]:40623) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pqtFF-0001VP-Uo for 63041@debbugs.gnu.org; Mon, 24 Apr 2023 06:16:30 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id E30AD24022C for <63041@debbugs.gnu.org>; Mon, 24 Apr 2023 12:16:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.de; s=2017; t=1682331383; bh=WmPlW8OIyFQjMNDuaYr9QfNlkL50QC0OXOaxb3APjvY=; h=From:To:Cc:Subject:Date:From; b=jZKTLTKY5sSiWAbqaIGq5ej+O5Bih27Ee3m4W7Klmb5+v5/672lwolX40JZqD1MQY Di6/gNgU4NKm1Jk3HHoASiFtnp5J4grdoQ5ME2XtBBppgSLzyStEUpZHgia4D462L6 xVUA6/sZSQXR1dhNjFv9wXRlCpitj3cbkc6qtvl2bQGFbB/YnszufM12o0k2ykQzwc e509MsYfB6nNvy8V9Lvn3m4fzUU0Ohxr9wDNGe2Z8wFwuD/fC/2Q834tic7FUH0ja0 CwLU+V9GQzk0nM+MCgJTEflbPqL5TA0hXNPryVBGZGa0tq8uncswHBlFz+o5KeA1Ts hTOMcNXe+d4JA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Q4gyb2yfzz9rxX; Mon, 24 Apr 2023 12:16:23 +0200 (CEST) From: Mekeor Melire Date: Mon, 24 Apr 2023 10:12:49 +0000 Message-Id: <8e7da6a9d83ba5c8139ea5aacd73a0f4acda9807.1682331168.git.mekeor@posteo.de> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-password-store): Update to 2.3.0. [propagated-inputs]: Remove emacs-auth-source-pass. --- gnu/packages/emacs-xyz.scm | 87 +++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 44 deletions(-) base-commit: 74e96c4cb171b17949f638d8b452d047a8f2dc6f diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 234b0f6868..caeb204f9e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20959,50 +20959,49 @@ (define-public emacs-ergoemacs-mode (license license:gpl3+))) (define-public emacs-password-store - (let ((commit "918992c19231b33b3d4a3288a7288a620e608cb4") - (revision "1")) - (package - (name "emacs-password-store") - ;; The emacs package version does not match the password-store version, - ;; even though it is part of the same repository. When updating, look - ;; at the version declared in password-store.el. - (version (git-version "2.1.4" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "git://git.zx2c4.com/password-store") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0ni62f4pq96g0i0q66bch1dl9k4zqwhg7xaf746k3gbbqxcdh3vi")))) - (build-system emacs-build-system) - (arguments - (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) - (emacs-substitute-variables "password-store.el" - ("password-store-executable" - (search-input-file inputs "/bin/pass")))))))) - (inputs - (list password-store)) - (propagated-inputs - (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 - "This package provides functions for working with pass (\"the -standard Unix password manager\").") - (license license:gpl3+)))) + (package + (name "emacs-password-store") + ;; The emacs package version does not match the password-store version, + ;; even though it is part of the same repository. When updating, look at + ;; the version declared in password-store.el. + (version "2.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "git://git.zx2c4.com/password-store") + (commit "26d2dae04bb76a87be6960861c10432820cd5d55"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1pkx6pgkkpddxrshzq3x8ilfwqjw9gawnbbskcbssxc88wrpbcjb")))) + (build-system emacs-build-system) + (arguments + (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) + (emacs-substitute-variables "password-store.el" + ("password-store-executable" + (search-input-file inputs "/bin/pass")))))))) + (inputs + (list password-store)) + (propagated-inputs + (list emacs-s emacs-with-editor)) + (home-page "https://git.zx2c4.com/password-store/tree/contrib/emacs") + (synopsis "Password store (pass) support for Emacs") + (description + "This package provides functions for working with pass (\"the + standard Unix password manager\").") + (license license:gpl3+)))) (define-public emacs-password-store-otp (package