From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 24 15:42:31 2023 Received: (at submit) by debbugs.gnu.org; 24 Apr 2023 19:42:31 +0000 Received: from localhost ([127.0.0.1]:50367 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pr250-0007FZ-RG for submit@debbugs.gnu.org; Mon, 24 Apr 2023 15:42:31 -0400 Received: from lists.gnu.org ([209.51.188.17]:43016) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pr24y-0007FR-Uh for submit@debbugs.gnu.org; Mon, 24 Apr 2023 15:42:29 -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 1pr24y-0003lt-HS for guix-patches@gnu.org; Mon, 24 Apr 2023 15:42:28 -0400 Received: from jpoiret.xyz ([206.189.101.64]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pr24x-0005No-1d for guix-patches@gnu.org; Mon, 24 Apr 2023 15:42:28 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id EBAED184F2B; Mon, 24 Apr 2023 19:42:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1682365345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=EOrm2MDegiGA/zdB7Top6Sn3QdTFWrICytGNvakyqGc=; b=FbX1kSMVNfTy3Ma4wBSkGj6xdxrMSzu04JHi1CK6OGU6y+tvwCDGRMkrNSYG/uuTImXGzr rQ4+bwWqK8yDudMEvagOLK0GfIA4TqPS+J5ebHOIVaaa+ioExnLt2JM0CzIRZUUIFsRZYt IjOmUwqIXTf8pLrcFwKOTe6HYO/lHY4CTvjXVq0165D4ToPRq3sM06+CJJcIO0eoBPgzpF Z/ZNnRwRrZqUIhI4b/Tat5XmuwitLjVGabKUAvQUqMd5IXQPp8qYbY7QxS2Ck96bRpc2GJ WzZrDIY1lKqIQ4gj384Kh51adlpaDlsKFe9Rz4ormFdLdf5cSSDuMyqMY+Sfvg== From: Josselin Poiret To: guix-patches@gnu.org Subject: [PATCH core-updates 0/3] Some installer fixes Date: Mon, 24 Apr 2023 21:42:19 +0200 Message-Id: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: ++++ Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Level: **** Received-SPF: pass client-ip=206.189.101.64; envelope-from=dev@jpoiret.xyz; helo=jpoiret.xyz X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.6 (/) X-Debbugs-Envelope-To: submit Cc: Josselin Poiret X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) Hello everyone, This patchset contains one installer fix (the second patch), while both of the other patches are fixes that should make installer debugging slightly easier. Since (current-guix) inherits the system's sysconfdir, that config variable needs to be set properly as well (so /etc for most installs, and not the default /usr/local/etc). Also, the acl file should be placed by the guix service in the correct spot, to account for sysconfdirs different from /etc. NB: I'm testing the new `mumi` CLI with this patchset. Best, Josselin Poiret (3): system: guix: Use config's ACL file location. installer: Filter out C.UTF-8 from the list of locales. doc: Add --sysconfdir=/etc to the recommended ./configure. doc/contributing.texi | 2 +- gnu/installer/locale.scm | 7 ++++--- gnu/services/base.scm | 17 +++++++++-------- 3 files changed, 14 insertions(+), 12 deletions(-) base-commit: 9e81b4da2d0626426d8d7b392b1e88caf5eb0161 -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 24 15:59:09 2023 Received: (at 63057) by debbugs.gnu.org; 24 Apr 2023 19:59:09 +0000 Received: from localhost ([127.0.0.1]:50377 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pr2L7-0007rE-Dr for submit@debbugs.gnu.org; Mon, 24 Apr 2023 15:59:09 -0400 Received: from jpoiret.xyz ([206.189.101.64]:41752) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pr2L5-0007qu-KU for 63057@debbugs.gnu.org; Mon, 24 Apr 2023 15:59:08 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id C814F184F6B; Mon, 24 Apr 2023 19:59:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1682366347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Boq/LHfzEEST1EUcRMSikfegKuK+VOPOfyzZ6jwdFzo=; b=vH+TqkVi7waoZER5QvAhLkAlRb0LeCwF2sLYnHvH+dyLZxPWZPpS5fQlj9BpxeKcBpwkQH cySL1eT4tnzyfCB1/2CCIYC5sIMTBGJ56gt/vW8hc/efn0AEc4qAjDy58HLdXFlSCQC5K3 uONGUXmKq45dEBXGSakJTO7G/o09BJHWiI7Qht/2rd8PAwaLVl/8GHGxRxxA1aD9tNoA8L +cx+9c/WtehB96+EKN59zW/IjZsVeXHhO+qB01t5uR3PNWGPHGewa6uPRquPQv0GYrVkBP ViZl/dNz4FHShxL9dN4CMLXaHFBuc9XSzpsLgf5J+b72igAT+t4m7V3zvzv2Kw== From: Josselin Poiret To: Josselin Poiret , 63057@debbugs.gnu.org Subject: [PATCH core-updates 2/3] installer: Filter out C.UTF-8 from the list of locales. Date: Mon, 24 Apr 2023 21:59:04 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63057 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/installer/locale.scm (supported-locales->locales): Filter out C.UTF-8. It doesn't follow the other locales' format, and doesn't have a corresponding iso639 code. --- gnu/installer/locale.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/installer/locale.scm b/gnu/installer/locale.scm index ccffb6d8ef..2ec0598abb 100644 --- a/gnu/installer/locale.scm +++ b/gnu/installer/locale.scm @@ -93,9 +93,10 @@ (define (locale->locale-string locale) (define (supported-locales->locales supported-locales) "Given SUPPORTED-LOCALES, a file produced by 'glibc-supported-locales', return a list of locales where each locale is an alist." - (map (match-lambda - ((locale . codeset) - (locale-string->locale locale codeset))) + (filter-map (match-lambda + (("C.UTF-8" . codeset) #f) + ((locale . codeset) + (locale-string->locale locale codeset))) (call-with-input-file supported-locales read))) -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 24 15:59:13 2023 Received: (at 63057) by debbugs.gnu.org; 24 Apr 2023 19:59:13 +0000 Received: from localhost ([127.0.0.1]:50379 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pr2LA-0007rP-Mw for submit@debbugs.gnu.org; Mon, 24 Apr 2023 15:59:12 -0400 Received: from jpoiret.xyz ([206.189.101.64]:41696) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pr2L5-0007qr-HY for 63057@debbugs.gnu.org; Mon, 24 Apr 2023 15:59:08 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id EDA7C184F2B; Mon, 24 Apr 2023 19:59:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1682366346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4vE2XcZmzCpTIDMKXHZawYsrDmHqomCzVu2gmPtuH8s=; b=goMrD0QQRf2oJvN2BluzVPWW2Z+8pzzoCPkgAxILnvUGFIidVR/oXbsGYyZM/HwkHvHBeO 9Geat1sevXQvbY09TJ8BIXGavfKn+euJKlIYB3nhAa49FRTlq1fMLpBGH4QZ7F0bxZBiSb BPkCATbwbTzis9iWZazOcg0jBblQ+K+e1FjLMnR3H9AqfPWJPekjLipsJ5FuLyJmXrFfh1 4I71pgP2ZgsZKLrlMKku6Hz8TolcDwK4qbevGGsvCmXIFnedtIZ9sFnJVrQ1cVzqNU6OCK XTRlYpJRZvaK8qVVS0a8rTdUt2rJObqXr3IeZTiSBFQ+6WRacV4xrVqRjc5VsQ== From: Josselin Poiret To: Josselin Poiret , 63057@debbugs.gnu.org Subject: [PATCH core-updates 1/3] system: guix: Use config's ACL file location. Date: Mon, 24 Apr 2023 21:59:03 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63057 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/services/base.scm (substitute-key-authorization): Use %acl-file instead of hardcoded "/etc/guix/acl". --- gnu/services/base.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index e8eae72aa2..4adb551796 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -83,6 +83,7 @@ (define-module (gnu services base) #:use-module (guix gexp) #:use-module (guix records) #:use-module (guix modules) + #:use-module (guix pki) #:use-module ((guix self) #:select (make-config.scm)) #:use-module (guix diagnostics) #:use-module (guix i18n) @@ -1727,19 +1728,19 @@ (define keys (with-imported-modules '((guix build utils)) #~(begin (use-modules (guix build utils)) - + (define acl-file #$%acl-file) ;; If the ACL already exists, move it out of the way. Create a backup ;; if it's a regular file: it's likely that the user manually updated ;; it with 'guix archive --authorize'. - (if (file-exists? "/etc/guix/acl") - (if (and (symbolic-link? "/etc/guix/acl") - (store-file-name? (readlink "/etc/guix/acl"))) - (delete-file "/etc/guix/acl") - (rename-file "/etc/guix/acl" "/etc/guix/acl.bak")) - (mkdir-p "/etc/guix")) + (if (file-exists? acl-file) + (if (and (symbolic-link? acl-file) + (store-file-name? (readlink acl-file))) + (delete-file acl-file) + (rename-file acl-file (string-append acl-file ".bak"))) + (mkdir-p (dirname acl-file))) ;; Installed the declared ACL. - (symlink #+default-acl "/etc/guix/acl")))) + (symlink #+default-acl acl-file)))) (define %default-authorized-guix-keys ;; List of authorized substitute keys. -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 24 15:59:13 2023 Received: (at 63057) by debbugs.gnu.org; 24 Apr 2023 19:59:13 +0000 Received: from localhost ([127.0.0.1]:50381 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pr2LB-0007rS-0v for submit@debbugs.gnu.org; Mon, 24 Apr 2023 15:59:13 -0400 Received: from jpoiret.xyz ([206.189.101.64]:41822) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pr2L6-0007qy-FD for 63057@debbugs.gnu.org; Mon, 24 Apr 2023 15:59:08 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id B4579185310; Mon, 24 Apr 2023 19:59:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1682366347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3FgSGr1L+vDLsHzwWdHy36VeHKycvOS28H6Xqv+uJS4=; b=JZNJxfE936TEo4PpcUHqym3HEpz8+MDb9Ipg45mAfnrOtt7nkMvft1BflAGVVaNZxBCo5s HQ47tAg2iz67+Kz6ykEBkcRsUuuljZxk0p/ER2brVauIvtDVKhaa1LcjEw1k7im1W1fOzJ S4qBPRD42GQGw9jljaHBqnYSYiniQXzaJO7tCyFUYc2aYczlkjoaHJTVINu6h9O1Nn5rUr qnN9l1TL1Tw1EJ5oNMUiPNAHDeB1j/yyjTl8R6dYtm69hpqRjJEUS3UuGoK4X1wE+xpten 8K882t8iiFVV3A3pkQQ1kIlG1B/5PCuliLzDy9S2gE3Z+R4Hk/4b0TP+yGxC6g== From: Josselin Poiret To: Josselin Poiret , 63057@debbugs.gnu.org Subject: [PATCH core-updates 3/3] doc: Add --sysconfdir=/etc to the recommended ./configure. Date: Mon, 24 Apr 2023 21:59:05 +0200 Message-Id: <92b4dd720cdddc4756c8000eb8090955046a410b.1682364024.git.dev@jpoiret.xyz> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: / Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63057 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * doc/contributing.texi (Building from Git): Add --sysconfdir=/etc to the recommended ./configure invocation. --- doc/contributing.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/contributing.texi b/doc/contributing.texi index 73d1cd2648..2a30b5055a 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -130,7 +130,7 @@ more information. Then, run: @example -./configure --localstatedir=/var +./configure --localstatedir=/var --sysconfdir=/etc @end example @noindent -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 30 17:12:17 2023 Received: (at 63057-done) by debbugs.gnu.org; 30 Apr 2023 21:12:17 +0000 Received: from localhost ([127.0.0.1]:38467 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ptELA-0006uh-LK for submit@debbugs.gnu.org; Sun, 30 Apr 2023 17:12:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49304) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ptEL9-0006uR-0x for 63057-done@debbugs.gnu.org; Sun, 30 Apr 2023 17:12:15 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ptEKy-0000Wh-1M; Sun, 30 Apr 2023 17:12:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=KJPXCDm10XQ4kU8XWw7XVpY4Nztp+oHjxBlAj1havJM=; b=PmWXzG58DybRVK2sjhXl bs/bXuuncaw/qwWYAmTJRDkvsLERQqqU5vHFOMR1NceE1FdaZtz8dF2No4sFg5Hla8YTXyN6g3gq8 J7td6aUazC80dRvUWRwW8f0RaTzvI1eApGRWeuFpT1XOmeN9CHQI8pIxj+PGDlnaop2IuFxaSeVsd efRga3nuCcYL6h0XLvSJutxiaBaHi019Nsi+RGj2KzEQ9ZA35lpc9eSLz4y0fbYxpldslWiRJEcAg 1dZg+BX0C/F0iOb1hRSeoatICbd5vWbZmALUBt08oeUE4GRlx8CvJ8S79LYB2ImdrczuDKRMh2PDj ZKZ5S9JMcbj+fw==; Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ptEKx-0006uM-6D; Sun, 30 Apr 2023 17:12:03 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Josselin Poiret Subject: Re: bug#63057: [PATCH core-updates 0/3] Some installer fixes References: Date: Sun, 30 Apr 2023 23:12:01 +0200 In-Reply-To: (Josselin Poiret's message of "Mon, 24 Apr 2023 21:42:19 +0200") Message-ID: <87h6sxoz1a.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 63057-done Cc: 63057-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Josselin Poiret skribis: > This patchset contains one installer fix (the second patch), while both o= f the > other patches are fixes that should make installer debugging slightly eas= ier. > Since (current-guix) inherits the system's sysconfdir, that config variab= le > needs to be set properly as well (so /etc for most installs, and not the > default /usr/local/etc). Also, the acl file should be placed by the guix > service in the correct spot, to account for sysconfdirs different from /e= tc. All good ideas. > NB: I'm testing the new `mumi` CLI with this patchset. Oh, I need to give it a spin! > system: guix: Use config's ACL file location. > installer: Filter out C.UTF-8 from the list of locales. > doc: Add --sysconfdir=3D/etc to the recommended ./configure. Applied, thanks! Ludo=E2=80=99. From unknown Sat Aug 09 13:19:32 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 29 May 2023 11:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator