guix-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH] doc: Merge 'HACKING' into Texinfo manual.


From: Mathieu Lirzin
Subject: Re: [PATCH] doc: Merge 'HACKING' into Texinfo manual.
Date: Thu, 11 Jun 2015 00:23:22 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux)

address@hidden (Ludovic Courtès) writes:

> LGTM, please push!

I noticed that I have forgot to update the detailed node listing.
Here is the updated patch. :/

>From 51ac59f58dea877226827f5779e659aacdedf8a8 Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin <address@hidden>
Date: Wed, 10 Jun 2015 13:39:54 +0200
Subject: [PATCH] doc: Move most 'HACKING' informations into the manual.

* HACKING (Contributing): New section.
  (Building from Git, The Perfect Setup, Coding Style, Submitting Patches):
  Move to ...
* doc/guix.texi (Running Guix Before It Is Installed): Likewise.
  (Contributing): ... here.
* README (Installation): Adapt to it.
* configure.ac (DOT): Likewise.
---
 HACKING       | 133 ++---------------------------
 README        |   4 +-
 configure.ac  |   2 +-
 doc/guix.texi | 268 ++++++++++++++++++++++++++++++++++++++++++++++++----------
 4 files changed, 233 insertions(+), 174 deletions(-)

diff --git a/HACKING b/HACKING
index 1e742c8..41838ee 100644
--- a/HACKING
+++ b/HACKING
@@ -2,141 +2,20 @@
 
 #+TITLE: Hacking GNU Guix and Its Incredible Distro
 
-Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <address@hidden>
-Copyright © 2013 Nikita Karetnikov <address@hidden>
-Copyright © 2014 Pierre-Antoine Rault <address@hidden>
+Copyright © 2012, 2013, 2014 Ludovic Courtès <address@hidden>
+Copyright © 2015 Mathieu Lirzin <address@hidden>
 
   Copying and distribution of this file, with or without modification,
   are permitted in any medium without royalty provided the copyright
   notice and this notice are preserved.
 
+* Contributing
 
-* Building from Git
+See the manual for useful hacking informations, either by running
 
-When building Guix from a checkout, the following packages are required in
-addition to those mentioned in the installation instructions:
+  info -f doc/guix.info "(guix) Contributing"
 
