From patchwork Tue Dec 21 22:44:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 35543 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 5E36A27BBE9; Tue, 21 Dec 2021 22:46:24 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,TVD_SPACE_RATIO,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 ED2EB27BBEA for ; Tue, 21 Dec 2021 22:46:23 +0000 (GMT) Received: from localhost ([::1]:37780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzntn-0000QV-1s for patchwork@mira.cbaines.net; Tue, 21 Dec 2021 17:46:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzntU-0008Lc-2K for guix-patches@gnu.org; Tue, 21 Dec 2021 17:46:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44513) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzntS-0001dW-Os for guix-patches@gnu.org; Tue, 21 Dec 2021 17:46:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzntS-000806-NE for guix-patches@gnu.org; Tue, 21 Dec 2021 17:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52723] [PATCH 02/26] gnu: Add apache-commons-parent-pom-52. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Dec 2021 22:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52723 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52723@debbugs.gnu.org Received: via spool by 52723-submit@debbugs.gnu.org id=B52723.164012672830476 (code B ref 52723); Tue, 21 Dec 2021 22:46:02 +0000 Received: (at 52723) by debbugs.gnu.org; 21 Dec 2021 22:45:28 +0000 Received: from localhost ([127.0.0.1]:55999 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsr-0007vP-2F for submit@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:28 -0500 Received: from lepiller.eu ([89.234.186.109]:52548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mznsm-0007uN-8D for 52723@debbugs.gnu.org; Tue, 21 Dec 2021 17:45:20 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 09b2ff2e for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=8N76cFd6ufqtXLF28gZR20Poe YYgi7zrDMy09w6YOCc=; b=Ro7xUd9/G+boZ5OHr6CbRJuxtIVzeYWe0PZj3f3yt lrdqDd/8YfC6+CiMU5InZJfShaB1c6bug0BKyE3FRZpnBleW/O7fWLwX7wbIL2SL yC/mrg5dqFTUJIK7AApqsW8lq58q/gehT8a2dNqqL79pLb0eCvstw2BlY4V7cdPi O3GiWk2rpAht3hv5Rpq0Q+zRACuhPANdYsBApfsvYOU+57xJKhy6Vc75kvBj4Som tiXM8svqbZvVDnnONOvLtmovpBRLvmlJCbgxt8biLqfeISwucfFP4vlQHmCLmmnX gV87fHnlq3hdgU7JIGsv0Bk9zDdZ4zruQbiXD+DrOnowg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 1e42ae8a (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <52723@debbugs.gnu.org>; Tue, 21 Dec 2021 22:45:17 +0000 (UTC) From: Julien Lepiller Date: Tue, 21 Dec 2021 23:44:46 +0100 Message-Id: X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211221234231.44299f63@tachikoma.lepiller.eu> References: <20211221234231.44299f63@tachikoma.lepiller.eu> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maven-parent-pom.scm (apache-commons-parent-pom-52): New variable. (make-apache-commons-parent-pom): Add optional tag-prefix input. --- gnu/packages/maven-parent-pom.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maven-parent-pom.scm b/gnu/packages/maven-parent-pom.scm index 9919a66105..8a70791353 100644 --- a/gnu/packages/maven-parent-pom.scm +++ b/gnu/packages/maven-parent-pom.scm @@ -88,7 +88,8 @@ (define-public apache-parent-pom-23 (make-apache-parent-pom "23" "05c8i741f0m4311q264zvq0lc6srsyz2x95ga4d7qfd89swkzg9d")) -(define (make-apache-commons-parent-pom version hash parent) +(define* (make-apache-commons-parent-pom version hash parent + #:key (tag-prefix "commons-parent-")) (hidden-package (package (name "apache-commons-parent-pom") @@ -97,7 +98,7 @@ (define (make-apache-commons-parent-pom version hash parent) (method git-fetch) (uri (git-reference (url "https://github.com/apache/commons-parent") - (commit (string-append "commons-parent-" version)))) + (commit (string-append tag-prefix version)))) (file-name (git-file-name name version)) (sha256 (base32 hash)))) (build-system ant-build-system) @@ -138,6 +139,12 @@ (define-public apache-commons-parent-pom-50 "50" "0ki8px35dan51ashblpw6rdl27c2fq62slazhslhq3lr4fwlpvxs" apache-parent-pom-21)) +(define-public apache-commons-parent-pom-52 + (make-apache-commons-parent-pom + "52" "0fb6id9cs9944fjlirjc07bf234bwi96i642px09m9nrfj338n5d" + apache-parent-pom-23 + #:tag-prefix "rel/commons-parent-")) + (define-public java-weld-parent-pom (hidden-package (package