gnu: BlueZ: Fix CVE-2020-0556.
[jackhill/guix/guix.git] / doc / contributing.texi
CommitLineData
8c01b9d0
ML
1@node Contributing
2@chapter Contributing
3
4This project is a cooperative effort, and we need your help to make it
5grow! Please get in touch with us on @email{guix-devel@@gnu.org} and
6@code{#guix} on the Freenode IRC network. We welcome ideas, bug
7reports, patches, and anything that may be helpful to the project. We
8particularly welcome help on packaging (@pxref{Packaging Guidelines}).
9
e15fcdd1
LC
10@cindex code of conduct, of contributors
11@cindex contributor covenant
dcb7119a
AS
12We want to provide a warm, friendly, and harassment-free environment, so
13that anyone can contribute to the best of their abilities. To this end
14our project uses a ``Contributor Covenant'', which was adapted from
478af028 15@url{https://contributor-covenant.org/}. You can find a local version in
dcb7119a 16the @file{CODE-OF-CONDUCT} file in the source tree.
e15fcdd1 17
dfcdd9c2
LC
18Contributors are not required to use their legal name in patches and
19on-line communication; they can use any name or pseudonym of their
20choice.
21
8c01b9d0
ML
22@menu
23* Building from Git:: The latest and greatest.
24* Running Guix Before It Is Installed:: Hacker tricks.
25* The Perfect Setup:: The right tools.
afe7408e 26* Packaging Guidelines:: Growing the distribution.
8c01b9d0
ML
27* Coding Style:: Hygiene of the contributor.
28* Submitting Patches:: Share your work.
a7bde77d 29* Tracking Bugs and Patches:: Using Debbugs.
2d315cd4 30* Commit Access:: Pushing to the official repository.
8c01b9d0
ML
31@end menu
32
33@node Building from Git
34@section Building from Git
35
36If you want to hack Guix itself, it is recommended to use the latest
dbfcadfc
LC
37version from the Git repository:
38
39@example
40git clone https://git.savannah.gnu.org/git/guix.git
41@end example
42
b3011dbb
LC
43@cindex authentication, of a Guix checkout
44How do you ensure that you obtained a genuine copy of the repository?
45Guix itself provides a tool to @dfn{authenticate} your checkout, but you
46must first make sure this tool is genuine in order to ``bootstrap'' the
47trust chain. To do that, run:
48
49@c XXX: Adjust instructions when there's a known tag to start from.
50@example
51git verify-commit `git log --format=%H build-aux/git-authenticate.scm`
52@end example
53
54The output must look something like:
55
56@example
57gpg: Signature made Fri 27 Dec 2019 01:27:41 PM CET
58gpg: using RSA key 3CE464558A84FDC69DB40CFB090B11993D9AEBB5
59@dots{}
60gpg: Signature made Fri 27 Dec 2019 01:25:22 PM CET
61gpg: using RSA key 3CE464558A84FDC69DB40CFB090B11993D9AEBB5
62@dots{}
63@end example
64
65@noindent
66... meaning that changes to this file are all signed with key
67@code{3CE464558A84FDC69DB40CFB090B11993D9AEBB5} (you may need to fetch
68this key from a key server, if you have not done it yet).
69
70From there on, you can authenticate all the commits included in your
71checkout by running:
72
73@example
74make authenticate
75@end example
76
77The first run takes a couple of minutes, but subsequent runs are faster.
78
79@quotation Note
80You are advised to run @command{make authenticate} after every
81@command{git pull} invocation. This ensures you keep receiving valid
82changes to the repository
83@end quotation
84
5fb95cc5
LC
85The easiest way to set up a development environment for Guix is, of
86course, by using Guix! The following command starts a new shell where
87all the dependencies and appropriate environment variables are set up to
88hack on Guix:
8c01b9d0 89
5fb95cc5 90@example
43ec98ef 91guix environment guix --pure
5fb95cc5
LC
92@end example
93
94@xref{Invoking guix environment}, for more information on that command.
0636742b
FP
95
96If you are unable to use Guix when building Guix from a checkout, the
97following are the required packages in addition to those mentioned in the
98installation instructions (@pxref{Requirements}).
99
100@itemize
21656ffa
VS
101@item @url{https://gnu.org/software/autoconf/, GNU Autoconf};
102@item @url{https://gnu.org/software/automake/, GNU Automake};
103@item @url{https://gnu.org/software/gettext/, GNU Gettext};
104@item @url{https://gnu.org/software/texinfo/, GNU Texinfo};
105@item @url{https://www.graphviz.org/, Graphviz};
106@item @url{https://www.gnu.org/software/help2man/, GNU Help2man (optional)}.
0636742b
FP
107@end itemize
108
109On Guix, extra dependencies can be added by instead running @command{guix
110environment} with @option{--ad-hoc}:
5fb95cc5
LC
111
112@example
43ec98ef 113guix environment guix --pure --ad-hoc help2man git strace
5fb95cc5
LC
114@end example
115
116Run @command{./bootstrap} to generate the build system infrastructure
117using Autoconf and Automake. If you get an error like this one:
8c01b9d0
ML
118
119@example
120configure.ac:46: error: possibly undefined macro: PKG_CHECK_MODULES
121@end example
122
5fb95cc5 123@noindent
8c01b9d0 124it probably means that Autoconf couldn’t find @file{pkg.m4}, which is
5fb95cc5
LC
125provided by pkg-config. Make sure that @file{pkg.m4} is available. The
126same holds for the @file{guile.m4} set of macros provided by Guile. For
127instance, if you installed Automake in @file{/usr/local}, it wouldn’t
128look for @file{.m4} files in @file{/usr/share}. In that case, you have
129to invoke the following command:
8c01b9d0
ML
130
131@example
132export ACLOCAL_PATH=/usr/share/aclocal
133@end example
134
aabe6d38 135@xref{Macro Search Path,,, automake, The GNU Automake Manual}, for
8c01b9d0
ML
136more information.
137
3a25c631
LC
138Then, run @command{./configure} as usual. Make sure to pass
139@code{--localstatedir=@var{directory}} where @var{directory} is the
140@code{localstatedir} value used by your current installation (@pxref{The
0758a70c 141Store}, for information about this). We recommend to use the value
142@code{/var}.
8c01b9d0 143
3a25c631
LC
144Finally, you have to invoke @code{make check} to run tests
145(@pxref{Running the Test Suite}). If anything
8c01b9d0
ML
146fails, take a look at installation instructions (@pxref{Installation})
147or send a message to the @email{guix-devel@@gnu.org, mailing list}.
148
149
150@node Running Guix Before It Is Installed
151@section Running Guix Before It Is Installed
152
153In order to keep a sane working environment, you will find it useful to
154test the changes made in your local source tree checkout without
155actually installing them. So that you can distinguish between your
156``end-user'' hat and your ``motley'' costume.
157
158To that end, all the command-line tools can be used even if you have not
0207768f
LC
159run @code{make install}. To do that, you first need to have an environment
160with all the dependencies available (@pxref{Building from Git}), and then
161simply prefix each command with
8c01b9d0 162@command{./pre-inst-env} (the @file{pre-inst-env} script lives in the
0636742b
FP
163top build tree of Guix; it is generated by @command{./configure}).
164An example@footnote{The @option{-E} flag to
67441b9a
LC
165@command{sudo} guarantees that @code{GUILE_LOAD_PATH} is correctly set
166such that @command{guix-daemon} and the tools it uses can find the Guile
167modules they need.}:
8c01b9d0
ML
168
169@example
67441b9a 170$ sudo -E ./pre-inst-env guix-daemon --build-users-group=guixbuild
8c01b9d0
ML
171$ ./pre-inst-env guix build hello
172@end example
173
174@noindent
0636742b 175Similarly, an example for a Guile session using the Guix modules:
8c01b9d0
ML
176
177@example
178$ ./pre-inst-env guile -c '(use-modules (guix utils)) (pk (%current-system))'
96856613
LC
179
180;;; ("x86_64-linux")
181@end example
182
183@noindent
184@cindex REPL
185@cindex read-eval-print loop
186@dots{} and for a REPL (@pxref{Using Guile Interactively,,, guile, Guile
187Reference Manual}):
188
189@example
190$ ./pre-inst-env guile
191scheme@@(guile-user)> ,use(guix)
192scheme@@(guile-user)> ,use(gnu)
193scheme@@(guile-user)> (define snakes
194 (fold-packages
195 (lambda (package lst)
196 (if (string-prefix? "python"
197 (package-name package))
198 (cons package lst)
199 lst))
200 '()))
201scheme@@(guile-user)> (length snakes)
202$1 = 361
8c01b9d0
ML
203@end example
204
205The @command{pre-inst-env} script sets up all the environment variables
206necessary to support this, including @env{PATH} and @env{GUILE_LOAD_PATH}.
207
ef54b61d 208Note that @command{./pre-inst-env guix pull} does @emph{not} upgrade the
75e24d7b 209local source tree; it simply updates the @file{~/.config/guix/current}
ef54b61d 210symlink (@pxref{Invoking guix pull}). Run @command{git pull} instead if
75e24d7b 211you want to upgrade your local source tree.
ef54b61d 212
8c01b9d0
ML
213
214@node The Perfect Setup
215@section The Perfect Setup
216
217The Perfect Setup to hack on Guix is basically the perfect setup used
218for Guile hacking (@pxref{Using Guile in Emacs,,, guile, Guile Reference
219Manual}). First, you need more than an editor, you need
21656ffa
VS
220@url{https://www.gnu.org/software/emacs, Emacs}, empowered by the
221wonderful @url{https://nongnu.org/geiser/, Geiser}. To set that up, run:
f73ab814
LC
222
223@example
224guix package -i emacs guile emacs-geiser
225@end example
8c01b9d0
ML
226
227Geiser allows for interactive and incremental development from within
228Emacs: code compilation and evaluation from within buffers, access to
229on-line documentation (docstrings), context-sensitive completion,
230@kbd{M-.} to jump to an object definition, a REPL to try out your code,
231and more (@pxref{Introduction,,, geiser, Geiser User Manual}). For
232convenient Guix development, make sure to augment Guile’s load path so
233that it finds source files from your checkout:
234
235@lisp
236;; @r{Assuming the Guix checkout is in ~/src/guix.}
bb38ece4
AK
237(with-eval-after-load 'geiser-guile
238 (add-to-list 'geiser-guile-load-path "~/src/guix"))
8c01b9d0
ML
239@end lisp
240
241To actually edit the code, Emacs already has a neat Scheme mode. But in
242addition to that, you must not miss
c2c73f58 243@url{https://www.emacswiki.org/emacs/ParEdit, Paredit}. It provides
8c01b9d0
ML
244facilities to directly operate on the syntax tree, such as raising an
245s-expression or wrapping it, swallowing or rejecting the following
246s-expression, etc.
247
42cdcdff
RW
248@cindex code snippets
249@cindex templates
250@cindex reducing boilerplate
251We also provide templates for common git commit messages and package
252definitions in the @file{etc/snippets} directory. These templates can
21656ffa 253be used with @url{https://joaotavora.github.io/yasnippet/, YASnippet} to
42cdcdff
RW
254expand short trigger strings to interactive text snippets. You may want
255to add the snippets directory to the @var{yas-snippet-dirs} variable in
256Emacs.
257
258@lisp
259;; @r{Assuming the Guix checkout is in ~/src/guix.}
260(with-eval-after-load 'yasnippet
261 (add-to-list 'yas-snippet-dirs "~/src/guix/etc/snippets"))
262@end lisp
263
264The commit message snippets depend on @url{https://magit.vc/, Magit} to
265display staged files. When editing a commit message type @code{add}
266followed by @kbd{TAB} to insert a commit message template for adding a
267package; type @code{update} followed by @kbd{TAB} to insert a template
9286c295
AI
268for updating a package; type @code{https} followed by @kbd{TAB} to
269insert a template for changing the home page URI of a package to HTTPS.
42cdcdff
RW
270
271The main snippet for @code{scheme-mode} is triggered by typing
272@code{package...} followed by @kbd{TAB}. This snippet also inserts the
273trigger string @code{origin...}, which can be expanded further. The
274@code{origin} snippet in turn may insert other trigger strings ending on
275@code{...}, which also can be expanded further.
276
9a397114
OP
277@cindex insert or update copyright
278@cindex @code{M-x guix-copyright}
279@cindex @code{M-x copyright-update}
280Additionaly we provide insertion and automatic update of a copyright in
281@file{etc/copyright.el}. You may want to set your full name, mail, and
282load a file.
283
284@lisp
285(setq user-full-name "Alice Doe")
286(setq user-mail-address "alice@@mail.org")
287;; @r{Assuming the Guix checkout is in ~/src/guix.}
288(load-file "~/src/guix/etc/copyright.el")
289@end lisp
290
291To insert a copyright at the current line invoke @code{M-x guix-copyright}.
292
293To update a copyright you need to specify a @code{copyright-names-regexp}.
294
295@lisp
296(setq copyright-names-regexp
297 (format "%s <%s>" user-full-name user-mail-address))
298@end lisp
299
300You can check if your copyright is up to date by evaluating @code{M-x
301copyright-update}. If you want to do it automatically after each buffer
302save then add @code{(add-hook 'after-save-hook 'copyright-update)} in
303Emacs.
8c01b9d0 304
afe7408e
LC
305@node Packaging Guidelines
306@section Packaging Guidelines
307
308@cindex packages, creating
309The GNU distribution is nascent and may well lack some of your favorite
310packages. This section describes how you can help make the distribution
311grow.
312
313Free software packages are usually distributed in the form of
314@dfn{source code tarballs}---typically @file{tar.gz} files that contain
315all the source files. Adding a package to the distribution means
316essentially two things: adding a @dfn{recipe} that describes how to
317build the package, including a list of other packages required to build
318it, and adding @dfn{package metadata} along with that recipe, such as a
319description and licensing information.
320
321In Guix all this information is embodied in @dfn{package definitions}.
322Package definitions provide a high-level view of the package. They are
323written using the syntax of the Scheme programming language; in fact,
324for each package we define a variable bound to the package definition,
325and export that variable from a module (@pxref{Package Modules}).
326However, in-depth Scheme knowledge is @emph{not} a prerequisite for
327creating packages. For more information on package definitions,
328@pxref{Defining Packages}.
329
330Once a package definition is in place, stored in a file in the Guix
331source tree, it can be tested using the @command{guix build} command
332(@pxref{Invoking guix build}). For example, assuming the new package is
333called @code{gnew}, you may run this command from the Guix build tree
334(@pxref{Running Guix Before It Is Installed}):
335
336@example
337./pre-inst-env guix build gnew --keep-failed
338@end example
339
340Using @code{--keep-failed} makes it easier to debug build failures since
341it provides access to the failed build tree. Another useful
342command-line option when debugging is @code{--log-file}, to access the
343build log.
344
345If the package is unknown to the @command{guix} command, it may be that
346the source file contains a syntax error, or lacks a @code{define-public}
347clause to export the package variable. To figure it out, you may load
348the module from Guile to get more information about the actual error:
349
350@example
351./pre-inst-env guile -c '(use-modules (gnu packages gnew))'
352@end example
353
354Once your package builds correctly, please send us a patch
355(@pxref{Submitting Patches}). Well, if you need help, we will be happy to
356help you too. Once the patch is committed in the Guix repository, the
357new package automatically gets built on the supported platforms by
44b5f28a 358@url{@value{SUBSTITUTE-SERVER}, our continuous integration system}.
afe7408e
LC
359
360@cindex substituter
361Users can obtain the new package definition simply by running
362@command{guix pull} (@pxref{Invoking guix pull}). When
363@code{@value{SUBSTITUTE-SERVER}} is done building the package, installing the
364package automatically downloads binaries from there
365(@pxref{Substitutes}). The only place where human intervention is
366needed is to review and apply the patch.
367
368
369@menu
370* Software Freedom:: What may go into the distribution.
371* Package Naming:: What's in a name?
372* Version Numbers:: When the name is not enough.
373* Synopses and Descriptions:: Helping users find the right package.
374* Python Modules:: A touch of British comedy.
375* Perl Modules:: Little pearls.
376* Java Packages:: Coffee break.
8d1b22b2 377* Rust Crates:: Beware of oxidation.
afe7408e
LC
378* Fonts:: Fond of fonts.
379@end menu
380
381@node Software Freedom
382@subsection Software Freedom
383
384@c Adapted from http://www.gnu.org/philosophy/philosophy.html.
385@cindex free software
386The GNU operating system has been developed so that users can have
387freedom in their computing. GNU is @dfn{free software}, meaning that
21656ffa 388users have the @url{https://www.gnu.org/philosophy/free-sw.html,four
afe7408e
LC
389essential freedoms}: to run the program, to study and change the program
390in source code form, to redistribute exact copies, and to distribute
391modified versions. Packages found in the GNU distribution provide only
392software that conveys these four freedoms.
393
394In addition, the GNU distribution follow the
21656ffa 395@url{https://www.gnu.org/distros/free-system-distribution-guidelines.html,free
afe7408e
LC
396software distribution guidelines}. Among other things, these guidelines
397reject non-free firmware, recommendations of non-free software, and
398discuss ways to deal with trademarks and patents.
399
400Some otherwise free upstream package sources contain a small and optional
401subset that violates the above guidelines, for instance because this subset
402is itself non-free code. When that happens, the offending items are removed
403with appropriate patches or code snippets in the @code{origin} form of the
404package (@pxref{Defining Packages}). This way, @code{guix
405build --source} returns the ``freed'' source rather than the unmodified
406upstream source.
407
408
409@node Package Naming
410@subsection Package Naming
411
412@cindex package name
413A package has actually two names associated with it:
414First, there is the name of the @emph{Scheme variable}, the one following
415@code{define-public}. By this name, the package can be made known in the
416Scheme code, for instance as input to another package. Second, there is
417the string in the @code{name} field of a package definition. This name
418is used by package management commands such as
419@command{guix package} and @command{guix build}.
420
421Both are usually the same and correspond to the lowercase conversion of
422the project name chosen upstream, with underscores replaced with
423hyphens. For instance, GNUnet is available as @code{gnunet}, and
424SDL_net as @code{sdl-net}.
425
426We do not add @code{lib} prefixes for library packages, unless these are
427already part of the official project name. But @pxref{Python
428Modules} and @ref{Perl Modules} for special rules concerning modules for
429the Python and Perl languages.
430
431Font package names are handled differently, @pxref{Fonts}.
432
433
434@node Version Numbers
435@subsection Version Numbers
436
437@cindex package version
438We usually package only the latest version of a given free software
439project. But sometimes, for instance for incompatible library versions,
440two (or more) versions of the same package are needed. These require
441different Scheme variable names. We use the name as defined
442in @ref{Package Naming}
443for the most recent version; previous versions use the same name, suffixed
444by @code{-} and the smallest prefix of the version number that may
445distinguish the two versions.
446
447The name inside the package definition is the same for all versions of a
448package and does not contain any version number.
449
450For instance, the versions 2.24.20 and 3.9.12 of GTK+ may be packaged as follows:
451
8ba31e8b 452@lisp
afe7408e
LC
453(define-public gtk+
454 (package
455 (name "gtk+")
456 (version "3.9.12")
457 ...))
458(define-public gtk+-2
459 (package
460 (name "gtk+")
461 (version "2.24.20")
462 ...))
8ba31e8b 463@end lisp
afe7408e 464If we also wanted GTK+ 3.8.2, this would be packaged as
8ba31e8b 465@lisp
afe7408e
LC
466(define-public gtk+-3.8
467 (package
468 (name "gtk+")
469 (version "3.8.2")
470 ...))
8ba31e8b 471@end lisp
afe7408e
LC
472
473@c See <https://lists.gnu.org/archive/html/guix-devel/2016-01/msg00425.html>,
474@c for a discussion of what follows.
475@cindex version number, for VCS snapshots
476Occasionally, we package snapshots of upstream's version control system
477(VCS) instead of formal releases. This should remain exceptional,
478because it is up to upstream developers to clarify what the stable
479release is. Yet, it is sometimes necessary. So, what should we put in
480the @code{version} field?
481
482Clearly, we need to make the commit identifier of the VCS snapshot
483visible in the version string, but we also need to make sure that the
484version string is monotonically increasing so that @command{guix package
485--upgrade} can determine which version is newer. Since commit
486identifiers, notably with Git, are not monotonically increasing, we add
487a revision number that we increase each time we upgrade to a newer
488snapshot. The resulting version string looks like this:
489
490@example
4912.0.11-3.cabba9e
492 ^ ^ ^
493 | | `-- upstream commit ID
494 | |
495 | `--- Guix package revision
496 |
497latest upstream version
498@end example
499
500It is a good idea to strip commit identifiers in the @code{version}
501field to, say, 7 digits. It avoids an aesthetic annoyance (assuming
502aesthetics have a role to play here) as well as problems related to OS
503limits such as the maximum shebang length (127 bytes for the Linux
504kernel.) It is best to use the full commit identifiers in
505@code{origin}s, though, to avoid ambiguities. A typical package
506definition may look like this:
507
8ba31e8b 508@lisp
afe7408e
LC
509(define my-package
510 (let ((commit "c3f29bc928d5900971f65965feaae59e1272a3f7")
511 (revision "1")) ;Guix package revision
512 (package
513 (version (git-version "0.9" revision commit))
514 (source (origin
515 (method git-fetch)
516 (uri (git-reference
517 (url "git://example.org/my-package.git")
518 (commit commit)))
519 (sha256 (base32 "1mbikn@dots{}"))
520 (file-name (git-file-name name version))))
521 ;; @dots{}
522 )))
8ba31e8b 523@end lisp
afe7408e
LC
524
525@node Synopses and Descriptions
526@subsection Synopses and Descriptions
527
528@cindex package description
529@cindex package synopsis
530As we have seen before, each package in GNU@tie{}Guix includes a
531synopsis and a description (@pxref{Defining Packages}). Synopses and
532descriptions are important: They are what @command{guix package
533--search} searches, and a crucial piece of information to help users
534determine whether a given package suits their needs. Consequently,
535packagers should pay attention to what goes into them.
536
537Synopses must start with a capital letter and must not end with a
538period. They must not start with ``a'' or ``the'', which usually does
539not bring anything; for instance, prefer ``File-frobbing tool'' over ``A
540tool that frobs files''. The synopsis should say what the package
541is---e.g., ``Core GNU utilities (file, text, shell)''---or what it is
542used for---e.g., the synopsis for GNU@tie{}grep is ``Print lines
543matching a pattern''.
544
545Keep in mind that the synopsis must be meaningful for a very wide
546audience. For example, ``Manipulate alignments in the SAM format''
547might make sense for a seasoned bioinformatics researcher, but might be
548fairly unhelpful or even misleading to a non-specialized audience. It
549is a good idea to come up with a synopsis that gives an idea of the
550application domain of the package. In this example, this might give
551something like ``Manipulate nucleotide sequence alignments'', which
552hopefully gives the user a better idea of whether this is what they are
553looking for.
554
555Descriptions should take between five and ten lines. Use full
556sentences, and avoid using acronyms without first introducing them.
557Please avoid marketing phrases such as ``world-leading'',
558``industrial-strength'', and ``next-generation'', and avoid superlatives
559like ``the most advanced''---they are not helpful to users looking for a
560package and may even sound suspicious. Instead, try to be factual,
561mentioning use cases and features.
562
563@cindex Texinfo markup, in package descriptions
564Descriptions can include Texinfo markup, which is useful to introduce
565ornaments such as @code{@@code} or @code{@@dfn}, bullet lists, or
566hyperlinks (@pxref{Overview,,, texinfo, GNU Texinfo}). However you
567should be careful when using some characters for example @samp{@@} and
568curly braces which are the basic special characters in Texinfo
569(@pxref{Special Characters,,, texinfo, GNU Texinfo}). User interfaces
570such as @command{guix package --show} take care of rendering it
571appropriately.
572
573Synopses and descriptions are translated by volunteers
21656ffa 574@uref{https://translationproject.org/domain/guix-packages.html, at the
afe7408e
LC
575Translation Project} so that as many users as possible can read them in
576their native language. User interfaces search them and display them in
577the language specified by the current locale.
578
579To allow @command{xgettext} to extract them as translatable strings,
580synopses and descriptions @emph{must be literal strings}. This means
581that you cannot use @code{string-append} or @code{format} to construct
582these strings:
583
584@lisp
585(package
586 ;; @dots{}
587 (synopsis "This is translatable")
588 (description (string-append "This is " "*not*" " translatable.")))
589@end lisp
590
591Translation is a lot of work so, as a packager, please pay even more
592attention to your synopses and descriptions as every change may entail
593additional work for translators. In order to help them, it is possible
594to make recommendations or instructions visible to them by inserting
595special comments like this (@pxref{xgettext Invocation,,, gettext, GNU
596Gettext}):
597
598@example
599;; TRANSLATORS: "X11 resize-and-rotate" should not be translated.
600(description "ARandR is designed to provide a simple visual front end
601for the X11 resize-and-rotate (RandR) extension. @dots{}")
602@end example
603
604
605@node Python Modules
606@subsection Python Modules
607
608@cindex python
609We currently package Python 2 and Python 3, under the Scheme variable names
610@code{python-2} and @code{python} as explained in @ref{Version Numbers}.
611To avoid confusion and naming clashes with other programming languages, it
612seems desirable that the name of a package for a Python module contains
613the word @code{python}.
614
615Some modules are compatible with only one version of Python, others with both.
616If the package Foo compiles only with Python 3, we name it
617@code{python-foo}; if it compiles only with Python 2, we name it
618@code{python2-foo}. If it is compatible with both versions, we create two
619packages with the corresponding names.
620
621If a project already contains the word @code{python}, we drop this;
622for instance, the module python-dateutil is packaged under the names
623@code{python-dateutil} and @code{python2-dateutil}. If the project name
624starts with @code{py} (e.g.@: @code{pytz}), we keep it and prefix it as
625described above.
626
627@subsubsection Specifying Dependencies
628@cindex inputs, for Python packages
629
630Dependency information for Python packages is usually available in the
631package source tree, with varying degrees of accuracy: in the
632@file{setup.py} file, in @file{requirements.txt}, or in @file{tox.ini}.
633
634Your mission, when writing a recipe for a Python package, is to map
635these dependencies to the appropriate type of ``input'' (@pxref{package
636Reference, inputs}). Although the @code{pypi} importer normally does a
637good job (@pxref{Invoking guix import}), you may want to check the
638following check list to determine which dependency goes where.
639
640@itemize
641
642@item
643We currently package Python 2 with @code{setuptools} and @code{pip}
644installed like Python 3.4 has per default. Thus you don't need to
645specify either of these as an input. @command{guix lint} will warn you
646if you do.
647
648@item
649Python dependencies required at run time go into
650@code{propagated-inputs}. They are typically defined with the
651@code{install_requires} keyword in @file{setup.py}, or in the
652@file{requirements.txt} file.
653
654@item
655Python packages required only at build time---e.g., those listed with
656the @code{setup_requires} keyword in @file{setup.py}---or only for
657testing---e.g., those in @code{tests_require}---go into
658@code{native-inputs}. The rationale is that (1) they do not need to be
659propagated because they are not needed at run time, and (2) in a
660cross-compilation context, it's the ``native'' input that we'd want.
661
662Examples are the @code{pytest}, @code{mock}, and @code{nose} test
663frameworks. Of course if any of these packages is also required at
664run-time, it needs to go to @code{propagated-inputs}.
665
666@item
667Anything that does not fall in the previous categories goes to
668@code{inputs}, for example programs or C libraries required for building
669Python packages containing C extensions.
670
671@item
672If a Python package has optional dependencies (@code{extras_require}),
673it is up to you to decide whether to add them or not, based on their
674usefulness/overhead ratio (@pxref{Submitting Patches, @command{guix
675size}}).
676
677@end itemize
678
679
680@node Perl Modules
681@subsection Perl Modules
682
683@cindex perl
684Perl programs standing for themselves are named as any other package,
685using the lowercase upstream name.
686For Perl packages containing a single class, we use the lowercase class name,
687replace all occurrences of @code{::} by dashes and prepend the prefix
688@code{perl-}.
689So the class @code{XML::Parser} becomes @code{perl-xml-parser}.
690Modules containing several classes keep their lowercase upstream name and
691are also prepended by @code{perl-}. Such modules tend to have the word
692@code{perl} somewhere in their name, which gets dropped in favor of the
693prefix. For instance, @code{libwww-perl} becomes @code{perl-libwww}.
694
695
696@node Java Packages
697@subsection Java Packages
698
699@cindex java
700Java programs standing for themselves are named as any other package,
701using the lowercase upstream name.
702
703To avoid confusion and naming clashes with other programming languages,
704it is desirable that the name of a package for a Java package is
705prefixed with @code{java-}. If a project already contains the word
706@code{java}, we drop this; for instance, the package @code{ngsjava} is
707packaged under the name @code{java-ngs}.
708
709For Java packages containing a single class or a small class hierarchy,
710we use the lowercase class name, replace all occurrences of @code{.} by
711dashes and prepend the prefix @code{java-}. So the class
712@code{apache.commons.cli} becomes package
713@code{java-apache-commons-cli}.
714
715
8d1b22b2
EF
716@node Rust Crates
717@subsection Rust Crates
718
719@cindex rust
720Rust programs standing for themselves are named as any other package, using the
721lowercase upstream name.
722
723To prevent namespace collisions we prefix all other Rust packages with the
724@code{rust-} prefix. The name should be changed to lowercase as appropriate and
725dashes should remain in place.
726
727In the rust ecosystem it is common for multiple incompatible versions of a
728package to be used at any given time, so all packages should have a versioned
729suffix. If a package has passed version 1.0.0 then just the major version
730number is sufficient (e.g.@: @code{rust-clap-2}), otherwise the version suffix
731should contain both the major and minor version (e.g.@: @code{rust-rand-0.6}).
732
733Because of the difficulty in reusing rust packages as pre-compiled inputs for
734other packages the Cargo build system (@pxref{Build Systems,
735@code{cargo-build-system}}) presents the @code{#:cargo-inputs} and
736@code{cargo-development-inputs} keywords as build system arguments. It would be
737helpful to think of these as similar to @code{propagated-inputs} and
738@code{native-inputs}. Rust @code{dependencies} and @code{build-dependencies}
739should go in @code{#:cargo-inputs}, and @code{dev-dependencies} should go in
740@code{#:cargo-development-inputs}. If a Rust package links to other libraries
741then the standard placement in @code{inputs} and the like should be used.
742
743Care should be taken to ensure the correct version of dependencies are used; to
744this end we try to refrain from skipping the tests or using @code{#:skip-build?}
745when possible. Of course this is not always possible, as the package may be
746developed for a different Operating System, depend on features from the Nightly
747Rust compiler, or the test suite may have atrophied since it was released.
748
749
afe7408e
LC
750@node Fonts
751@subsection Fonts
752
753@cindex fonts
754For fonts that are in general not installed by a user for typesetting
755purposes, or that are distributed as part of a larger software package,
756we rely on the general packaging rules for software; for instance, this
757applies to the fonts delivered as part of the X.Org system or fonts that
758are part of TeX Live.
759
760To make it easier for a user to search for fonts, names for other packages
761containing only fonts are constructed as follows, independently of the
762upstream package name.
763
764The name of a package containing only one font family starts with
765@code{font-}; it is followed by the foundry name and a dash @code{-}
766if the foundry is known, and the font family name, in which spaces are
767replaced by dashes (and as usual, all upper case letters are transformed
768to lower case).
769For example, the Gentium font family by SIL is packaged under the name
770@code{font-sil-gentium}.
771
772For a package containing several font families, the name of the collection
773is used in the place of the font family name.
774For instance, the Liberation fonts consist of three families,
775Liberation Sans, Liberation Serif and Liberation Mono.
776These could be packaged separately under the names
777@code{font-liberation-sans} and so on; but as they are distributed together
778under a common name, we prefer to package them together as
779@code{font-liberation}.
780
781In the case where several formats of the same font family or font collection
782are packaged separately, a short form of the format, prepended by a dash,
783is added to the package name. We use @code{-ttf} for TrueType fonts,
784@code{-otf} for OpenType fonts and @code{-type1} for PostScript Type 1
785fonts.
786
787
8c01b9d0
ML
788@node Coding Style
789@section Coding Style
790
791In general our code follows the GNU Coding Standards (@pxref{Top,,,
792standards, GNU Coding Standards}). However, they do not say much about
793Scheme, so here are some additional rules.
794
795@menu
796* Programming Paradigm:: How to compose your elements.
797* Modules:: Where to store your code?
798* Data Types and Pattern Matching:: Implementing data structures.
799* Formatting Code:: Writing conventions.
800@end menu
801
802@node Programming Paradigm
803@subsection Programming Paradigm
804
805Scheme code in Guix is written in a purely functional style. One
806exception is code that involves input/output, and procedures that
807implement low-level concepts, such as the @code{memoize} procedure.
808
809@node Modules
810@subsection Modules
811
812Guile modules that are meant to be used on the builder side must live in
813the @code{(guix build @dots{})} name space. They must not refer to
814other Guix or GNU modules. However, it is OK for a ``host-side'' module
815to use a build-side module.
816
817Modules that deal with the broader GNU system should be in the
818@code{(gnu @dots{})} name space rather than @code{(guix @dots{})}.
819
820@node Data Types and Pattern Matching
821@subsection Data Types and Pattern Matching
822
823The tendency in classical Lisp is to use lists to represent everything,
824and then to browse them ``by hand'' using @code{car}, @code{cdr},
825@code{cadr}, and co. There are several problems with that style,
826notably the fact that it is hard to read, error-prone, and a hindrance
827to proper type error reports.
828
829Guix code should define appropriate data types (for instance, using
830@code{define-record-type*}) rather than abuse lists. In addition, it
831should use pattern matching, via Guile’s @code{(ice-9 match)} module,
832especially when matching lists.
833
834@node Formatting Code
835@subsection Formatting Code
836
7bb2b10c
LC
837@cindex formatting code
838@cindex coding style
8c01b9d0
ML
839When writing Scheme code, we follow common wisdom among Scheme
840programmers. In general, we follow the
21656ffa 841@url{https://mumble.net/~campbell/scheme/style.txt, Riastradh's Lisp
8c01b9d0
ML
842Style Rules}. This document happens to describe the conventions mostly
843used in Guile’s code too. It is very thoughtful and well written, so
844please do read it.
845
846Some special forms introduced in Guix, such as the @code{substitute*}
847macro, have special indentation rules. These are defined in the
8ca0c88a
AK
848@file{.dir-locals.el} file, which Emacs automatically uses. Also note
849that Emacs-Guix provides @code{guix-devel-mode} mode that indents and
850highlights Guix code properly (@pxref{Development,,, emacs-guix, The
851Emacs-Guix Reference Manual}).
7bb2b10c
LC
852
853@cindex indentation, of code
854@cindex formatting, of code
855If you do not use Emacs, please make sure to let your editor knows these
856rules. To automatically indent a package definition, you can also run:
857
858@example
557d9c8d 859./etc/indent-code.el gnu/packages/@var{file}.scm @var{package}
7bb2b10c
LC
860@end example
861
862@noindent
863This automatically indents the definition of @var{package} in
557d9c8d
LC
864@file{gnu/packages/@var{file}.scm} by running Emacs in batch mode. To
865indent a whole file, omit the second argument:
866
867@example
868./etc/indent-code.el gnu/services/@var{file}.scm
869@end example
8c01b9d0 870
60912a88
LC
871@cindex Vim, Scheme code editing
872If you are editing code with Vim, we recommend that you run @code{:set
873autoindent} so that your code is automatically indented as you type.
874Additionally,
875@uref{https://www.vim.org/scripts/script.php?script_id=3998,
876@code{paredit.vim}} may help you deal with all these parentheses.
877
8c01b9d0
ML
878We require all top-level procedures to carry a docstring. This
879requirement can be relaxed for simple private procedures in the
880@code{(guix build @dots{})} name space, though.
881
882Procedures should not have more than four positional parameters. Use
883keyword parameters for procedures that take more than four parameters.
884
885
886@node Submitting Patches
887@section Submitting Patches
888
889Development is done using the Git distributed version control system.
890Thus, access to the repository is not strictly necessary. We welcome
891contributions in the form of patches as produced by @code{git
230efa87 892format-patch} sent to the @email{guix-patches@@gnu.org} mailing list.
2d315cd4
LC
893Seasoned Guix developers may also want to look at the section on commit
894access (@pxref{Commit Access}).
230efa87 895
a7bde77d
LC
896This mailing list is backed by a Debbugs instance, which allows us to
897keep track of submissions (@pxref{Tracking Bugs and Patches}). Each
898message sent to that mailing list gets a new tracking number assigned;
899people can then follow up on the submission by sending email to
900@code{@var{NNN}@@debbugs.gnu.org}, where @var{NNN} is the tracking
901number (@pxref{Sending a Patch Series}).
230efa87 902
8c01b9d0
ML
903Please write commit logs in the ChangeLog format (@pxref{Change Logs,,,
904standards, GNU Coding Standards}); you can check the commit history for
905examples.
906
907Before submitting a patch that adds or modifies a package definition,
fcc58db6
LC
908please run through this check list:
909
910@enumerate
308c08d3
RW
911@item
912If the authors of the packaged software provide a cryptographic
913signature for the release tarball, make an effort to verify the
914authenticity of the archive. For a detached GPG signature file this
915would be done with the @code{gpg --verify} command.
916
cbd02397
LC
917@item
918Take some time to provide an adequate synopsis and description for the
919package. @xref{Synopses and Descriptions}, for some guidelines.
920
fcc58db6
LC
921@item
922Run @code{guix lint @var{package}}, where @var{package} is the
8c01b9d0 923name of the new or modified package, and fix any errors it reports
fcc58db6
LC
924(@pxref{Invoking guix lint}).
925
926@item
927Make sure the package builds on your platform, using @code{guix build
928@var{package}}.
929
89339a35
DM
930@item
931We recommend you also try building the package on other supported
932platforms. As you may not have access to actual hardware platforms, we
933recommend using the @code{qemu-binfmt-service-type} to emulate them. In
934order to enable it, add the following service to the list of services in
935your @code{operating-system} configuration:
936
8ba31e8b 937@lisp
89339a35
DM
938(service qemu-binfmt-service-type
939 (qemu-binfmt-configuration
b28e4e3c 940 (platforms (lookup-qemu-platforms "arm" "aarch64" "mips64el"))
89339a35 941 (guix-support? #t)))
8ba31e8b 942@end lisp
89339a35
DM
943
944Then reconfigure your system.
945
946You can then build packages for different platforms by specifying the
947@code{--system} option. For example, to build the "hello" package for
b28e4e3c
EF
948the armhf, aarch64, or mips64 architectures, you would run the following
949commands, respectively:
89339a35
DM
950@example
951guix build --system=armhf-linux --rounds=2 hello
952guix build --system=aarch64-linux --rounds=2 hello
89339a35
DM
953guix build --system=mips64el-linux --rounds=2 hello
954@end example
955
d222522e
LC
956@item
957@cindex bundling
958Make sure the package does not use bundled copies of software already
959available as separate packages.
960
961Sometimes, packages include copies of the source code of their
962dependencies as a convenience for users. However, as a distribution, we
963want to make sure that such packages end up using the copy we already
964have in the distribution, if there is one. This improves resource usage
965(the dependency is built and stored only once), and allows the
966distribution to make transverse changes such as applying security
967updates for a given software package in a single place and have them
968affect the whole system---something that bundled copies prevent.
969
fcc58db6
LC
970@item
971Take a look at the profile reported by @command{guix size}
972(@pxref{Invoking guix size}). This will allow you to notice references
973to other packages unwillingly retained. It may also help determine
974whether to split the package (@pxref{Packages with Multiple Outputs}),
024e358c 975and which optional dependencies should be used. In particular, avoid adding
0afeb746
PN
976@code{texlive} as a dependency: because of its extreme size, use
977@code{texlive-tiny} or @code{texlive-union} instead.
fcc58db6
LC
978
979@item
980For important changes, check that dependent package (if applicable) are
981not affected by the change; @code{guix refresh --list-dependent
8c01b9d0
ML
982@var{package}} will help you do that (@pxref{Invoking guix refresh}).
983
916b5eba
LC
984@c See <https://lists.gnu.org/archive/html/guix-devel/2016-10/msg00933.html>.
985@cindex branching strategy
986@cindex rebuild scheduling strategy
987Depending on the number of dependent packages and thus the amount of
988rebuilding induced, commits go to different branches, along these lines:
989
990@table @asis
991@item 300 dependent packages or less
992@code{master} branch (non-disruptive changes).
993
994@item between 300 and 1,200 dependent packages
995@code{staging} branch (non-disruptive changes). This branch is intended
996to be merged in @code{master} every 3 weeks or so. Topical changes
997(e.g., an update of the GNOME stack) can instead go to a specific branch
998(say, @code{gnome-updates}).
999
1000@item more than 1,200 dependent packages
1001@code{core-updates} branch (may include major and potentially disruptive
1002changes). This branch is intended to be merged in @code{master} every
10032.5 months or so.
1004@end table
1005
44b5f28a 1006All these branches are @uref{@value{SUBSTITUTE-SERVER},
38ab778f 1007tracked by our build farm} and merged into @code{master} once
189b1543
LC
1008everything has been successfully built. This allows us to fix issues
1009before they hit users, and to reduce the window during which pre-built
1010binaries are not available.
1011
38ab778f
MB
1012Generally, branches other than @code{master} are considered
1013@emph{frozen} if there has been a recent evaluation, or there is a
1014corresponding @code{-next} branch. Please ask on the mailing list or
1015IRC if unsure where to place a patch.
1016@c TODO: It would be good with badges on the website that tracks these
1017@c branches. Or maybe even a status page.
1018
d23c20f1 1019@item
5b74fe06
LC
1020@cindex determinism, of build processes
1021@cindex reproducible builds, checking
d23c20f1
LC
1022Check whether the package's build process is deterministic. This
1023typically means checking whether an independent build of the package
1024yields the exact same result that you obtained, bit for bit.
1025
5b74fe06
LC
1026A simple way to do that is by building the same package several times in
1027a row on your machine (@pxref{Invoking guix build}):
1028
1029@example
1030guix build --rounds=2 my-package
1031@end example
1032
1033This is enough to catch a class of common non-determinism issues, such
1034as timestamps or randomly-generated output in the build result.
1035
1036Another option is to use @command{guix challenge} (@pxref{Invoking guix
1037challenge}). You may run it once the package has been committed and
0bc02bec 1038built by @code{@value{SUBSTITUTE-SERVER}} to check whether it obtains the same
5b74fe06
LC
1039result as you did. Better yet: Find another machine that can build it
1040and run @command{guix publish}. Since the remote build machine is
1041likely different from yours, this can catch non-determinism issues
1042related to the hardware---e.g., use of different instruction set
1043extensions---or to the operating system kernel---e.g., reliance on
1044@code{uname} or @file{/proc} files.
d23c20f1 1045
3c2d03a2
LC
1046@item
1047When writing documentation, please use gender-neutral wording when
1048referring to people, such as
1049@uref{https://en.wikipedia.org/wiki/Singular_they, singular
1050``they''@comma{} ``their''@comma{} ``them''}, and so forth.
1051
3a78fab8 1052@item
1053Verify that your patch contains only one set of related changes.
1054Bundling unrelated changes together makes reviewing harder and slower.
1055
1056Examples of unrelated changes include the addition of several packages,
1057or a package update along with fixes to that package.
1058
7bb2b10c
LC
1059@item
1060Please follow our code formatting rules, possibly running the
557d9c8d 1061@command{etc/indent-code.el} script to do that automatically for you
7bb2b10c
LC
1062(@pxref{Formatting Code}).
1063
4feb589b
PN
1064@item
1065When possible, use mirrors in the source URL (@pxref{Invoking guix download}).
1066Use reliable URLs, not generated ones. For instance, GitHub archives are not
1067necessarily identical from one generation to the next, so in this case it's
1068often better to clone the repository. Don't use the @command{name} field in
1069the URL: it is not very useful and if the name changes, the URL will probably
1070be wrong.
1071
bf99d7e0 1072@item
da31e7d9
PN
1073Check if Guix builds (@pxref{Building from Git}) and address the
1074warnings, especially those about use of undefined symbols.
bf99d7e0 1075
9fcf2820
PN
1076@item
1077Make sure your changes do not break Guix and simulate a @code{guix pull} with:
1078@example
1079guix pull --url=/path/to/your/checkout --profile=/tmp/guix.master
1080@end example
1081
fcc58db6
LC
1082@end enumerate
1083
a40424bd
CM
1084When posting a patch to the mailing list, use @samp{[PATCH] @dots{}} as
1085a subject. You may use your email client or the @command{git
5a183a1e
JN
1086send-email} command (@pxref{Sending a Patch Series}). We prefer to get
1087patches in plain text messages, either inline or as MIME attachments.
1088You are advised to pay attention if your email client changes anything
1089like line breaks or indentation which could potentially break the
1090patches.
1091
4619b59c
JN
1092When a bug is resolved, please close the thread by sending an email to
1093@email{@var{NNN}-done@@debbugs.gnu.org}.
1094
5a183a1e
JN
1095@unnumberedsubsec Sending a Patch Series
1096@anchor{Sending a Patch Series}
1097@cindex patch series
1098@cindex @code{git send-email}
1099@cindex @code{git-send-email}
1100
1101When sending a patch series (e.g., using @code{git send-email}), please
1102first send one message to @email{guix-patches@@gnu.org}, and then send
1103subsequent patches to @email{@var{NNN}@@debbugs.gnu.org} to make sure
1104they are kept together. See
1105@uref{https://debbugs.gnu.org/Advanced.html, the Debbugs documentation}
fb8b99a5
AB
1106for more information. You can install @command{git send-email} with
1107@command{guix install git:send-email}.
5a183a1e 1108@c Debbugs bug: https://debbugs.gnu.org/db/15/15361.html
a7bde77d
LC
1109
1110@node Tracking Bugs and Patches
1111@section Tracking Bugs and Patches
1112
1113@cindex bug reports, tracking
1114@cindex patch submissions, tracking
1115@cindex issue tracking
1116@cindex Debbugs, issue tracking system
1117Bug reports and patch submissions are currently tracked using the
1118Debbugs instance at @uref{https://bugs.gnu.org}. Bug reports are filed
1119against the @code{guix} ``package'' (in Debbugs parlance), by sending
1120email to @email{bug-guix@@gnu.org}, while patch submissions are filed
1121against the @code{guix-patches} package by sending email to
1122@email{guix-patches@@gnu.org} (@pxref{Submitting Patches}).
1123
1124A web interface (actually @emph{two} web interfaces!) are available to
1125browse issues:
1126
1127@itemize
1128@item
1129@url{https://bugs.gnu.org/guix} lists bug reports;
1130@item
1131@url{https://bugs.gnu.org/guix-patches} lists patch submissions.
1132@end itemize
1133
1134You can also access both of these @i{via} the (nicer)
1135@url{https://issues.guix.gnu.org} interface@footnote{The web interface
1136at @url{https://issues.guix.gnu.org} is powered by Mumi, a nice piece of
1137software written in Guile, and you can help! See
1138@url{https://git.elephly.net/gitweb.cgi?p=software/mumi.git}.}. To view
1139discussions related to issue number @var{n}, go to
1140@indicateurl{https://issues.guix.gnu.org/issue/@var{n}} or
1141@indicateurl{https://bugs.gnu.org/@var{n}}.
1142
1143If you use Emacs, you may find it more convenient to interact with
1144issues using @file{debbugs.el}, which you can install with:
1145
1146@example
1147guix install emacs-debbugs
1148@end example
1149
1150For example, to list all open issues on @code{guix-patches}, hit:
1151
1152@example
1153@kbd{C-u} @kbd{M-x} debbugs-gnu @kbd{RET} @kbd{RET} guix-patches @kbd{RET} n y
1154@end example
1155
1156@xref{Top,,, debbugs-ug, Debbugs User Guide}, for more information on
1157this nifty tool!
2d315cd4
LC
1158
1159@node Commit Access
1160@section Commit Access
1161
1162@cindex commit access, for developers
1163For frequent contributors, having write access to the repository is
ef09cb86
LC
1164convenient. When you deem it necessary, consider applying for commit
1165access by following these steps:
1166
1167@enumerate
1168@item
1169Find three committers who would vouch for you. You can view the list of
1170committers at
1171@url{https://savannah.gnu.org/project/memberlist.php?group=guix}. Each
1172of them should email a statement to @email{guix-maintainers@@gnu.org} (a
1173private alias for the collective of maintainers), signed with their
1174OpenPGP key.
1175
1176Committers are expected to have had some interactions with you as a
1177contributor and to be able to judge whether you are sufficiently
1178familiar with the project's practices. It is @emph{not} a judgment on
1179the value of your work, so a refusal should rather be interpreted as
1180``let's try again later''.
1181
1182@item
1183Send @email{guix-maintainers@@gnu.org} a message stating your intent,
1184listing the three committers who support your application, signed with
1185the OpenPGP key you will use to sign commits, and giving its fingerprint
1186(see below). See @uref{https://emailselfdefense.fsf.org/en/}, for an
1187introduction to public-key cryptography with GnuPG.
1188
1189@item
1190Maintainers ultimately decide whether to grant you commit access,
1191usually following your referrals' recommendation.
1192
1193@item
1194If and once you've been given access, please send a message to
1195@email{guix-devel@@gnu.org} to say so, again signed with the OpenPGP key
1196you will use to sign commits (do that before pushing your first commit).
1197That way, everyone can notice and ensure you control that OpenPGP key.
1198
1199@c TODO: Add note about adding the fingerprint to the list of authorized
1200@c keys once that has stabilized.
1201
1202@item
1203Make sure to read the rest of this section and... profit!
1204@end enumerate
1205
1206@quotation Note
1207Maintainers are happy to give commit access to people who have been
1208contributing for some time and have a track record---don't be shy and
1209don't underestimate your work!
1210
1211However, note that the project is working towards a more automated patch
1212review and merging system, which, as a consequence, may lead us to have
1213fewer people with commit access to the main repository. Stay tuned!
1214@end quotation
1215
1216If you get commit access, please make sure to follow
2d315cd4
LC
1217the policy below (discussions of the policy can take place on
1218@email{guix-devel@@gnu.org}).
1219
1220Non-trivial patches should always be posted to
1221@email{guix-patches@@gnu.org} (trivial patches include fixing typos,
1222etc.). This mailing list fills the patch-tracking database
1223(@pxref{Tracking Bugs and Patches}).
1224
1225For patches that just add a new package, and a simple one, it's OK to
1226commit, if you're confident (which means you successfully built it in a
1227chroot setup, and have done a reasonable copyright and license
1228auditing). Likewise for package upgrades, except upgrades that trigger
1229a lot of rebuilds (for example, upgrading GnuTLS or GLib). We have a
1230mailing list for commit notifications (@email{guix-commits@@gnu.org}),
1231so people can notice. Before pushing your changes, make sure to run
1232@code{git pull --rebase}.
1233
1234All commits that are pushed to the central repository on Savannah must
1235be signed with an OpenPGP key, and the public key should be uploaded to
1236your user account on Savannah and to public key servers, such as
1237@code{keys.openpgp.org}. To configure Git to automatically sign
1238commits, run:
1239
1240@example
1241git config commit.gpgsign true
1242git config user.signingkey CABBA6EA1DC0FF33
1243@end example
1244
1245You can prevent yourself from accidentally pushing unsigned commits to
1246Savannah by using the pre-push Git hook called located at
1247@file{etc/git/pre-push}:
1248
1249@example
1250cp etc/git/pre-push .git/hooks/pre-push
1251@end example
1252
1253When pushing a commit on behalf of somebody else, please add a
1254@code{Signed-off-by} line at the end of the commit log message---e.g.,
1255with @command{git am --signoff}. This improves tracking of who did
1256what.
1257
1258For anything else, please post to @email{guix-patches@@gnu.org} and
1259leave time for a review, without committing anything (@pxref{Submitting
1260Patches}). If you didn’t receive any reply after two weeks, and if
1261you're confident, it's OK to commit.
1262
1263That last part is subject to being adjusted, allowing individuals to commit
1264directly on non-controversial changes on parts they’re familiar with.
98ebcf1c
LC
1265
1266One last thing: the project keeps moving forward because committers not
1267only push their own awesome changes, but also offer some of their time
1268@emph{reviewing} and pushing other people's changes. As a committer,
1269you're welcome to use your expertise and commit rights to help other
1270contributors, too!