From patchwork Fri Mar 3 04:37:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jack Hill X-Patchwork-Id: 47556 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 D8A5216D1B; Fri, 3 Mar 2023 04:38:31 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=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 EDE7416D0F for ; Fri, 3 Mar 2023 04:38:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXxBE-0006ku-Bv; Thu, 02 Mar 2023 23:38:04 -0500 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 1pXxBD-0006kc-7n for guix-patches@gnu.org; Thu, 02 Mar 2023 23:38:03 -0500 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 1pXxBC-0004Pl-Sc for guix-patches@gnu.org; Thu, 02 Mar 2023 23:38:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXxBC-0005x5-IR for guix-patches@gnu.org; Thu, 02 Mar 2023 23:38:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61928] [PATCH 2/2] gnu: rnp: Improve package style. Resent-From: Jack Hill Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Mar 2023 04:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61928 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61928@debbugs.gnu.org Received: via spool by 61928-submit@debbugs.gnu.org id=B61928.167781825622836 (code B ref 61928); Fri, 03 Mar 2023 04:38:02 +0000 Received: (at 61928) by debbugs.gnu.org; 3 Mar 2023 04:37:36 +0000 Received: from localhost ([127.0.0.1]:59395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXxAl-0005wA-CY for submit@debbugs.gnu.org; Thu, 02 Mar 2023 23:37:36 -0500 Received: from minsky.hcoop.net ([104.248.1.95]:34566) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXxAj-0005vv-J5 for 61928@debbugs.gnu.org; Thu, 02 Mar 2023 23:37:34 -0500 Received: from [2001:470:8:9f5:e878:315c:5ed6:89d] (helo=leyden.home.eronel.org) by minsky.hcoop.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pXxAc-0005hr-M2 for 61928@debbugs.gnu.org; Thu, 02 Mar 2023 23:37:26 -0500 From: Jack Hill Date: Thu, 2 Mar 2023 23:37:13 -0500 Message-Id: <20230303043713.18948-2-jackhill@jackhill.us> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230303043713.18948-1-jackhill@jackhill.us> References: <9b6ed9ac-400f-ffa6-df41-8b89a45006ba@jackhill.us> <20230303043713.18948-1-jackhill@jackhill.us> 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/package/openpgp.scm (rnp)[phases]{fixes}: Rename fixes to patch-tests, use search-input-file, and remove trailing #t. {check}: Respect tests?. [native-inputs]: Remove labels. [home-page]: Update URL. --- gnu/packages/openpgp.scm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/gnu/packages/openpgp.scm b/gnu/packages/openpgp.scm index 422e9bdcd6..9b6f04b407 100644 --- a/gnu/packages/openpgp.scm +++ b/gnu/packages/openpgp.scm @@ -118,23 +118,23 @@ (define-public rnp "-DDOWNLOAD_RUBYRNP=off") #:phases (modify-phases %standard-phases - (add-after 'unpack 'fixes - (lambda* (#:key inputs #:allow-other-keys) + (add-after 'unpack 'patch-tests + (lambda _ (substitute* "src/tests/support.cpp" - (("\"cp\"") (string-append "\"" (which "cp") "\""))) - #t)) + (("\"cp\"") (search-input-file inputs "/bin/cp"))))) (replace 'check - (lambda _ - ;; Some OpenPGP certificates used by the tests expire. - ;; To work around that, set the time to roughly the - ;; release date. - (invoke "faketime" ,day-of-release "make" "test")))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Some OpenPGP certificates used by the tests expire. + ;; To work around that, set the time to roughly the + ;; release date. + (invoke "faketime" ,day-of-release "make" "test"))))))) (native-inputs - `(("gnupg" ,gnupg) ; for tests - ("googletest" ,googletest) - ("libfaketime" ,libfaketime) ; for tests - ("pkg-config" ,pkg-config) - ("python" ,python))) + (list gnupg ; for tests + googletest ; for tests + libfaketime ; for tests + pkg-config + python)) (inputs (list botan bzip2 json-c zlib)) (synopsis "RFC4880-compliant OpenPGP library written in C++") @@ -146,7 +146,7 @@ (define-public rnp librnp is the library used by rnp for all OpenPGP functions, useful for developers to build against. It is a “real” library, not a wrapper like GPGME of GnuPG.") - (home-page "https://www.rnpgp.com/") + (home-page "https://www.rnpgp.org/") (license ;; RNP contains code written by Ribose and code derived from netpgp. (list