From patchwork Wed Dec 13 12:48:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 57568 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9580327BBEC; Wed, 13 Dec 2023 12:50:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2856E27BBE2 for ; Wed, 13 Dec 2023 12:50:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rDOgZ-0005S4-5r; Wed, 13 Dec 2023 07:49:59 -0500 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 1rDOgO-0005R5-KK for guix-patches@gnu.org; Wed, 13 Dec 2023 07:49:49 -0500 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 1rDOgM-0005un-VB for guix-patches@gnu.org; Wed, 13 Dec 2023 07:49:46 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rDOgc-00059a-L4 for guix-patches@gnu.org; Wed, 13 Dec 2023 07:50:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67811] [PATCH 2/3] services: guix: Move GUIX_LOCPATH handling to packages. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Dec 2023 12:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67811 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67811@debbugs.gnu.org Received: via spool by 67811-submit@debbugs.gnu.org id=B67811.170247175319731 (code B ref 67811); Wed, 13 Dec 2023 12:50:02 +0000 Received: (at 67811) by debbugs.gnu.org; 13 Dec 2023 12:49:13 +0000 Received: from localhost ([127.0.0.1]:58391 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDOfo-000586-Ik for submit@debbugs.gnu.org; Wed, 13 Dec 2023 07:49:13 -0500 Received: from mira.cbaines.net ([212.71.252.8]:43054) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDOfj-00057O-RI for 67811@debbugs.gnu.org; Wed, 13 Dec 2023 07:49:09 -0500 Received: from localhost (unknown [217.155.61.229]) by mira.cbaines.net (Postfix) with ESMTPSA id F0B9D27BBE9 for <67811@debbugs.gnu.org>; Wed, 13 Dec 2023 12:48:50 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id d510c131 for <67811@debbugs.gnu.org>; Wed, 13 Dec 2023 12:48:50 +0000 (UTC) From: Christopher Baines Date: Wed, 13 Dec 2023 12:48:48 +0000 Message-ID: <7e135e82d0529b41331b286e9beaac9825bf02e8.1702471729.git.mail@cbaines.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: <290a4907b4c735ca78a19826000c7f7014d173f5.1702471729.git.mail@cbaines.net> References: <290a4907b4c735ca78a19826000c7f7014d173f5.1702471729.git.mail@cbaines.net> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches I think this might be better than handling it in the service. I'm seeing locale issues on the hurd which I hope this will address. * gnu/packages/package-management.scm (guix-build-coordinator, guix-build-coordinator/agent-only): * gnu/services/guix.scm (guix-build-coordinator-shepherd-services, guix-build-coordinator-agent-shepherd-services): Change-Id: I07ca424f434854176326a19177dc5573d53b59c2 --- gnu/packages/package-management.scm | 7 ++++++- gnu/services/guix.scm | 10 ++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 30216f518a..e73c142236 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1570,6 +1570,9 @@ (define-public guix-build-coordinator ,@(or (and=> (assoc-ref inputs "sqitch") list) '()))) + `("GUIX_LOCPATH" ":" prefix + (,(string-append (assoc-ref inputs "glibc-utf8-locales") + "/lib/locale"))) `("GUILE_LOAD_PATH" ":" prefix (,scm ,(string-join (map (lambda (input) @@ -1608,6 +1611,7 @@ (define-public guix-build-coordinator (list (first (assoc-ref (package-native-inputs guix) "guile")) sqlite bash-minimal + (libc-utf8-locales-for-target) sqitch)) (propagated-inputs (list guile-prometheus @@ -1647,7 +1651,8 @@ (define-public guix-build-coordinator/agent-only (first (assoc-ref (package-native-inputs guix) "guile")))) (inputs (list (first (assoc-ref (package-native-inputs guix) "guile")) - bash-minimal)) + bash-minimal + (libc-utf8-locales-for-target))) (propagated-inputs (list guile-prometheus guile-gcrypt diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm index ff6cce507e..17599193e3 100644 --- a/gnu/services/guix.scm +++ b/gnu/services/guix.scm @@ -342,10 +342,7 @@ (define (guix-build-coordinator-shepherd-services config) ;; Allow time for migrations to run #:pid-file-timeout 60 #:environment-variables - `(,(string-append - "GUIX_LOCPATH=" - #$(libc-utf8-locales-for-target) "/lib/locale") - "LC_ALL=en_US.utf8" + `("LC_ALL=en_US.utf8" "PATH=/run/current-system/profile/bin" ; for hooks #$@extra-environment-variables) #:log-file "/var/log/guix-build-coordinator/coordinator.log") @@ -470,10 +467,7 @@ (define (guix-build-coordinator-agent-shepherd-services config) (or systems '()))) #:user #$user #:environment-variables - `(,(string-append - "GUIX_LOCPATH=" - #$(libc-utf8-locales-for-target) "/lib/locale") - ;; XDG_CACHE_HOME is used by Guix when caching narinfo files + `(;; XDG_CACHE_HOME is used by Guix when caching narinfo files "XDG_CACHE_HOME=/var/cache/guix-build-coordinator-agent" "LC_ALL=en_US.utf8") #:log-file "/var/log/guix-build-coordinator/agent.log"))))