diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2019-10-06 22:02:20 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2019-10-06 22:02:20 +0200 |
| commit | e08902d3cbb307e1523485becbbdaf9aed56ac4a (patch) | |
| tree | ca79454c4146f37c0e0f4d354d434816928812ed /doc | |
| parent | 1714edc3d4e8d6da1b0cdef300ae882d0885f182 (diff) | |
| parent | f58702465d0b2daab1775d29439b73b4486a108a (diff) | |
| download | patches-e08902d3cbb307e1523485becbbdaf9aed56ac4a.tar patches-e08902d3cbb307e1523485becbbdaf9aed56ac4a.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/guix.texi | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 2aa3b11f07..97d797c13f 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -9083,6 +9083,16 @@ The crate importer also allows you to specify a version string: guix import crate constant-time-eq@@0.1.0 @end example +Additional options include: + +@table @code +@item --recursive +@itemx -r +Traverse the dependency graph of the given upstream package recursively +and generate package expressions for all those packages that are not yet +in Guix. +@end table + @item opam @cindex OPAM @cindex OCaml @@ -19409,13 +19419,13 @@ Other services can also extend the @code{httpd-service-type} to add to the configuration. @lisp -(simple-service 'my-extra-server httpd-service-type +(simple-service 'www.example.com-server httpd-service-type (list (httpd-virtualhost "*:80" - (list (string-append - "ServerName "www.example.com - DocumentRoot \"/srv/http/www.example.com\""))))) + (list (string-join '("ServerName www.example.com" + "DocumentRoot /srv/http/www.example.com") + "\n"))))) @end lisp @end deffn @@ -19549,13 +19559,13 @@ This data type represents a virtualhost configuration block for the httpd servic These should be added to the extra-config for the httpd-service. @lisp -(simple-service 'my-extra-server httpd-service-type +(simple-service 'www.example.com-server httpd-service-type (list (httpd-virtualhost "*:80" - (list (string-append - "ServerName "www.example.com - DocumentRoot \"/srv/http/www.example.com\""))))) + (list (string-join '("ServerName www.example.com" + "DocumentRoot /srv/http/www.example.com") + "\n"))))) @end lisp @table @asis |