Merge branch 'master' into core-updates

32cd878b · Marius Bakke <[email protected]> · 2017-12-19 01:42:40 +01:00

Commit: 32cd878be0bb7e153fcaa6f3bfa2632867390ff9
Parents: 75342561 · 98bd11cf

Merge commit. Changes below are compared with the first parent: 75342561.

Changes

159 files changed · +24714 −3245

File	Status	Add	Del	Content
Makefile.am	modified	+4	−1	View file
build-aux/build-self.scm	modified	+1	−0	View file
build-aux/hydra/gnu-system.scm	modified	+13	−4	View file
doc/contributing.texi	modified	+28	−0	View file
doc/guix.texi	modified	+186	−31	View file
etc/snippets/scheme-mode/guix-cvs-reference	added	+8	−0	View file
etc/snippets/scheme-mode/guix-git-reference	added	+7	−0	View file
etc/snippets/scheme-mode/guix-hg-reference	added	+7	−0	View file
etc/snippets/scheme-mode/guix-origin	added	+23	−0	View file
etc/snippets/scheme-mode/guix-package	added	+34	−0	View file
etc/snippets/scheme-mode/guix-svn-reference	added	+7	−0	View file
etc/snippets/text-mode/guix-commit-message-add-package	added	+8	−0	View file
etc/snippets/text-mode/guix-commit-message-update-package	added	+9	−0	View file
gnu/bootloader/extlinux.scm	modified	+3	−7	View file
gnu/bootloader/u-boot.scm	modified	+24	−1	View file
gnu/build/bootloader.scm	added	+37	−0	View file
gnu/build/linux-boot.scm	modified	+107	−0	View file
gnu/build/vm.scm	modified	+34	−10	View file
gnu/local.mk	modified	+13	−13	View file
gnu/packages/algebra.scm	modified	+18	−9	View file
gnu/packages/aspell.scm	modified	+34	−34	View file
gnu/packages/audio.scm	modified	+136	−1	View file
gnu/packages/axoloti.scm	modified	+1	−1	View file
gnu/packages/backup.scm	modified	+1	−0	View file
gnu/packages/bioinformatics.scm	modified	+96	−78	View file
gnu/packages/build-tools.scm	modified	+3	−2	View file
gnu/packages/chez.scm	modified	+12	−3	View file
gnu/packages/code.scm	modified	+3	−3	View file
gnu/packages/compression.scm	modified	+2	−2	View file
gnu/packages/cran.scm	modified	+131	−0	View file
gnu/packages/crypto.scm	modified	+2	−2	View file
gnu/packages/cups.scm	modified	+15	−8	View file
gnu/packages/databases.scm	modified	+1	−1	View file
gnu/packages/datastructures.scm	modified	+55	−0	View file
gnu/packages/dictionaries.scm	modified	+40	−0	View file
gnu/packages/emacs.scm	modified	+167	−11	View file
gnu/packages/embedded.scm	modified	+38	−0	View file
gnu/packages/erlang.scm	modified	+5	−4	View file
gnu/packages/fontutils.scm	modified	+6	−2	View file
gnu/packages/fvwm.scm	modified	+4	−4	View file
gnu/packages/game-development.scm	modified	+5	−4	View file
gnu/packages/games.scm	modified	+44	−0	View file
gnu/packages/gl.scm	modified	+35	−0	View file
gnu/packages/gnome.scm	modified	+3	−3	View file
gnu/packages/gnunet.scm	modified	+4	−5	View file
gnu/packages/gnupg.scm	modified	+5	−2	View file
gnu/packages/gnuzilla.scm	modified	+2	−1	View file
gnu/packages/graph.scm	modified	+26	−0	View file
gnu/packages/gstreamer.scm	modified	+16	−25	View file
gnu/packages/gtk.scm	modified	+3	−2	View file
gnu/packages/guile.scm	modified	+13	−6	View file
gnu/packages/haskell.scm	modified	+2	−2	View file
gnu/packages/image.scm	modified	+2	−2	View file
gnu/packages/imagemagick.scm	modified	+2	−12	View file
gnu/packages/jemalloc.scm	modified	+19	−1	View file
gnu/packages/kde.scm	modified	+93	−1	View file
gnu/packages/language.scm	modified	+6	−5	View file
gnu/packages/linux.scm	modified	+127	−10	View file
gnu/packages/machine-learning.scm	modified	+3	−1	View file
gnu/packages/mail.scm	modified	+56	−16	View file
gnu/packages/maths.scm	modified	+4	−4	View file
gnu/packages/messaging.scm	modified	+1	−1	View file
gnu/packages/mpd.scm	modified	+2	−2	View file
gnu/packages/music.scm	modified	+273	−70	View file
gnu/packages/networking.scm	modified	+7	−6	View file
gnu/packages/nutrition.scm	modified	+8	−1	View file
gnu/packages/package-management.scm	modified	+3	−3	View file
gnu/packages/password-utils.scm	modified	+5	−0	View file
gnu/packages/patches/borg-fix-archive-corruption-bug.patch	added	+68	−0	View file
gnu/packages/patches/eigen-arm-neon-fixes.patch	added	+245	−0	View file
gnu/packages/patches/graphicsmagick-CVE-2017-11403+CVE-2017-14103.patch	deleted	+0	−137	View before deletion
gnu/packages/patches/graphicsmagick-CVE-2017-12935.patch	deleted	+0	−28	View before deletion
gnu/packages/patches/graphicsmagick-CVE-2017-12936.patch	deleted	+0	−16	View before deletion
gnu/packages/patches/graphicsmagick-CVE-2017-12937.patch	deleted	+0	−28	View before deletion
gnu/packages/patches/graphicsmagick-CVE-2017-13775.patch	deleted	+0	−195	View before deletion
gnu/packages/patches/graphicsmagick-CVE-2017-13776+CVE-2017-13777.patch	deleted	+0	−179	View before deletion
gnu/packages/patches/graphicsmagick-CVE-2017-14042.patch	deleted	+0	−80	View before deletion
gnu/packages/patches/graphicsmagick-CVE-2017-14165.patch	deleted	+0	−72	View before deletion
gnu/packages/patches/graphicsmagick-CVE-2017-14649.patch	deleted	+0	−210	View before deletion
gnu/packages/patches/jemalloc-arm-address-bits.patch	added	+39	−0	View file
gnu/packages/patches/libvdpau-va-gl-unbundle.patch	added	+35	−0	View file
gnu/packages/patches/picprog-non-intel-support.patch	added	+74	−0	View file
gnu/packages/patches/python-scikit-learn-fix-test-non-determinism.patch	added	+25	−0	View file
gnu/packages/patches/qemu-CVE-2017-15118.patch	deleted	+0	−58	View before deletion
gnu/packages/patches/qemu-CVE-2017-15119.patch	deleted	+0	−68	View before deletion
gnu/packages/patches/qemu-CVE-2017-15268.patch	deleted	+0	−62	View before deletion
gnu/packages/patches/rsync-CVE-2017-16548.patch	added	+31	−0	View file
gnu/packages/patches/rsync-CVE-2017-17433-fix-tests.patch	added	+42	−0	View file
gnu/packages/patches/rsync-CVE-2017-17433.patch	added	+45	−0	View file
gnu/packages/patches/rsync-CVE-2017-17434-pt1.patch	added	+28	−0	View file
gnu/packages/patches/rsync-CVE-2017-17434-pt2.patch	added	+39	−0	View file
gnu/packages/patches/t1lib-CVE-2011-1552+CVE-2011-1553+CVE-2011-1554.patch → gnu/packages/patches/t1lib-CVE-2011-1552+.patch	renamed	+0	−0	View file
gnu/packages/perl-check.scm	modified	+20	−17	View file
gnu/packages/perl.scm	modified	+22	−0	View file
gnu/packages/photo.scm	modified	+3	−3	View file
gnu/packages/popt.scm	modified	+3	−2	View file
gnu/packages/python.scm	modified	+34	−3	View file
gnu/packages/rsync.scm	modified	+10	−1	View file
gnu/packages/ruby.scm	modified	+25	−4	View file
gnu/packages/rust.scm	modified	+932	−375	View file
gnu/packages/search.scm	modified	+4	−3	View file
gnu/packages/security-token.scm	modified	+5	−5	View file
gnu/packages/shells.scm	modified	+7	−5	View file
gnu/packages/skarnet.scm	modified	+2	−2	View file
gnu/packages/sml.scm	modified	+3	−2	View file
gnu/packages/statistics.scm	modified	+8	−7	View file
gnu/packages/tcl.scm	modified	+2	−2	View file
gnu/packages/terminals.scm	modified	+2	−2	View file
gnu/packages/tex.scm	modified	+9	−6	View file
gnu/packages/text-editors.scm	modified	+9	−4	View file
gnu/packages/tls.scm	modified	+22	−2	View file
gnu/packages/upnp.scm	modified	+4	−3	View file
gnu/packages/version-control.scm	modified	+62	−1	View file
gnu/packages/video.scm	modified	+39	−17	View file
gnu/packages/virtualization.scm	modified	+71	−6	View file
gnu/packages/web.scm	modified	+30	−0	View file
gnu/packages/wine.scm	modified	+13	−3	View file
gnu/packages/wm.scm	modified	+117	−2	View file
gnu/packages/xdisorg.scm	modified	+4	−4	View file
gnu/packages/xfig.scm	modified	+22	−83	View file
gnu/packages/xorg.scm	modified	+28	−27	View file
gnu/services.scm	modified	+2	−1	View file
gnu/services/base.scm	modified	+15	−1	View file
gnu/services/certbot.scm	modified	+3	−3	View file
gnu/services/version-control.scm	modified	+2	−1	View file
gnu/services/web.scm	modified	+350	−92	View file
gnu/system/examples/beaglebone-black.tmpl	added	+54	−0	View file
gnu/system/install.scm	modified	+29	−2	View file
gnu/system/vm.scm	modified	+12	−4	View file
gnu/tests/version-control.scm	modified	+3	−4	View file
gnu/tests/web.scm	modified	+123	−5	View file
guix/build-system/asdf.scm	modified	+62	−62	View file
guix/build/ant-build-system.scm	modified	+5	−2	View file
guix/build/download.scm	modified	+3	−3	View file
guix/derivations.scm	modified	+37	−24	View file
guix/gexp.scm	modified	+11	−5	View file
guix/gnu-maintenance.scm	modified	+3	−0	View file
guix/licenses.scm	modified	+7	−0	View file
guix/man-db.scm	added	+200	−0	View file
guix/memoization.scm	modified	+135	−22	View file
guix/profiles.scm	modified	+50	−60	View file
guix/profiling.scm	added	+52	−0	View file
guix/progress.scm	modified	+6	−6	View file
guix/scripts/archive.scm	modified	+1	−0	View file
guix/scripts/copy.scm	modified	+1	−0	View file
guix/scripts/environment.scm	modified	+1	−0	View file
guix/scripts/gc.scm	modified	+21	−10	View file
guix/scripts/lint.scm	modified	+10	−3	View file
guix/scripts/offload.scm	modified	+39	−0	View file
guix/scripts/pack.scm	modified	+1	−0	View file
guix/scripts/package.scm	modified	+2	−1	View file
guix/scripts/pull.scm	modified	+1	−0	View file
guix/scripts/system.scm	modified	+27	−9	View file
guix/store.scm	modified	+9	−10	View file
guix/ui.scm	modified	+23	−1	View file
guix/utils.scm	modified	+5	−0	View file
po/packages/hu.po	modified	+19116	−773	View file
tests/guix-gc.sh	modified	+3	−0	View file
tests/lint.scm	modified	+15	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

