diff options
| author | Mathieu Lirzin <mthl@openmailbox.org> | 2015-09-13 22:26:37 +0200 |
|---|---|---|
| committer | Mathieu Lirzin <mthl@openmailbox.org> | 2015-09-14 23:10:58 +0200 |
| commit | 17d8e33f316b7e88aa06452f873b59770989f1b6 (patch) | |
| tree | f2b9581ba113a5dc45d6c722534c3ee9deca0176 | |
| parent | 9c38b54027ee009f9ff604342ae99c4ebd7958a6 (diff) | |
doc: Use the recommended Scheme format.
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.
| -rw-r--r-- | doc/guix.texi | 31 | ||||
| -rw-r--r-- | doc/package-hello.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/base.scm | 29 |
3 files changed, 34 insertions, 31 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index ff3a9c47b7d..51f7cb24b9a 100644 --- a/doc/guix.texi +++ b/doc/guix.texi | |||
| @@ -1963,13 +1963,14 @@ package looks like this: | |||
| 1963 | (define-public hello | 1963 | (define-public hello |
| 1964 | (package | 1964 | (package |
| 1965 | (name "hello") | 1965 | (name "hello") |
| 1966 | (version "2.8") | 1966 | (version "2.10") |
| 1967 | (source (origin | 1967 | (source (origin |
| 1968 | (method url-fetch) | 1968 | (method url-fetch) |
| 1969 | (uri (string-append "mirror://gnu/hello/hello-" version | 1969 | (uri (string-append "mirror://gnu/hello/hello-" version |
| 1970 | ".tar.gz")) | 1970 | ".tar.gz")) |
| 1971 | (sha256 | 1971 | (sha256 |
| 1972 | (base32 "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6")))) | 1972 | (base32 |
| 1973 | "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i")))) | ||
| 1973 | (build-system gnu-build-system) | 1974 | (build-system gnu-build-system) |
| 1974 | (arguments `(#:configure-flags '("--enable-silent-rules"))) | 1975 | (arguments `(#:configure-flags '("--enable-silent-rules"))) |
| 1975 | (inputs `(("gawk" ,gawk))) | 1976 | (inputs `(("gawk" ,gawk))) |
| @@ -7232,22 +7233,22 @@ For instance, the versions 2.24.20 and 3.9.12 of GTK+ may be packaged as follows | |||
| 7232 | @example | 7233 | @example |
| 7233 | (define-public gtk+ | 7234 | (define-public gtk+ |
| 7234 | (package | 7235 | (package |
| 7235 | (name "gtk+") | 7236 | (name "gtk+") |
| 7236 | (version "3.9.12") | 7237 | (version "3.9.12") |
| 7237 | ...)) | 7238 | ...)) |
| 7238 | (define-public gtk+-2 | 7239 | (define-public gtk+-2 |
| 7239 | (package | 7240 | (package |
| 7240 | (name "gtk+") | 7241 | (name "gtk+") |
| 7241 | (version "2.24.20") | 7242 | (version "2.24.20") |
| 7242 | ...)) | 7243 | ...)) |
| 7243 | @end example | 7244 | @end example |
| 7244 | If we also wanted GTK+ 3.8.2, this would be packaged as | 7245 | If we also wanted GTK+ 3.8.2, this would be packaged as |
| 7245 | @example | 7246 | @example |
| 7246 | (define-public gtk+-3.8 | 7247 | (define-public gtk+-3.8 |
| 7247 | (package | 7248 | (package |
| 7248 | (name "gtk+") | 7249 | (name "gtk+") |
| 7249 | (version "3.8.2") | 7250 | (version "3.8.2") |
| 7250 | ...)) | 7251 | ...)) |
| 7251 | @end example | 7252 | @end example |
| 7252 | 7253 | ||
| 7253 | 7254 | ||
diff --git a/doc/package-hello.scm b/doc/package-hello.scm index b3fcd4ff73b..c57eb891089 100644 --- a/doc/package-hello.scm +++ b/doc/package-hello.scm | |||
| @@ -4,13 +4,14 @@ | |||
| 4 | 4 | ||
| 5 | (package | 5 | (package |
| 6 | (name "hello") | 6 | (name "hello") |
| 7 | (version "2.8") | 7 | (version "2.10") |
| 8 | (source (origin | 8 | (source (origin |
| 9 | (method url-fetch) | 9 | (method url-fetch) |
| 10 | (uri (string-append "mirror://gnu/hello/hello-" version | 10 | (uri (string-append "mirror://gnu/hello/hello-" version |
| 11 | ".tar.gz")) | 11 | ".tar.gz")) |
| 12 | (sha256 | 12 | (sha256 |
| 13 | (base32 "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6")))) | 13 | (base32 |
| 14 | "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i")))) | ||
| 14 | (build-system gnu-build-system) | 15 | (build-system gnu-build-system) |
| 15 | (synopsis "Hello, GNU world: An example GNU package") | 16 | (synopsis "Hello, GNU world: An example GNU package") |
| 16 | (description "Guess what GNU Hello prints!") | 17 | (description "Guess what GNU Hello prints!") |
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index f35f6192010..c5f447736a6 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm | |||
| @@ -49,22 +49,23 @@ | |||
| 49 | 49 | ||
| 50 | (define-public hello | 50 | (define-public hello |
| 51 | (package | 51 | (package |
| 52 | (name "hello") | 52 | (name "hello") |
| 53 | (version "2.10") | 53 | (version "2.10") |
| 54 | (source (origin | 54 | (source (origin |
| 55 | (method url-fetch) | 55 | (method url-fetch) |
| 56 | (uri (string-append "mirror://gnu/hello/hello-" version | 56 | (uri (string-append "mirror://gnu/hello/hello-" version |
| 57 | ".tar.gz")) | 57 | ".tar.gz")) |
| 58 | (sha256 | 58 | (sha256 |
| 59 | (base32 "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i")))) | 59 | (base32 |
| 60 | (build-system gnu-build-system) | 60 | "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i")))) |
| 61 | (synopsis "Hello, GNU world: An example GNU package") | 61 | (build-system gnu-build-system) |
| 62 | (description | 62 | (synopsis "Hello, GNU world: An example GNU package") |
| 63 | "GNU Hello prints the message \"Hello, world!\" and then exits. It | 63 | (description |
| 64 | "GNU Hello prints the message \"Hello, world!\" and then exits. It | ||
| 64 | serves as an example of standard GNU coding practices. As such, it supports | 65 | serves as an example of standard GNU coding practices. As such, it supports |
| 65 | command-line arguments, multiple languages, and so on.") | 66 | command-line arguments, multiple languages, and so on.") |
| 66 | (home-page "http://www.gnu.org/software/hello/") | 67 | (home-page "http://www.gnu.org/software/hello/") |
| 67 | (license gpl3+))) | 68 | (license gpl3+))) |
| 68 | 69 | ||
| 69 | (define-public grep | 70 | (define-public grep |
| 70 | (package | 71 | (package |
