From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id 6ImUMHIHPGaW6gAAe85BDQ:P1 (envelope-from ) for ; Thu, 09 May 2024 01:14:59 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 6ImUMHIHPGaW6gAAe85BDQ (envelope-from ) for ; Thu, 09 May 2024 01:14:58 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=dC6F2zzA; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=bP8GSOmQ; 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=fail reason="SPF not aligned (relaxed)" header.from=wolfsden.cz (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1715210098; 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=uscdoLWK+6BRI95NHHOJSSMzFDW+aVzL0X9ANmHxVlg=; b=dzYRktSpUzbcq5e4S/iTUiu6CyU2xePtCTi+mjCIV9Bsgh2Kz4n8/4et0jKo2gmek41qjo fQOuP2qeg+Ow4yX+gnz/obunvAVAzdmsB3hmVVFDyXf0ilzrTsOCOmPM/glrunVuIUD9Y4 1+r2B4G/YmNI6FWzJYK0vW6noLelieJbI8QJPN5h2KsX+8J7NR0r17JZbzcEvM6CRy4rid dHx8wUjZRjT58ms8MuUp+cM1PfZN/7sAmpneALYc/jsfKgxd2YAKDQ0QIYht65Sy9RHxGV mbHrIoSZg55Y1+OV3cvvUC4Rk+IE2saWIKFWRiqn4InepmgWpUMattzhTpVq+A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=dC6F2zzA; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=bP8GSOmQ; 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=fail reason="SPF not aligned (relaxed)" header.from=wolfsden.cz (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1715210098; a=rsa-sha256; cv=none; b=oxBPs4Artw73Tnml6z42tnvWeUEs47pFIzuGesR8ALGvkUhJM+iDEA7eJAofY7m8Seyirq ulSJqCihKMTlLPV25DK4ESRvFe/s0U4pqz/J0eOlTBZLnMx7Uo7cXJDrfNCBIAVyhSRWAn wXXzmGMIQ5o6iKKnfBaN3NodTlkrs66mRYfAUj7IYriR5jJp81JSxwT5+brA19RMY+Iary qWCwN74kKD6fb0NSls7heslaQfL1/4BApvj4dNfGiJp4PpVpX0dn+ZYODsokd03hAaoRGY 8Uih3CslGdyP3zb9yrxhqgZz689BV4z43/d3Tawsihadw9Nj5Wz9RMk832IgiQ== 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 1CC9E25E2C for ; Thu, 9 May 2024 01:14:58 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s4qUk-0001Dg-5t; Wed, 08 May 2024 19:14:42 -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 1s4qUh-0001Ce-6a for guix-patches@gnu.org; Wed, 08 May 2024 19:14:40 -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 1s4qUg-0001mk-81; Wed, 08 May 2024 19:14:38 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s4qV4-0004YQ-Tp; Wed, 08 May 2024 19:15:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70839] [PATCH 3/3] services: guix: Default `channels' field to #f. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: pelzflorian@pelzflorian.de, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Wed, 08 May 2024 23:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70839 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70839@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz>, Florian Pelz , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Florian Pelz , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 70839-submit@debbugs.gnu.org id=B70839.171521004717462 (code B ref 70839); Wed, 08 May 2024 23:15:02 +0000 Received: (at 70839) by debbugs.gnu.org; 8 May 2024 23:14:07 +0000 Received: from localhost ([127.0.0.1]:51437 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s4qUA-0004XU-Es for submit@debbugs.gnu.org; Wed, 08 May 2024 19:14:06 -0400 Received: from wolfsden.cz ([37.205.8.62]:52684) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1s4qU4-0004Wl-UH for 70839@debbugs.gnu.org; Wed, 08 May 2024 19:14:04 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 9276C28390C; Wed, 8 May 2024 23:13:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715210014; bh=gcifiKg10SixgQT43PLvQavvttcjD0336Qajyvwb078=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dC6F2zzAYUWUl0EWVRduoQWVwl+gVctcN4geQGE/K/8l3oDCfUNrTpaea5EAnR0G4 /m0Ku3vRqZJOxtWkpTBK6ePTyeAMg/Q00ViMaVsn5IoBTCw9LomvtuGLEsM9pPc+Gr E1xvhnmqKzqrxs/HP1e1OeeO0SqDmayitRd2cH1kootTordxvXiuij/Cu/FO5OgtXP p5ATNlZ+bWiN9xF0aJbZYUqtNJ9CWLNQprakbRAyVJNPGVkzyE8FcVhtlGKwvx4Xvi IkIy6C+oADFgPpHfJE0CDMyZBEVK3+6ESQZORNraCILPuq0qMgSYwenKUJq5BJpwzA //Q/c8YGGRYj5jcYQpwlzWFoHzRPbXHpSflcTManBcOXOx9+h01rxePx51On+AEx5X lVS6xwM839wCS54yROcQTNSlrdJun2M36eeS5mS/bJ21Eu3IGfUDbbgjNAhnvxiJVN Q6iJ68YE3nzSfV28QwcqfnyCFIK96L/5uzgejcTiaU1UPJjm5YM29P25j0vj/XHN6j k9y97bddTGzxHsKCpJpfaoKBOnbSdiAhkHNB0eBK6Dg+mFgHqsPcZhFuNPMKbgSplW r45bKUtoZyyvkZ+S83NEEQiQZv9WnIJkq1Os8bNq5P0nwvuJXvq6ENlWxaoQX9Vaza aPbSzwVQ+xq7FhVdznEO/8IE= Received: from localhost (unknown [146.70.134.183]) by wolfsden.cz (Postfix) with ESMTPSA id 367D1283345; Wed, 8 May 2024 23:13:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1715210013; bh=gcifiKg10SixgQT43PLvQavvttcjD0336Qajyvwb078=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bP8GSOmQQc6bo1bi637P/+9Jn2N/T7nbu9CXlcTH8FJ6JRvgCtia3x3/wtlWlQuct jXPei8FRLnTOuqqvGvGfPORbX+F+kJUpkGw0f7SZW6wLWLHPyUGSkbsVzKJ1aMe7pr M1xQotDUujY4uSz7tR9P4EMGr4WXtn9C1cO3rSyfdMzbTv9c6/0m2hNRoWGM7JF+RB j2MvOH0XwseucI9VjuHkLgm/m039+zBOi2u5MuqIuTqyJGy7yd10z71pxeyPaob8Xr b5rQ6GXzZD1rHXBiCaopWKN8qXcCjMohT3+hOKGI5L04JXhFARmME1lK3cDvJzo7oE FmA6hPhu27wu+dRcn7ujB346APYxf711J/SpgilGi4S2JkOKIR3HQ2jPukVjj14Q4O hADGK5wL+6z/TV6zZnwBdkjD8ayp7yefhtL94KgzdELvn+hiFm6WKcW8Jj1cq8ihxG WmD33umTASK912v1hT2KXZ1LIxi2x1jxPhR9r0c970pSPXThVGmJKUkMydkaNCl30k yIhl/A0UsziJJjj1SaS/NfCoQcGipmzVhAyLCdd5zsriGytsxUXzjWc6SYoEZCWaDN ZqhFDLhe2iYVgPM8yV2quxzgR6SDChfOntSSEBqtukDw709Jb8+JXQvIa3a8Y7t0Sf ZYJDemlfGaT+tcFY9FpaEVSM= From: Tomas Volf <~@wolfsden.cz> Date: Thu, 9 May 2024 01:13:24 +0200 Message-ID: <9334845b5b459b34a7b9ce7d56a68629bb333f03.1715208954.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: 4.11 X-Migadu-Queue-Id: 1CC9E25E2C X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: 4.11 X-TUID: ZVZ+m41FYeA5 In the absence of the /etc/guix/channels.scm file, %default-channels is used anyway. If user manually (or by extra-special-file) created the file, we should respect it. This commit therefore changes the default to #f, hopefully having zero impact on people not actively using the `channels' field. * gnu/services/base.scm ()[channels]: Set default to #f. Change-Id: I516c1735a037a153fabbebfc337051aaf0be2155 --- doc/guix.texi | 2 +- gnu/services/base.scm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 568878ad24..9f422f8212 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -19591,7 +19591,7 @@ Base Services not need it and where the extra boot time is a problem. @anchor{guix-configuration-channels} -@item @code{channels} (default: @code{%default-channels}) +@item @code{channels} (default: @code{#f}) List of channels to be specified in @file{/etc/guix/channels.scm}, which is what @command{guix pull} uses by default (@pxref{Invoking guix pull}). diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 85160bd3ab..c5f28fd611 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1830,7 +1830,7 @@ (define-record-type* (generate-substitute-key? guix-configuration-generate-substitute-key? (default #t)) ;Boolean (channels guix-configuration-channels ;file-like - (default %default-channels)) + (default #f)) (chroot-directories guix-configuration-chroot-directories ;list of file-like/strings (default '())) (max-silent-time guix-configuration-max-silent-time ;integer -- 2.41.0