Makefile.am

View file

diff --git a/Makefile.am b/Makefile.am
index e9c323b..f992151 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,7 +34,8 @@ nodist_noinst_SCRIPTS =				\
 
 # Modules that are not compiled but are installed nonetheless, such as
 # build-side modules with unusual dependencies.
-MODULES_NOT_COMPILED =
+MODULES_NOT_COMPILED =				\
+  guix/man-db.scm
 
 include gnu/local.mk
 
@@ -102,6 +103,7 @@ MODULES =					\
   guix/http-client.scm				\
   guix/gnupg.scm				\
   guix/elf.scm					\
+  guix/profiling.scm				\
   guix/store.scm				\
   guix/cvs-download.scm				\
   guix/svn-download.scm				\
@@ -252,6 +254,7 @@ AUX_FILES =						\
 # Templates, examples.
 EXAMPLES =					\
   gnu/system/examples/bare-bones.tmpl		\
+  gnu/system/examples/beaglebone-black.tmpl	\
   gnu/system/examples/desktop.tmpl		\
   gnu/system/examples/lightweight-desktop.tmpl	\
   gnu/system/examples/vm-image.tmpl

build-aux/build-self.scm

View file

diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm
index 6415978..17d947b 100644
--- a/build-aux/build-self.scm
+++ b/build-aux/build-self.scm
@@ -267,6 +267,7 @@ Please upgrade to an intermediate version first, for instance with:
                                   ;; Closure of (guix modules).
                                   (guix modules)
                                   (guix memoization)
