From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:5f26::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id sCJuCvPBjmVOfAEAkFu2QA (envelope-from ) for ; Fri, 29 Dec 2023 13:56:19 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id iKCMBPPBjmWKOAEAqHPOHw (envelope-from ) for ; Fri, 29 Dec 2023 13:56:19 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=apatience.com header.s=protonmail2 header.b=PetIigzU; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1703854578; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=KlxMnLlwdnEqdh+9v76GCHNo0/QlIkqLb3AaUEtwBfU=; b=Sd09GaB2Aihr8Ak7/y6RAZ9xd/dG5sJ6WC35AuJdXjTJM1JQ3wo9jW079VIFygPSULJEzR gsaUUojyxq9QkYRwP1risahkENNFa1GP3X3vBOSBu/6m8b7/Z94UGJ/naNgNj+d6HICd/4 /FJTUTj4TL9bbPn3Qauz+JUYE2Fg3kk83f91ST/YDjfFJ5xQQo6CFYi5SqdWsTPwDJEpGh Z7MrNSCbNFIRhe9L6yv5UOC47h3Fw9VVjKtb5WL4znWYmf2qPUpiT75vIRTaGn/VMfcKEz OADN6qIrgUTNeZTvsvZHGp1Pwqu9G2xu+zxyo+uWteAtpz2+FiggFTwE0+lI2g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1703854578; a=rsa-sha256; cv=none; b=SABsZnQtIH2O5xph9WEaDG/iiGaPdRLAxn0/inldV0i4dTqlfUS5nUwYYQ/4Iovbm+6TYE SduKyW2b2jAB3wVlfS/oxRg4ZvC8QD2Cbh9dRLz/kqev6SQViqoFgyiwUNTqPRLPnf4qox ix+RZuum/RMcpRfzN4ypn/0F/bHTx1zFTdK3UHuY3hjjgdOiPWbW62Nr5rgx2G1745/JQs h96TninD+LeJkTBsKlKFKY8IQFgwD9pwB/Ervr1fBqw9Hlk57NcMs3pCi0RFghwQlvSjVa 4js3IqtQQsMCFh5SZyvQZ4x2t8hsfdUGA/OW0r0LSu9L8FHmFpTET0e3p3J04g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=apatience.com header.s=protonmail2 header.b=PetIigzU; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E29E346801 for ; Fri, 29 Dec 2023 13:56:18 +0100 (CET) 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.24 X-Spam-Score: -4.24 X-Migadu-Queue-Id: E29E346801 X-Migadu-Scanner: mx11.migadu.com X-TUID: qBskA0qhkSxH * 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 "coreutil= s") "/bin")) + (ps-bin (string-append (assoc-ref inputs "procp= s") "/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 --=20 2.41.0