From debbugs-submit-bounces@debbugs.gnu.org Fri May 12 03:44:54 2023 Received: (at submit) by debbugs.gnu.org; 12 May 2023 07:44:54 +0000 Received: from localhost ([127.0.0.1]:53975 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxNSP-0000iS-Pe for submit@debbugs.gnu.org; Fri, 12 May 2023 03:44:54 -0400 Received: from lists.gnu.org ([209.51.188.17]:53458) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxNSN-0000iK-7C for submit@debbugs.gnu.org; Fri, 12 May 2023 03:44:51 -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 1pxNSM-0000Lu-Tl for guix-patches@gnu.org; Fri, 12 May 2023 03:44:51 -0400 Received: from mira.cbaines.net ([212.71.252.8]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxNSK-0006S3-Le for guix-patches@gnu.org; Fri, 12 May 2023 03:44:50 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id EF91D27BBEE for ; Fri, 12 May 2023 08:44:46 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 2f5c6090 for ; Fri, 12 May 2023 07:44:46 +0000 (UTC) From: Christopher Baines To: guix-patches@gnu.org Subject: [PATCH] gnu: guix-build-coordinator: Neaten up the package definitions. Date: Fri, 12 May 2023 08:44:46 +0100 Message-Id: X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=212.71.252.8; 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, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) 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: -2.4 (--) Remove duplication and redundant append calls. * gnu/packages/package-management.scm (guix-build-coordinator)[inputs]: Always add sqitch. [propagated-inputs]: Always add guile-fibers-next. (guix-build-coordinator-agent-only)[arguments]: Remove unnecessary duplication of phases. [propagated-inputs]: Remove unnecessary append. --- gnu/packages/package-management.scm | 109 +++++++--------------------- 1 file changed, 26 insertions(+), 83 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 7be497c534..494ae7445d 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1474,27 +1474,21 @@ (define-public guix-build-coordinator guile-lib (first (assoc-ref (package-native-inputs guix) "guile")))) (inputs - (append - (list (first (assoc-ref (package-native-inputs guix) "guile")) - sqlite - bash-minimal) - (if (hurd-target?) - '() - (list sqitch)))) + (list (first (assoc-ref (package-native-inputs guix) "guile")) + sqlite + bash-minimal + sqitch)) (propagated-inputs - (append - (list guile-prometheus - guile-gcrypt - guile-json-4 - guile-lib - guile-lzlib - guile-zlib - guile-sqlite3 - guix - guile-gnutls) - (if (hurd-target?) - '() - (list guile-fibers-next)))) + (list guile-prometheus + guile-gcrypt + guile-json-4 + guile-lib + guile-lzlib + guile-zlib + guile-sqlite3 + guix + guile-gnutls + guile-fibers-next)) (home-page "https://git.cbaines.net/guix/build-coordinator/") (synopsis "Tool to help build derivations") (description @@ -1508,62 +1502,12 @@ (define-public guix-build-coordinator/agent-only (inherit guix-build-coordinator) (name "guix-build-coordinator-agent-only") (arguments - `(#:modules (((guix build guile-build-system) + (list + #:modules `(((guix build guile-build-system) #:select (target-guile-effective-version)) ,@%gnu-build-system-modules) - #:imported-modules ((guix build guile-build-system) - ,@%gnu-build-system-modules) - #:phases - (modify-phases %standard-phases - (add-before 'build 'set-GUILE_AUTO_COMPILE - (lambda _ - ;; To avoid warnings relating to 'guild'. - (setenv "GUILE_AUTO_COMPILE" "0") - #t)) - (add-after 'install 'wrap-executable - (lambda* (#:key inputs outputs target #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (guile (assoc-ref inputs "guile")) - (version (target-guile-effective-version)) - (scm (string-append out "/share/guile/site/" version)) - (go (string-append out "/lib/guile/" version "/site-ccache"))) - (for-each - (lambda (file) - (simple-format (current-error-port) "wrapping: ~A\n" file) - (let ((guile-inputs (list - "guile-json" - "guile-gcrypt" - "guix" - "guile-prometheus" - "guile-lib" - "guile-lzlib" - "guile-zlib" - "guile-sqlite3" - "guile-gnutls"))) - (wrap-program file - `("PATH" ":" prefix (,bin)) - `("GUILE_LOAD_PATH" ":" prefix - (,scm ,(string-join - (map (lambda (input) - (simple-format - #f "~A/share/guile/site/~A" - (assoc-ref inputs input) - version)) - guile-inputs) - ":"))) - `("GUILE_LOAD_COMPILED_PATH" ":" prefix - (,go ,(string-join - (map (lambda (input) - (simple-format - #f "~A/lib/guile/~A/site-ccache" - (assoc-ref inputs input) - version)) - guile-inputs) - ":")))))) - (find-files bin))) - #t)) - (delete 'strip)))) ; As the .go files aren't compatible + #:imported-modules `((guix build guile-build-system) + ,@%gnu-build-system-modules))) (native-inputs (list pkg-config autoconf @@ -1581,15 +1525,14 @@ (define-public guix-build-coordinator/agent-only (list (first (assoc-ref (package-native-inputs guix) "guile")) bash-minimal)) (propagated-inputs - (append - (list guile-prometheus - guile-gcrypt - guile-json-4 - guile-lib - guile-lzlib - guile-zlib - guix - guile-gnutls))) + (list guile-prometheus + guile-gcrypt + guile-json-4 + guile-lib + guile-lzlib + guile-zlib + guix + guile-gnutls)) (description "The Guix Build Coordinator helps with performing lots of builds across potentially many machines, and with doing something with the results and base-commit: 23a575f97cab5b86a72391dd4ab3b937cd70d8a9 prerequisite-patch-id: e5211bfb82950d0b0a127e22dc4eb63dc5792633 -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Mon May 15 04:52:55 2023 Received: (at 63458-done) by debbugs.gnu.org; 15 May 2023 08:52:55 +0000 Received: from localhost ([127.0.0.1]:42713 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pyTwt-0005NM-Ae for submit@debbugs.gnu.org; Mon, 15 May 2023 04:52:55 -0400 Received: from mira.cbaines.net ([212.71.252.8]:42538) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pyTwr-0005NB-2D for 63458-done@debbugs.gnu.org; Mon, 15 May 2023 04:52:53 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id 8C7F827BBE2 for <63458-done@debbugs.gnu.org>; Mon, 15 May 2023 09:52:52 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 393e3370 for <63458-done@debbugs.gnu.org>; Mon, 15 May 2023 08:52:51 +0000 (UTC) References: User-agent: mu4e 1.8.13; emacs 28.2 From: Christopher Baines To: 63458-done@debbugs.gnu.org Subject: Re: [bug#63458] [PATCH] gnu: guix-build-coordinator: Neaten up the package definitions. Date: Mon, 15 May 2023 09:52:26 +0100 In-reply-to: Message-ID: <87a5y6f02k.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: 63458-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: > Remove duplication and redundant append calls. > > * gnu/packages/package-management.scm (guix-build-coordinator)[inputs]: Always > add sqitch. > [propagated-inputs]: Always add guile-fibers-next. > (guix-build-coordinator-agent-only)[arguments]: Remove unnecessary duplication > of phases. > [propagated-inputs]: Remove unnecessary append. > --- > gnu/packages/package-management.scm | 109 +++++++--------------------- > 1 file changed, 26 insertions(+), 83 deletions(-) Pushed to master as 38cfe61780f03b8cc029e1346a11bae2c0231625. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmRh8uNfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XfKHxAAs01plEV9xtTfYd+xkREq7yW06+OiBeIi ZJ4ykMTejQRUyMeCZsKe/dFE4t9UDMUq4roD0dmc253Eq9YfeHF4G9gmeF/0j1Bt 0vzcjCXdtj93Jd89wDbtQBbx4R2KiOGxhL+EbTUruOY+9CbAYNbTHK6BrgkP4f4b /OveTUKrKS4zOV/sxvgLglrppWWzChQOZbujaTEhi8IjZ5Wg8XBCM8V3jAIMosRK /CsVp8JbdtTbmmb2skcnLz/dbQ9UKW4kw9fXFWwnEb9beuVXRJ4qOdwUqy19JRRx SNEQeuzYQVg9KC7BR567/28MtB6+CTHDNYC6Lg7S8pJgVVw3Yuw7mPnOthhd5n75 3AbWtmotk7RfQx+Vs+KJDz7T3/n4FUIrZnGcDawn9WhHWkAJVts6IjI2B7vnlLkt ptHsuPhc0ps1tky6nwtIVC0JDTG39982c4rLbGbQeLIA3MPIlnOOuKLAbmdzVz5A 2+KRg5dUfW9qmJbi4RaTZLBB6CXp48A/i8b7FK9BONCBfeB8UhjJ/4EJSQg6Tnx7 FkHBK4ag7W/QBbdXIKruKHjeWahyX1nPu9zW9DAjPGrD4Ophkhl4CpJUL+2wo6dp BCoL7K2bNhlRfPu/tz274RBsAO4zrR0+hU2YQq1E3YBGgXNyGsjtAbPATK4oUUZx R9hpsbtJQNA= =2K78 -----END PGP SIGNATURE----- --=-=-=-- From unknown Thu Sep 11 16:22:16 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, 12 Jun 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