+                                  (guix profiling)
                                   (guix sets))
 
                       ;; Arrange so that our own (guix build …) modules are

build-aux/hydra/gnu-system.scm

View file

diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm
index d9b9c55..04845a3 100644
--- a/build-aux/hydra/gnu-system.scm
+++ b/build-aux/hydra/gnu-system.scm
@@ -22,12 +22,14 @@
 ;;; tool.
 ;;;
 
-;; Attempt to use our very own Guix modules.
+(use-modules (system base compile))
+
 (eval-when (compile load eval)
 
-  ;; Ignore any available .go, and force recompilation.  This is because our
-  ;; checkout in the store has mtime set to the epoch, and thus .go files look
-  ;; newer, even though they may not correspond.
+  ;; Pre-load the compiler so we don't end up auto-compiling it.
+  (compile #t)
+
+  ;; Use our very own Guix modules.
   (set! %fresh-auto-compile #t)
 
   (and=> (assoc-ref (current-source-location) 'filename)
@@ -334,6 +336,13 @@ valid."
   (parameterize ((%graft? #f))
     ;; Return one job for each package, except bootstrap packages.
     (append-map (lambda (system)
+                  (format (current-error-port)
+                          "evaluating for '~a' (heap size: ~a MiB)...~%"
+                          system
+                          (round
+                           (/ (assoc-ref (gc-stats) 'heap-size)
+                              (expt 2. 20))))
+                  (invalidate-derivation-caches!)
                   (case subset
                     ((all)
                      ;; Build everything, including replacements.

doc/contributing.texi

View file

diff --git a/doc/contributing.texi b/doc/contributing.texi
index 1dd3ea8..01f8aad 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -193,6 +193,34 @@ 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.
 
+@cindex code snippets
+@cindex templates
+@cindex reducing boilerplate
+We also provide templates for common git commit messages and package
+definitions in the @file{etc/snippets} directory.  These templates can
+be used with @url{http://joaotavora.github.io/yasnippet/, YASnippet} to
+expand short trigger strings to interactive text snippets.  You may want
+to add the snippets directory to the @var{yas-snippet-dirs} variable in
+Emacs.
+
+@lisp
+;; @r{Assuming the Guix checkout is in ~/src/guix.}
+(with-eval-after-load 'yasnippet
+  (add-to-list 'yas-snippet-dirs "~/src/guix/etc/snippets"))
+@end lisp
+
+The commit message snippets depend on @url{https://magit.vc/, Magit} to
+display staged files.  When editing a commit message type @code{add}
+followed by @kbd{TAB} to insert a commit message template for adding a
+package; type @code{update} followed by @kbd{TAB} to insert a template
+for updating a package.
+
+The main snippet for @code{scheme-mode} is triggered by typing
+@code{package...} followed by @kbd{TAB}.  This snippet also inserts the
+trigger string @code{origin...}, which can be expanded further.  The
+@code{origin} snippet in turn may insert other trigger strings ending on
+@code{...}, which also can be expanded further.
+
 
 @node Coding Style
 @section Coding Style

doc/guix.texi

View file

diff --git a/doc/guix.texi b/doc/guix.texi
index c14df7f..3bb29db 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -43,7 +43,8 @@ Copyright @copyright{} 2017 Maxim Cournoyer@*
 Copyright @copyright{} 2017 Tobias Geerinckx-Rice@*
 Copyright @copyright{} 2017 George Clemmer@*
 Copyright @copyright{} 2017 Andy Wingo@*
-Copyright @copyright{} 2017 Arun Isaac
+Copyright @copyright{} 2017 Arun Isaac@*
+Copyright @copyright{} 2017 nee
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -1065,6 +1066,15 @@ regular expression like this:
 # guix offload test machines.scm '\.gnu\.org$'
 @end example
 
+@cindex offload status
+To display the current load of all build hosts, run this command on the
+main node:
+
+@example
+# guix offload status
+@end example
+
+
 @node Invoking guix-daemon
 @section Invoking @command{guix-daemon}
 
@@ -1550,7 +1560,7 @@ features.
 This chapter describes the main features of Guix, as well as the
 package management tools it provides.  Along with the command-line
 interface described below (@pxref{Invoking guix package, @code{guix
-package}}), you may also use Emacs Interface (@pxref{Top,,,
+package}}), you may also use the Emacs-Guix interface (@pxref{Top,,,
 emacs-guix, The Emacs-Guix Reference Manual}), after installing
 @code{emacs-guix} package (run @kbd{M-x guix-help} command to start
 with it):
@@ -8690,6 +8700,9 @@ also specified.  @xref{Mapped Devices} and @ref{File Systems}.
 @itemx @code{groups} (default: @var{%base-groups})
 List of user accounts and groups.  @xref{User Accounts}.
 
+If the @code{users} list lacks a user account with UID@tie{}0, a
+``root'' account with UID@tie{}0 is automatically added.
+
 @item @code{skeletons} (default: @code{(default-skeletons)})
 A list target file name/file-like object tuples (@pxref{G-Expressions,
 file-like objects}).  These are the skeleton files that will be added to
@@ -14813,10 +14826,7 @@ A simple example configuration is given below.
            (server-blocks
              (list (nginx-server-configuration
                      (server-name '("www.example.com"))
-                     (root "/srv/http/www.example.com")
-                     (https-port #f)
-                     (ssl-certificate #f)
-                     (ssl-certificate-key #f))))))
+                     (root "/srv/http/www.example.com"))))))
 @end example
 
 In addition to adding server blocks to the service configuration
@@ -14826,9 +14836,6 @@ blocks, as in this example:
 @example
 (simple-service 'my-extra-server nginx-service-type
                 (list (nginx-server-configuration
-                        (https-port #f)
-                        (ssl-certificate #f)
-                        (ssl-certificate-key #f)
                         (root "/srv/http/extra-website")
                         (try-files (list "$uri" "$uri/index.html")))))
 @end example
@@ -14873,10 +14880,7 @@ HTTPS.
            (server-blocks
              (list (nginx-server-configuration
                      (server-name '("www.example.com"))
-                     (root "/srv/http/www.example.com")
-                     (https-port #f)
-                     (ssl-certificate #f)
-                     (ssl-certificate-key #f))))))
+                     (root "/srv/http/www.example.com"))))))
 @end example
 
 @item @code{upstream-blocks} (default: @code{'()})
@@ -14899,9 +14903,6 @@ requests with two servers.
       (list (nginx-server-configuration
               (server-name '("www.example.com"))
               (root "/srv/http/www.example.com")
-              (https-port #f)
-              (ssl-certificate #f)
-              (ssl-certificate-key #f)
               (locations
                 (list
                   (nginx-location-configuration
@@ -14925,6 +14926,13 @@ This can be useful if you have an existing configuration file, or it's
 not possible to do what is required through the other parts of the
 nginx-configuration record.
 
+@item @code{server-names-hash-bucket-size} (default: @code{#f})
+Bucket size for the server names hash tables, defaults to @code{#f} to
+use the size of the processors cache line.
+
+@item @code{server-names-hash-bucket-max-size} (default: @code{#f})
+Maximum bucket size for the server names hash tables.
+
 @end table
 @end deffn
 
@@ -14933,17 +14941,15 @@ Data type representing the configuration of an nginx server block.
 This type has the following parameters:
 
 @table @asis
-@item @code{http-port} (default: @code{80})
-Nginx will listen for HTTP connection on this port.  Set it at @code{#f} if
-nginx should not listen for HTTP (non secure) connection for this
-@dfn{server block}.
-
-@item @code{https-port} (default: @code{443})
-Nginx will listen for HTTPS connection on this port.  Set it at @code{#f} if
-nginx should not listen for HTTPS (secure) connection for this @dfn{server block}.
+@item @code{listen} (default: @code{'("80" "443 ssl")})
+Each @code{listen} directive sets the address and port for IP, or the
+path for a UNIX-domain socket on which the server will accept requests.
+Both address and port, or only address or only port can be specified.
+An address may also be a hostname, for example:
 
-Note that nginx can listen for HTTP and HTTPS connections in the same
-@dfn{server block}.
+@example
+'("127.0.0.1:8000" "127.0.0.1" "8000" "*:8000" "localhost:8000")
+@end example
 
 @item @code{server-name} (default: @code{(list 'default)})
 A list of server names this server represents. @code{'default} represents the
@@ -14965,17 +14971,20 @@ Nginx will send the list of files in the directory.
 A list of files whose existence is checked in the specified order.
 @code{nginx} will use the first file it finds to process the request.
 
-@item @code{ssl-certificate} (default: @code{"/etc/nginx/cert.pem"})
+@item @code{ssl-certificate} (default: @code{#f})
 Where to find the certificate for secure connections.  Set it to @code{#f} if
 you don't have a certificate or you don't want to use HTTPS.
 
-@item @code{ssl-certificate-key} (default: @code{"/etc/nginx/key.pem"})
+@item @code{ssl-certificate-key} (default: @code{#f})
 Where to find the private key for secure connections.  Set it to @code{#f} if
 you don't have a key or you don't want to use HTTPS.
 
 @item @code{server-tokens?} (default: @code{#f})
 Whether the server should add its configuration to response.
 
+@item @code{raw-content} (default: @code{'()})
+A list of raw lines added to the server block.
+
 @end table
 @end deftp
 
@@ -15086,6 +15095,145 @@ capability also has to be configured on the front-end as well.
 @end table
 @end deftp
 
+@cindex php-fpm
+PHP-FPM (FastCGI Process Manager) is an alternative PHP FastCGI implementation
+with some additional features useful for sites of any size.
+
+These features include:
+@itemize @bullet
+@item Adaptive process spawning
+@item Basic statistics (similar to Apache's mod_status)
+@item Advanced process management with graceful stop/start
+@item Ability to start workers with different uid/gid/chroot/environment
+and different php.ini (replaces safe_mode)
+@item Stdout & stderr logging
+@item Emergency restart in case of accidental opcode cache destruction
+@item Accelerated upload support
+@item Support for a "slowlog"
+@item Enhancements to FastCGI, such as fastcgi_finish_request() -
+a special function to finish request & flush all data while continuing to do
+something time-consuming (video converting, stats processing, etc.)
+@end itemize
+... and much more.
+
+@defvr {Scheme Variable} php-fpm-service-type
+A Service type for @code{php-fpm}.
+@end defvr
+
+@deftp {Data Type} php-fpm-configuration
+Data Type for php-fpm service configuration.
+@table @asis
+@item @code{php} (default: @code{php})
+The php package to use.
+@item @code{socket} (default: @code{(string-append "/var/run/php" (version-major (package-version php)) "-fpm.sock")})
+The address on which to accept FastCGI requests.  Valid syntaxes are:
+@table @asis
+@item @code{"ip.add.re.ss:port"}
+Listen on a TCP socket to a specific address on a specific port.
+@item @code{"port"}
+Listen on a TCP socket to all addresses on a specific port.
+@item @code{"/path/to/unix/socket"}
+Listen on a unix socket.
+@end table
+
+@item @code{user} (default: @code{php-fpm})
+User who will own the php worker processes.
+@item @code{group} (default: @code{php-fpm})
+Group of the worker processes.
+@item @code{socket-user} (default: @code{php-fpm})
+User who can speak to the php-fpm socket.
+@item @code{socket-group} (default: @code{php-fpm})
+Group that can speak to the php-fpm socket.
+@item @code{pid-file} (default: @code{(string-append "/var/run/php" (version-major (package-version php)) "-fpm.pid")})
+The process id of the php-fpm process is written to this file
+once the service has started.
+@item @code{log-file} (default: @code{(string-append "/var/log/php" (version-major (package-version php)) "-fpm.log")})
+Log for the php-fpm master process.
+@item @code{process-manager} (default: @code{(php-fpm-dynamic-process-manager-configuration)})
+Detailed settings for the php-fpm process manager.
+Must be either:
+@table @asis
+@item @code{<php-fpm-dynamic-process-manager-configuration>}
+@item @code{<php-fpm-static-process-manager-configuration>}
+@item @code{<php-fpm-on-demand-process-manager-configuration>}
+@end table
+@item @code{display-errors} (default @code{#f})
+Determines wether php errors and warning should be sent to clients
+and displayed in their browsers.
+This is useful for local php development, but a security risk for public sites,
+as error messages can reveal passwords and personal data.
+@item @code{workers-logfile} (default @code{(string-append "/var/log/php" (version-major (package-version php)) "-fpm.www.log")})
+This file will log the @code{stderr} outputs of php worker processes.
+Can be set to @code{#f} to disable logging.
+@item @code{file} (default @code{#f})
+An optional override of the whole configuration.
+You can use the @code{mixed-text-file} function or an absolute filepath for it.
+@end table
+@end deftp
+
+@deftp {Data type} php-fpm-dynamic-process-manager-configuration
+Data Type for the @code{dynamic} php-fpm process manager.  With the
+@code{dynamic} process manager, spare worker processes are kept around
+based on it's configured limits.
+@table @asis
+@item @code{max-children} (default: @code{5})
+Maximum of worker processes.
+@item @code{start-servers} (default: @code{2})
+How many worker processes should be started on start-up.
+@item @code{min-spare-servers} (default: @code{1})
+How many spare worker processes should be kept around at minimum.
+@item @code{max-spare-servers} (default: @code{3})
+How many spare worker processes should be kept around at maximum.
+@end table
+@end deftp
+
+@deftp {Data type} php-fpm-static-process-manager-configuration
+Data Type for the @code{static} php-fpm process manager.  With the
+@code{static} process manager, an unchanging number of worker processes
+are created.
+@table @asis
+@item @code{max-children} (default: @code{5})
+Maximum of worker processes.
+@end table
+@end deftp
+
+@deftp {Data type} php-fpm-on-demand-process-manager-configuration
+Data Type for the @code{on-demand} php-fpm process manager.  With the
+@code{on-demand} process manager, worker processes are only created as
+requests arrive.
+@table @asis
+@item @code{max-children} (default: @code{5})
+Maximum of worker processes.
+@item @code{process-idle-timeout} (default: @code{10})
+The time in seconds after which a process with no requests is killed.
+@end table
+@end deftp
+
+
+@deffn {Scheme Procedure} nginx-php-fpm-location @
+       [#:nginx-package nginx] @
+       [socket (string-append "/var/run/php" @
+                              (version-major (package-version php)) @
+                              "-fpm.sock")]
+A helper function to quickly add php to an @code{nginx-server-configuration}.
+@end deffn
+
+A simple services setup for nginx with php can look like this:
+@example
+(services (cons* (dhcp-client-service)
+                 (service php-fpm-service-type)
+                 (service nginx-service-type
+                          (nginx-server-configuration
+                           (server-name '("example.com"))
+                           (root "/srv/http/")
+                           (locations
+                            (list (nginx-php-location)))
+                           (https-port #f)
+                           (ssl-certificate #f)
+                           (ssl-certificate-key #f)))
+                 %base-services))
+@end example
+
 @node Certificate Services
 @subsubsection Certificate Services
 
@@ -15206,7 +15354,7 @@ and one slave, is:
 (operating-system
   ;; ...
   (services (cons* (service knot-service-type
-                     (knot-confifguration
+                     (knot-configuration
                        (remotes (list plop-master))
                        (zones (list master-zone slave-zone))))
                    ;; ...
@@ -17545,7 +17693,7 @@ serve the default @file{/srv/git} over HTTPS might be:
           (server-blocks
            (list
             (nginx-server-configuration
-             (http-port #f)
+             (listen '("443 ssl"))
              (server-name "git.my-host.org")
              (ssl-certificate
               "/etc/letsencrypt/live/git.my-host.org/fullchain.pem")
@@ -18228,7 +18376,6 @@ system.
 A possibly empty list of @code{menu-entry} objects (see below), denoting
 entries to appear in the bootloader menu, in addition to the current
 system entry and the entry pointing to previous system generations.
-generations.
 
 @item @code{default-entry} (default: @code{0})
 The index of the default boot menu entry.  Index 0 is for the entry of the
@@ -18609,6 +18756,14 @@ Build Options}).  In addition, @var{options} can contain one of the
 following:
 
 @table @option
+@item --expression=@var{expr}
+@itemx -e @var{expr}
+Consider the operating-system @var{expr} evaluates to.
+This is an alternative to specifying a file which evaluates to an
+operating system.
+This is used to generate the GuixSD installer @pxref{Building the
+Installation Image}).
+
 @item --system=@var{system}
 @itemx -s @var{system}
 Attempt to build for @var{system} instead of the host system type.

etc/snippets/scheme-mode/guix-cvs-reference

View file

diff --git a/etc/snippets/scheme-mode/guix-cvs-reference b/etc/snippets/scheme-mode/guix-cvs-reference
new file mode 100644
index 0000000..fbc5034
--- /dev/null
+++ b/etc/snippets/scheme-mode/guix-cvs-reference
@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# name: guix-cvs-reference
+# key: cvs-reference...
+# --
+(cvs-reference
+  (root-directory "${1:root-directory}")
+  (module "${2:module}")
+  (revision "${3:revision}"))
\ No newline at end of file

etc/snippets/scheme-mode/guix-git-reference

View file

diff --git a/etc/snippets/scheme-mode/guix-git-reference b/etc/snippets/scheme-mode/guix-git-reference
new file mode 100644
index 0000000..29ca6a9
--- /dev/null
+++ b/etc/snippets/scheme-mode/guix-git-reference
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: guix-git-reference
+# key: git-reference...
+# --
+(git-reference
+  (url "$1")
+  (commit ${2:commit}))
\ No newline at end of file

etc/snippets/scheme-mode/guix-hg-reference

View file

diff --git a/etc/snippets/scheme-mode/guix-hg-reference b/etc/snippets/scheme-mode/guix-hg-reference
new file mode 100644
index 0000000..95de16d
--- /dev/null
+++ b/etc/snippets/scheme-mode/guix-hg-reference
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: guix-hg-reference
+# key: hg-reference...
+# --
+(hg-reference
+  (url "$1")
+  (changeset ${2:changeset}))
\ No newline at end of file

etc/snippets/scheme-mode/guix-origin

View file

diff --git a/etc/snippets/scheme-mode/guix-origin b/etc/snippets/scheme-mode/guix-origin
new file mode 100644
index 0000000..68d4713
--- /dev/null
+++ b/etc/snippets/scheme-mode/guix-origin
@@ -0,0 +1,23 @@
+# -*- mode: snippet -*-
+# name: guix-origin
+# key: origin...
+# --
+(origin
+ (method ${1:$$(yas-choose-value "url-fetch"
+                                 "url-fetch/tarbomb"
+                                 "url-fetch/zipbomb"
+                                 "cvs-fetch"
+                                 "git-fetch"
+                                 "hg-fetch"
+                                 "svn-fetch")})
+ (uri ${1:$(cond ((equal yas-text "git-fetch") "git-reference...")
+                 ((equal yas-text "svn-fetch") "svn-reference...")
+                 ((equal yas-text "hg-fetch")  "hg-reference...")
+                 ((equal yas-text "cvs-fetch") "cvs-reference...")
+                 (t "(string-append \\"https://\\" version \\".tar.gz\\")"))}$0)
+ ${1:$(cond ((member yas-text '("git-fetch" "svn-fetch" "hg-fetch" "cvs-fetch"))
+             "(file-name (string-append name \\"-\\" version \\"-checkout\\"))")
+            (t ""))}
+ (sha256
+  (base32
+    "$2")))
\ No newline at end of file

etc/snippets/scheme-mode/guix-package

View file

diff --git a/etc/snippets/scheme-mode/guix-package b/etc/snippets/scheme-mode/guix-package
new file mode 100644
index 0000000..d392e82
--- /dev/null
+++ b/etc/snippets/scheme-mode/guix-package
@@ -0,0 +1,34 @@
+# -*- mode: snippet -*-
+# name: guix-package
+# key: package...
+# --
+(define-public $1
+  (package
+    (name "$1")
+    (version "$2")
+    (source origin...$0)
+    (build-system ${3:$$(yas-choose-value "ant-build-system"
+                                          "asdf-build-system"
+                                          "cargo-build-system"
+                                          "cmake-build-system"
+                                          "dub-build-system"
+                                          "emacs-build-system"
+                                          "font-build-system"
+                                          "glib-or-gtk-build-system"
+                                          "gnu-build-system"
+                                          "go-build-system"
+                                          "haskell-build-system"
+                                          "meson-build-system"
+                                          "minify-build-system"
+                                          "ocaml-build-system"
+                                          "perl-build-system"
+                                          "python-build-system"
+                                          "r-build-system"
+                                          "ruby-build-system"
+                                          "texlive-build-system"
+                                          "trivial-build-system"
+                                          "waf-build-system")})
+    (home-page "$4")
+    (synopsis "$5")
+    (description "$6")
+    (license $7)))
\ No newline at end of file

etc/snippets/scheme-mode/guix-svn-reference

View file

diff --git a/etc/snippets/scheme-mode/guix-svn-reference b/etc/snippets/scheme-mode/guix-svn-reference
new file mode 100644
index 0000000..7d897dc
--- /dev/null
+++ b/etc/snippets/scheme-mode/guix-svn-reference
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: guix-svn-reference
+# key: svn-reference...
+# --
+(svn-reference
+  (url "$1")
+  (revision ${2:svn-revision}))
\ No newline at end of file

etc/snippets/text-mode/guix-commit-message-add-package

View file

diff --git a/etc/snippets/text-mode/guix-commit-message-add-package b/etc/snippets/text-mode/guix-commit-message-add-package
new file mode 100644
index 0000000..1aebe8a
--- /dev/null
+++ b/etc/snippets/text-mode/guix-commit-message-add-package
@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# name: guix-commit-message-add-package
+# key: add
+# condition: git-commit-mode
+# --

This diff is incomplete. Download the complete patch.