From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id aLykBMZ5AWTg8QAAbAwnHQ (envelope-from ) for ; Fri, 03 Mar 2023 05:38:30 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id aLL5BMZ5AWS0GQAAauVa8A (envelope-from ) for ; Fri, 03 Mar 2023 05:38:30 +0100 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 E31F9277A6 for ; Fri, 3 Mar 2023 05:38:29 +0100 (CET) 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 Content-Type: text/plain; charset=UTF-8 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1677818309; a=rsa-sha256; cv=none; b=AA/KYuxxNaLgRdomrsGAWH7JMdxA/uVr6JPAuLhTrmjWKUpLc7HwG9k3tbEcYEU8Q842Il Q4hRoV9R08Vwip7AifVSiCuvZzQFBE45W+xNxcUI5zuenkvIeZEbmv/OYLn/fOzHkf3rvH LrCAFSgrOz6R1OGN7fRjGiB+u4nguoKy+4gtSPgRRgMyR/eHniFadIqFJeT6my/iSmK2DD anM7URFn7rFoQVhDMF61Yau5574EBIoxHznSUDYsnOnbPopVkUgTbP5aJ5BIHuMwboLy9+ WMiD8wl25Skk7Dl9l7jmKH9cc3h6lp3p114OmJd9GqdKKYTpPpL7RrNJbF8E5w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; 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"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1677818309; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: 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; bh=jOnbof2azkIFZkVcEV2cbd2Ldj+sjlcekefq5KwW4/E=; b=c2nGx6dfxSsyEyIW3jyffe3fma2WnB5SE5VbJ9PLqAwUEoQLGxiB0h7zBZeFIvipny+I+p BhFXKrnGTLrz6DasJgj28NXbpxk1/YHfpbm0BQcDcUxdzzm3eJ/Yy7RlPDyvsIW0l0rNur ieXIJd3rKBWZ/DpgZD83q3TrTaoKZMEAb4LVMx4nvjC4jB25R+D7s9UDMRpK4g7I8DXJ+J JLxLYsdANF4/J/n7W4eyaD5AuzSf9mIqzuvn3s4V+fmvlv5yGmLy8AzkxepOm0hCkd4CYV f80nZ+baVTPCsBeugnkba7QD+yVn27tUbzxUiRa4to10aQWSd9yW47YdZrbjcQ== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -0.70 X-Spam-Score: -0.70 X-Migadu-Queue-Id: E31F9277A6 Authentication-Results: aspmx1.migadu.com; dkim=none; 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"; dmarc=none X-TUID: 0gBoxa9NbGXW * 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 -- 2.39.1