From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id kPz5N4U3hWL0gQEAbAwnHQ (envelope-from ) for ; Wed, 18 May 2022 20:14:29 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id sF3iN4U3hWJCXAEAauVa8A (envelope-from ) for ; Wed, 18 May 2022 20:14:29 +0200 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 BE06E3FBDD for ; Wed, 18 May 2022 20:14:29 +0200 (CEST) Received: from localhost ([::1]:37066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nrOBo-00008w-Ta for larch@yhetil.org; Wed, 18 May 2022 14:14:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45084) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nrOAS-0007kX-Vs for guix-patches@gnu.org; Wed, 18 May 2022 14:13:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39622) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nrOAS-0005Dm-Ky for guix-patches@gnu.org; Wed, 18 May 2022 14:13:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nrOAS-0006Lz-Gn for guix-patches@gnu.org; Wed, 18 May 2022 14:13:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55030] [PATCH v2 05/34] build-system/elm: Add implicit Elm inputs. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 18 May 2022 18:13:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55030 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55030@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Philip McGrath Received: via spool by 55030-submit@debbugs.gnu.org id=B55030.165289755224222 (code B ref 55030); Wed, 18 May 2022 18:13:04 +0000 Received: (at 55030) by debbugs.gnu.org; 18 May 2022 18:12:32 +0000 Received: from localhost ([127.0.0.1]:33485 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrO9w-0006IX-86 for submit@debbugs.gnu.org; Wed, 18 May 2022 14:12:32 -0400 Received: from mail-vs1-f41.google.com ([209.85.217.41]:37860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nrO9t-0006Hi-Or for 55030@debbugs.gnu.org; Wed, 18 May 2022 14:12:30 -0400 Received: by mail-vs1-f41.google.com with SMTP id w10so458218vsa.4 for <55030@debbugs.gnu.org>; Wed, 18 May 2022 11:12:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8eB+KxS+XvMi+vTosChUMKJY/hyck4QM8yg+N6olk1s=; b=BXHLGE8s+9TulrS/pEb/GifG7zz/ETI3t7rNXUEr8y0Qhs8+8Dx1X/evm2OrmST3LW P0W0WFkfYLuNcP+4bCDG6ccSK1kFDIoxjFYI7ffll9PDmupzqmJiKlvnt4yAU6dnUN/O FI29ni4Onj3Y5buRG8XxJukJXQzjmmaMTOHKzY06BmMrW8+EnMW9E/Qdb8HNRve2poYN g0ZNtyGFOfKYc/wzFPPLHBrABMvAAbmObHm/eZ+uPE8jwIpa6QlWIyXZiuanuEDZE2dT RJTOKvJUwPtUUUWUWl1ZVTn5evWz50TD1B48Sqc6UUtucU0li4+oQz5Th4BgTMFGr5Oo fOBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8eB+KxS+XvMi+vTosChUMKJY/hyck4QM8yg+N6olk1s=; b=SH9nckdFz/ayePuhB0De1X4gM+7RMJcNv0ZLQWekO+EfHL2AqD8LjaY4kXcLYMZmp1 BRxqV5nOVzBmb2uGaHkAy+3gXABpXb4AuIjkl5tbOQG1TTxDpnZBCPIY9RBvSiJNI2uF u5bp0TAWqbPrluoIin67kf3AwKA5+7ZmoyLZGaUbqeIsZPNb8mkmV7gUSsgnhmhUf1aq ojF/3Bte3EAEP3fnLucxga4k/vWglfSaYx1K9A5057c+9m1rp+gMeVSy0SMIx7xvoUmU lqn5h2UxGPB7nIz9S4P1Xt4hW+2kmfhNV44N7/zXlyhI+aocqu1/318L5Moukft209Dq n72A== X-Gm-Message-State: AOAM530l6gTLL7Pk41bI0srOMg/EuYLUhHDvzpNp7BHF4HJCZoLHDIV8 jWiIbEVw9G+TD1+OJmrzaqYGanA4Y+fE1Vd4 X-Google-Smtp-Source: ABdhPJzkEf1hHdlTRML/ImcwpgkCMizS4ddukbYG9PCt+PXOYSXjFWrrXl+7f2irXt683gvHfCYZQw== X-Received: by 2002:a05:6102:6d1:b0:32d:35ae:f68e with SMTP id m17-20020a05610206d100b0032d35aef68emr588781vsg.7.1652897544395; Wed, 18 May 2022 11:12:24 -0700 (PDT) Received: from localhost (c-73-125-98-51.hsd1.fl.comcast.net. [73.125.98.51]) by smtp.gmail.com with UTF8SMTPSA id a18-20020ab03c92000000b003626f894deasm342446uax.24.2022.05.18.11.12.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 18 May 2022 11:12:24 -0700 (PDT) From: Philip McGrath Date: Wed, 18 May 2022 14:10:52 -0400 Message-Id: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: <20220419232736.272970-1-philip@philipmcgrath.com> MIME-Version: 1.0 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" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1652897669; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=8eB+KxS+XvMi+vTosChUMKJY/hyck4QM8yg+N6olk1s=; b=XneEu5Rye2paFDiXZ85NmoReiCL2qOk+dLXKdNz3zc4qP+oMUJIbLIGGLdWYnu6BtBixCn 896RKyGWGpG6rfedDtwDgo0LwDnvm2xc6rp8hEV963iwhFcpuS8o/gVBJpRXtl2zSUCG5F V7QSO4jJf6xZT759u5zlTZRKFv1vd9Hd0DQZElYwJAXllTbiOOEzRPdubd1fyLOK0nev1s vxOJinU/H0i3SeYEF4CY5pJRN40lQO7jmgFuf/2WOP1+hDhgYVsREwWb8dudpDpmJqb5Iy c+kF7eRjGpRIJU+6IWigTocua7BC1FVb/patMyusG7hhK5w0RQSTa0od/znrrA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1652897669; a=rsa-sha256; cv=none; b=PU/Mtxnk7N2OthL64pr+a8HhmkhAtDh/qCANCF3xEJeAdLHrjd/t1zSFmPe6QsX/1ObbzY 78Wmkf39lbCya8ajuCUYvXOc5PrpdgHCFT7OC+QJEe8rUYx+OMc0qf9nfWGSXZQEoRDyBi FqOg7YHAOM8KBSUavcF3R9hYfCZ/3/Lksx0ULaUGPaAg5Uj2TKhGcm/CkAt/yCeO6xDnCj KRhVGwU2wxKJEoH2fF6emP+LDCHAd9dIFBfEd20XFgj2xqL+7X2HdKNdVQL/9jGSIhcbTe zFSG6iEoLEqzV4lKJq/RcuZbdBLbePvImdr6ErC7NrniQSIoDdGnR2LGJ2H4tg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=philipmcgrath.com header.s=google header.b=BXHLGE8s; dmarc=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" X-Migadu-Spam-Score: 3.46 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=philipmcgrath.com header.s=google header.b=BXHLGE8s; dmarc=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" X-Migadu-Queue-Id: BE06E3FBDD X-Spam-Score: 3.46 X-Migadu-Scanner: scn0.migadu.com X-TUID: V6+gm1Hg/D16 * guix/build-system/elm.scm (default-elm-core): New variable. (default-elm-json): Likewise (lower): Use them as implicit inputs when applicable. --- guix/build-system/elm.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/guix/build-system/elm.scm b/guix/build-system/elm.scm index b54954bf4e..293bcbfb64 100644 --- a/guix/build-system/elm.scm +++ b/guix/build-system/elm.scm @@ -103,6 +103,18 @@ (define (default-elm) (let ((elm (resolve-interface '(gnu packages elm)))) (module-ref elm 'elm))) +(define (default-elm-core) + "Return the default elm-core package." + ;; Lazily resolve the binding to avoid a circular dependency. + (let ((elm (resolve-interface '(gnu packages elm)))) + (module-ref elm 'elm-core))) + +(define (default-elm-json) + "Return the default elm-json package." + ;; Lazily resolve the binding to avoid a circular dependency. + (let ((elm (resolve-interface '(gnu packages elm)))) + (module-ref elm 'elm-json))) + (define* (lower name #:key source inputs native-inputs outputs system target (implicit-elm-package-inputs? #t) @@ -127,6 +139,28 @@ (define* (lower name '()) ,@inputs ("elm" ,elm) + ,@(cond + (implicit-elm-package-inputs? + ;; These are needed for elm-build-system even if not actually + ;; needed by the package being built. But "elm/json" is often + ;; present in practice, and "elm/core" always is: only add the + ;; default packages if no suitable inputs have been given + ;; explicitly. + (filter-map + (match-lambda + ((name get-default) + (cond + ((find (match-lambda + ((_ pkg . _) + (equal? name (guix-package->elm-name pkg)))) + inputs) + #f) + (else + `(,name ,(get-default)))))) + `(("elm/core" ,default-elm-core) + ("elm/json" ,default-elm-json)))) + (else + '())) ;; TODO: probably don't need most of (standard-packages) ,@(standard-packages))) (outputs outputs) -- 2.32.0