From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mathieu Lirzin Subject: [PATCH] doc: Use the recommended Scheme format. Date: Sun, 13 Sep 2015 22:57:39 +0200 Message-ID: <1442177859-1506-1-git-send-email-mthl@openmailbox.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------2.5.1" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:41579) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbEM4-0008QA-Bm for guix-devel@gnu.org; Sun, 13 Sep 2015 16:58:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZbEM0-0004nj-9a for guix-devel@gnu.org; Sun, 13 Sep 2015 16:58:32 -0400 Received: from smtp25.openmailbox.org ([62.4.1.59]:49573) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZbELz-0004nX-Uw for guix-devel@gnu.org; Sun, 13 Sep 2015 16:58:28 -0400 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org This is a multi-part message in MIME format. --------------2.5.1 Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: quoted-printable Apply the recommended formatting rules from '.dir-locals.el' to the examples in the manual in order to fulfill it's purpose of being a reference. * doc/package-hello.scm: Indent it. * doc/guix.texi (Defining Packages, Version Numbers): Likewise. * gnu/packages/base.scm (hello): Be consistent with the manual. --- doc/guix.texi | 31 ++++++++++++++++--------------- doc/package-hello.scm | 5 +++-- gnu/packages/base.scm | 29 +++++++++++++++-------------- 3 files changed, 34 insertions(+), 31 deletions(-) --------------2.5.1 Content-Type: text/x-patch; name="0001-doc-Use-the-recommended-Scheme-format.patch" Content-Disposition: inline; filename="0001-doc-Use-the-recommended-Scheme-format.patch" Content-Transfer-Encoding: quoted-printable diff --git a/doc/guix.texi b/doc/guix.texi index 9ae91a8..64c4a55 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -1963,13 +1963,14 @@ package looks like this: (define-public hello (package (name "hello") - (version "2.8") + (version "2.10") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/hello/hello-" version - ".tar.gz")) - (sha256 - (base32 "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pz= dz6")))) + (method url-fetch) + (uri (string-append "mirror://gnu/hello/hello-" version + ".tar.gz")) + (sha256 + (base32 + "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i"))= )) (build-system gnu-build-system) (arguments `(#:configure-flags '("--enable-silent-rules"))) (inputs `(("gawk" ,gawk))) @@ -7231,22 +7232,22 @@ For instance, the versions 2.24.20 and 3.9.12 of = GTK+ may be packaged as follows @example (define-public gtk+ (package - (name "gtk+") - (version "3.9.12") - ...)) + (name "gtk+") + (version "3.9.12") + ...)) (define-public gtk+-2 (package - (name "gtk+") - (version "2.24.20") - ...)) + (name "gtk+") + (version "2.24.20") + ...)) @end example If we also wanted GTK+ 3.8.2, this would be packaged as @example (define-public gtk+-3.8 (package - (name "gtk+") - (version "3.8.2") - ...)) + (name "gtk+") + (version "3.8.2") + ...)) @end example =20 =20 diff --git a/doc/package-hello.scm b/doc/package-hello.scm index b3fcd4f..c57eb89 100644 --- a/doc/package-hello.scm +++ b/doc/package-hello.scm @@ -4,13 +4,14 @@ =20 (package (name "hello") - (version "2.8") + (version "2.10") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/hello/hello-" version ".tar.gz")) (sha256 - (base32 "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzd= z6")))) + (base32 + "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i")))) (build-system gnu-build-system) (synopsis "Hello, GNU world: An example GNU package") (description "Guess what GNU Hello prints!") diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index f35f619..c5f4477 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -49,22 +49,23 @@ =20 (define-public hello (package - (name "hello") - (version "2.10") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/hello/hello-" version - ".tar.gz")) - (sha256 - (base32 "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq= 1i")))) - (build-system gnu-build-system) - (synopsis "Hello, GNU world: An example GNU package") - (description - "GNU Hello prints the message \"Hello, world!\" and then exits. It + (name "hello") + (version "2.10") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/hello/hello-" version + ".tar.gz")) + (sha256 + (base32 + "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i"))= )) + (build-system gnu-build-system) + (synopsis "Hello, GNU world: An example GNU package") + (description + "GNU Hello prints the message \"Hello, world!\" and then exits. It serves as an example of standard GNU coding practices. As such, it supp= orts command-line arguments, multiple languages, and so on.") - (home-page "http://www.gnu.org/software/hello/") - (license gpl3+))) + (home-page "http://www.gnu.org/software/hello/") + (license gpl3+))) =20 (define-public grep (package --------------2.5.1--