From patchwork Fri May 12 07:44:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 49954 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 DEE4627BBF1; Fri, 12 May 2023 08:45:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED 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 BB46327BBEE for ; Fri, 12 May 2023 08:45:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxNSa-0000Mn-KX; Fri, 12 May 2023 03:45:04 -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 1pxNSY-0000MX-Kv for guix-patches@gnu.org; Fri, 12 May 2023 03:45:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pxNSY-0006Wx-Am for guix-patches@gnu.org; Fri, 12 May 2023 03:45:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pxNSY-0000j9-5d for guix-patches@gnu.org; Fri, 12 May 2023 03:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63458] [PATCH] gnu: guix-build-coordinator: Neaten up the package definitions. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 May 2023 07:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63458 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63458@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16838774942761 (code B ref -1); Fri, 12 May 2023 07:45:02 +0000 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 Date: Fri, 12 May 2023 08:44:46 +0100 Message-Id: X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 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-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 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(-) base-commit: 23a575f97cab5b86a72391dd4ab3b937cd70d8a9 prerequisite-patch-id: e5211bfb82950d0b0a127e22dc4eb63dc5792633 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