From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id eLDYHDrNhWYd5wAAqHPOHw:P1 (envelope-from ) for ; Wed, 03 Jul 2024 22:14:18 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id eLDYHDrNhWYd5wAAqHPOHw (envelope-from ) for ; Thu, 04 Jul 2024 00:14:18 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none ("invalid DKIM record") header.d=freakingpenguin.com header.s=x header.b="GrK2qG8/"; 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=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1720044858; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=rNBm5jTy66oDdv/NCuz1/DMBQPaQo0xwiy9uyeOQ1aM=; b=kpb5bjyYOM/Drq+4/GkumgRAtVh58a0Iq5Mi04J9/T7Qk+MuRV8i8KkscaBnHn6uzwVWs6 e2vY+aHU9LTSiTcAuUjO2vCVzQEj03j/uYQ+wqhPcGxupi1eFrAMNZEvBoswbEnawunZyr 8fdaJgKqw0g0K+KDiKfwdkWeml7nAW0HOWV7CkCplOuwXdxg8RJJctJqZzLUlFE9gksI9K QYgEm2OTggTRcMjk5ruF8S9lAJedwb8PY12u4mJzehKo5c5/DJW2+SMnUq0jsostswYrsp olHJFBjJRRgC0/joE7T0xqJjAmZzi++t2tcG3IWmQZNkMqqGJi9TdjKm296kIA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none ("invalid DKIM record") header.d=freakingpenguin.com header.s=x header.b="GrK2qG8/"; 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=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1720044858; a=rsa-sha256; cv=none; b=i12OOyVWc/JsWXJ7iwXtx2EuJKCE5jV19I6UZtVP6ATOVJ6ly5fRSR66DkCVaY9qACN/6Y e+HP8ctKgWGNVjsJRBTjT7qgmy1VxM693SJFI16yPQFuZHJrD/SWhhbCDihhDI2eG+ZbKj e/Bz3W0eWqH2yvXVHnSbArulQjI1IM6YVUrRvt1szuKbgTpiDjoJJvEHdxeQ9zNE0lxse4 tbj+qIp/xcPrl3V84ADejraj6jmOsLcTAi+GNYMAeftOEsCX1rF9h/sKH8kmZAaCDTS67l Kk0maVhhxfkTw2bgLkk6qtWdoKEzR60kQNR6hAsylJW9pTYzyStrbX2F8SYYwA== 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 1D12454E43 for ; Thu, 4 Jul 2024 00:14:17 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sP8Ek-0007vE-FD; Wed, 03 Jul 2024 18:14:02 -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 1sP8Ei-0007tL-Uv for guix-patches@gnu.org; Wed, 03 Jul 2024 18:14:01 -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 1sP8Ei-0001UA-Mu for guix-patches@gnu.org; Wed, 03 Jul 2024 18:14:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sP8Ek-0007G6-LK for guix-patches@gnu.org; Wed, 03 Jul 2024 18:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71928] [PATCH] gnu: Throw error when extending services that do not use extensions. Resent-From: Richard Sent Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Jul 2024 22:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71928 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71928@debbugs.gnu.org Cc: Richard Sent X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172004482927870 (code B ref -1); Wed, 03 Jul 2024 22:14:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 Jul 2024 22:13:49 +0000 Received: from localhost ([127.0.0.1]:40933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP8EW-0007FS-LE for submit@debbugs.gnu.org; Wed, 03 Jul 2024 18:13:49 -0400 Received: from lists.gnu.org ([209.51.188.17]:47650) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sP8EV-0007FK-4T for submit@debbugs.gnu.org; Wed, 03 Jul 2024 18:13:47 -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 1sP8ES-0007kd-SG for guix-patches@gnu.org; Wed, 03 Jul 2024 18:13:44 -0400 Received: from mail-108-mta139.mxroute.com ([136.175.108.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sP8ER-0001S1-5P for guix-patches@gnu.org; Wed, 03 Jul 2024 18:13:44 -0400 Received: from filter006.mxroute.com ([136.175.111.3] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta139.mxroute.com (ZoneMTA) with ESMTPSA id 1907aa90b5d00017a3.001 for (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Wed, 03 Jul 2024 22:13:37 +0000 X-Zone-Loop: 557bade68aaa11c4221e3a536d21c674027bc9e8c38a X-Originating-IP: [136.175.111.3] DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=freakingpenguin.com; s=x; h=Content-Transfer-Encoding:MIME-Version: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=rNBm5jTy66oDdv/NCuz1/DMBQPaQo0xwiy9uyeOQ1aM=; b=GrK2qG8/xu0D2SYVfwF3ihvPbz O6vZKWu038BcB+oODrrDSSkyviYTOxDcP11PjkDpbtBIZRckXrUnxwAyW2XM9tXiMZAhsqLbrpEDh LYInQeq8qzr3VK9Ej/k35VE1D6Lg1FqKHk200JRYoWbl3c+4wS0FSXIGqQ7CQ7PG7v4Asn1PaVSPA QfqGfgljWGpOl5Ru8FxX3QWW4D8C+wF1TiqIGxRg123pVJH7IZYDGk4AkhVs6NGs08IOsJ8HyYB9C a7Lm9T4y6aQpaG7nfw66ZLceXuP2cYFcUtW3+jL8OOink9SYwMo61NoJ/FmghDOksuANyHOh9X2Zi 4WYSyZvg==; From: Richard Sent Date: Wed, 3 Jul 2024 18:12:48 -0400 Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Authenticated-Id: richard@freakingpenguin.com Received-SPF: pass client-ip=136.175.108.139; envelope-from=richard@freakingpenguin.com; helo=mail-108-mta139.mxroute.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 1D12454E43 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -5.09 X-Spam-Score: -5.09 X-TUID: nTflvPCPUTVH * gnu/services.scm (fold-services): Add error handling when using service extensions. Fixes: https://issues.guix.gnu.org/71887 Change-Id: Ic8d631674bfddde495c93952d9e6cd5649bb287d --- gnu/services.scm | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/gnu/services.scm b/gnu/services.scm index 88593e8091..a7a9e00478 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -1223,12 +1223,22 @@ (define* (fold-services services (params -> (service-value sink)) (service -> - ;; Distinguish COMPOSE and EXTEND because PARAMS typically - ;; has a different type than the elements of EXTENSIONS. - (if extend - (service (service-kind sink) - (extend params (compose extensions))) - sink))) + (begin + (unless (or (null? extensions) + ;; A value of #t is a convention for "make + ;; sure the service is present." + (every (cut eq? #t <>) extensions) + (and extend compose)) + (error (format #f "Extensions are not supported in \ +~a yet the following service types extend it:~{~% ~a~}" + (service-kind sink) + (map service-kind dependents)))) + ;; Distinguish COMPOSE and EXTEND because PARAMS typically + ;; has a different type than the elements of EXTENSIONS. + (if extend + (service (service-kind sink) + (extend params (compose extensions))) + sink)))) (mbegin %state-monad (set-current-state (vhash-consq sink service visited)) (return service)))) base-commit: 85012e64819b39fd6112038134548b415fd5daff -- 2.45.2