From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id yCLYFJ4iXmeFLgEAqHPOHw:P1 (envelope-from ) for ; Sun, 15 Dec 2024 00:28:14 +0000 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 yCLYFJ4iXmeFLgEAqHPOHw (envelope-from ) for ; Sun, 15 Dec 2024 01:28:14 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=qwPQs2vg; dkim=fail ("headers rsa verify failed") header.d=freakingpenguin.com header.s=x header.b=BQjTuoEW; 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=1734222494; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=W9doXzuMZ2PVew1PlJ1QeyxuWE+Qmg8HwIxf5GhAtSY=; b=kcS2Ph8JHzRlIA8SA+P9toJRCLOipYINC4HP7wmMiZY9BjfBzRGdJLYvIIvbHC/37dSVLj PtgLFjn1B5nd+QiIM1AIEjxym3v6jD/r7r231v2zD2VsCvzXmF9bVDuFLECurLSG+wAegq Uke9Eg6gsgSRrVTYeDLx3NAjUdJW/4ctuWTP9gUyo5ioa2GuYyXIvvvvKkRSXc3g924/WW D6IfLUdPIwxJqDXw/VwZcDKBGUxslR5HiLXsSWAQ3tYP4KzkyFJINb+nhdV18abXmtmULY tHTLft8O9ARf35N92rzBQRJxR9iyf/WNoq3NbenCvD0AUtlMpGscwoWv9PHsdw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734222494; a=rsa-sha256; cv=none; b=QVSAVOp79TVucAtVFVg/69s+xoEwh4QBsId0/xUcMzvh5/M06kzeH73LuhOM0/jC3tzLos pmyfdlvVXC6Mrmy/7O77nEKor79sOS1VcDyTYlgnl7g++jBEuM1Fv6InqdfkNEwa4Jl4nQ 3ec8TTOChXM+ArFhBiCBcMrAupe3x2SM09lc7IjvRytoM7utr4UTVdvfgbPSSY8CVbdElx dXC/T7R8Q7KgIJiaosi36+FoZBoSgioLLFT2m6Vi1DkqrOiRbUediRF6Fd0Uv1knYBqZxi igNuf8RJ2Y8ePnctDZvkmwVvFchMYLf9OdZc2R45+H6ipseJAtfQVfSIBhcDfg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=qwPQs2vg; dkim=fail ("headers rsa verify failed") header.d=freakingpenguin.com header.s=x header.b=BQjTuoEW; 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 0F91A88FB4 for ; Sun, 15 Dec 2024 01:28:14 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tMcUP-0002GU-DH; Sat, 14 Dec 2024 19:28: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 1tMcUN-0002G6-AQ for guix-patches@gnu.org; Sat, 14 Dec 2024 19:28: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 1tMcUN-0004s1-0J; Sat, 14 Dec 2024 19:28: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:References:In-Reply-To:Date:From:To:Subject; bh=W9doXzuMZ2PVew1PlJ1QeyxuWE+Qmg8HwIxf5GhAtSY=; b=qwPQs2vgR3+eAAaHYUg111IyY/jkU+YmcHumfdLqNUEEP+/rG0hrDFYLldNWKpDCVlKTQwfvTPDcedA9aZkiH9dUKJ6h43VOxCgdlTuGJtKLUTl084urtTmhV72Z63vLqZrLsYvFFXHGQ3GZ1RWO+9lx6J2iSj+frLgaM3RhpGK844hoGp5W1X909Rna1sV/3XG8jkdV3Cd+laObH+KfdplBGLULwYu/G8eRQ3AzTLIaSJhL+3ebdnwbUNj29XEJc0tQsRS8fVHz4yfJhXBsBPUb1arrZJ9YDUIxgvTWG2y+THyzuwkWdVuMd3852GzJ+8tLE3ykSvejZRq7LcBwuA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tMcUM-0001Cw-GC; Sat, 14 Dec 2024 19:28:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74878] [PATCH 2/2] scripts: substitute: Improve the help output. Resent-From: Richard Sent Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Sun, 15 Dec 2024 00:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74878 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74878@debbugs.gnu.org Cc: Richard Sent , Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 74878-submit@debbugs.gnu.org id=B74878.17342224564587 (code B ref 74878); Sun, 15 Dec 2024 00:28:02 +0000 Received: (at 74878) by debbugs.gnu.org; 15 Dec 2024 00:27:36 +0000 Received: from localhost ([127.0.0.1]:48850 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMcTt-0001Br-8q for submit@debbugs.gnu.org; Sat, 14 Dec 2024 19:27:36 -0500 Received: from mail-108-mta59.mxroute.com ([136.175.108.59]:33445) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tMcTr-0001Bd-8Z for 74878@debbugs.gnu.org; Sat, 14 Dec 2024 19:27:32 -0500 Received: from filter006.mxroute.com ([136.175.111.3] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta59.mxroute.com (ZoneMTA) with ESMTPSA id 193c7b68e050003e01.001 for <74878@debbugs.gnu.org> (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Sun, 15 Dec 2024 00:27:30 +0000 X-Zone-Loop: 86f86678cc647a0ee71a6a21b5e766b9bb7a67f8dacb X-Originating-IP: [136.175.111.3] DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=freakingpenguin.com; s=x; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=W9doXzuMZ2PVew1PlJ1QeyxuWE+Qmg8HwIxf5GhAtSY=; b=BQjTuoEWP8MHLss15+Wx4AgEty vGDzfG3CvEckBUuVj3B2nPPvxlU2ayvDXhd3jTOYkcO3rDemGlKsWTt69g5uFtmfU1yYrKP6UqySX Q0dl9WZbFULVAmXQIPwFQYrUFwv5hJFR5BX8807ZXNcgFkmX9NQlFbN309GnWVenFBwSJ4v+jqVRI 8K4S0X93SCrq/Mnra2bBm+XDeKDam9EYUaQx0g4JIr+qm8dQmlHtKkDstKLrXCZUDu5q7dq1xEHl4 ctL6sJnhEpVX3x3RvWhsvM9M6O4K09M9ZiGuf1DkXJyz1J1sGR2YVyk/SjW8JE7P9EC/j+61t1uV/ IE+wPGmA==; From: Richard Sent Date: Sat, 14 Dec 2024 19:26:47 -0500 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Authenticated-Id: richard@freakingpenguin.com 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: -6.81 X-Spam-Score: -6.81 X-Migadu-Queue-Id: 0F91A88FB4 X-Migadu-Scanner: mx11.migadu.com X-TUID: KG/Z3afJApqF Clarify that arguments are read from standard input and that --query expects a command. * guix/scripts/substitute.scm (show-help): Reword. Change-Id: Ifc197d5e10e43663f1e05039ce29086f6a21b943 --- guix/scripts/substitute.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index 08ec172675..d5c2a84c33 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -244,13 +244,16 @@ (define-syntax with-networking (define (show-help) (display (G_ "Usage: guix substitute OPTION [ARGUMENT]... -Internal tool to substitute a pre-built binary to a local build.\n")) +Internal tool to substitute a pre-built binary to a local build. + +ARGUMENT is read from standard input, not from the command line.\n")) (display (G_ " - --query report on the availability of substitutes for the - store file names passed on the standard input")) + --query COMMAND STORE-FILE ... + Run query COMMAND with STORE-FILE to report on + the availability of substitutes")) (display (G_ " --substitute STORE-FILE DESTINATION - download STORE-FILE and store it as a Nar in file + download STORE-FILE and store it as a nar in file DESTINATION")) (newline) (display (G_ " -- 2.46.0