From patchwork Wed Nov 20 16:29:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sisiutl X-Patchwork-Id: 70604 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 D864527BBEA; Wed, 20 Nov 2024 16:31:32 +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=-5.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI, PDS_OTHER_BAD_TLD,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,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 3034727BBE2 for ; Wed, 20 Nov 2024 16:31:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDnbd-0001N2-8e; Wed, 20 Nov 2024 11:31: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 1tDnbb-0001MU-D2 for guix-patches@gnu.org; Wed, 20 Nov 2024 11:31:03 -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 1tDnbb-0004vN-42 for guix-patches@gnu.org; Wed, 20 Nov 2024 11:31:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=BrU6X6KEWQLkO5VAaZEDFoGPy3Gp2S6mjWCbiUS0Tkg=; b=f6yh1mAw/515ne4gFqdpS+ue8p85CkEQ7e9fEruALBiB3d04rFxEaupnBR+b7NC8Ip8lfcQhIslwCpfNUcpjX//+J3fYuC6Tl5XnH2bgqTpOcGAoe2L9DUVpsb+6yNoV64uZQXL9WfLgqnlsDesXbvcRF+4w9bd7zfOOAWDdTKL1dpbIuXsOBO8Wqi4eezwqnKf6T0TzUeis87g26RHPWDE3zRqa/1alKxWRBAXRx2bAJW+GgNDEElBBRu8c9bFlc+rhhtABBYvKa7f5m2qnxPY0o0RQapvgwtGGCeFk+myPGlTXZdi6RAw8SSGgslEKT0kUJzdsbotL9bsgxtof/Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tDnba-0004kY-NK for guix-patches@gnu.org; Wed, 20 Nov 2024 11:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74446] [PATCH] gnu: liquidprompt: Patch additional utilities Resent-From: Sisiutl Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Nov 2024 16:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74446 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74446@debbugs.gnu.org Cc: Sisiutl X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.173212025518244 (code B ref -1); Wed, 20 Nov 2024 16:31:02 +0000 Received: (at submit) by debbugs.gnu.org; 20 Nov 2024 16:30:55 +0000 Received: from localhost ([127.0.0.1]:47535 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDnbT-0004kA-9u for submit@debbugs.gnu.org; Wed, 20 Nov 2024 11:30:55 -0500 Received: from lists.gnu.org ([209.51.188.17]:42858) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDnbQ-0004jw-Ss for submit@debbugs.gnu.org; Wed, 20 Nov 2024 11:30:53 -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 1tDnbL-0001Jk-8M for guix-patches@gnu.org; Wed, 20 Nov 2024 11:30:47 -0500 Received: from 2a02-8428-4716-0c01-eecc-61c0-3286-ff35.rev.sfr.net ([2a02:8428:4716:c01:eecc:61c0:3286:ff35] helo=fujo.egregore.fun) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDnbJ-0004Hw-54 for guix-patches@gnu.org; Wed, 20 Nov 2024 11:30:46 -0500 Received: from localhost (2a02-8428-4716-0c01-69f4-ade7-72a4-dc0f.rev.sfr.net [IPv6:2a02:8428:4716:c01:69f4:ade7:72a4:dc0f]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) (Authenticated sender: sisiutl@egregore.fun) by fujo.egregore.fun (Postfix) with ESMTPSA id 0364C6740F; Wed, 20 Nov 2024 17:29:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=egregore.fun; s=fujo; t=1732120182; bh=BrU6X6KEWQLkO5VAaZEDFoGPy3Gp2S6mjWCbiUS0Tkg=; h=From:To:Cc:Subject:Date; b=IMRmsBVrWtpwhiyrb6nEwZqttHZqmSxE4nhNs9m7MlU8ICzVfQwiaohzDQgwIBj2s ilKDCYB+2bDf3Tioa9I69SQyMh+YqZ4kwNRqp1TdlJdc5O3lDz1UN810bzVfuEj/oZ /NftRt98Oqs0BdnsfgNdNB0U1gUWVVuYdaj/fQgw= From: Sisiutl Date: Wed, 20 Nov 2024 17:29:30 +0100 Message-ID: <20241120162937.15722-1-sisiutl@egregore.fun> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a02:8428:4716:c01:eecc:61c0:3286:ff35; envelope-from=sisiutl@egregore.fun; helo=fujo.egregore.fun X-Spam_score_int: 67 X-Spam_score: 6.7 X-Spam_bar: ++++++ X-Spam_report: (6.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FROM_SUSPICIOUS_NTLD=0.5, FROM_SUSPICIOUS_NTLD_FP=1.999, PDS_OTHER_BAD_TLD=1.999, RCVD_IN_PBL=3.335, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: reject 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/shellutils.scm (liquidprompt) [inputs]: Add coreutils and inetutils. [arguments]<#:phases>: Replace the paths of more utilites Change-Id: I84578ca40300a7527a23e5d8c3257d49be911a7b --- gnu/packages/shellutils.scm | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 7e9f85a5f2..74e9429de0 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -47,6 +47,7 @@ (define-module (gnu packages shellutils) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system python) + #:use-module (gnu packages admin) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bison) @@ -946,14 +947,19 @@ (define-public liquidprompt (string-append "source " #$output "/share/liquidprompt/liquidprompt"))))) - (add-after 'fix-plugin 'fix-tput-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "liquidprompt" - (("([ (])tput " all beginning) + (add-after 'fix-plugin 'fix-utils-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "liquidprompt" + (("([ (])\\\\?(tput|hostname|cksum|uname|tty|grep)([) ])" + all beginning command ending) (string-append beginning - (search-input-file inputs "bin/tput") - " ")))))))) - (inputs (list ncurses)) + (search-input-file + inputs + (string-append "bin/" command)) + ending)))))))) + (inputs (list ncurses + coreutils + inetutils)) (synopsis "Full-featured prompt for Bash & Zsh") (description "Liquidprompt is an adaptive prompt for Bash and Zsh that gives