From patchwork Fri Dec 29 12:54:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 58162 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 4AC5F27BBE9; Fri, 29 Dec 2023 12:56:20 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 7D79F27BBE2 for ; Fri, 29 Dec 2023 12:56:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJCPF-0000tq-SM; Fri, 29 Dec 2023 07:56:05 -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 1rJCPC-0000tb-Pl for guix-patches@gnu.org; Fri, 29 Dec 2023 07:56:02 -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 1rJCPC-0001fj-16 for guix-patches@gnu.org; Fri, 29 Dec 2023 07:56:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJCPB-0005KA-Lo for guix-patches@gnu.org; Fri, 29 Dec 2023 07:56:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68107] [PATCH 2/2] gnu: cl-cmd: Improve package style. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 29 Dec 2023 12:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68107 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68107@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 68107-submit@debbugs.gnu.org id=B68107.170385450920402 (code B ref 68107); Fri, 29 Dec 2023 12:56:01 +0000 Received: (at 68107) by debbugs.gnu.org; 29 Dec 2023 12:55:09 +0000 Received: from localhost ([127.0.0.1]:40983 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJCOK-0005Iy-Os for submit@debbugs.gnu.org; Fri, 29 Dec 2023 07:55:09 -0500 Received: from mail-40136.proton.ch ([185.70.40.136]:48105) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJCOJ-0005Ib-6S for 68107@debbugs.gnu.org; Fri, 29 Dec 2023 07:55:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1703854501; x=1704113701; bh=KlxMnLlwdnEqdh+9v76GCHNo0/QlIkqLb3AaUEtwBfU=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=PetIigzUNfxwnmeKrHh6UHqaYEFSmbtCHMGcoVC76+PyHrFC/wP3wzIbg5x59OMH3 UZPlqyyJMMTUZNvI6NhvH2G/7qJ+aTHZKSDzHSD6rZO7SINg5ICBmWYTNIFURqMkgp 34oNLwAyP6toU9WLO+RMluO93sl3GroTcwI8L/sOjdrihDhUo7n7zFeRVJ8xgZRT4S cUefnpbOT2kBNZZfgl5pnjXssWazHehlW+IcGZaPYfTT8mjCR48Ztai4AwTF+2VfPb MOI11K4mVDZOMKhR9dhCVxLSDVRlwXxio9DCCEERmo8oF44+5kQEQEOyT80bf7UYeV pgtZBxYsP70GQ== Date: Fri, 29 Dec 2023 12:54:57 +0000 From: "Paul A. Patience" Message-ID: In-Reply-To: References: Feedback-ID: 19227857:user:proton 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 * gnu/packages/lisp-xyz.scm (sbcl-cmd)[arguments]: Use G-expressions. Move above inputs. [inputs]: Remove labels. Sort. Change-Id: I7cafea4cce3b2dfb89b21c43d71b96767d55c7f5 --- gnu/packages/lisp-xyz.scm | 52 +++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index a9a2274bbe..2b56670c79 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -17967,33 +17967,33 @@ (define-public sbcl-cmd (sha256 (base32 "03wbckzmz6pqdlz7pyar6nfg4vs4bl0b2np7n3kk3qhjbrdakc4m")))) (build-system asdf-build-system/sbcl) - (inputs - `(("alexandria" ,sbcl-alexandria) - ("coreutils" ,coreutils) - ("procps" ,procps) - ("serapeum" ,sbcl-serapeum) - ("shlex" ,sbcl-shlex) - ("trivia" ,sbcl-trivia))) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref inputs "coreutils") "/bin")) - (ps-bin (string-append (assoc-ref inputs "procps") "/bin"))) - (substitute* "cmd.lisp" - (("\\(def \\+env\\+ \"env\"\\)") - (format #f "(def +env+ \"~a/env\")" bin)) - (("\\(def \\+kill\\+ \"kill\"\\)") - (format #f "(def +kill+ \"~a/kill\")" bin)) - (("\\(def \\+ps\\+ \"ps\"\\)") - (format #f "(def +ps+ \"~a/ps\")" ps-bin)) - (("\\(def \\+pwd\\+ \"pwd\"\\)") - (format #f "(def +pwd+ \"~a/pwd\")" bin)) - (("\\(def \\+sh\\+ \"/bin/sh\"\\)") - (format #f "(def +sh+ \"~a\")" (which "sh"))) - (("\\(def \\+tr\\+ \"tr\"\\)") - (format #f "(def +tr+ \"~a/tr\")" bin))))))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref inputs "coreutils") "/bin")) + (ps-bin (string-append (assoc-ref inputs "procps") "/bin"))) + (substitute* "cmd.lisp" + (("\\(def \\+env\\+ \"env\"\\)") + (format #f "(def +env+ \"~a/env\")" bin)) + (("\\(def \\+kill\\+ \"kill\"\\)") + (format #f "(def +kill+ \"~a/kill\")" bin)) + (("\\(def \\+ps\\+ \"ps\"\\)") + (format #f "(def +ps+ \"~a/ps\")" ps-bin)) + (("\\(def \\+pwd\\+ \"pwd\"\\)") + (format #f "(def +pwd+ \"~a/pwd\")" bin)) + (("\\(def \\+sh\\+ \"/bin/sh\"\\)") + (format #f "(def +sh+ \"~a\")" (which "sh"))) + (("\\(def \\+tr\\+ \"tr\"\\)") + (format #f "(def +tr+ \"~a/tr\")" bin))))))))) + (inputs + (list coreutils + procps + sbcl-alexandria + sbcl-serapeum + sbcl-shlex + sbcl-trivia)) (home-page "https://github.com/ruricolist/cmd") (synopsis "Conveniently run external programs from Common Lisp") (description