From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id GMDjL3wf82Y+RAAAqHPOHw:P1 (envelope-from ) for ; Tue, 24 Sep 2024 20:22:20 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id GMDjL3wf82Y+RAAAqHPOHw (envelope-from ) for ; Tue, 24 Sep 2024 22:22:20 +0200 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=qUjFqjzk; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=K7xG4Syj; 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=1727209340; 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=B55v1uxYlYKoU4ZUaomkSGCoc+WRrqq9U3l4wmyQcXo=; b=Fs7kGdsZSb+eNCda3hQ1YqGR7moDhK0yIObvBpW8ifbaPr3Cx0wEuhX0wX9yRZfbK5URTl nB5Sl8mFWqKx7sTzF5ZSZX+o3TKNWg+9hMIh/Of+QU+41aqLPXVOXu2LIAvu0DErsoIlhH dqqOJ4t3L8RJ4T+1XNseADf0il1ZXs46tavfFjTaQF7UICZ2sMZ6S3VSwoiehzyyQSgpZV R25FY7VWBL3ISJWOSA1OHEWHx8T5/rsB596Vr1NiXLYVpiLjefuUL1G0AZaf7D0C3ZrBHc D/jZqCxk3fievYw8t4ytnft9wsA3WA/4FFc45/rBJmwrN1QL0ykm1UaVrED3jA== 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=qUjFqjzk; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=K7xG4Syj; 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=1727209340; a=rsa-sha256; cv=none; b=hxDitUogP3l+N7eu78dRfa++UnWEs/BV8f2WTBn0k/hW6VV7hGipoPJbAujek/TjQX5wOA 5Qlt2k10U6sJP8j0CY7Sddt4LrT3h6Aqi6cF6t3d7B5wrTAVJaaQPnordAGidioxriJ1SQ aWrhAij43lbCf/Okfsx3/ybFyt6jd0lAThDCgBd0x3XwYGQjX/Ggl79MjhRkPkDFTmsmqY h1CEF12RHXsEHED108ETvcuUb6c66+zWoPr7UHztZQQOL5++R59G3c1OFGT2OFQJhM3BR7 M//dt0heQIvQZW7qkZ8y7F81FZKK/lvzUmVg4Q8yNkezwre2lZHix82KHy/lDg== 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 8B36B7B655 for ; Tue, 24 Sep 2024 22:22:20 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1stC2x-0000gj-C3; Tue, 24 Sep 2024 16:22:07 -0400 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 1stC2b-0000MH-Is for guix-patches@gnu.org; Tue, 24 Sep 2024 16:21:46 -0400 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 1stC2Y-0003PO-IC for guix-patches@gnu.org; Tue, 24 Sep 2024 16:21:43 -0400 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=B55v1uxYlYKoU4ZUaomkSGCoc+WRrqq9U3l4wmyQcXo=; b=qUjFqjzkOkvrKyVOb6+MTIpGgowWR1dcizU1rE2hWkXa5K3Wte8jAnV0r8Jfchp3GPcxRHyYjY3Rwqqt3Toib663HmQCwWHPapmK0a0/52Gp6pumWz6XNTFuFvi797ybs3EYiOHo7bHBnAB9St/YDBbKLnF3YtbA2f+sfcY4MWMa6jLiWc/Lfw09lhpMz8cERRsUj34fjsO2Z9TS7UfPd7epxChOCGvXrUrOwrMkzw5Q53FI2Fget72WAK0YtuTZU/XAmljIdMweo5/7FQHvJPTkaNlwmDIqwCYagEh9Aocwd4tUKtzJMrBupxdLLC917Q5+QL6YFxOqbEM6fAZmQg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1stC2x-00055M-A2 for guix-patches@gnu.org; Tue, 24 Sep 2024 16:22:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70923] [PATCH v3 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: Tue, 24 Sep 2024 20:22:07 +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.172720930119422 (code B ref 70923); Tue, 24 Sep 2024 20:22:07 +0000 Received: (at 70923) by debbugs.gnu.org; 24 Sep 2024 20:21:41 +0000 Received: from localhost ([127.0.0.1]:38516 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stC2X-000535-4Z for submit@debbugs.gnu.org; Tue, 24 Sep 2024 16:21:41 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:37373 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stC2H-00050F-8H for 70923@debbugs.gnu.org; Tue, 24 Sep 2024 16:21:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1727208849; 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=B55v1uxYlYKoU4ZUaomkSGCoc+WRrqq9U3l4wmyQcXo=; b=K7xG4Syj5StyzBvRBU40nMC2ui9eRcsEwKSqCiNm6v34OZkG0TS9R7vgWDE/lnoTOUaGXt jspVUOdor4Lbw0UW4ewNi6dNOGHScyz4eq9v+xNE3l0atJR6Uaaj/s69eveGAB4vp4RCvj CD8eyF/3ZGAruc2WhIw9D8PhCylEfOo7WHJmXW9YLMdWTJrctmu1eIQ6SGxQWWPGxKjT3o 3pjTP20RFOjd5IgjhNbsFRD2ufjA7hGUh5b+tdgxvSsq5qVLl9K5HurUvvE1aqIEjIZ0zD Jmm8zFrI79kp3kFxxfCB17Sa8LwmAPa2PWRXdBHJq/igAdfA+NKqYJyvYON2hg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 576da104 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70923@debbugs.gnu.org>; Tue, 24 Sep 2024 20:14:09 +0000 (UTC) Date: Tue, 24 Sep 2024 22:13:15 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.91 X-Spam-Score: -4.91 X-Migadu-Queue-Id: 8B36B7B655 X-Migadu-Scanner: mx10.migadu.com X-TUID: rJiJtltWZT1u * guix/import/cpan.scm (maybe-inputs): Delete procedure. (cpan-module->sexp): Use 'maybe-upstream-inputs' procedure. Change-Id: I4fa99da62d81f02c2998ad96f5ea81e27df071cd --- guix/import/cpan.scm | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm index b87736eef6..611ea63eba 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,7 +38,8 @@ (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)) + #:use-module ((guix import utils) #:select (factorize-uri + maybe-upstream-inputs)) #:use-module (guix import json) #:use-module (guix packages) #:use-module (guix upstream) @@ -275,15 +277,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))) @@ -297,12 +290,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