From patchwork Sat Oct 8 22:44:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43224 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 A1D8F27BBEA; Sat, 8 Oct 2022 23:46:49 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS 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 6395627BBE9 for ; Sat, 8 Oct 2022 23:46:49 +0100 (BST) Received: from localhost ([::1]:39240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ohIam-0000wr-GA for patchwork@mira.cbaines.net; Sat, 08 Oct 2022 18:46:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34060) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ohIa3-0000wA-06 for guix-patches@gnu.org; Sat, 08 Oct 2022 18:46:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42520) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ohIa2-0006gt-Ng for guix-patches@gnu.org; Sat, 08 Oct 2022 18:46:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ohIa2-00054f-JL for guix-patches@gnu.org; Sat, 08 Oct 2022 18:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58386] [PATCH 1/2] gnu: passage: Rename package to passage-game. References: <87h70edjjs.fsf@ngraves.fr> In-Reply-To: <87h70edjjs.fsf@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 08 Oct 2022 22:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58386 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 58386@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 58386-submit@debbugs.gnu.org id=B58386.166526910519392 (code B ref 58386); Sat, 08 Oct 2022 22:46:02 +0000 Received: (at 58386) by debbugs.gnu.org; 8 Oct 2022 22:45:05 +0000 Received: from localhost ([127.0.0.1]:41592 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ohIZ7-00052i-Ga for submit@debbugs.gnu.org; Sat, 08 Oct 2022 18:45:05 -0400 Received: from 14.mo561.mail-out.ovh.net ([188.165.43.98]:51577) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ohIZ4-00051w-FI for 58386@debbugs.gnu.org; Sat, 08 Oct 2022 18:45:04 -0400 Received: from player716.ha.ovh.net (unknown [10.108.1.93]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id 38C1523A4D for <58386@debbugs.gnu.org>; Sat, 8 Oct 2022 22:44:59 +0000 (UTC) Received: from ngraves.fr (met42-h01-213-44-161-47.dsl.sta.abo.bbox.fr [213.44.161.47]) (Authenticated sender: ngraves@ngraves.fr) by player716.ha.ovh.net (Postfix) with ESMTPSA id 8F5DD2F635AF5; Sat, 8 Oct 2022 22:44:57 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-100R003a906ad29-17a1-48a7-a181-b7d7d67521d3, CEC9B8182432DF3FB9030C0E377394C4D93A3A8E) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 213.44.161.47 Date: Sun, 9 Oct 2022 00:44:52 +0200 Message-Id: <20221008224453.8634-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.38.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 18260407642931847906 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvfedrfeejtddgudegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeffgeetfffgffejgeejvdffgfdtvdeuueetgfefuedvjeegvdegjeejveeuueevnecukfhppedtrddtrddtrddtpddvudefrdeggedrudeiuddrgeejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmohguvgepshhmthhpohhuthdphhgvlhhopehplhgrhigvrhejudeirdhhrgdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepheekfeekieesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeiud 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves X-getmail-retrieved-from-mailbox: Patches * gnu/packages/games.scm (passage): Define in terms of 'deprecated-package'. (passage-game): New variable, formerly known as "passage". --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 246472c699..3efd5ff626 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -10820,9 +10820,9 @@ (define-public cgoban @end itemize") (license license:gpl2+))) -(define-public passage +(define-public passage-game (package - (name "passage") + (name "passage-game") (version "4") (source (origin From patchwork Sat Oct 8 22:44:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 43223 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 E245627BBEA; Sat, 8 Oct 2022 23:46:48 +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.9 required=5.0 tests=BAYES_00,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 93A0D27BBE9 for ; Sat, 8 Oct 2022 23:46:48 +0100 (BST) Received: from localhost ([::1]:39242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ohIal-0000y7-Mk for patchwork@mira.cbaines.net; Sat, 08 Oct 2022 18:46:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34062) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ohIa3-0000wI-Hy for guix-patches@gnu.org; Sat, 08 Oct 2022 18:46:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42521) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ohIa3-0006h2-A3 for guix-patches@gnu.org; Sat, 08 Oct 2022 18:46:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ohIa3-00054n-4N for guix-patches@gnu.org; Sat, 08 Oct 2022 18:46:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58386] [PATCH 2/2] gnu: Add passage. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 08 Oct 2022 22:46:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58386 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 58386@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 58386-submit@debbugs.gnu.org id=B58386.166526910919408 (code B ref 58386); Sat, 08 Oct 2022 22:46:03 +0000 Received: (at 58386) by debbugs.gnu.org; 8 Oct 2022 22:45:09 +0000 Received: from localhost ([127.0.0.1]:41594 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ohIZA-00052x-Pz for submit@debbugs.gnu.org; Sat, 08 Oct 2022 18:45:09 -0400 Received: from 7.mo582.mail-out.ovh.net ([46.105.59.196]:54739) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ohIZ7-00052a-4X for 58386@debbugs.gnu.org; Sat, 08 Oct 2022 18:45:06 -0400 Received: from player726.ha.ovh.net (unknown [10.109.146.166]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 18391238C0 for <58386@debbugs.gnu.org>; Sat, 8 Oct 2022 22:45:02 +0000 (UTC) Received: from ngraves.fr (met42-h01-213-44-161-47.dsl.sta.abo.bbox.fr [213.44.161.47]) (Authenticated sender: ngraves@ngraves.fr) by player726.ha.ovh.net (Postfix) with ESMTPSA id 459D52F6B7742; Sat, 8 Oct 2022 22:45:01 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-106R006274fd68c-af1f-4bd4-bbe4-74f8bacbc15f, CEC9B8182432DF3FB9030C0E377394C4D93A3A8E) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 213.44.161.47 Date: Sun, 9 Oct 2022 00:44:53 +0200 Message-Id: <20221008224453.8634-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221008224453.8634-1-ngraves@ngraves.fr> References: <20221008224453.8634-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 18261533539227656930 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvfedrfeejtddgudegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvffehgeekhfekgffgleehffetiefggeeitdduteekfffhkeehveejfeejledtieenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppedtrddtrddtrddtpddvudefrdeggedrudeiuddrgeejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmohguvgepshhmthhpohhuthdphhgvlhhopehplhgrhigvrhejvdeirdhhrgdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepheekfeekieesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekvd 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves X-getmail-retrieved-from-mailbox: Patches * gnu/packages/password-utils.scm (passage): New variable. --- gnu/packages/password-utils.scm | 39 +++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 8e29bef484..6bc3b99af4 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -37,6 +37,7 @@ ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022 Maxime Devos ;;; Copyright © 2022 ( +;;; Copyright © 2022 Nicolas Graves ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,6 +58,7 @@ (define-module (gnu packages password-utils) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system python) @@ -589,6 +591,43 @@ (define-public password-store through the pass command.") (license license:gpl2+))) +(define-public passage + (package + (inherit password-store) + (name "passage") + (version "1.7.4a0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/FiloSottile/passage") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "17899whffnpqqx9x1nx2b8bfxbxlh1pwlglqa0kznl0cn6sb37ql")))) + (build-system copy-build-system) + (propagated-inputs + (list util-linux git qrencode sed tree age)) + (build-system copy-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'rename-exe + (lambda _ + (rename-file "src/password-store.sh" + "src/passage")))) + #:install-plan + (list '("src/passage" "/bin/") + '("src/completion/pass.bash-completion" + "/share/bash-completion/completions/") + '("src/completion/pass.zsh-completion" + "/share/zsh/site-functions/")))) + (home-page "https://github.com/FiloSottile/passage") + (synopsis "A fork of the password-store encrypted password manager") + (description "This package provides a fork of the @code{password-store} +encrypted password manager. It relies on @code{age} instead of +@code{gnupg}.") + (license license:gpl2+))) + (define-public pass-otp (package (name "pass-otp")