From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id iM0WDHRMV2c+8gAAqHPOHw:P1 (envelope-from ) for ; Mon, 09 Dec 2024 20:00:52 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id iM0WDHRMV2c+8gAAqHPOHw (envelope-from ) for ; Mon, 09 Dec 2024 21:00:52 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="F/BqC0Zc"; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=r8UQL69l; 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=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1733774452; h=from:from:sender:sender:reply-to: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:dkim-signature; bh=LKGXZOAZQm/HBzMrUMNTcnJ7X4/orZqyPz52qLi35gQ=; b=qdD5iknWa7Af+aRLasNdJXtAS64YyUV587noabux/nc9N/AMORCRtKGlcqo6BBdU8+38dq qoZvs26uadWhSfMA2DW2dwsP7Ki8sTL6GM3QbtqmJPauGyQrJkvJKq21Zu5VKsU3Agt+Zm VDdir8qWMnANYemkgnfN1uq3ODyaqKagQV8CPeBWuDbTEM+8q3t5s1kC+ZniMbXU+DveU2 Rb54rkWifU8z0lvPw4hHWz6IRO0RACnNSBvW72AO4cbTupNcNbY8JZQAWNqrkJ/aNK0PhH Mxw1htJcslbiXR+URwc17KASlbv4QgiY9TiNcUZD0FzumfNV+u698TKQHi2rTg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="F/BqC0Zc"; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=r8UQL69l; 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=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1733774452; a=rsa-sha256; cv=none; b=BzPIRLCdz5LZ3zO1xrsmAvBV/5L6A+vF7/bbh+3hJ7YLbECc+x3hfZ6LEVkjlhLB32fPAv GOoDjprcMJy2t+G5p18TglONTqaMCFihEXREaDnl1MbVC9pvV1WrsGzmvivQgCHG+QNXmN VsjSCj4wACQgY5wIPlTHPri89JOfrKWjDVOX3SxUpqhYKhNGKCahOn4CLuj2adlAFq5PGG Z1W/YmBCowWEtcfHXXJYOeLFNDJ82kavrBYubHjKxQPhQF7gQQgZK20h7+pu1mBqCK9tJL 7Akcea+ug5EJsWrPKsY+Rd+Fn49ZKgFw9V6acXu64xpfxG6zYKcpu7fIY0lpUA== 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 1E20B7994C for ; Mon, 09 Dec 2024 21:00:51 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tKjvU-0005Gp-2M; Mon, 09 Dec 2024 15:00:16 -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 1tKjvO-0005Bw-PU for guix-patches@gnu.org; Mon, 09 Dec 2024 15:00:10 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tKjvO-0007Yi-Gu for guix-patches@gnu.org; Mon, 09 Dec 2024 15:00:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=LKGXZOAZQm/HBzMrUMNTcnJ7X4/orZqyPz52qLi35gQ=; b=F/BqC0ZcgZbBXFG8RLruX2h/0uCpRz7oyfhZItaWErBUjKj+JK7S+VbllOKA2MoSwCqtC1nJ+HviAcu67a40umg9fTF5Uk5b+30OdpJuwSpZxIoBQunQHAMt+FfsyFYsQuqNU9vl38a8FqwPVbbsNnGnHWd3OKxBtPlFtISEYNNZRRi1CZEKTw6owAfSm91RJIw/hudKhfASdIx7aGpSmJfhd+5172F+MrXqoN5e1qqDr+bQQJjMzWjBfa4XbemUQVhqlUcM1nGy2pGHES0DTIQVFsDcbhmgpDliixGt0OsPVpDgM6rWiFmYYlHBPhzBS+FMHPnCvp5VcfYaCn90Hg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tKjvN-0002GP-SD for guix-patches@gnu.org; Mon, 09 Dec 2024 15:00:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#70923] [PATCH v4 09/11] import: cpan: Use 'maybe-upstream-inputs' procedure. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Dec 2024 20:00:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70923 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70923@debbugs.gnu.org Received: via spool by 70923-submit@debbugs.gnu.org id=B70923.17337743758322 (code B ref 70923); Mon, 09 Dec 2024 20:00:09 +0000 Received: (at 70923) by debbugs.gnu.org; 9 Dec 2024 19:59:35 +0000 Received: from localhost ([127.0.0.1]:55749 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tKjuo-0002A1-Ov for submit@debbugs.gnu.org; Mon, 09 Dec 2024 14:59:35 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:60445 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tKjuj-00027f-Ma for 70923@debbugs.gnu.org; Mon, 09 Dec 2024 14:59:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1733774354; h=from:from: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: in-reply-to:in-reply-to:references:references; bh=LKGXZOAZQm/HBzMrUMNTcnJ7X4/orZqyPz52qLi35gQ=; b=r8UQL69laODd6Bd0KnhGr6D0c/bARDoTMhA/oPGox5UESH6X09z4aNmaaIVOznfLaZZ5e5 +sQJLmh0m+zc7PW7URZ7wTOGM5xF+irYQjD/K7ppwUPtB5Yb59+ExjYq1zrYknEGnDEByd LlSwSMOQILaHFGsbOsf58cYuVAFFE0ww/Oudv397X1o4/3+PJNaMnO75U5V5tvPdiMNn1P Xl8bQAgMUCcbg1HE3y2UJrmHb6qb8JLGjTkF8nIMmD+EPceCfyEMvkL0UEU5CoGWvzpqw4 6W3mK8YU6E2Yr1In6qAiqfW/o8CKTjW70NTPD8qpQhS1KehEw8ERpek8r7IXLA== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 77e07663 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70923@debbugs.gnu.org>; Mon, 9 Dec 2024 19:59:14 +0000 (UTC) Date: Mon, 9 Dec 2024 20:58:13 +0100 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@rimm.ee> References: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@rimm.ee> 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: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches From: Herman Rimm via Guix-patches via 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 X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: -2.66 X-Spam-Score: -2.66 X-Migadu-Queue-Id: 1E20B7994C X-TUID: mvoj2qBjAu4c * guix/import/cpan.scm (maybe-inputs): Delete procedure. (cpan-module->sexp): Use 'maybe-upstream-inputs' procedure. Change-Id: I4fa99da62d81f02c2998ad96f5ea81e27df071cd --- guix/import/cpan.scm | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm index 85e5e69098..e26cc85491 100644 --- a/guix/import/cpan.scm +++ b/guix/import/cpan.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2020, 2021, 2023 Ludovic Courtès ;;; Copyright © 2022 Hartmut Goebel +;;; Copyright © 2024 Herman Rimm ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,8 +38,9 @@ (define-module (guix import cpan) #:use-module (guix utils) #:use-module (guix base32) #:use-module ((guix download) #:select (download-to-store url-fetch)) - #:use-module ((guix import utils) - #:select (factorize-uri recursive-import)) + #:use-module ((guix import utils) #:select (factorize-uri + maybe-upstream-inputs + recursive-import)) #:use-module (guix import json) #:use-module (guix packages) #:use-module (guix upstream) @@ -277,15 +279,6 @@ (define (cpan-module->sexp release) (define version (cpan-release-version release)) (define source-url (cpan-source-url release)) - (define (maybe-inputs input-type inputs) - (match inputs - (() - '()) - ((inputs ...) - `((,input-type (list ,@(map (compose string->symbol - upstream-input-downstream-name) - inputs))))))) - (let* ((tarball (with-store store (download-to-store store source-url))) (inputs (cpan-module-inputs release)) @@ -300,12 +293,10 @@ (define (cpan-module->sexp release) (base32 ,(bytevector->nix-base32-string (file-sha256 tarball)))))) (build-system perl-build-system) - ,@(maybe-inputs 'native-inputs - (filter (upstream-input-type-predicate 'native) - inputs)) - ,@(maybe-inputs 'propagated-inputs - (filter (upstream-input-type-predicate 'propagated) - inputs)) + ,@(maybe-upstream-inputs 'native-inputs + (filter (upstream-input-type-predicate 'native) inputs)) + ,@(maybe-upstream-inputs 'propagated-inputs + (filter (upstream-input-type-predicate 'propagated) inputs)) (home-page ,(cpan-home name)) (synopsis ,(cpan-release-abstract release)) (description fill-in-yourself!) -- 2.45.2