-  - [[http://www.gnu.org/software/autoconf/][GNU Autoconf]]
-  - [[http://www.gnu.org/software/automake/][GNU Automake]]
-  - [[http://www.gnu.org/software/gettext/][GNU Gettext]]
-  - [[http://www.graphviz.org/][Graphviz]]
-  - [[http://www.gnu.org/software/help2man/][GNU Help2man]] (optional)
-
-Run ‘./bootstrap’ to download the Nix daemon source code and to generate the
-build system infrastructure using autoconf.  It reports an error if an
-inappropriate version of the above packages is being used.
-
-If you get an error like this one:
-
-  configure.ac:46: error: possibly undefined macro: PKG_CHECK_MODULES
-
-it probably means that Autoconf couldn’t find ‘pkg.m4’, which is provided by
-pkg-config.  Make sure that ‘pkg.m4’ is available.  For instance, if you
-installed Automake in ‘/usr/local’, it wouldn’t look for ‘.m4’ files in
-‘/usr/share’.  So you have to invoke the following command in that case
-
-  $ export ACLOCAL_PATH=/usr/share/aclocal
-
-See “info '(automake) Macro Search Path'” for more information.
-
-Then, run ‘./configure’ as usual.
-
-Finally, you have to invoke ‘make check’ to run tests.  If anything fails,
-take a look at “info '(guix) Installation'” or send a message to
-<address@hidden>.
-
-* Running Guix before it is installed
-
-See the same-named section in the manual.
-
-* The Perfect Setup
-
-The Perfect Setup to hack on Guix is basically the perfect setup used
-for Guile hacking (info "(guile) Using Guile in Emacs").  First, you
-need more than an editor, you need 
[[http://www.gnu.org/software/emacs][Emacs]], empowered by the wonderful
-[[http://nongnu.org/geiser/][Geiser]].
-
-Geiser allows for interactive and incremental development from within
-Emacs: code compilation and evaluation from within buffers, access to
-on-line documentation (docstrings), context-sensitive completion, M-. to
-jump to an object definition, a REPL to try out your code, and more.
-
-To actually edit the code, Emacs already has a neat Scheme mode.  But in
-addition to that, you must not miss 
[[http://www.emacswiki.org/emacs/ParEdit][Paredit]].  It provides facilities to
-directly operate on the syntax tree, such as raising an s-expression or
-wrapping it, swallowing or rejecting the following s-expression, etc.
-
-* Submitting Patches
-
-Development is done using the Git distributed version control system.  Thus,
-access to the repository is not strictly necessary.  We welcome contributions
-in the form of patches as produced by ‘git format-patch’ sent to
address@hidden  Please write commit logs in the 
[[http://www.gnu.org/prep/standards/html_node/Change-Logs.html#Change-Logs][GNU 
ChangeLog
-format]]; you can check the commit history for examples.
-
-Before submitting a patch that adds or modifies a package definition, please
-run ‘guix lint PACKAGE’, where PACKAGE is the name of the new or modified
-package, and fix any errors it reports.  In addition, please make sure the
-package builds on your platform, using ‘guix build’.  You may also want to
-check that dependent package (if applicable) are not affected by the change;
-‘guix refresh --list-dependent PACKAGE’ will help you do that.
-
-When posting a patch to the mailing list, use "[PATCH] ..." as a subject.  You
-may use your email client or the ‘git send-mail’ command.
-
-As you become a regular contributor, you may find it convenient to have write
-access to the repository (see below.)
-
-* Coding Style
-
-In general our code follows the [[info:standards][GNU Coding Standards]] 
(GCS).  However, the GCS
-do not say much about Scheme, so here are some additional rules.
-
-** Programming Paradigm
-
-Scheme code in Guix is written in a purely functional style.  One exception is
-code that involves input/output, and procedures that implement low-level
-concepts, such as the ‘memoize’ procedure.
-
-** Modules
-
-Guile modules that are meant to be used on the builder side must live in the
-(guix build …) name space.  They must not refer to other Guix or GNU modules.
-However, it is OK for a “host-side” module to use a build-side module.
-
-Modules that deal with the broader GNU system should be in the (gnu …) name
-space rather than (guix …).
-
-** Data Types and Pattern Matching
-
-The tendency in classical Lisp is to use lists to represent everything, and
-then to browse them “by hand” using ‘car’, ‘cdr’, ‘cadr’, and co.  There are
-several problems with that style, notably the fact that it is hard to read,
-error-prone, and a hindrance to proper type error reports.
-
-Guix code should define appropriate data types (for instance, using
-‘define-record-type*’) rather than abuse lists.  In addition, it should use
-pattern matching, via Guile’s (ice-9 match) module, especially when matching
-lists.
-
-** Formatting Code
-
-When writing Scheme code, we follow common wisdom among Scheme programmers.
-In general, we follow the 
[[http://mumble.net/~campbell/scheme/style.txt][Riastradh's Lisp Style Rules]]. 
 This document happens
-to describe the conventions mostly used in Guile’s code too.  It is very
-thoughtful and well written, so please do read it.
-
-Some special forms introduced in Guix, such as the ‘substitute*’ macro, have
-special indentation rules.  These are defined in the .dir-locals.el file,
-which Emacs automatically uses.  If you do not use Emacs, please make sure to
-let your editor know the rules.
-
-We require all top-level procedures to carry a docstring.  This requirement
-can be relaxed for simple private procedures in the (guix build …) name space,
-though.
-
-Procedures should not have more than four positional parameters.  Use keyword
-parameters for procedures that take more than four parameters.
+or by checking the 
[[http://www.gnu.org/software/guix/manual/guix.html#Contributing][web copy of 
the manual]].
 
 * Commit Access
 
diff --git a/README b/README
index 4d3367e..df52822 100644
--- a/README
+++ b/README
@@ -46,8 +46,8 @@ See the manual for the installation instructions, either by 
running
 
 or by checking the 
[[http://www.gnu.org/software/guix/manual/guix.html#Installation][web copy of 
the manual]].
 
-For information on installation from a Git checkout, please see the ‘HACKING’
-file.
+For information on installation from a Git checkout, please see the section
+"Building from Git" in the manual.
 
 * Installing Guix from Guix
 
diff --git a/configure.ac b/configure.ac
index 50b65fd..2c8b9f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -179,7 +179,7 @@ AC_CACHE_SAVE
 m4_include([config-daemon.ac])
 
 dnl `dot' (from the Graphviz package) is only needed for maintainers.
-dnl See `HACKING' for more info.
+dnl See `Building from Git' in the manual for more info.
 AM_MISSING_PROG([DOT], [dot])
 
 dnl Manual pages.
diff --git a/doc/guix.texi b/doc/guix.texi
index be7a292..d75ffba 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -13,6 +13,8 @@
 Copyright @copyright{} 2012, 2013, 2014, 2015 Ludovic address@hidden
 Copyright @copyright{} 2013, 2014 Andreas address@hidden
 Copyright @copyright{} 2013 Nikita address@hidden
+Copyright @copyright{} 2015 Mathieu address@hidden
+Copyright @copyright{} 2014 Pierre-Antoine address@hidden
 Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer
 
 Permission is granted to copy, distribute and/or modify this document
@@ -88,7 +90,6 @@ Installation
 * Running the Test Suite::      Testing Guix.
 * Setting Up the Daemon::       Preparing the build daemon's environment.
 * Invoking guix-daemon::        Running the build daemon.
-* Running Guix Before It Is Installed:: Hacker tricks.
 
 Setting Up the Daemon
 
@@ -177,6 +178,21 @@ Packaging Guidelines
 * Perl Modules::                Little pearls.
 * Fonts::                       Fond of fonts.
 
+Contributing
+
+* Building from Git::           The latest and greatest.
+* Running Guix Before It Is Installed::  Hacker tricks.
+* The Perfect Setup::           The right tools.
+* Coding Style::                Hygiene of the contributor.
+* Submitting Patches::          Share your work.
+
+Coding Style
+
+* Programming Paradigm::        How to compose your elements.
+* Modules::                     Where to store your code?
+* Data Types and Pattern Matching::  Implementing data structures.
+* Formatting Code::             Writing conventions.
+
 @end detailmenu
 @end menu
 
@@ -253,7 +269,6 @@ instead, you want to install the complete GNU operating 
system,
 * Running the Test Suite::      Testing Guix.
 * Setting Up the Daemon::       Preparing the build daemon's environment.
 * Invoking guix-daemon::        Running the build daemon.
-* Running Guix Before It Is Installed::     Hacker tricks.
 @end menu
 
 @node Binary Installation
@@ -847,44 +862,6 @@ useful in exceptional circumstances, such as if you need 
to run several
 daemons on the same machine.
 @end table
 
address@hidden Running Guix Before It Is Installed
address@hidden Running Guix Before It Is Installed
-
-If you are hacking Guix itself---which is a good idea!---you will find
-it useful to test the changes made in your local source tree checkout
-without actually installing them.
-
-To that end, all the command-line tools can be used even if you have not
-run @command{make install}.  To do that, prefix each command with
address@hidden/pre-inst-env} (the @file{pre-inst-env} script lives in the
-top build tree of Guix), as in:
-
address@hidden
-$ sudo ./pre-inst-env guix-daemon --build-users-group=guixbuild
-$ ./pre-inst-env guix build hello
address@hidden example
-
address@hidden
-Similarly, for a Guile session using the Guix modules:
-
address@hidden
-$ ./pre-inst-env guile -c '(use-modules (guix utils)) (pk (%current-system))'
address@hidden example
-
-The @command{pre-inst-env} script sets up all the environment variables
-necessary to support this, including @code{PATH} and
address@hidden
-
-If you are hacking Guix from Emacs using the wonderful Geiser
-(@pxref{Introduction,,, geiser, Geiser User Manual}), make sure to
-augment Guile's load path so that it finds source files from your
-checkout:
-
address@hidden
-;; Assuming the Guix checkout is in ~/src/guix.
-(add-to-list 'geiser-guile-load-path "~/src/guix")
address@hidden lisp
-
 
 @c *********************************************************************
 @node Package Management
@@ -6792,10 +6769,213 @@ grow!  Please get in touch with us on 
@email{guix-devel@@gnu.org} and
 reports, patches, and anything that may be helpful to the project.  We
 particularly welcome help on packaging (@pxref{Packaging Guidelines}).
 
-Please see the
address@hidden://git.savannah.gnu.org/cgit/guix.git/tree/HACKING,
address@hidden file} that comes with the Guix source code for practical
-details about contributions.
address@hidden
+* Building from Git::           The latest and greatest.
+* Running Guix Before It Is Installed::  Hacker tricks.
+* The Perfect Setup::           The right tools.
+* Coding Style::                Hygiene of the contributor.
+* Submitting Patches::          Share your work.
address@hidden menu
+
address@hidden Building from Git
address@hidden Building from Git
+
+If you want to hack Guix itself, it is recommended to use the latest
+version from the Git repository.  When building Guix from a checkout,
+the following packages are required in addition to those mentioned in
+the installation instructions (@pxref{Requirements}).
+
address@hidden
address@hidden @url{http://gnu.org/software/autoconf/, GNU Autoconf};
address@hidden @url{http://gnu.org/software/automake/, GNU Automake};
address@hidden @url{http://gnu.org/software/gettext/, GNU Gettext};
address@hidden @url{http://www.graphviz.org/, Graphviz};
address@hidden @url{http://www.gnu.org/software/help2man/, GNU Help2man 
(optional)}.
address@hidden itemize
+
+Run @command{./bootstrap} to download the Nix daemon source code and to
+generate the build system infrastructure using autoconf.  It reports an
+error if an inappropriate version of the above packages is being used.
+
address@hidden
+If you get an error like this one:
+
address@hidden
+configure.ac:46: error: possibly undefined macro: PKG_CHECK_MODULES
address@hidden example
+
+it probably means that Autoconf couldn’t find @file{pkg.m4}, which is
+provided by @command{pkg-config}.  Make sure that @file{pkg.m4} is
+available.  For instance, if you installed Automake in
address@hidden/usr/local}, it wouldn’t look for @file{.m4} files in
address@hidden/usr/share}.  So you have to invoke the following command in that
+case
+
address@hidden
+export ACLOCAL_PATH=/usr/share/aclocal
address@hidden example
+
+See @pxref{Macro Search Path,,, automake, The GNU Automake Manual} for
+more information.
+
+Then, run @command{./configure} as usual.
+
+Finally, you have to invoke @code{make check} to run tests.  If anything
+fails, take a look at installation instructions (@pxref{Installation})
+or send a message to the @email{guix-devel@@gnu.org, mailing list}.
+
+
address@hidden Running Guix Before It Is Installed
address@hidden Running Guix Before It Is Installed
+
+In order to keep a sane working environment, you will find it useful to
+test the changes made in your local source tree checkout without
+actually installing them.  So that you can distinguish between your
+``end-user'' hat and your ``motley'' costume.
+
+To that end, all the command-line tools can be used even if you have not
+run @code{make install}.  To do that, prefix each command with
address@hidden/pre-inst-env} (the @file{pre-inst-env} script lives in the
+top build tree of Guix), as in:
+
address@hidden
+$ sudo ./pre-inst-env guix-daemon --build-users-group=guixbuild
+$ ./pre-inst-env guix build hello
address@hidden example
+
address@hidden
+Similarly, for a Guile session using the Guix modules:
+
address@hidden
+$ ./pre-inst-env guile -c '(use-modules (guix utils)) (pk (%current-system))'
address@hidden example
+
+The @command{pre-inst-env} script sets up all the environment variables
+necessary to support this, including @env{PATH} and @env{GUILE_LOAD_PATH}.
+
+
address@hidden The Perfect Setup
address@hidden The Perfect Setup
+
+The Perfect Setup to hack on Guix is basically the perfect setup used
+for Guile hacking (@pxref{Using Guile in Emacs,,, guile, Guile Reference
+Manual}).  First, you need more than an editor, you need
address@hidden://www.gnu.org/software/emacs, Emacs}, empowered by the
+wonderful @url{http://nongnu.org/geiser/, Geiser}.
+
+Geiser allows for interactive and incremental development from within
+Emacs: code compilation and evaluation from within buffers, access to
+on-line documentation (docstrings), context-sensitive completion,
address@hidden to jump to an object definition, a REPL to try out your code,
+and more (@pxref{Introduction,,, geiser, Geiser User Manual}).  For
+convenient Guix development, make sure to augment Guile’s load path so
+that it finds source files from your checkout:
+
address@hidden
+;; @r{Assuming the Guix checkout is in ~/src/guix.}
+(add-to-list 'geiser-guile-load-path "~/src/guix")
address@hidden lisp
+
+To actually edit the code, Emacs already has a neat Scheme mode.  But in
+addition to that, you must not miss
address@hidden://www.emacswiki.org/emacs/ParEdit, Paredit}.  It provides
+facilities to directly operate on the syntax tree, such as raising an
+s-expression or wrapping it, swallowing or rejecting the following
+s-expression, etc.
+
+
address@hidden Coding Style
address@hidden Coding Style
+
+In general our code follows the GNU Coding Standards (@pxref{Top,,,
+standards, GNU Coding Standards}).  However, they do not say much about
+Scheme, so here are some additional rules.
+
address@hidden
+* Programming Paradigm::        How to compose your elements.
+* Modules::                     Where to store your code?
+* Data Types and Pattern Matching::  Implementing data structures.
+* Formatting Code::             Writing conventions.
address@hidden menu
+
address@hidden Programming Paradigm
address@hidden Programming Paradigm
+
+Scheme code in Guix is written in a purely functional style.  One
+exception is code that involves input/output, and procedures that
+implement low-level concepts, such as the @code{memoize} procedure.
+
address@hidden Modules
address@hidden Modules
+
+Guile modules that are meant to be used on the builder side must live in
+the @code{(guix build @dots{})} name space.  They must not refer to
+other Guix or GNU modules.  However, it is OK for a ``host-side'' module
+to use a build-side module.
+
+Modules that deal with the broader GNU system should be in the
address@hidden(gnu @dots{})} name space rather than @code{(guix @dots{})}.
+
address@hidden Data Types and Pattern Matching
address@hidden Data Types and Pattern Matching
+
+The tendency in classical Lisp is to use lists to represent everything,
+and then to browse them ``by hand'' using @code{car}, @code{cdr},
address@hidden, and co.  There are several problems with that style,
+notably the fact that it is hard to read, error-prone, and a hindrance
+to proper type error reports.
+
+Guix code should define appropriate data types (for instance, using
address@hidden) rather than abuse lists.  In addition, it
+should use pattern matching, via Guile’s @code{(ice-9 match)} module,
+especially when matching lists.
+
address@hidden Formatting Code
address@hidden Formatting Code
+
+When writing Scheme code, we follow common wisdom among Scheme
+programmers.  In general, we follow the
address@hidden://mumble.net/~campbell/scheme/style.txt, Riastradh's Lisp
+Style Rules}.  This document happens to describe the conventions mostly
+used in Guile’s code too.  It is very thoughtful and well written, so
+please do read it.
+
+Some special forms introduced in Guix, such as the @code{substitute*}
+macro, have special indentation rules.  These are defined in the
address@hidden file, which Emacs automatically uses.  If you do
+not use Emacs, please make sure to let your editor know the rules.
+
+We require all top-level procedures to carry a docstring.  This
+requirement can be relaxed for simple private procedures in the
address@hidden(guix build @dots{})} name space, though.
+
+Procedures should not have more than four positional parameters.  Use
+keyword parameters for procedures that take more than four parameters.
+
+
address@hidden Submitting Patches
address@hidden Submitting Patches
+
+Development is done using the Git distributed version control system.
+Thus, access to the repository is not strictly necessary.  We welcome
+contributions in the form of patches as produced by @code{git
+format-patch} sent to the @email{guix-devel@@gnu.org, mailing list}.
+Please write commit logs in the ChangeLog format (@pxref{Change Logs,,,
+standards, GNU Coding Standards}); you can check the commit history for
+examples.
+
+Before submitting a patch that adds or modifies a package definition,
+please run @code{guix lint @var{package}}, where @var{package} is the
+name of the new or modified package, and fix any errors it reports
+(@pxref{Invoking guix lint}).  In addition, please make sure the package
+builds on your platform, using @code{guix build @var{package}}.  You may
+also want to check that dependent package (if applicable) are not
+affected by the change; @code{guix refresh --list-dependent
address@hidden will help you do that (@pxref{Invoking guix refresh}).
+
+When posting a patch to the mailing list, use @samp{[PATCH] @dots{}} as a
+subject.  You may use your email client or the @command{git send-mail}
+command.
 
 
 @c *********************************************************************
-- 
2.1.4

--
Mathieu Lirzin

reply via email to

[Prev in Thread] Current Thread [Next in Thread]