From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id gIC4HsC+lGH2SAAAgWs5BA (envelope-from ) for ; Wed, 17 Nov 2021 09:35:12 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id eFWLGsC+lGG6JwAA1q6Kng (envelope-from ) for ; Wed, 17 Nov 2021 08:35:12 +0000 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 28DB72028F for ; Wed, 17 Nov 2021 09:35:12 +0100 (CET) Received: from localhost ([::1]:58018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mnGPP-0005aA-1f for larch@yhetil.org; Wed, 17 Nov 2021 03:35:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54616) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnGPG-0005Zy-QP for guix-patches@gnu.org; Wed, 17 Nov 2021 03:35:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48522) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mnGPG-00033p-IY for guix-patches@gnu.org; Wed, 17 Nov 2021 03:35:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mnGPG-0002ik-Ax for guix-patches@gnu.org; Wed, 17 Nov 2021 03:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51914] [PATCH 1/2] build-system/asdf: Don't fail in sbcl-package->cl-source-package on non-package inputs. References: <20211117082905.29499-1-mail@ambrevar.xyz> In-Reply-To: <20211117082905.29499-1-mail@ambrevar.xyz> Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Nov 2021 08:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51914 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51914@debbugs.gnu.org Received: via spool by 51914-submit@debbugs.gnu.org id=B51914.163713805010346 (code B ref 51914); Wed, 17 Nov 2021 08:35:02 +0000 Received: (at 51914) by debbugs.gnu.org; 17 Nov 2021 08:34:10 +0000 Received: from localhost ([127.0.0.1]:60066 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnGOP-0002go-WA for submit@debbugs.gnu.org; Wed, 17 Nov 2021 03:34:10 -0500 Received: from relay10.mail.gandi.net ([217.70.178.230]:53573) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnGON-0002g6-Vb for 51914@debbugs.gnu.org; Wed, 17 Nov 2021 03:34:08 -0500 Received: (Authenticated sender: mail@ambrevar.xyz) by relay10.mail.gandi.net (Postfix) with ESMTPSA id 2147124000A for <51914@debbugs.gnu.org>; Wed, 17 Nov 2021 08:34:00 +0000 (UTC) From: Pierre Neidhardt Date: Wed, 17 Nov 2021 09:33:52 +0100 Message-Id: <20211117083353.31561-1-mail@ambrevar.xyz> X-Mailer: git-send-email 2.32.0 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-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1637138112; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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; bh=JjAlAL2L/0+zWKdNivNSQWjMzUwy+/LWgrMmixdUz8g=; b=Oirj4sCA/U3H4sWNZ8qq/YQ46F0I4irVqgKTd4wwtKTqkIHPHrxiIMOT1OISYrRFUvcoNp tO7bg5a5T1wYQSn44QqpMfvtEb8g7ySdMQgmZP6f5gTbpYgbpSmG4sDPDSBF/w9W6nCnz5 8Wk0KUfBMTM/VHTVM4LmimdF4KX63YBXkgOKeC79R5uncUtwd1mWh8nzOkpuZNrs49nbEp KRkXRLNW3MqYu5RDX4Ts4Lu9pZoOmqg+1smFuW7yRNrLVOZle6kmqWsUfU7hZONWoPfjcb RNTid0p2h9jF/IY7sCoIgv07bwVQ4SNXpUXGh0YWAqOhvVPtK1uVUampckL/jg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1637138112; a=rsa-sha256; cv=none; b=oHSLm4cDNf83CYCl//c7f9UVGjrX/iVmZPgZIsGHDx7roOdykzusF4+9ajTXv5+oITbtBo sNxYuOIaGBSZgAwaL3EzDF0A6Kkjk0R5U8kVBDIQm0vcGogD4qq0xlW/6r9l8abWlW5TXV 1PC5sDe8pihc+BEZ0kDRNOemD4pQluzznyC6jBNlN8jo7H5UKqLs7UuvZzX9883dR/2sgl pyR8HURDXTQrPlagIwWQdW4GnY5O2jdPPCGTwloItIz7bJjln/PPPnZtC0Y9RGHZ5P95MP gVT/VcHQEhi8kB6BEsGVinBSe/0WLtUY2kyStA56JZk6b6RWmHZ0eXjh46fGtQ== 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" X-Migadu-Spam-Score: -1.45 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" X-Migadu-Queue-Id: 28DB72028F X-Spam-Score: -1.45 X-Migadu-Scanner: scn0.migadu.com X-TUID: a/vNJkvzV+0W Inputs can be non-packages, for instance (origin ...). sbcl-package->cl-source-package used to fail if such inputs were present in the parent sbcl-* package. * guix/build-system/asdf.scm (package-with-build-system): Fix 'has-from-build-system?' function. --- guix/build-system/asdf.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/build-system/asdf.scm b/guix/build-system/asdf.scm index b4e40ee8c2..538812d620 100644 --- a/guix/build-system/asdf.scm +++ b/guix/build-system/asdf.scm @@ -162,7 +162,8 @@ (define (transform-package-name name) name)) (define (has-from-build-system? pkg) - (eq? from-build-system (package-build-system pkg))) + (when (package? pkg) + (eq? from-build-system (package-build-system pkg)))) (define (find-input-package pkg) (let* ((name (package-name pkg)) -- 2.32.0