From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 13 07:43:16 2023 Received: (at submit) by debbugs.gnu.org; 13 Dec 2023 12:43:16 +0000 Received: from localhost ([127.0.0.1]:58380 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDOa3-0004sk-OZ for submit@debbugs.gnu.org; Wed, 13 Dec 2023 07:43:15 -0500 Received: from lists.gnu.org ([2001:470:142::17]:59720) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDOa1-0004sU-Bp for submit@debbugs.gnu.org; Wed, 13 Dec 2023 07:43:14 -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 1rDOZf-0004Ru-Ip for guix-patches@gnu.org; Wed, 13 Dec 2023 07:42:51 -0500 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rDOZd-0004De-3u for guix-patches@gnu.org; Wed, 13 Dec 2023 07:42:51 -0500 Received: from localhost (unknown [217.155.61.229]) by mira.cbaines.net (Postfix) with ESMTPSA id D5AF627BBE2 for ; Wed, 13 Dec 2023 12:42:45 +0000 (GMT) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id c83ab7b7 for ; Wed, 13 Dec 2023 12:42:45 +0000 (UTC) User-agent: mu4e 1.10.7; emacs 29.1 From: Christopher Baines To: guix-patches@gnu.org Subject: [PATCH 0/3] Make some Guix Build Coordiantor updates Date: Wed, 13 Dec 2023 12:42:03 +0000 Message-ID: <87r0jqxohm.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, 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.9 (/) X-Debbugs-Envelope-To: submit 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: -0.1 (/) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Christopher Baines (3): services: guix: Remove guix-build-coordinator-queue-builds service. services: guix: Move GUIX_LOCPATH handling to packages. gnu: guix-build-coordinator: Update to 0-93.e4af682. doc/guix.texi | 52 ---------- gnu/packages/package-management.scm | 13 ++- gnu/services/guix.scm | 143 +--------------------------- 3 files changed, 11 insertions(+), 197 deletions(-) base-commit: 06f25a9a85be1bbe7a709e58ce41c1a834e5f1ae =2D-=20 2.41.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmV5psVfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XemSw/+J0gM4GuhO8CsoHyjAb/4g5Z8sYp5lQs+ wuan7NG9h/0DqECkAHZBFY12CW894HmJGitJ3VEhXcNzFHY/t/G/E0ssFij2hbfr wRp+kTYI4oxzX1JLB/UBZbWRNJS86hJ40s1BMOpwd1FbjE0p+QMRM0zkP7qcrsgo a3hIXama4YiV4dLNJziCK/UXw/LwDUjpKreKNz6laJ0Po+0ikXz2E9IAJHSm1Z7x HaDekPNSv8LveVRCJvh3JbKMjCbypT4SSRDhsYiEr1AvsSeumWkyCCiGO6K+saTk 9w8w065wi6/CnXcIYOAC8oiXspKv0iF1/JxLHDYTKX2LguNRdjc3/10p/8WlUm6F 94uNLbZ6v7fNpkgVCdf0Nck9NBx3weGVTr2JC+oFEryTpxCZLThcd5U1bovJwMIR qyN9EQ8BFIX+IqRRdWqcRKBUjMq5gaBCBgEnWYbwoSCUbEVS3tYnotKsXZKaI779 t0/PFpS9c2AWaQqohHR6tUuhixa1bGUuSxcDHg1USnnE0xn0tqqlI37b5rMYWmXX d4TkwzZ6C629vOiCnTJC+Id3NoFtQwrHO44G7Y9v/49KVY7jRG1F53JljW21BJKH xKSiA6poZlSeDm7Gg+t9B7L3OUZFS71tjT6RLCb/4M9RBdfQu2NomBMn5tb8hLr8 IsjWHLM6SbU= =s1i7 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 13 07:49:09 2023 Received: (at 67811) by debbugs.gnu.org; 13 Dec 2023 12:49:10 +0000 Received: from localhost ([127.0.0.1]:58387 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDOfl-00057n-GV for submit@debbugs.gnu.org; Wed, 13 Dec 2023 07:49:09 -0500 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:45601) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDOfj-00057P-G6 for 67811@debbugs.gnu.org; Wed, 13 Dec 2023 07:49:08 -0500 Received: from localhost (unknown [217.155.61.229]) by mira.cbaines.net (Postfix) with ESMTPSA id 1226927BBEA for <67811@debbugs.gnu.org>; Wed, 13 Dec 2023 12:48:51 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 65d74624 for <67811@debbugs.gnu.org>; Wed, 13 Dec 2023 12:48:50 +0000 (UTC) From: Christopher Baines To: 67811@debbugs.gnu.org Subject: [PATCH 3/3] gnu: guix-build-coordinator: Update to 0-93.e4af682. Date: Wed, 13 Dec 2023 12:48:49 +0000 Message-ID: <6ca07a4a416f8123e4fca20f95c13bc28e73068b.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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67811 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/packages/package-management.scm (guix-build-coordinator): Update to 0-93.e4af682. Change-Id: Ice91ef075db02d3f2bcb445d4fd5621bc00a02a0 --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index e73c142236..97ea41df66 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1510,8 +1510,8 @@ (define-public gwl/next "0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc"))))))) (define-public guix-build-coordinator - (let ((commit "78df0b3a9f4f27df8341da36d4dfa8e49dfad900") - (revision "92")) + (let ((commit "e4af682452580298b34681d37818a16771a17c66") + (revision "93")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1522,7 +1522,7 @@ (define-public guix-build-coordinator (commit commit))) (sha256 (base32 - "06xp38k6yfvsvl20hrqvmarpysd07nkbj53an729lqr50qdd4jcq")) + "1i8x9nfpvg832lxwbpjl1kadldpkcnjlxdxl4c5jqx2hz680ylf3")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 13 07:49:12 2023 Received: (at 67811) by debbugs.gnu.org; 13 Dec 2023 12:49:12 +0000 Received: from localhost ([127.0.0.1]:58389 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDOfn-000583-Sv for submit@debbugs.gnu.org; Wed, 13 Dec 2023 07:49:12 -0500 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:52403) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDOfj-00057N-Dt 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 E4B1827BBE2 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 30c716b5 for <67811@debbugs.gnu.org>; Wed, 13 Dec 2023 12:48:50 +0000 (UTC) From: Christopher Baines To: 67811@debbugs.gnu.org Subject: [PATCH 1/3] services: guix: Remove guix-build-coordinator-queue-builds service. Date: Wed, 13 Dec 2023 12:48:47 +0000 Message-ID: <290a4907b4c735ca78a19826000c7f7014d173f5.1702471729.git.mail@cbaines.net> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67811 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 (-) This has been effectively replaced by the bffe. * gnu/services/guix.scm (): Remove record type. (guix-build-coordinator-queue-builds-shepherd-services, guix-build-coordinator-queue-builds-activation, guix-build-coordinator-queue-builds-account): Remove procedures (guix-build-coordinator-queue-builds-service-type): Remove service type. Change-Id: I2a233fb10b12cc9bfddebaa35928b25c243f82a2 --- doc/guix.texi | 52 ----------------- gnu/services/guix.scm | 133 ------------------------------------------ 2 files changed, 185 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 7dde9b727b..60a62fa3f0 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -38606,58 +38606,6 @@ Guix Services @end table @end deftp -The Guix Build Coordinator package contains a script to query an -instance of the Guix Data Service for derivations to build, and then -submit builds for those derivations to the coordinator. The service -type below assists in running this script. This is an additional tool -that may be useful when building derivations contained within an -instance of the Guix Data Service. - -@defvar guix-build-coordinator-queue-builds-service-type -Service type for the -guix-build-coordinator-queue-builds-from-guix-data-service script. Its -value must be a @code{guix-build-coordinator-queue-builds-configuration} -object. -@end defvar - -@deftp {Data Type} guix-build-coordinator-queue-builds-configuration -Data type representing the options to the queue builds from guix data -service script. - -@table @asis -@item @code{package} (default: @code{guix-build-coordinator}) -The Guix Build Coordinator package to use. - -@item @code{user} (default: @code{"guix-build-coordinator-queue-builds"}) -The system user to run the service as. - -@item @code{coordinator} (default: @code{"http://localhost:8746"}) -The URI to use when connecting to the coordinator. - -@item @code{systems} (default: @code{#f}) -The systems for which to fetch derivations to build. - -@item @code{systems-and-targets} (default: @code{#f}) -An association list of system and target pairs for which to fetch -derivations to build. - -@item @code{guix-data-service} (default: @code{"https://data.guix.gnu.org"}) -The Guix Data Service instance from which to query to find out about -derivations to build. - -@item @code{guix-data-service-build-server-id} (default: @code{#f}) -The Guix Data Service build server ID corresponding to the builds being -submitted. Providing this speeds up the submitting of builds as -derivations that have already been submitted can be skipped before -asking the coordinator to build them. - -@item @code{processed-commits-file} (default: @code{"/var/cache/guix-build-coordinator-queue-builds/processed-commits"}) -A file to record which commits have been processed, to avoid needlessly -processing them again if the service is restarted. - -@end table -@end deftp - @subsubheading Guix Data Service The @uref{http://data.guix.gnu.org,Guix Data Service} processes, stores and provides data about GNU Guix. This includes information about diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm index 389903451a..ff6cce507e 100644 --- a/gnu/services/guix.scm +++ b/gnu/services/guix.scm @@ -88,19 +88,6 @@ (define-module (gnu services guix) guix-build-coordinator-agent-service-type - guix-build-coordinator-queue-builds-configuration - guix-build-coordinator-queue-builds-configuration? - guix-build-coordinator-queue-builds-configuration-package - guix-build-coordinator-queue-builds-configuration-user - guix-build-coordinator-queue-builds-coordinator - guix-build-coordinator-queue-builds-configuration-systems - guix-build-coordinator-queue-builds-configuration-system-and-targets - guix-build-coordinator-queue-builds-configuration-guix-data-service - guix-build-coordinator-queue-builds-configuration-guix-data-service-build-server-id - guix-build-coordinator-queue-builds-configuration-processed-commits-file - - guix-build-coordinator-queue-builds-service-type - guix-data-service-configuration guix-data-service-configuration? @@ -250,31 +237,6 @@ (define-record-type* (agent-name guix-build-coordinator-agent-dynamic-auth-with-file-agent-name) (token-file guix-build-coordinator-agent-dynamic-auth-with-file-token-file)) -(define-record-type* - guix-build-coordinator-queue-builds-configuration - make-guix-build-coordinator-queue-builds-configuration - guix-build-coordinator-queue-builds-configuration? - (package guix-build-coordinator-queue-builds-configuration-package - (default guix-build-coordinator)) - (user guix-build-coordinator-queue-builds-configuration-user - (default "guix-build-coordinator-queue-builds")) - (coordinator guix-build-coordinator-queue-builds-coordinator - (default "http://localhost:8746")) - (systems guix-build-coordinator-queue-builds-configuration-systems - (default #f)) - (systems-and-targets - guix-build-coordinator-queue-builds-configuration-system-and-targets - (default #f)) - (guix-data-service - guix-build-coordinator-queue-builds-configuration-guix-data-service - (default "https://data.guix.gnu.org")) - (guix-data-service-build-server-id - guix-build-coordinator-queue-builds-configuration-guix-data-service-build-server-id - (default #f)) - (processed-commits-file - guix-build-coordinator-queue-builds-configuration-processed-commits-file - (default "/var/cache/guix-build-coordinator-queue-builds/processed-commits"))) - (define* (make-guix-build-coordinator-start-script database-uri-string allocation-strategy pid-file @@ -559,101 +521,6 @@ (define guix-build-coordinator-agent-service-type (description "Run a Guix Build Coordinator agent."))) -(define (guix-build-coordinator-queue-builds-shepherd-services config) - (match-record config - (package user coordinator systems systems-and-targets - guix-data-service - guix-data-service-build-server-id - processed-commits-file) - (list - (shepherd-service - (documentation "Guix Build Coordinator queue builds from Guix Data Service") - (provision '(guix-build-coordinator-queue-builds)) - (requirement '(networking)) - (start - #~(lambda _ - (parameterize ((%current-logfile-date-format "")) - (fork+exec-command - (list - #$(file-append - package - "/bin/guix-build-coordinator-queue-builds-from-guix-data-service") - #$(string-append "--coordinator=" coordinator) - #$@(map (lambda (system) - (string-append "--system=" system)) - (or systems '())) - #$@(map (match-lambda - ((system . target) - (string-append "--system-and-target=" system "=" target))) - (or systems-and-targets '())) - #$@(if guix-data-service - #~(#$(string-append "--guix-data-service=" guix-data-service)) - #~()) - #$@(if guix-data-service-build-server-id - #~(#$(simple-format - #f - "--guix-data-service-build-server-id=~A" - guix-data-service-build-server-id)) - #~()) - #$@(if processed-commits-file - #~(#$(string-append "--processed-commits-file=" - processed-commits-file)) - #~())) - #:user #$user - #:environment-variables - `(,(string-append - "GUIX_LOCPATH=" - #$(libc-utf8-locales-for-target) "/lib/locale") - "LC_ALL=en_US.utf8") - #:log-file "/var/log/guix-build-coordinator/queue-builds.log")))) - (stop #~(make-kill-destructor)) - (modules - `((shepherd comm) - ,@%default-modules)))))) - -(define (guix-build-coordinator-queue-builds-activation config) - #~(begin - (use-modules (guix build utils)) - - (define %user - (getpw #$(guix-build-coordinator-queue-builds-configuration-user - config))) - - (mkdir-p "/var/log/guix-build-coordinator") - - ;; Allow writing the processed commits file - (mkdir-p "/var/cache/guix-build-coordinator-queue-builds") - (chown "/var/cache/guix-build-coordinator-queue-builds" - (passwd:uid %user) - (passwd:gid %user)))) - -(define (guix-build-coordinator-queue-builds-account config) - (list (user-account - (name (guix-build-coordinator-queue-builds-configuration-user config)) - (group "nogroup") - (system? #t) - (comment "Guix Build Coordinator queue-builds user") - (home-directory "/var/empty") - (shell (file-append shadow "/sbin/nologin"))))) - -(define guix-build-coordinator-queue-builds-service-type - (service-type - (name 'guix-build-coordinator-queue-builds) - (extensions - (list - (service-extension shepherd-root-service-type - guix-build-coordinator-queue-builds-shepherd-services) - (service-extension activation-service-type - guix-build-coordinator-queue-builds-activation) - (service-extension account-service-type - guix-build-coordinator-queue-builds-account))) - (description - "Run the guix-build-coordinator-queue-builds-from-guix-data-service -script. - -This is a script to assist in having the Guix Build Coordinator build -derivations stored in an instance of the Guix Data Service."))) - ;;; ;;; Guix Data Service base-commit: 06f25a9a85be1bbe7a709e58ce41c1a834e5f1ae -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 13 07:49:13 2023 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 To: 67811@debbugs.gnu.org Subject: [PATCH 2/3] services: guix: Move GUIX_LOCPATH handling to packages. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67811 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 (-) 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")))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Dec 22 12:37:33 2023 Received: (at 67811-done) by debbugs.gnu.org; 22 Dec 2023 17:37:33 +0000 Received: from localhost ([127.0.0.1]:47810 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rGjSn-0003Sj-1H for submit@debbugs.gnu.org; Fri, 22 Dec 2023 12:37:33 -0500 Received: from mira.cbaines.net ([212.71.252.8]:43062) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rGjSj-0003SX-C8 for 67811-done@debbugs.gnu.org; Fri, 22 Dec 2023 12:37:31 -0500 Received: from localhost (132.249.6.51.dyn.plus.net [51.6.249.132]) by mira.cbaines.net (Postfix) with ESMTPSA id A440B27BBE2 for <67811-done@debbugs.gnu.org>; Fri, 22 Dec 2023 17:37:23 +0000 (GMT) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 53961ac2 for <67811-done@debbugs.gnu.org>; Fri, 22 Dec 2023 17:37:23 +0000 (UTC) References: <87r0jqxohm.fsf@cbaines.net> User-agent: mu4e 1.10.7; emacs 29.1 From: Christopher Baines To: 67811-done@debbugs.gnu.org Subject: Re: [bug#67811] [PATCH 0/3] Make some Guix Build Coordiantor updates Date: Fri, 22 Dec 2023 17:36:54 +0000 In-reply-to: <87r0jqxohm.fsf@cbaines.net> Message-ID: <87wmt6w33g.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 67811-done 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 (-) --=-=-= Content-Type: text/plain Christopher Baines writes: > Christopher Baines (3): > services: guix: Remove guix-build-coordinator-queue-builds service. > services: guix: Move GUIX_LOCPATH handling to packages. > gnu: guix-build-coordinator: Update to 0-93.e4af682. > > doc/guix.texi | 52 ---------- > gnu/packages/package-management.scm | 13 ++- > gnu/services/guix.scm | 143 +--------------------------- > 3 files changed, 11 insertions(+), 197 deletions(-) Pushed to master as aa631ea62ed9e417b72c45d8857291130a52debc. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmWFyVNfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XdmTQ/+LbLhBDxBqG8Jb0PoYJnsqyXqPiknD4Uz Qb9dtAV12/Io75Lcv7Vd1MlmhJ017Ci8ft67g3dK7Aib5xi2haahIoV3yEtUxCYk 2CnOk5fKXml7OZFbTdm3FWwI2CskQsrBgwjPwZisXuQl6+7Imi4qS9jGX9sIpsJL QXG85cfW/EzN2UfcRgH1MnsoK8oyMLgwRZJjds02uGvU2dGLE3H0KvBj2+Bs1SDh 99M8OBKqnAMGB05JYPasi28JnlgRbLBhc67NnQ1BxGVLaysE0Ne7Di/gCxSpEDwQ PBAsqIjQayIByGY9z+kahfRzYUhKrwNEEVUX6wXjGliJac2rMtlOm1oqv3pmydjV woy/VpIZ1pqR6w08b9y9ExImtAw5xM4fuoIT6lVd7E+0uQeGKxq/+itoI1BMusdd J4u1TEhi/1FMh2A63Fsr7GaT2uKBDVEH0AbGc37ruJQ19b974QEEz1UUDWdVpvwv 3HxayZV6HCFPhju6GqIppMipwsxZCkRbB9JtrND8uMbrmmsZwB6vVicHIZJcdXrR L3qdIW3+ypAvgnb03+DywiOG7PD9H53qW+5YBWMiJiE5b75Ehn2VJBFpyIDpqz37 Z63a7HBKKBVCArChqeYzC5Uz9gsfsQhJflHTKN78Cs8cfR2ElnzvLk7BbzgrLPlJ 5QV7yW7tOpk= =bkwO -----END PGP SIGNATURE----- --=-=-=-- From unknown Thu Jun 19 14:33:46 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 20 Jan 2024 12:24:06 +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