unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: mikadoZero <mikadozero@yandex.com>
To: 34625@debbugs.gnu.org
Subject: [bug#34625] [PATCH] Documentation: Update `guix challenge` diffing
Date: Fri, 22 Feb 2019 20:29:31 -0500	[thread overview]
Message-ID: <20190223012931.GA17575@z.z> (raw)

[-- Attachment #1: Type: text/plain, Size: 435 bytes --]

Attached is a patch that updates the manual sections `Invoking guix challenge` and `Invoking guix archive`.  The update involves changing a command in both sections to one that I verified worked as part of my submission of `guix challenge` diffs for bug#34597.  The commands that are replaces did not work for me.  There is also a cross reference added to the `Invoking guix challenge` in the relevant part of `Invoking guix archive`.

[-- Attachment #2: 0001-Documentation-Update-guix-challenge-diffing.patch --]
[-- Type: text/x-diff, Size: 2386 bytes --]

From ea59d81de86fd5179eebf9782fbe66213ed59397 Mon Sep 17 00:00:00 2001
From: mikadoZero <mikadozero@yandex.com>
Date: Fri, 22 Feb 2019 18:24:20 -0500
Subject: [PATCH] Documentation: Update `guix challenge` diffing.

Add /gzip/ part into url which has the benefit of matching the output of
`guix challenge`.  Change the commands to include gunzip in the pipeline as
they are working on gzipped files.  Add reference to `guix challenge` in `guix
archive` section where talking about challenging.
---
 doc/guix.texi | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 9fb5cff06..43c12cd72 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -58,6 +58,7 @@ Copyright @copyright{} 2018 Gábor Boskovits@*
 Copyright @copyright{} 2018 Florian Pelz@*
 Copyright @copyright{} 2018 Laura Lazzati@*
 Copyright @copyright{} 2018 Alex Vong@*
+Copyright @copyright{} 2019 mikadoZero@*
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -4204,8 +4205,8 @@ served by @code{@value{SUBSTITUTE-SERVER}} to @file{/tmp/emacs}:
 
 @example
 $ wget -O - \
-  https://@value{SUBSTITUTE-SERVER}/nar/@dots{}-emacs-24.5 \
-  | bunzip2 | guix archive -x /tmp/emacs
+  https://@value{SUBSTITUTE-SERVER}/nar/gzip/@dots{}-emacs-24.5 \
+  | gunzip | guix archive -x /tmp/emacs
 @end example
 
 Single-item archives are different from multiple-item archives produced
@@ -4215,7 +4216,8 @@ and they do @emph{not} embed a signature.  Thus this operation does
 unsafe.
 
 The primary purpose of this operation is to facilitate inspection of
-archive contents coming from possibly untrusted substitute servers.
+archive contents coming from possibly untrusted substitute servers
+(@pxref{Invoking guix challenge}).
 
 @end table
 
@@ -9559,8 +9561,8 @@ To find out what is wrong with this Git binary, we can do something along
 these lines (@pxref{Invoking guix archive}):
 
 @example
-$ wget -q -O - https://@value{SUBSTITUTE-SERVER}/nar/@dots{}-git-2.5.0 \
-   | guix archive -x /tmp/git
+$ wget -q -O - https://@value{SUBSTITUTE-SERVER}/nar/gzip/@dots{}-git-2.5.0 \
+   | gunzip | guix archive -x /tmp/git
 $ diff -ur --no-dereference /gnu/store/@dots{}-git.2.5.0 /tmp/git
 @end example
 
-- 
2.20.1


             reply	other threads:[~2019-02-23  1:17 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-23  1:29 mikadoZero [this message]
2020-04-17 20:57 ` bug#34625: [PATCH] Documentation: Update `guix challenge` diffing Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190223012931.GA17575@z.z \
    --to=mikadozero@yandex.com \
    --cc=34625@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).